From patchwork Fri Aug 7 09:48:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 254028 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BAB0BC433E0 for ; Fri, 7 Aug 2020 09:48:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AD58221E5 for ; Fri, 7 Aug 2020 09:48:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="RGpxzowG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728253AbgHGJsq (ORCPT ); Fri, 7 Aug 2020 05:48:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58942 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727037AbgHGJsp (ORCPT ); Fri, 7 Aug 2020 05:48:45 -0400 Received: from mail-pf1-x441.google.com (mail-pf1-x441.google.com [IPv6:2607:f8b0:4864:20::441]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2A5F0C061574 for ; Fri, 7 Aug 2020 02:48:45 -0700 (PDT) Received: by mail-pf1-x441.google.com with SMTP id m8so730565pfh.3 for ; Fri, 07 Aug 2020 02:48:45 -0700 (PDT) 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:content-transfer-encoding; bh=02o/duJFuPsa51rahLQuUkgKqOgWknYxohHZSpeLSFM=; b=RGpxzowGLm/VGCRGVp5wBW5ZhuH3Ip5LxyD9aPh4uqdx8ec1ZZ6pdaOFgmgn29Imy+ QL2UE3qUKUuqcdYeFeUsX/wDny/mfbkSsoj98Q6RfZoz5WsrhzImURmBc9r3Rg4XMA2H DapvsItYXeFiMP1dT6Tk8D6/dqUhY2cDbIvEs= 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:content-transfer-encoding; bh=02o/duJFuPsa51rahLQuUkgKqOgWknYxohHZSpeLSFM=; b=eda/0VuAFwC5sv6eVhoRH6pu2KrvZ1rvVZYRKZ0U1IiJbD1pLJQ0utnfot0c4QckcS nr1eWzfJ6sxN9nKulDM7cxJX3pWti/UN6dcx8JBAdSNAI/4eBg0RBoAXZdcF+vXRZqhz duad+GuC16jF6mWGzCcdDuLxj8REROs/x1g1OVjoDS54kbK4CpKgjDvPDtSJ1+309cDa tHjL3h9QdPXwgcMjWFuNZRFjZPyK+PC6GEe55gNs/gTp6jeWsUWT1dUnFwNyUzdOiQe2 dJlMiHNDT5dZOrbSxkTH3ThDETzUelXXYldNudCLb0dv8iazsovWIMpzPLN+E0jPRIut AkkA== X-Gm-Message-State: AOAM53068Z7t7erP0CM7+mrjjurFOfozZAQ0ZqDlWId4wzzkeEo1zpHw xgTRsDz73YJ71nOZWz7VN1nx/Hl+UklwiQ== X-Google-Smtp-Source: ABdhPJxgq2N8SMIizuOiXCoiNNoqPeSr3OpOAYogDH8wSLOQikEaK92KPDRdBvhs7ITb0jkYqSGLbQ== X-Received: by 2002:a62:cfc1:: with SMTP id b184mr11610684pfg.262.1596793724650; Fri, 07 Aug 2020 02:48:44 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:48:43 -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 2/4] arm64: dts: rockchip: Mark rock-pi-4 as rock-pi-4a dts Date: Fri, 7 Aug 2020 15:18:24 +0530 Message-Id: <20200807094826.12019-2-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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org ROCKPi 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C. - ROCKPi 4A has no Wif/BT. - ROCKPi 4B has AP6256 Wifi/BT, PoE. - ROCKPi 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C So move common nodes, properties into dtsi file and include on respective variant dts files. Signed-off-by: Jagan Teki --- Changes for v4, v3: - none Changes for v2: - update commit message - add radxa,rockpi4a arch/arm64/boot/dts/rockchip/Makefile | 2 +- .../{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 3 --- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 13 +++++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) rename arch/arm64/boot/dts/rockchip/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (99%) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index b87b1f773083..42f9e1861461 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -33,7 +33,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb 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-4.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.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.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi similarity index 99% rename from arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts rename to arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi index 60f98a3e19d8..e163f438f836 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi @@ -11,9 +11,6 @@ #include "rk3399-opp.dtsi" / { - model = "Radxa ROCK Pi 4"; - compatible = "radxa,rockpi4", "rockchip,rk3399"; - chosen { stdout-path = "serial2:1500000n8"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts new file mode 100644 index 000000000000..89f2af5e111d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts @@ -0,0 +1,13 @@ +// 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 4A"; + compatible = "radxa,rockpi4a", "radxa,rockpi4", "rockchip,rk3399"; +}; From patchwork Fri Aug 7 09:48:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 254027 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17369C433DF for ; Fri, 7 Aug 2020 09:48:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EAC92221E5 for ; Fri, 7 Aug 2020 09:48:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="FnPFmg0+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728279AbgHGJsy (ORCPT ); Fri, 7 Aug 2020 05:48:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728166AbgHGJsx (ORCPT ); Fri, 7 Aug 2020 05:48:53 -0400 Received: from mail-pf1-x443.google.com (mail-pf1-x443.google.com [IPv6:2607:f8b0:4864:20::443]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEF7BC061575 for ; Fri, 7 Aug 2020 02:48:53 -0700 (PDT) Received: by mail-pf1-x443.google.com with SMTP id u20so737116pfn.0 for ; Fri, 07 Aug 2020 02:48:53 -0700 (PDT) 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:content-transfer-encoding; bh=Qtqjn9bdXGvUfpcD1HWzU/py18DJffCjiF+w/RFjz2g=; b=FnPFmg0+YjpnOkedvmWUx/ChyDyzoLbOYxMCplO9uSXgjyi2P9moYPhApSPzIst4Q/ FyVpEp9zRgs4lIOPwgA2WL+R4KAyqm6b1reDWc64DnQ+JNLRyC1CdS07wQVyYO0zSLug LO8Tgr/oTyUjlzGhqSXRbsCFJMaaBRVMzOWCc= 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:content-transfer-encoding; bh=Qtqjn9bdXGvUfpcD1HWzU/py18DJffCjiF+w/RFjz2g=; b=cLTu1pqNn9lGdt0i/GZV+V1Pq8NFEbRkhgOVYFJDUSv+G7XnBQN6TZCnKRsXCDh3as jMcqaeEH/lz69o5b1kch9rcbadbTYpA0aFwRT0r1t2IoBdSkEeo/dKphS6/eVYOQbDx3 h1XTRP7toUfVvAU8/rvCxuhLgcenafMleqmQ47Xh8vSJia9IYBoNw4i9RqTwN9GmIGtl SNLNZOaI6V1j5npQZuVCwpOTgadt8WftjltekN1qx/M7zTjAcgdCFOHgBMDxe3geBsBZ jZnI6u+wu8of0RYPwRNE9XZ0qQE+P1kUiANuihMaI1y9p/11nTuuMZi9PZ6Bcd8GNbuW JZ7w== X-Gm-Message-State: AOAM530J2iCgmxywJ4R8FvZCZiv0umEgiAzYoypliX1IpAUY9JxFqN6T oxEbaNgtlu1G/FdTKgD55A7ltQ== X-Google-Smtp-Source: ABdhPJzQ/zkmkBdBxmXc5ZdCVmyPR4dyh4piPTo+ebtaM8xlE4gOHHzep/PgunOz6/hEUBRNDtgpfg== X-Received: by 2002:a62:7ac2:: with SMTP id v185mr12567409pfc.277.1596793733318; Fri, 07 Aug 2020 02:48:53 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Aug 2020 02:48:52 -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 4/4] arm64: dts: rockchip: Add Radxa ROCK Pi 4C support Date: Fri, 7 Aug 2020 15:18:26 +0530 Message-Id: <20200807094826.12019-4-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 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enabled GPIO pin change compared to 4B, 4C. So, add or enable difference nodes/properties in 4C dts by including common dtsi. Signed-off-by: Jagan Teki --- Changes for v4, v3: - none Changes for v2: - update commit message - add radxa,rockpi4c arch/arm64/boot/dts/rockchip/Makefile | 1 + .../boot/dts/rockchip/rk3399-rock-pi-4c.dts | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile index 8832d05c2571..02cdb3c4a6c1 100644 --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile @@ -35,6 +35,7 @@ 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-rock-pi-4c.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-4c.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts new file mode 100644 index 000000000000..4c7ebb1c5d2d --- /dev/null +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts @@ -0,0 +1,51 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 Fuzhou Rockchip Electronics Co., Ltd + * Copyright (c) 2019 Radxa Limited + * Copyright (c) 2019 Amarula Solutions(India) + */ + +/dts-v1/; +#include "rk3399-rock-pi-4.dtsi" + +/ { + model = "Radxa ROCK Pi 4C"; + compatible = "radxa,rockpi4c", "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>; + }; +}; + +&vcc5v0_host { + gpio = <&gpio3 RK_PD6 GPIO_ACTIVE_HIGH>; +}; + +&vcc5v0_host_en { + rockchip,pins = <3 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>; +};