From patchwork Wed Jul 22 19:09:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1561 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B82463F03F for ; Wed, 22 Jul 2020 21:10:16 +0200 (CEST) Received: by mail-pj1-f72.google.com with SMTP id cq11sf2133632pjb.0 for ; Wed, 22 Jul 2020 12:10:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595445015; cv=pass; d=google.com; s=arc-20160816; b=IFeJhNzKf7RsMKlqJy0Azz5c5sgMNrnpibsS7Gh23vq3S2UkSsAoEi0UOV17Nc611i 9WUGkjEY6EvnD/jSQUP3RczbDbX3HxpOrdoER8ddSH1L+NP4QnRnw98JQbMXGtRL3gZh JVh7XZczUpPGnJz1SxesmELluV7tUplEuK1dOr6t0nx01lrDwItrxXxtT/FikaPRKbgg t1xqJJHHXi+jOQI9WkQ83hRrWs0Tlwh7TsEqMCjtX4pW5rh1wb5wHi3JxYMTIH+06x+W i29qiXGmQn0jpyQMfeBhEolTYfCImuSWL99Zz48KZCYiPpfyfKeDwNNlCFOfGAi+Bbcw 9K0Q== 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=ZzO5LmX6DbZbRxLCy6rtJGBXP+7OLd0gNHM54ayhaow=; b=jhDnAWBzeizFPbOchi2cF/NXvaug06eMLuu0kOtyemSy9GIo67Eljn0zZe7dqLgeLM XdPg6GtSJwYb0TrkCMkFJRVycnsSASJN8jh2WdwmvwT3a7LMIEPsif4ATPlPUJ/j1w4R 278AjiTRqQoZPKbOQFGd2lKvAKYxSGI0DAAy+f43SbljsIsaNJV7JniRmeL8NeCZWw7w DlaxkRAJacFTkXjHhFsSXtl3rMtY1WauhUF2pcqStFna3jpFtCtSrqfQIvwufrt0vhJU 62RHyXzBEjrm2tuNBfe5tnzowLPhadKb2aBb45V1jfF1RMo6rJacTRoHi0NC2unwBHJR d71g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BsU4+NGY; 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=ZzO5LmX6DbZbRxLCy6rtJGBXP+7OLd0gNHM54ayhaow=; b=rQQEP5+14CynLlLLiUf7qy0W8fjt1S5xEp5yJ/o4CYzItu+IpBjTCd8O3TsHdM5oDl 1n+O9sFxXCdS28wZ/S5QKWRH4Da6pgJx0vWEYrPQnfjIqYRtgXCB+xhvigSRxo6zGK4J T4wlmcYzSz/GTusdBOGXS/hGHWxPxT8b3L0Mk= 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=ZzO5LmX6DbZbRxLCy6rtJGBXP+7OLd0gNHM54ayhaow=; b=Mps45iT64oUUWa8agFp1syyBFr+UTDF0hT/jR7nfzPjLGFtwK+XaSBkXT666a+UraK rNqU0eNUMGCzq/PIjqswn33HIFJDJvupf2ZCHPGs257qOWeo0MwxDSn8ZxLARKP49PXc bnlQATxj/3I8+XgpAH8gKvhQSyZ7xtG0teR0WFOTGMQhH/RV7G4PqI0ixCOiK5K7AL/r Q6OwZwMXl568wb7pZkJdv3//yEDSWekvJu+m77n7dTkx1BfmGd3CeAVn0JjaheXJ/FXf mZj11W8Ts4+tcrJ6Q3wB+Bt/HiCA5ZnksNymGN4l5QdclZTPd3QFYDhUKlOncRzIcWSm mOZw== X-Gm-Message-State: AOAM533lahdkS4TxRmgNGi1EkNEWP50218t+nZmb3U61z9+LRex6pChu Y0gJBAriKIEP7WtTe2cIEMFHnkmD X-Google-Smtp-Source: ABdhPJzipnoIqLld9txMjRUtTaiJ5zaujSVbV8zKYCKfjkGlz/dwkB6b82g+DyQ+RObgfM38YvSsmw== X-Received: by 2002:aa7:8edc:: with SMTP id b28mr981291pfr.230.1595445015497; Wed, 22 Jul 2020 12:10:15 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:7757:: with SMTP id s84ls1028582pfc.9.gmail; Wed, 22 Jul 2020 12:10:15 -0700 (PDT) X-Received: by 2002:a05:6a00:2257:: with SMTP id i23mr918887pfu.25.1595445014932; Wed, 22 Jul 2020 12:10:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595445014; cv=none; d=google.com; s=arc-20160816; b=W1tV0agzVv1Z6L9mJjYpMv5A3BPGf3+IkWw+xBoSxNWzX4910io9Q1z8Nm9jIC8WV8 NNwghuED8PhVTk37dIxTau4zHS/t/VY7XAXthzCQPwgbYv9nLM6idoT55VX4nNSDOEo+ dVbTUm01XVPh6wcfhxGxlf8t3mY/L1UhMePuKQp1lemWmX1tbp+SSrzZuoTp1B6SLtLG 61Gj0iGO+ONWrdixqXF/nEVHofMG0Q5heKYWpJStVgRGvB2vc5fJ0B7GM7nsA5j7eWba ywmkCfuFm2rh7WmrTvCQuHlOFcjVYXVg2NNHLsdH26iWHpkYEIk4KT9RJiKstk8XcAN0 +yWA== 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=LSzw5Z9vI5ptiBRPoRfqBOqKnLsmDUkdHQCEgOWcVKY=; b=v0gJ37DOuXaycBzrrOd/wP30Vo685d0HJfcQD3HQYJ4DIiNXIsEOBf/jZzpnCT+XpC 5H1zz1FlyIYTUOM2tNeUsyHBH7NAb4ZW/gWb5ET8T0d7Mnnq94hqbVKgqeV0z4Sd89qz u+mMKdy7ZUV2Yykt81HmOVcm4uav4TjkDdlngMgsdrv2QrYUXqJ0TKrjCVG0nodhCnwI jPeZobNKqPXxWsdyIq974wrI5kYQIKLJXCySvkDreDazM8XLz6cHg1Txj1NZ+fLG4/8N Jk0bM9AdH4FP3PpjtKBJlKuI7yfz4AanGSoL8bLId15vuF2JYkkvgTmrhpgPs/wP+RSW vuJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=BsU4+NGY; 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 a14sor656056pfl.57.2020.07.22.12.10.14 for (Google Transport Security); Wed, 22 Jul 2020 12:10:14 -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:a62:794e:: with SMTP id u75mr978867pfc.298.1595445014607; Wed, 22 Jul 2020 12:10:14 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:fda7:aaf8:9d1a:6749]) by smtp.gmail.com with ESMTPSA id n137sm342398pfd.194.2020.07.22.12.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2020 12:10:13 -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 v2 4/6] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Date: Thu, 23 Jul 2020 00:39:47 +0530 Message-Id: <20200722190949.215656-4-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200722190949.215656-1-jagan@amarulasolutions.com> References: <20200722190949.215656-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=BsU4+NGY; 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 v2: - 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 1250c62205a4..e7b11e8fd9b6 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -36,6 +36,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>; + }; +};