From patchwork Mon Jul 20 10:55:30 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1510 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 C2B8D3F080 for ; Mon, 20 Jul 2020 12:56:13 +0200 (CEST) Received: by mail-pj1-f71.google.com with SMTP id k7sf13329935pjw.2 for ; Mon, 20 Jul 2020 03:56:13 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595242572; cv=pass; d=google.com; s=arc-20160816; b=HFqz85dgK7k89aJG+YY5cjTkmxwhN8BHxWIJGYN2I+n8OscLvZxk9WID+b7j0qyX7g Fz4sY0YCaYffViVj0ckB063F8ZPFBbcNUUpQr3wM2G+M41o+fkvS6bxDmv7ykSTpg2Em jOb6LjzFdwiRdd3/HcYjtT5OlZZNTiumupczckZSllWGSUjMkqXtxTL+PQED0qKE48Ij ICo3ep6F2mpRrzhiuSWm2d4E1eP84vkP6TskcWA8pVeB2NomIfwqP5pSUk+b6lIcHqCw Efod695lKeX4vVpeK7gaKwsURez/FJfa8SdLtvh8T969T9uLy9jsyFluMgjAnkb9PkXx E0YQ== 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=0i4tR1/5deb5Iev8hT2V8Lr/a+INSmBO02tv5E7btZWhLjgrCpBBzZUZC5xSUx+z4E mLjCp/6SJq3iYYuvTDXLeSN/PqN2BGlVx9792SdCTda3H3XTB73Qp0gLpdxJv09yGAhk wOk981j/M6jAsXZMfYohumY1inP8XpmziPu/Rol1EkYOnRmndfRTgVdoCDRWfKDlCmCW ywa0LAZZhvp2Ci0G8LJvZbl8n3FA80fCWw0FYYpJeaatROIYZCB4ErNp0RNCgglBk5Nk 6DUNKMOb0KQyap/cYLoLn9p5QheYXXUVY/hSlK9OHijgZAvedECYSf8DaZsvlk0X9FGL 2V/Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RtUNFEDV; 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=TNizWRMSHIaqt7ViJdOKh7Jaz/jISEphrEzIhgpN22Paa4J2NZuQwyOxqrGh+JsYob wBOz71YVQKiBScsHxjxlctZ1886jEIqWFmPxBVhVb2zgh89fCYypG6PaaFDEMjnLymnp nE4Vo/LYaYidEIiMMsr0Vu+7BppkdD+A32M/o= 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=/CceSkjO/3vpjoaxdCqdbmb+1YrXpzuAWpx61KBgT+M=; b=iqzkLQ1MzIaOmlzSNR7u+yCQ1e7JhvpO2YWpUKW5tD5pJABFxd9jq+XDtBQ6XwY+/A WYX8AlNVkB7uIh3VVwnV053rQvkLMDZ+w7Ve4vsHW8ZyilS0CxXYkPlttthUHvBtR1FC E0EUhlhWkLk3mq0SmaGhlCb5B07bzWMeq5CrJvSBHFzuqGn1nCjuUWji4usTTji7Qouj WvCGu94zO7rUgGJzyOeX4XkthpmZk/gW35bC0s/cAZOkdsf4TtzOZCrMPosgs+nMJQZN RITzcXnDFpbvURjQj3plEVbY/sclHuNMXPBDiWT9UzRpdaw+vLONc4fcuB+YZzV+rXIt iewQ== X-Gm-Message-State: AOAM530zZSBrL7ra6JefnW9v0ToGYifXVqC+qZ3+mX5kydGDesUvI25Y 1UBz1WaTJ5XEJj6VlWcqa489Mtnk X-Google-Smtp-Source: ABdhPJwG52kd3xMN+5a9GNqU/j702TelgZOMMV0iQBPx6BR/N6PaB/FCIUBrjjJUNwLuFxNCdVwdrg== X-Received: by 2002:a62:88d4:: with SMTP id l203mr18467017pfd.205.1595242572539; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:bb8f:: with SMTP id m15ls2627488pls.5.gmail; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) X-Received: by 2002:a17:902:b78b:: with SMTP id e11mr17056353pls.204.1595242572070; Mon, 20 Jul 2020 03:56:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595242572; cv=none; d=google.com; s=arc-20160816; b=ylmc4MQGS45DxMaUBtOlD7V49tyPtwLQb2HLQ7AvSMnKTisNFOluWiOP0sVqzpiwgU KyzzXzd01iXeFNbYbXNKFsD3d6jssJ7eOuWc4yWLJ5Be1P+91g5b3UryWryu6c/uZGoy opNmhlRBKfY1m8H4Y0fmkPQdSVXCqmE/TCyBoQUI0uxhf6WJrCRZMHCwFDPwa3SOACqR T5FS86OtceYdlUcVEsxCG4G861kPOV7KxWEK7noOiv9eHnRx6RHIRqrIu+ulXTEtxdHF VQ4WeFX/jTgztNR8geIH6MZePMCOTdNJu5s8OCDxaKCWHEwxAix3sTuNVUBj41q1KzQ3 Pm8g== 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=7jsB7/zG2Zw1ViCb1957FBxqdpipMGGh3/SxIaRSDfI=; b=u72SQVRb3MPu1ItqEPDKy74pSpFOclXojo6b4nGXKwlBYFFBTlcVbLVq8v2+etyG24 X3gU8V0Qu2MpM2EySkxVlmLQWxW32+tnUwm5CM/wZcmUS1v2eLKsmh/5zqosq3rZW2IN I65YHgIjo8EqxbtjHMcWwH8eMPmDr2Cfd0lRypM0Eph/xb//YL/K0VXhsdpDMKDc00z9 Of2iu6T5t9vj0EuNYcCgDgVsQyHhIKNhLu7HjB8I5TDLhTPR5/pIdgWz1yqprT6NAnGh 7BffrKckIF1su0IA3oD31VecCLSBD69Cx7HuB2jwmJBVBKTGYhNVGAVnz/ofTjPYbqqf 2nvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=RtUNFEDV; 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 ng6sor14091982pjb.4.2020.07.20.03.56.12 for (Google Transport Security); Mon, 20 Jul 2020 03:56:12 -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:a106:: with SMTP id s6mr22863520pjp.53.1595242571727; Mon, 20 Jul 2020 03:56:11 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:8c21:db7b:4558:fba3]) by smtp.gmail.com with ESMTPSA id j5sm13984721pgi.42.2020.07.20.03.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 03:56:10 -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 2/3] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Date: Mon, 20 Jul 2020 16:25:30 +0530 Message-Id: <20200720105531.367671-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720105531.367671-1-jagan@amarulasolutions.com> References: <20200720105531.367671-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=RtUNFEDV; 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 --- 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 c39334b139cc..1c55a4645b59 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..4ca970acacd3 --- /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,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>; + }; +};