From patchwork Wed Jul 8 06:36: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: 1451 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id D25A33F209 for ; Wed, 8 Jul 2020 08:36:49 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id c4sf24586089plo.6 for ; Tue, 07 Jul 2020 23:36:49 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1594190207; cv=pass; d=google.com; s=arc-20160816; b=PJOPVkBDiuvvQ26RW0gh+1aRBaXaghMRpNotfdu/H7b/1StBO1Y7/wfPbNNovQmUHj jKYYWunAEZ2HQ9B7MgBa85mz8PihqjY4RXcIC2pDwZ0n9aHA9oBpIGqhlJ5KJSbys7Cc vXhanbdvfudkqBAJAu2xJIHS+VmVFU1oqpJ6SxEispur7mizwhZVnQUvk5eWuwqbeL7U nAnnvJouNMas6kie1YFpIDmnq5TwYFwobpMK2jWG4Fgu4QEZi5oAS9af8C7GjOee11MD 9QajlAuMEugt1BjWCI4PtFcIl8E6EfDSXysnqxZTXGuv6ZdXDJdTU4AUnPD5POGl7YLT G0LQ== 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=gPC9NMH9hSxVzBi+RNXMzS9agjPzWvkw6YCy304kN5w=; b=iIutyzr5CaCxgLTYOCtbMz0dKwIlin3+Ne7lfFiZtikYK1EPHVNXkI5+AivbkAyXq1 6kE2558H/tpZjTnodx1ncoM06J76WVI+/rQqE937mlGTuqkK4NSAgLK3QtDJqgjfqNY1 lJcEloqiL9erouIU+1xrkupn6GYElScqC516eOSfZtv/QDES0/LR9CdDFVltxyi86Ve7 LFxnFvlA+c5fciYBQxi0xiDIBG+LlQkzra7PDwYjCICoAy5fN9pDHan5ZURUYUxjbJcy qROOMAD4Ft0sIZ4vGrrNC2lTObzwNmpXHULlHQypS5DE4kAvLyMfOiB77LYRpXqmZUBh dFiw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dZbc2VWp; 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=gPC9NMH9hSxVzBi+RNXMzS9agjPzWvkw6YCy304kN5w=; b=CGUPFPK6PKICA5MUi+x7orH8jMA5afDoV7pvMCnvSMIVIRvKzpupk7128bJOZMCj7l DR0FSUAg8Mkf/6rlrajahdLzypHOhxPJf+4rEgf85B+BISe3qQuPQJKQje4BbhC8a7UP UtRtK4fFdp7xTfqAC5EwjdfDztidleCgLLAFk= 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=gPC9NMH9hSxVzBi+RNXMzS9agjPzWvkw6YCy304kN5w=; b=evmat7Ky12QrPl6igI9GWPSoLQgzups4WBIY9rG+7teNPy8nBSMshy8wHM5nBpGuyd fVO7IycTtbGO9s1SbAEmihVRFY8VbfFbowmLEv5Q+kt57TFLxtvX9Uf+p6uvzd6wBcpM VPq1xrYWiDdjg30fktmoJWmxBsUIFm7sfzUAzoKEOsolVnZAo2WqT1kPQxnsGXOp+Q5f 8LT1YXN/7QNYCNBhXia2698WI2d1JYEnkkxT5s4UcPX6DWtzi3/wo0SKgZUj6YbQ7d1k 4eNDAnfc/9zWStfJzdTLR9o7i7H8zNu6sHHI16oJb5dQkYoL2MWO0OORYVeszhNoh2L5 vNhg== X-Gm-Message-State: AOAM532BHsVq0J7Hmj7nSbvqS23p96PdMI5je4z7eOkdApBinicCkHDD Ffv0NscBXpwqMAkuydmbcpt73UoI X-Google-Smtp-Source: ABdhPJzYKmhBdZwDv67MAB820IxUuJ2+Csva/OGb/pChv9RQoZK9kRgYTqKi7jmpNfCMAP9BHmyOMg== X-Received: by 2002:a62:e119:: with SMTP id q25mr34945882pfh.300.1594190207776; Tue, 07 Jul 2020 23:36:47 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:b10a:: with SMTP id q10ls576250plr.0.gmail; Tue, 07 Jul 2020 23:36:47 -0700 (PDT) X-Received: by 2002:a17:902:7241:: with SMTP id c1mr42040509pll.79.1594190207304; Tue, 07 Jul 2020 23:36:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594190207; cv=none; d=google.com; s=arc-20160816; b=mNCkdEkeoO3qffmkT9LDkHYGfolE+osYH/8XvLmD4XsINz4rfs8xSS8ur4m2WMvX3B 4h9fd9fJ0JhsImGP+jlaz4uSI5rr8BF9CMqpdg3g5x+x445MUzjSRND9Tg0T4y5DQvLT m+iz9FBFbOeT0yxkl7Wf0+CmofP7kgpNOhklhdfeitwx9WJ/6xqlehdn/MqK8sL2nLzw b45X9IPcFGcUwg39G6ay8nwM3woBIVpj6RHeBvsoJbi/op3uXnTHvq1U96NfPW6j+ZaN fK1Hs19WDZdckDhVUBSvmnWLMONGMRvJQa5EpnkpLYREilpBqyQeJvZlHSl68gcuoBlL 4avw== 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=LNhgJ2q2uo48GOrk8hWiL3C46b1eONoSiPmpkt6Yxqw=; b=MBQAC6cKV9mcvjBLQLXrwpkH/wfouuneDhZTeGBmRv8AbB2LvtMqBZer1sp0JFvz5V i9KKiVpwpHGeqbkLmqBNjWgoeBqOyAkjewSnX80VNXmDusC67HwULm1TX2xWe39PODxH p87zKqazO5qeb8ti97OdUhxLO9bcuZRlDlBqPKqEhqr0H93QrBfPF2pOVh+b/Hsq0cX2 HMlH2uTuxfYAxou+XNsyG55Tyj4SAnEEDKfHQ3wh0fkI+qIUP5INgHWLf8cVowX/FjD0 L3z0QfEonXpqL71d7ofw/1YBQDobVI+urpoYHp8E/k72yG19HhgqbLyl26Y75o45S6fX Z8rQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=dZbc2VWp; 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 nv14sor5976825pjb.5.2020.07.07.23.36.47 for (Google Transport Security); Tue, 07 Jul 2020 23:36:47 -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:8c0e:: with SMTP id a14mr7974542pjo.75.1594190206594; Tue, 07 Jul 2020 23:36:46 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:ade2:f5f3:8cc0:52f9]) by smtp.gmail.com with ESMTPSA id c12sm24587898pfn.162.2020.07.07.23.36.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 23:36:45 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Cc: Tom Cubie , 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 1/4] arm64: dts: rockchip: Trivial cleanups for RockPI N10 Date: Wed, 8 Jul 2020 12:06:24 +0530 Message-Id: <20200708063627.8365-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200708063627.8365-1-jagan@amarulasolutions.com> References: <20200708063627.8365-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=dZbc2VWp; 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: , Radxa dalang carrier boards are used to mount vmarc SoM's of rk3399pro and rk3288 to make complete SBC. So, this patch adds trivial changes to properties. - move common properties into radxa dalang carrier dtsi. - maintain ascending order for nodes, properties. - change the order of dtsi include so-that common properties will reflect in main dts. - drop unnecessary header includes. No functionally changes. Signed-off-by: Jagan Teki --- Changes for v4: - move i2c2 into rk3399pro dtsi Changes for v3: - move hym8563_int into rk3399pro dtsi Changes for v2: - updated commit message - add more trivial changes .../dts/rockchip-radxa-dalang-carrier.dtsi | 67 ++++++------- .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 2 +- .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 98 ++++++++++--------- 3 files changed, 85 insertions(+), 82 deletions(-) diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index df3712aedf8a..450e5bb5af0b 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -8,36 +8,44 @@ #include / { - chosen { - stdout-path = "serial2:1500000n8"; + clkin_gmac: external-gmac-clock { + compatible = "fixed-clock"; + clock-frequency = <125000000>; + clock-output-names = "clkin_gmac"; + #clock-cells = <0>; }; -}; -&gmac { - status = "okay"; -}; + vcc12v_dcin: vcc12v-dcin-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc12v_dcin"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + }; -&i2c1 { - status = "okay"; - i2c-scl-rising-time-ns = <140>; - i2c-scl-falling-time-ns = <30>; + vcc5v0_sys: vcc5v0-sys-regulator { + compatible = "regulator-fixed"; + regulator-name = "vcc5v0_sys"; + regulator-always-on; + regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc12v_dcin>; + }; }; -&i2c2 { +&gmac { + assigned-clock-parents = <&clkin_gmac>; + clock_in_out = "input"; + phy-mode = "rgmii"; + pinctrl-names = "default"; + pinctrl-0 = <&rgmii_pins>; + snps,reset-active-low; + snps,reset-delays-us = <0 10000 50000>; + tx_delay = <0x28>; + rx_delay = <0x11>; status = "okay"; - clock-frequency = <400000>; - - hym8563: hym8563@51 { - compatible = "haoyu,hym8563"; - reg = <0x51>; - #clock-cells = <0>; - clock-frequency = <32768>; - clock-output-names = "hym8563"; - pinctrl-names = "default"; - pinctrl-0 = <&hym8563_int>; - interrupt-parent = <&gpio4>; - interrupts = <30 IRQ_TYPE_LEVEL_LOW>; - }; }; &pwm0 { @@ -52,10 +60,8 @@ &sdmmc { bus-width = <4>; cap-mmc-highspeed; cap-sd-highspeed; - cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; disable-wp; vqmmc-supply = <&vccio_sd>; - max-frequency = <150000000>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; status = "okay"; @@ -70,12 +76,3 @@ &uart0 { &uart2 { status = "okay"; }; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = - <4 RK_PD6 0 &pcfg_pull_up>; - }; - }; -}; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts index a1783e7f769a..539f4005386d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts @@ -8,8 +8,8 @@ /dts-v1/; #include "rk3399.dtsi" #include "rk3399-opp.dtsi" -#include "rk3399pro-vmarc-som.dtsi" #include +#include "rk3399pro-vmarc-som.dtsi" / { model = "Radxa ROCK Pi N10"; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index 0a516334f15f..63eb498b365e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -7,35 +7,12 @@ #include #include -#include / { compatible = "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro"; - clkin_gmac: external-gmac-clock { - compatible = "fixed-clock"; - clock-frequency = <125000000>; - clock-output-names = "clkin_gmac"; - #clock-cells = <0>; - }; - - vcc12v_dcin: vcc12v-dcin-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc12v_dcin"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <12000000>; - regulator-max-microvolt = <12000000>; - }; - - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - vin-supply = <&vcc12v_dcin>; + chosen { + stdout-path = "serial2:1500000n8"; }; }; @@ -61,17 +38,13 @@ &emmc_phy { &gmac { assigned-clocks = <&cru SCLK_RMII_SRC>; - assigned-clock-parents = <&clkin_gmac>; - clock_in_out = "input"; phy-supply = <&vcc_lan>; - phy-mode = "rgmii"; - pinctrl-names = "default"; - pinctrl-0 = <&rgmii_pins>; snps,reset-gpio = <&gpio3 RK_PB7 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 10000 50000>; - tx_delay = <0x28>; - rx_delay = <0x11>; +}; + +&hym8563 { + interrupt-parent = <&gpio4>; + interrupts = ; }; &i2c0 { @@ -297,16 +270,53 @@ regulator-state-mem { }; }; -&io_domains { +&i2c1 { + i2c-scl-rising-time-ns = <140>; + i2c-scl-falling-time-ns = <30>; + status = "okay"; +}; + +&i2c2 { + clock-frequency = <400000>; status = "okay"; + + hym8563: hym8563@51 { + compatible = "haoyu,hym8563"; + reg = <0x51>; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "hym8563"; + pinctrl-names = "default"; + pinctrl-0 = <&hym8563_int>; + interrupt-parent = <&gpio4>; + interrupts = ; + }; +}; + +&io_domains { bt656-supply = <&vcca_1v8>; sdmmc-supply = <&vccio_sd>; gpio1830-supply = <&vccio_3v0>; + status = "okay"; +}; + +&pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; + }; + }; + + pmic { + pmic_int_l: pmic-int-l { + rockchip,pins = <1 RK_PC2 0 &pcfg_pull_up>; + }; + }; }; &pmu_io_domains { - status = "okay"; pmu1830-supply = <&vcc_1v8>; + status = "okay"; }; &sdhci { @@ -317,17 +327,13 @@ &sdhci { status = "okay"; }; +&sdmmc { + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + max-frequency = <150000000>; +}; + &tsadc { - status = "okay"; rockchip,hw-tshut-mode = <1>; rockchip,hw-tshut-polarity = <1>; -}; - -&pinctrl { - pmic { - pmic_int_l: pmic-int-l { - rockchip,pins = - <1 RK_PC2 0 &pcfg_pull_up>; - }; - }; + status = "okay"; };