From mboxrd@z Thu Jan 1 00:00:00 1970 From: 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> References: <20200704201604.85343-1-jagan@amarulasolutions.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: In-Reply-To: <20200704201604.85343-1-jagan-dyjBcgdgk7Pe9wHmmfpqLFaTQe2KTcn/@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Heiko Stuebner , Rob Herring Cc: Tom Cubie , Suniel Mahesh , Michael Trimarchi , linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-amarula , Jagan Teki List-Id: linux-rockchip.vger.kernel.org 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"; }; -- 2.25.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 1353AC433E0 for ; Sat, 4 Jul 2020 20:18:19 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id CAB2420890 for ; Sat, 4 Jul 2020 20:18:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="W0LC30yc"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="kCsTO3lA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CAB2420890 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amarulasolutions.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=PqAvN0gPLDmzaSPolrRG+VIeL0+Urp9jibmYMt+2hTU=; b=W0LC30ycPAL57ol1FTg2v8dK7 rUK/HCUJF/DJp9r9HlTP20O13pCz2ttEbUntcomaDx6cyA7pt1eZ1eBwc4G0HSOs34IP1iWhCdoBW 7c5Bx3YB1KfHK2W9Bmzy09eCE8I+GebjXT0/AbB/7SiV47TmIikFi2J8dVIr81pZD9CT/dG4dsHY3 uiwDp9olwmmwGHvd1c6/NSRhXWMdxaw0ofFeuiuK2bxpLFb5Es4c+/J2n4/04a6kJdW8ULfTRXBjA okS7W7t+C0wrHJQlBaCA/9MpuUK2vfm18eF6EamVgtyCYUP4HpX+fX+KOfUqvzaD/ORVAcGIxWZA4 iZ779z53g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jroaT-0003no-3H; Sat, 04 Jul 2020 20:16:37 +0000 Received: from mail-pg1-x543.google.com ([2607:f8b0:4864:20::543]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jroaF-0003jS-Tj for linux-arm-kernel@lists.infradead.org; Sat, 04 Jul 2020 20:16:25 +0000 Received: by mail-pg1-x543.google.com with SMTP id k27so493099pgm.2 for ; Sat, 04 Jul 2020 13:16:21 -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=1LJ8XZzAMnwatcyvnEIkzckG/GwAtPASUgyz1CJ13Rc=; b=kCsTO3lA3ieOUq9zeqMMeexmoUdpZs009CatJCQw5nNaNfKjEU77VxiBfZBDINQNlO W9MMK/liGnpYYuqk9lIlE5aUGeyTMz5+IuX7uXeWlbvOe4DF3ccRCcpdGsaC/fH3ysy3 jGDiFem26/91MQ9R+5Tq4JI7uxDEZTChVafJM= 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=1LJ8XZzAMnwatcyvnEIkzckG/GwAtPASUgyz1CJ13Rc=; b=YzytVdiAgNgyfYmhVrg2zvRJwPTt92Pod4MxumKv7xyXITM5Ri5TEuuXL2w4MNSuHV GsCgfKV6vID8sUz67llEhiK6rqo26g2G/T6VUEBT7uZy3E4xLgpi6yobBXnRv0mCTwzv 7EYnMIbwioqJ3w1T98wMzmLY2nwpKjA22ffi1pWqCfnVYt10fNhPr+NhUhpHEnfOtu3B 9VjmcbwDBM7JnT6miDiKemKyj0PuthpWgzxwEznnVHi+6WjLeRrbFLA13177COzST+vW 5VXtgGppT8tvprINyWjNpZ3rg1tSC3rrxzgfOZOADq77vLO2cqeLToPa5qjFM51Ia8dy 9MIA== X-Gm-Message-State: AOAM533oPlrkEeGi9Bap7yyGsMdQm3W7n/cInJvvPrJjrVTAPP9hP4bD UHYrCVZ9hTdRfk1oU/hjMaNF6Q== X-Google-Smtp-Source: ABdhPJxuHHJR9PBLuVbrjR+paZuoQ20kMmZLHfZzgrzc44z1KLL2EIhBALqYDdJgR1WG5q+ibaBMpg== 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200704_161624_287437_31DDDC6F X-CRM114-Status: GOOD ( 14.01 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Tom Cubie , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , Michael Trimarchi , linux-amarula , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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"; }; -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=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 B7707C433E0 for ; Sat, 4 Jul 2020 20:16:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8AF0C208B8 for ; Sat, 4 Jul 2020 20:16:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="kCsTO3lA" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727879AbgGDUQV (ORCPT ); Sat, 4 Jul 2020 16:16:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726669AbgGDUQU (ORCPT ); Sat, 4 Jul 2020 16:16:20 -0400 Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B73DC061794 for ; Sat, 4 Jul 2020 13:16:20 -0700 (PDT) Received: by mail-pg1-x541.google.com with SMTP id w2so15776699pgg.10 for ; Sat, 04 Jul 2020 13:16:20 -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=1LJ8XZzAMnwatcyvnEIkzckG/GwAtPASUgyz1CJ13Rc=; b=kCsTO3lA3ieOUq9zeqMMeexmoUdpZs009CatJCQw5nNaNfKjEU77VxiBfZBDINQNlO W9MMK/liGnpYYuqk9lIlE5aUGeyTMz5+IuX7uXeWlbvOe4DF3ccRCcpdGsaC/fH3ysy3 jGDiFem26/91MQ9R+5Tq4JI7uxDEZTChVafJM= 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=1LJ8XZzAMnwatcyvnEIkzckG/GwAtPASUgyz1CJ13Rc=; b=J69Z3Jwh3cidCPPyU2iXFl4jfvG9Jqj3AYb7B6I0c1iuU2VGg+4aO9VVpwh0XhvCNj 2L7vswnHsPZTAl45Etd1TTpXqTwffkkbSCkk5RG4G+euv9UgmFU/SleVDGTD9IPIu9Ue Zjf0/VAV7r0fVqKLMFS7Lg7QhbMf57E4/Sak7TKU/dL2yZCKh38/0KiSbycGe/vIuKPf F4WgO5YOcCH+JJCoOdm2TR/RMTFG6TICnnaVQ/dVCidKdxCSRMXka9xV/bbzDvp/IrS+ gnqv1YvoVrhgm+MrcZcsQwiDYFZGvYGjByxhrL43yOaGr337QfMiXgSOVsX0VIRPWAVA uGPg== X-Gm-Message-State: AOAM530mgmS+g92dZ/iXB7SPFJgSVbuGGmVUlOgsOiGQ999So7uvn9ND g2ez+bgWmRlmbtRzHMJ/5hIxyw== X-Google-Smtp-Source: ABdhPJxuHHJR9PBLuVbrjR+paZuoQ20kMmZLHfZzgrzc44z1KLL2EIhBALqYDdJgR1WG5q+ibaBMpg== 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 Content-Transfer-Encoding: 8bit Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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"; }; -- 2.25.1