From patchwork Thu Jul 9 10:07:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1464 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3F1BD3F06D for ; Thu, 9 Jul 2020 12:09:11 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id v25sf996354pfm.15 for ; Thu, 09 Jul 2020 03:09:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1594289350; cv=pass; d=google.com; s=arc-20160816; b=GHSAshgmCzgfUpr5b6yKK3/syrGo7OGZxeDKEOON2/onap4tGgs7IdTWmMJOQMSxuG cubt6cabuEnIjTdmwd+uaC0/iN9p1CWE+EUMECruO6AFrasEjDiWqa/phxRMQAAB10H+ nSEMtIz+IDX3GarK0K00Up504rJaETaybgbozpcaNroVAf2aWS1/CBtapl6aZHYlB0J8 kNsiVSnDqsq1/39XgEVZ8/iDizcRKmC7wdgR1YFo6rpoJmMxVREieyAN8xWlZed3QnMf Bfiz4nYxkkpQLfJAlj/OkKIDxXn/i3lS9wHq1Ud/VW6J9Cs8KSGHqVluc8mPIXKqsuqP B6cg== 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=VAaVzzI3s2gkorby5xsDhXsQc5qKg3KLlshmonbT6ww=; b=a2E0eB92w4R4MdDl7H70BCeOO5/lYgDTznq4lUOO2MbQL2bDEwHI2Wq1Z1S1W5uStZ 5N45qhfsCjj/BHBAfigTVETlKYMb0zKrT8Ik79HIofxDQzq2pnoe0Hss/JQkfQf13v6d git8ebVTOL7h5HJKzw/lUWSAUTdx9NcRWgGXp4dV1mXh/5hw4x3TJCj2fHWnHGeTMH7+ BZwFUYMtXnIznQMBtzh35ebEFwVmNbUR7paHa2s9QNDni0YuqLyhosKWCJkw9g58gmV3 n3Qhi73Rx1+eJ0xCvHGCCvzd6NI7HQAK5SO4I+MdoFsJvOSfSaEZPG6pp2Wo9lNEXxxB 0Exw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZgxOC2Nd; 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=VAaVzzI3s2gkorby5xsDhXsQc5qKg3KLlshmonbT6ww=; b=VO0SKRBNxNoJmhrQt5YmR0ptG+673bZWnzpiCBcQQzdN282tFgtcpScJds7wqHdUTT 9UUgP+nW69o18c4iuWjUVvob7JtVC0ICrpyBsgY1UicHdlGsGRfF3+hPKHoZEgE+8+5R i9Xpbw9S0vUoaP5LSoV7PAkbp7l2HomvY9NCI= 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=VAaVzzI3s2gkorby5xsDhXsQc5qKg3KLlshmonbT6ww=; b=XqhHaRNYBXlHpSymOrzQLU0RiIHFpDm39JRXeK8SOVBlklTx2IkHTmsXRdKjaoEmB+ TbAmkqlRdJ4rpbKGxJ9PQnUdNPLLNXpuCrMYX9tK7TJJp2OPJIGK4F2YKGwmdK5j3icS QRI6hPiIQH8mYT+CgKPbbSIM3ZY3wSbFsCFOzdDjzW6NZvcdvEV+f8/kcpEFv9EfHFHx /jqsUtFhHan12k24PcLDsqDQIHa1dI76TdKwo79YDrZ5wecJyz6btYHSvC69B7sDysjm 6VcDlY9h4c2kqsGltQF2tkYVKxwopgtsssExwNz6oC+v3yWlIUOE8ZGFtStqloJjHKBH W91A== X-Gm-Message-State: AOAM533A9HMw5HT3JrEJI830jd2Vbr2ZU5RzslJJHfYPWguT9vuUTz1i xvH2cb/i7OmYOROuqD2g2d6efh+k X-Google-Smtp-Source: ABdhPJzmF7hMb/ooC2N6BMw2ktvFgfGAkugrHESmYUXkB4SzTo2jXlpJHezSm7XVNfr90u67GBjSXQ== X-Received: by 2002:a63:de4b:: with SMTP id y11mr29763049pgi.26.1594289350005; Thu, 09 Jul 2020 03:09:10 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:6b02:: with SMTP id o2ls2186244plk.7.gmail; Thu, 09 Jul 2020 03:09:09 -0700 (PDT) X-Received: by 2002:a17:902:a515:: with SMTP id s21mr46810293plq.192.1594289349465; Thu, 09 Jul 2020 03:09:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594289349; cv=none; d=google.com; s=arc-20160816; b=K3DYf4BBDJPsayXKc7t525FJjE9o09e+/PDNGKdxWHQtsm8fhuSyKB0ojdROR6ilH4 xRIJwcU8j7StZwKKZtNJFoZiD/UUThreEvbNPQ+fa+c4EXaTC7iUrT5hzaodQT6SlDd5 DAXg7j1y28zauefETrarnYEzM4QIYbVvTpmtE0KPukmaow1i+AqfMMQfDbQpLfcflIHT +Bsym+EWcDenPAJWXlBJmwT0YdkW1iWn3Cq88SS8jQYBDTm9HHzmVs9B/f6jkBCGWYEx ztaGSaBfITPNirsEUSrGJjtlMkCUuchxdKqkxzMVMS6BfO7ViXnIA0kHel11vGkYmIXW tnNQ== 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=7GlKmsDfajxoEQByZOU5laddM+m8R3hyzOJ5BtugjyA=; b=Mp96XY87RglGQsJjWM6pjmenki15Gk72VuEvbI4CSw8fHRWhfbHKNPpFw4/f1CXyrR iQvyoj308WewEKE3EuT1oQrZ1SWnyctBOzXeWhDd1poYeAXsXvmOry9fV3YhJbIMgOa9 5y3zrYHOBW6fBFaQ1Qc4KK+0yiVQ75595obvvDXkEqTZufvncNI05KQDCebeQMmjZihx uwOSkNcJNhuVodFawjCtT6a/eb2QS5GviAgVRdyR2CnQfT9ae1l0yOyYIASEHtnXueTd 1BiGw7cZO7+Fy2x4cORe+RrGo1gpFCWLpWdEW2YLFurAHMBZ2Jt0KJVRwoL+fjJS8Ijq qw+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ZgxOC2Nd; 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 d14sor3005059pgv.43.2020.07.09.03.09.09 for (Google Transport Security); Thu, 09 Jul 2020 03:09:09 -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:a63:2d44:: with SMTP id t65mr43760200pgt.257.1594289349091; Thu, 09 Jul 2020 03:09:09 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:24b9:69b0:e917:1d11]) by smtp.gmail.com with ESMTPSA id ji2sm2076527pjb.1.2020.07.09.03.08.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jul 2020 03:09:08 -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 v5 1/4] arm64: dts: rockchip: Trivial cleanups for RockPI N10 Date: Thu, 9 Jul 2020 15:37:53 +0530 Message-Id: <20200709100756.42384-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200709100756.42384-1-jagan@amarulasolutions.com> References: <20200709100756.42384-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=ZgxOC2Nd; 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 v5: - drop redundent hym8563_int pin 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 | 93 ++++++++++--------- 3 files changed, 80 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..9ed5b27d715c 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,8 @@ &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>; }; &i2c0 { @@ -297,16 +265,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 +322,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"; };