From patchwork Sat Jul 4 20:16:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1439 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id B6FEF3F03F for ; Sat, 4 Jul 2020 22:16:22 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id v15sf26240114pgi.3 for ; Sat, 04 Jul 2020 13:16:22 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1593893781; cv=pass; d=google.com; s=arc-20160816; b=qYZZLJTkuXEaMgnBD9WZ/utmc9c42mRrw2DVb1JviFRsIs010OcbzlJfSn2TLB6BEI 17hDCshRa6T3RgWHmbtwY3VXaz6dcjiCgy2u4/bYbdHGirqAsv/VBH1CjzqLkTsz2Nxz q3QL0GrNiwHFlxDMlf2pHvMxtMjF22S8gmkzIO9MIGqHNBhu7aF5FbT7r4kMqAWTI7mz 0s9ol8hsyvFKhHQbW633mhGClb/Ruxp4mJUm1vbYSNAfNqiuV7pQFOAs5qtVsDhzgZws AKEHEspxaytZprjBAAEfYM4TXY46a5ey4+Uwi2k19khBeAnnQfCg2qmcZ+ALCn6VmLku 1SxQ== 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=S7hSw70YZcz3YzgUA7cCLLOIO6TvsThRvcxWbkYT5DQ=; b=k65iTPKHlnzUtgHzXBS6yPTaUHBovC8K5C6W0eWFkJOfysf/st25j3sC0J3tH8XBo1 bOKszd7z8Anx7E15HKOSfX4J36z0pOpLmyYS6K80doJUHMRNaCqj79R8hP/3FISk7zyC aPxvqS3xP1hpsUHMKZkqpnkLVJms0gnPtyUtwYQKhVpxnI1y0f0zHwtG4fOIumwDooLZ 92b+6LZqD0Q3T/xtXl5TiHeeba2kOemJARm68hK1o+4u6BtoYa2aaNlEuc8RQ9uwshpO fI4C1zgWRLufvUBzE6AEf8oijIQxJt4fOi+G2jMPFqWHgbaT/W9g0ILoSKnVPqKb3fDQ LxFQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kCsTO3lA; 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=S7hSw70YZcz3YzgUA7cCLLOIO6TvsThRvcxWbkYT5DQ=; b=SC5et1/wv9laYK8PU59ynUeCb1ZDrIenGsiVH7axYii3PM1IJyZMtgIFuECx24ubFB npmPaZ4t6y0M2xsHCFjym2fsuy6S692KIvbO1FbTvZieaMuZyOduJid9SMj4duYg+cHt /Nn6AgiGByimJ97JA+OgWSgc7mGlt6j6YH1KI= 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=S7hSw70YZcz3YzgUA7cCLLOIO6TvsThRvcxWbkYT5DQ=; b=s6DZSdalleJPdvYLOWvADu/UVqHfAEyddg7lDBQE82ukimmSMcL/3mBuRYrNXDzBzu f1fffvDRsp68fi8xADQmAf23l3N9B5+12JL8XRktBdXwf/v7JKiltuV0O/O1uODdilMZ CI4BX3ISFNmWcqizEC/Gvmw/Egn2tWAKssLigZ91dei74R2GHFUeiXVITqk+kgYELWZ8 7Sb2qz+A7wOQ7fYDEaSWpzzjpusu7BeHizd4Kj8VuvTGzx7b7frRGYigMqYe3RnnsMl0 8w23qQIk7VH6j41xYfGI+PfM5zFcLODm8aPPjntkq/w/zxC4pj3DQP2DLMvSqAVxJ+Hl 50cw== X-Gm-Message-State: AOAM5304I0zyXANQUwZoY3gQEbq7xnXj3TuELqNpF/D4UUGn1TU6Vaix O39A8EUO1G3n0Zgptrqw8Wnv0WUk X-Google-Smtp-Source: ABdhPJxAwh/tozSbDXcD5N5Ncl5fxaA3+mwOGcEZjd5nhQC3ffVzPYF4dwXVfbkaauG+qDwR8/apKg== X-Received: by 2002:a63:141:: with SMTP id 62mr33206832pgb.366.1593893780837; Sat, 04 Jul 2020 13:16:20 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:7b91:: with SMTP id w17ls4503154pll.10.gmail; Sat, 04 Jul 2020 13:16:20 -0700 (PDT) X-Received: by 2002:a17:90a:254f:: with SMTP id j73mr33928459pje.16.1593893780327; Sat, 04 Jul 2020 13:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593893780; cv=none; d=google.com; s=arc-20160816; b=Su05nDDnnfP8exPNTTqWvqJODZAJpzNQbkeYYbL5J9gENb+hUXnlUMWBP6fgv6EQdM +oOxXBaHzuICMfeXZIejgY2tyE/iiZZK641aaMTH21QuqgKbWkEPJW9Q8tEObZlpTo9V YYnXdnnH25mD1+Bifa1tp43KQrXcfC3ewqbkEnR6Io6NyCtOz1jSyvF8eo1eISEsHjRI o+Sfy/qw8cUVU7sRbAzaHbUO41F6Ktepv92zMZdQ8MxaUGAECnXfRQkFqtyRjSOrVswm xyH6pHkOrppm0DJ2V+tuo5Gc2P6px5Yp7MVA3J955v/8aEPbiFV1stjX6evBdmLCe7Ya fgZQ== 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=1LJ8XZzAMnwatcyvnEIkzckG/GwAtPASUgyz1CJ13Rc=; b=WHkHDEFJyOy1Fwn4ApUAEzSgzPtmpxyz5wBhRMzHbbF+lV5c+RIPz407xDfS7ndgAF kL1OZnOTiEMeFwDj7VGbkg5MFYT633Wml225wUqgZiN8U3oMvfOrzS874YxR8K1pNCgj /oN35O1U4CofL+AE7VCMXEaetVCglsL6KznXsaviqA3KolH/rVtsyX4hmm0/+IcIEnA2 G/jLgctHfPdowVTm6O+ATrx9gf5S69WSsLI2yxMcOwAIBumjyIufB7wzVJGp2sNLZ0PD /lVfC++NPkTlYzCovGPYTZ4CxSEs6318WUT4U+vxad4MSGdb+rEft8hIponUt/ofG+gT AmFA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kCsTO3lA; 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 j19sor20426472pfr.16.2020.07.04.13.16.20 for (Google Transport Security); Sat, 04 Jul 2020 13:16:20 -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:8b42:: with SMTP id j63mr35090427pge.131.1593893780036; Sat, 04 Jul 2020 13:16:20 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:bdf4:3289:4b66:dcc0]) by smtp.gmail.com with ESMTPSA id d16sm14960791pfo.156.2020.07.04.13.16.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Jul 2020 13:16:19 -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 v3 1/4] arm64: dts: rockchip: Trivial cleanups for RockPI N10 Date: Sun, 5 Jul 2020 01:46:01 +0530 Message-Id: <20200704201604.85343-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200704201604.85343-1-jagan@amarulasolutions.com> References: <20200704201604.85343-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=kCsTO3lA; 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 v3: - move hym8563_int into rk3399pro dtsi Changes for v2: - updated commit message - add more trivial changes .../dts/rockchip-radxa-dalang-carrier.dtsi | 60 ++++++++++----- .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 2 +- .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 75 +++++++------------ 3 files changed, 73 insertions(+), 64 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..6330ede90e35 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -8,24 +8,55 @@ #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>; + }; + + 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>; }; }; &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"; }; &i2c1 { - status = "okay"; i2c-scl-rising-time-ns = <140>; i2c-scl-falling-time-ns = <30>; + status = "okay"; }; &i2c2 { - status = "okay"; clock-frequency = <400000>; + status = "okay"; hym8563: hym8563@51 { compatible = "haoyu,hym8563"; @@ -35,8 +66,14 @@ hym8563: hym8563@51 { clock-output-names = "hym8563"; pinctrl-names = "default"; pinctrl-0 = <&hym8563_int>; - interrupt-parent = <&gpio4>; - interrupts = <30 IRQ_TYPE_LEVEL_LOW>; + }; +}; + +&pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; + }; }; }; @@ -52,10 +89,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 +105,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..9d1dadb94380 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 { @@ -298,15 +271,29 @@ regulator-state-mem { }; &io_domains { - status = "okay"; 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 +304,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"; };