From patchwork Thu Jul 23 09:02:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1566 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4EC6F41487 for ; Thu, 23 Jul 2020 11:02:34 +0200 (CEST) Received: by mail-pj1-f69.google.com with SMTP id h93sf3472896pjb.2 for ; Thu, 23 Jul 2020 02:02:34 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595494953; cv=pass; d=google.com; s=arc-20160816; b=TE8OBIJtvQ9XJeL5mzs5BTeT1daOKECv3lhY70tVPUWUvWHuPymGMbit/Lg6854IQb iw5x7QLPD+G0SMQVnNnpp3UdD4vOjRkHqKyBrv7IGj/r2EiLHB3LYE6/ubHyeA3tWJV3 dROix2tEazJ86ILmBGO5m+Vf4ZYPl2VF0bdUwmk5a/xSq2OM7vwvomPVBCmgMZEOA71s KoPt0aflVTHoo/8LaInQbLJC2F5KSs/n1mxfsHxsLceFKbRAsRi5519Ne8AI/yf2cYUe 7SzsMs58m2x8pv/oKyHaZDSCgqV2vCvLeWpTbgQAr3GWaKOaD4FyUvT1Eca/nHx5aL+g R57Q== 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=ZCa1YE8+/I5e/fGZdzUQDVggghjH0aNiJhTSdoB9WIo=; b=u0jDtgtyzPufr/A2eqeaYmyxn7oRfS41TlLL/NEGplcKsMrT45lAH4j34uw4azcCn1 DyBNpqZGTscEdq821neBNWgmgznq1RbhLkM2RmVAa+GucQs9BoM+0t4qzB1OMJUbii1u 9FdBtWO23lnsw0dM4Q7ciGHl0LJCvb9D0j9JkPsIftAspBOLehfCHxEeBbwCbiWSfI9w STViRrwhDlGYVWudVOVTdf/XnLqQgCCbbhQm/evDmTx/+mRTaJBAzXvDq7jTI/8FXeFy XqtOIcWcB04DcWY/Zu6pbQeCTfocxhCjO2P/tIlMYFs54pKL1PVFRx95LUSv5oTczx2G 7s6g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IAju02F8; 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=ZCa1YE8+/I5e/fGZdzUQDVggghjH0aNiJhTSdoB9WIo=; b=PtwEFkCPcR9dIFogHUBC/EMqptYAT8EkZdc1tRu6pCXWgGVyzwXE2spyUVICQKe8Vc PQ5MhheX8KYlsvc3AKLAuQBDdAwUqtQJhEPsncy1GrpmyQqG7wJ7J3JMoo9d4cV+C27t 2Twks6kAjxOD3LzjWg/5HALV2FexbhmlNI/ho= 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=ZCa1YE8+/I5e/fGZdzUQDVggghjH0aNiJhTSdoB9WIo=; b=F8A12Goqw2PrIywqatAPkNsoLdXWuNxmavXkpkb5J+ZDtpx9Anmk+Ex0r5iLcFqh7a BUxwCiD28XgTDOk0SG7mqNwqNjsH5haNVwzVD3BREX0LsQYi2Zf+ijRMifNCKhp8F45f v7TrkadMojIMe/1BolrwwcU4bDR+9DGUJHPmV9OGa2IU0xhe9YchLfajwa5IxT1IhZLT gXMPmN22x0GAQfg0QTtw2JUdakBxB3IXdQkkrEV5GxQEScSuowvBOSI4JVJ3y2i5Kuqi RMv/oj2PBHznRSsmCCFoqWLpObOa4r9gGmNe6efoKF96AxpVdmDBU2P4Bqaj1N9zWt/f 7CpQ== X-Gm-Message-State: AOAM532X5ad3HIX4+vo8fNEaRcJT9Enftr+W1cPFADooyuE7T+0OaWrB jx0SgiXnwepNuNA6FSoI0mEfL5dD X-Google-Smtp-Source: ABdhPJzyh7U8jBcuijLfLhC4m3YKCh7ATMMfHnwhit0S5VBKerHexC7mULMQSd1m30D5XufzsXbC2g== X-Received: by 2002:a17:90a:8993:: with SMTP id v19mr183218pjn.122.1595494952989; Thu, 23 Jul 2020 02:02:32 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:864e:: with SMTP id a14ls1579152pfo.7.gmail; Thu, 23 Jul 2020 02:02:32 -0700 (PDT) X-Received: by 2002:a62:cfc2:: with SMTP id b185mr3199332pfg.125.1595494952498; Thu, 23 Jul 2020 02:02:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595494952; cv=none; d=google.com; s=arc-20160816; b=wj6FnU7Aly8PiLM/Vc41aJ14+fhzoyJU2Pv0MCPUc0S8U8bO5tNP1kY/Us5T0k3Yhu ZSR2TZm0GP94m5SuAR/z9QpEbbTqzWy0Xjqd0/aaP5t7rKbK/1WnzINsTKpVAnhC5a/v 3WEmOUlKHttEpGI3YbX0iqDsfha4gYqQ2jIQZ9XB6StGy8h9n8eed++QaPy1J3BHc6cP 1WP6R36FRDEBc9voe/ccSPbns7zSoGyEF2mVBdGSMxWcVf/OI2sLu5wMRHfwRvJFBJmX a08ScY0z3L454WATNPPZocJJrL+stvqwgkgh361LDciyoIjVte6nHS9VcIsYOfNnakNu iFew== 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=mXAoChgL41EYHlBynT6RAmQ3PERwS+BjK2PhZPY9IXA=; b=0DSNRQ8jx+Qh3pDh+cOm1BEVo7gH7CN4xJBscUmOX+TBXCd8wRu1wtG1qdHuwzfRAK 7OBsILxVlHR9IbKjgEkqeG6ZNKlv/HIDLAIaopIVtDmOJ0eCmU51NU9lGg0OWoI7UIJH hOKNBFTHZmvxoZa1XQgNQP/kbEnSQElrIxVOlDFIyDPB+uuSHFOhq4acwRpQmMUjabrt CEDJ5B6kdH6lmVnHsNy1Ud1zIuYV5LhdcSMm/a2INE760RCvnSoezhjZCDi92Mp0qu5A y21BlpmUk2S22luXdCq0p/w6CahGg9Wv+XPO9nTt1OAB5i1HbYEFIJ4PUOpSDXoR3eb2 79vw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=IAju02F8; 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 140sor2588562pfb.45.2020.07.23.02.02.32 for (Google Transport Security); Thu, 23 Jul 2020 02:02:32 -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:a05:6a00:10:: with SMTP id h16mr3218673pfk.214.1595494952164; Thu, 23 Jul 2020 02:02:32 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:cbf:ea0:8a30:a3af]) by smtp.gmail.com with ESMTPSA id k23sm2319383pgb.92.2020.07.23.02.02.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Jul 2020 02:02:31 -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 v3 3/4] arm64: dts: rockchip: Add Radxa ROCK Pi 4B support Date: Thu, 23 Jul 2020 14:32:09 +0530 Message-Id: <20200723090210.41201-3-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200723090210.41201-1-jagan@amarulasolutions.com> References: <20200723090210.41201-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=IAju02F8; 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 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>; + }; +};