From patchwork Fri Aug 7 09:48:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1586 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 61E3B3F22D for ; Fri, 7 Aug 2020 11:48:51 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id oc8sf1182382pjb.4 for ; Fri, 07 Aug 2020 02:48:51 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1596793729; cv=pass; d=google.com; s=arc-20160816; b=zq/b234Nqcff/A9XE1oTz/MfegE7T4etYl0IvEFGytVj8th7g2zIHkk+aDyaYQoirV wDqxIieeKDa1vybECNwEqV97YCbvPKRkrEoZAJ+jqfHtsi8/f1sYzPvrJyq+oAyYy40l 7xx4zGZvwqMGdbzf/6vTpgySv5Sf1/6rlqIWy3Ov8CMqQexx3a6ywBNhpBfNNosNz0Ce APOUnKrgzt+EZ5yihbuivtu0Jc1r+0wfOXrlO0VAgsIWLaxTpXtmujarmhV3b4Z//lVf mBFoBNfsWXFMgX7slgy71xjyIR/+GfHizpN1h73oECCzpb5BKM2x/xF885g4rzoPJ8HM i9uw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=eiSMxer15CCxuBHBP2aZeno9OEhkLDl9J2nq8qRTNds=; b=EhDxoQIEG3vd2yk8ldhqTFUSyR4SxxIQdvwTFNFTzKkaEnEMwnzDhEsvuT2NlxJ6G7 hlG8AE6bdF4ocR3empTR/xdmzCaFjWJv0jBYnZhTRKMwZGdKOWMQA+vDvW12adZnzb4S VAmst/mx9fJKtN9SHMhUQwjm2vNGV6nuLGvPiRulvquxnxhCyz6YUMonw2WMh7bgh42F YuR8qunMwyUZ4zHRhefAeahJf89Y39Y3WjQs/xM5g2Qab1yl6++DFFgH5SfUUfoe1k5a eN45zjXQvF5kGkkoR/34Mt90EaTJ0CqEJXQNEsQO5QtKLeIhffzoxKBlKiORZ42T4jdf QWGg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZJhlgW2q; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=eiSMxer15CCxuBHBP2aZeno9OEhkLDl9J2nq8qRTNds=; b=fAcgmVDqKmO4i2UjQ9CcZHQSUSB4H6wHno6GIYCAjoEBfMdpA53vh6RyHRv41uCbG6 E8+bwmdFcfTiS6IHtSHkVjspAlqOSw6MJAJmeVFVjNtN2QjnxKjFSYr4vo2ambiARFCl 9euc/fmYrQD3LZO4tPQsQJ0x/jGL1aD5fsyxg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=eiSMxer15CCxuBHBP2aZeno9OEhkLDl9J2nq8qRTNds=; b=qqoFmPGeuNaSFPd8UvoiLxm4HTxn9H0hpB6o4gMbVIrf53lPFNVdM6UMfGjGKG8AJB maUHjrbYYEUglD7++TOwD5eoOy2ydt6eFTKsejutH1ubP2Q1HWOjX+XDUGGyEMNT+jCr 2EPOmMIos/PetR/Qyl2jkysC+nkdpKiwfCB7sWgVLPq2LnRogH4FuSH0RdP8Bo/fW3Li 8XVNjirDWPT2Xx763JygGK1kyKkI2bdDe+2uvIrbkhl4AdA9Yqf8eUK+Qr7SUHuUn646 I3b4E+W1lGKRNL1gkdCzObMP+Lc7DO5oamkj9ThedPzvhEzleeVYUd5qMop/UkQin1D1 cKGQ== X-Gm-Message-State: AOAM532V/DWYvOvV2quRYwAVbqm5H3As2PuIfbMkA9mxXuXwUuaPMdPv 4owp/zk6tqQREtRnK4pdnSjHpmW2 X-Google-Smtp-Source: ABdhPJw4EmmMgHrmf+Qgi5bFFrA2AtDv35JRahZ/pC+aozLUY4CwtyEpePl6zqMDpyvzgviImPhfBQ== X-Received: by 2002:a63:7a06:: with SMTP id v6mr10821038pgc.441.1596793729725; Fri, 07 Aug 2020 02:48:49 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:525b:: with SMTP id s27ls2389827pgl.11.gmail; Fri, 07 Aug 2020 02:48:49 -0700 (PDT) X-Received: by 2002:a63:31c6:: with SMTP id x189mr10732718pgx.182.1596793729271; Fri, 07 Aug 2020 02:48:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596793729; cv=none; d=google.com; s=arc-20160816; b=xKNuMrhKcwdX9d90ddSfcBqSQwgIFv+5n/LERCXLJW+u4Y51Jj+ft3U0Fn2DDcv6g3 iylCOdnlS9rQ3rTVR55TSx0aEYTQLVEEtCOt/KekT6j3s1jZ+wMjgiP0vl92dLdvpHSs H9kg46APNu5gzl+JZ3BG+iqqTCG03uorS7JUCf66zfiDG0JOydsrQcyI/b/kNY+niXww cwcYhoYaZV3mbufLafxUXTTtx3qfwVbg9jwfJ8DoB53+TqSMdIuuzaVttpmusYWuNhiD E8wS6iqGHeafHjsTXgNe4p+6IyYRHkpR8OGrrc4rSGk57q/Uvw/C8eHHfatahFVicanP C8LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=xpgEOhtDJgg+JHNnGT0zB8AHGVroP0sa6vGC4+WgrY0=; b=NblDv4N3R+uaG/4YmFJpp3zMg1qb4E5y+/KOt2OZAlLvbaRG3ujdZWAscVr19oSX/v RDaMVxaims2wAFIZRHAlofhMlHqtmcgnbWmpgfPsF3hv8JJksEM3Nt8/xTKCr5Xc6VBs zHlICW5c5OvuHwzuBA1iflxWwr+KB6inwTSQIpz5r3J1AKoG8vuuKtX2fboOq1ElMIzB jkBdwqMOLNlV/3RocGQBZ7LJHa/3K9bg72pKmerdPghsm07ihcsY+clMq1QPVIlzj8T/ 3sluZ678RhJJkX8VEBdpO02/DBEmwqjDjC+6dwmQnYF0TIKHt99917Pa5lzDy5RJcWA5 N3qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZJhlgW2q; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id mg18sor9728774pjb.7.2020.08.07.02.48.49 for (Google Transport Security); Fri, 07 Aug 2020 02:48:49 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a17:90a:2110:: with SMTP id a16mr12756782pje.104.1596793728986; Fri, 07 Aug 2020 02:48:48 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:6097:2d32:26bb:64fe]) by smtp.gmail.com with ESMTPSA id d65sm11412112pfc.97.2020.08.07.02.48.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:48:48 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Cc: Suniel Mahesh , Michael Trimarchi , linux-arm-kernel@lists.infradead.org, linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-amarula , Jagan Teki Subject: [PATCH v4 3/4] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Date: Fri, 7 Aug 2020 15:18:25 +0530 Message-Id: <20200807094826.12019-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200807094826.12019-1-jagan@amarulasolutions.com> References: <20200807094826.12019-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZJhlgW2q; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , RockPI 4B has AP6256 Wifi/BT, so enable them in 4B dts instead of enable in common dtsi. Signed-off-by: Jagan Teki --- Changes for v4, v3: - none Changes for v2: - update commit message - add radxa,rockpi4b arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 23 ---------- .../boot/dts/rockchip/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++ 3 files changed, 43 insertions(+), 23 deletions(-) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 42f9e1861461..8832d05c2571 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -34,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-puma-haikou.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64-v2.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rockpro64.dtb diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index e163f438f836..678a336010bf 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -584,17 +584,6 @@ &sdio0 { pinctrl-names = "default"; pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>; sd-uhs-sdr104; - status = "okay"; - - brcmf: wifi@1 { - compatible = "brcm,bcm4329-fmac"; - reg = <1>; - interrupt-parent = <&gpio0>; - interrupts = ; - interrupt-names = "host-wake"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_l>; - }; }; &sdmmc { @@ -663,18 +652,6 @@ u2phy1_host: host-port { &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>; - status = "okay"; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - clocks = <&rk808 1>; - clock-names = "ext_clock"; - device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; - host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; - }; }; &uart2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts new file mode 100644 index 000000000000..f0055ce2fda0 --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Akash Gajjar + * Copyright (c) 2019 Pragnesh Patel + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4B"; + compatible = "radxa,rockpi4b", "radxa,rockpi4", "rockchip,rk3399"; +}; + +&sdio0 { + status = "okay"; + + brcmf: wifi@1 { + compatible = "brcm,bcm4329-fmac"; + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = ; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake_l>; + }; +}; + +&uart0 { + status = "okay"; + + bluetooth { + compatible = "brcm,bcm43438-bt"; + clocks = <&rk808 1>; + clock-names = "ext_clock"; + device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; + host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>; + }; +};