From patchwork Mon Jul 20 18:55:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1535 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3045C3F03F for ; Mon, 20 Jul 2020 20:56:17 +0200 (CEST) Received: by mail-pf1-f197.google.com with SMTP id a25sf13321413pfl.2 for ; Mon, 20 Jul 2020 11:56:17 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1595271376; cv=pass; d=google.com; s=arc-20160816; b=Qe1cyb/BklAZUFd3bGBm79DwDdUSsyoDj0qatfCAAcA4WPJ6aExD9+7mBjiIVih3bc aGw8j9Tjxlp4o7wND+1NocqKVNURmTUpsBVyjsFQUlGhA3CWaBhGTQeHvdmT9+oxUQyT H0uFzoFvTNxMRU67/g9CRMP4lMzDgTFiMx60v0cixLyKBezx1EU3iJ3WNwfUnJ08bGTt 7PNgbQbO8/4uyu8S9xreBIct2MSzqUYxPWAjxMkTJUl3VMaBdgq7yh/v5STcLt23qdkz gUO/aPGUhdsXlatvPJK+F207OeBfX3Ve8a4NP+Sdps9UMiAvbF0XB9iq2BZXm7yONP9r ecow== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=hjBsiI8b5taLCSabScVJZtXzlpP80C8tGTmxO0l7fcw=; b=JDiRFNu2LIunjbAzqojQzSDn1HwUGQWeewGPEtA0D9v93mYzn5Xl0m2auDhsobsccv Af0mTf4Y5mFkQFhVQzhNxafU95GJ2SsGxHJGBQM1+V4M88CgSFzzxykJDhbJT5mmDRS+ mkj+v5+mqujDcW7F0beEhYz3LSu8TeM7OWuJRU7Ftnj6KCM9fq6XYUKjRqFpW6fF+SeE 6mTufwS3jJ/B/rWGkM8VuPnCM2ctw/4k12+ELYC+YdQ1SHfuLw2vEyFdq9kFwXeIkebo pAzJ7mDl83Mu+7rm2y7RUAVFV4V3NaR2+hErPwzYHy5/WS0UjO7/QxnpRsO9w+y2AZZJ dutg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=oRPmZ92L; 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:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=hjBsiI8b5taLCSabScVJZtXzlpP80C8tGTmxO0l7fcw=; b=QV1VsmFclDwsZP8cg7141ihdQdQRFPlrZSQz9Ptct0l8s7mDIzC5Lm2OOBNIQUw1vo O+Zc/iraTZ3irt2VH6dCVonxOcmnoDBzCT7jifm4ymGkWRPZNyXDfSg/es+EhifY4iCV eLXpcD1ZZxz8kFUNEJ/Iud6HPauOIezZVVvs8= 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: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=hjBsiI8b5taLCSabScVJZtXzlpP80C8tGTmxO0l7fcw=; b=VDduN5j92Asvr7EysiwUksfrWggoDI9y1Wj0vKGULlwX6Y+m+PkIDM9xaJaxxjN4FJ DoBvxJ+13B2VbTl0OEvjijtYV6RPLEyxWpXl4HvuYbn627H2arqHjwIEzKNQLJbo3JqB MOtuMd2kwi+luyYNpRo3LuuMRap22GkyVVGkP3vQBCQhcx2ZveV7ab+qxaVGc9C8SygO vUFoHqRMVcyfZZAc+5WFHuSVAIDBj322ftrp1UbXqrClVySATf2YWPT6MqlII0B8TshH vXQzJbPvxpS2jvyHBEfrMQ1qnQNi+wj5UON/FMxdHhzifDGw9MDPq5kLDssdoW7p/TSH RyYA== X-Gm-Message-State: AOAM53052SAvHzMvZSnJ5a2zyoJL7YiKVMWHL5AnxKPOGswZybhluRL9 FBPyNihaBjuIUguG6sbXoAjzrYac X-Google-Smtp-Source: ABdhPJzPzMlpdO83mK7kZbepKtunqpjXtK7I4M6uKm6gSZkvUWK0jiD1gihXF9oNon676c+Db0gNMw== X-Received: by 2002:a63:5d1:: with SMTP id 200mr20204517pgf.59.1595271375831; Mon, 20 Jul 2020 11:56:15 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a65:6891:: with SMTP id e17ls2102216pgt.3.gmail; Mon, 20 Jul 2020 11:56:15 -0700 (PDT) X-Received: by 2002:a63:5806:: with SMTP id m6mr19778192pgb.362.1595271375420; Mon, 20 Jul 2020 11:56:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595271375; cv=none; d=google.com; s=arc-20160816; b=sL0qoyYFIasC/+Aw0Ij41eEyR8JZFEV4a/mH3C1qd3Ra1AtSSEPfCC7L/daT2SN8hz g1bKKJf4CFc8wYKuO9J7HODBsRH0RNjn3DyCrMwv0NGaXwQwInNBzsFWZ0Kpq09kk9TG cutmsUH6zYQbM7LLikUae2zlI20GDuWazhuAwMszrzcsr8MQT9oLCShtL0cU9s6ElnbC 7M+MgLThJboCvVZNthydUG1Zmd2I3uKtcHwdthFU9F2qjZxqAja8gu7p/O18ww9ylM1J VWqyPX2yn5EN1gSLTrDgif3BhwYM+SsGMbrJRR/RePyxnv+t4YkJ8xsSzN5JxjYU8S5n sDWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=Vf6AGLB95WNFyq1kuujotm85CpWfHSpAr2DRU+d3NIA=; b=FVxs9my1lIVRfmxfdTlpfYHHZN3xbwcu2+q+CzJmz/tJq6m8xKTafKh/+LWMMfkuZx tVI/u6Sspb3nu4QH6pmvoUh0ok6xtoctk8OhDNF8nwqoHz2YXXiv8RzZjEKsj2OOK7qH jFfAQvkSMqamm0x2xrGNBX5B4zEcatbdCZ5/xGjlJ4dJZG+mkNPG8+/PlvtoZyeOHjJi M6KFVnF0CbhNZMoNU8uvQdtflahOzE5jqasK/rA2yXjoyo9FO7wkTeIweoKRRzKCMFHy muj67V/tUL7HF/wzzI1ThCgTbexZHwDSDYgULN+9O6An6i56zhX5BioQ86PiG7g6udjG 22CQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=oRPmZ92L; 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 w14sor21682864pfu.31.2020.07.20.11.56.15 for (Google Transport Security); Mon, 20 Jul 2020 11:56:15 -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:f:: with SMTP id h15mr20713877pfk.193.1595271374977; Mon, 20 Jul 2020 11:56:14 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:8c21:db7b:4558:fba3]) by smtp.gmail.com with ESMTPSA id l9sm330318pjy.2.2020.07.20.11.56.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 11:56:14 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Cc: Suniel Mahesh , U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki Subject: [PATCH v2 1/2] arm64: dts: rockchip: Add ROCKPi 4A/4B support Date: Tue, 21 Jul 2020 00:25:48 +0530 Message-Id: <20200720185549.671360-1-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 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=oRPmZ92L; 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: , Rock PI 4 has 3 variants of hardware platforms called RockPI 4A, 4B, and 4C. - Rock PI 4A has no Wif/BT. - Rock PI 4B has AP6256 Wifi/BT, PoE. - Rock PI 4C has AP6256 Wifi/BT, PoE, miniDP, USB Host enable GPIO pin change compared to 4B, 4C So move common nodes, properties into dtsi file and include on respective variant dts files. Use 4B dts into default rock-pi-4 defconfig until we find any solution for dynamic detection of these variants. Signed-off-by: Jagan Teki Reviewed-by: Kever Yang --- Changes for v2: - none arch/arm/dts/Makefile | 3 +- ...99-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} | 26 ------------ arch/arm/dts/rk3399-rock-pi-4a.dts | 13 ++++++ arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi | 6 +++ arch/arm/dts/rk3399-rock-pi-4b.dts | 42 +++++++++++++++++++ configs/rock-pi-4-rk3399_defconfig | 4 +- 6 files changed, 65 insertions(+), 29 deletions(-) rename arch/arm/dts/{rk3399-rock-pi-4.dts => rk3399-rock-pi-4.dtsi} (95%) create mode 100644 arch/arm/dts/rk3399-rock-pi-4a.dts create mode 100644 arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi create mode 100644 arch/arm/dts/rk3399-rock-pi-4b.dts diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 82e9b18cb8..bcd89af6a5 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -136,7 +136,8 @@ dtb-$(CONFIG_ROCKCHIP_RK3399) += \ rk3399-puma-haikou.dtb \ rk3399-roc-pc.dtb \ rk3399-roc-pc-mezzanine.dtb \ - rk3399-rock-pi-4.dtb \ + rk3399-rock-pi-4a.dtb \ + rk3399-rock-pi-4b.dtb \ rk3399-rock960.dtb \ rk3399-rockpro64.dtb \ rk3399pro-rock-pi-n10.dtb diff --git a/arch/arm/dts/rk3399-rock-pi-4.dts b/arch/arm/dts/rk3399-rock-pi-4.dtsi similarity index 95% rename from arch/arm/dts/rk3399-rock-pi-4.dts rename to arch/arm/dts/rk3399-rock-pi-4.dtsi index 3923ec01ef..1c55a4645b 100644 --- a/arch/arm/dts/rk3399-rock-pi-4.dts +++ b/arch/arm/dts/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"; }; @@ -587,17 +584,6 @@ 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 { @@ -666,18 +652,6 @@ &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/arm/dts/rk3399-rock-pi-4a.dts b/arch/arm/dts/rk3399-rock-pi-4a.dts new file mode 100644 index 0000000000..d96dd3ebd3 --- /dev/null +++ b/arch/arm/dts/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,rockpi4", "rockchip,rk3399"; +}; diff --git a/arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi b/arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi new file mode 100644 index 0000000000..85ee5770ad --- /dev/null +++ b/arch/arm/dts/rk3399-rock-pi-4b-u-boot.dtsi @@ -0,0 +1,6 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Jagan Teki + */ + +#include "rk3399-rock-pi-4-u-boot.dtsi" diff --git a/arch/arm/dts/rk3399-rock-pi-4b.dts b/arch/arm/dts/rk3399-rock-pi-4b.dts new file mode 100644 index 0000000000..4ca970acac --- /dev/null +++ b/arch/arm/dts/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>; + }; +}; diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig index 98f71a50a5..1d34476825 100644 --- a/configs/rock-pi-4-rk3399_defconfig +++ b/configs/rock-pi-4-rk3399_defconfig @@ -9,7 +9,7 @@ CONFIG_DEBUG_UART_BASE=0xFF1A0000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART=y # CONFIG_ANDROID_BOOT_IMAGE is not set -CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4.dtb" +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4b.dtb" CONFIG_MISC_INIT_R=y CONFIG_DISPLAY_BOARDINFO_LATE=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set @@ -24,7 +24,7 @@ CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_TIME=y CONFIG_SPL_OF_CONTROL=y -CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4" +CONFIG_DEFAULT_DEVICE_TREE="rk3399-rock-pi-4b" CONFIG_OF_SPL_REMOVE_PROPS="pinctrl-0 pinctrl-names clock-names interrupt-parent assigned-clocks assigned-clock-rates assigned-clock-parents" CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y