From patchwork Wed Jul 1 06:17:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1426 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 438C13F082 for ; Wed, 1 Jul 2020 08:17:40 +0200 (CEST) Received: by mail-pj1-f69.google.com with SMTP id e14sf4382445pjt.0 for ; Tue, 30 Jun 2020 23:17:40 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1593584258; cv=pass; d=google.com; s=arc-20160816; b=PWBykkwAo6eKVD5MB36eZ5XagBgQjMm8KEMOqmV2gjSETdHfGh8e3G9Xm6ltadyYns bySJhqfWD3Oq54gle3SLIYAn3kQ5JISEts3lrP1XxRIOZVbTYurjnOAzE0ITxxlL+xUr 0u196gzzmUe/lD+y1fdzjVO6Qzkc2Yu9fB9ii8ll93+SL2Rl4HowMnbSRg+VRUOf2Deh z/ONW5hh4lOObjeUnLb4kKXgVD5D7ypDeOUHLM0XzaQTEsRTOjNtMYLVYYMxgpLIwaOj Zmw7ZFsGNVYW+8e0SvbMtfe92Jg6mGx5YyXA0MQyD5eMc1sCQxhtNpSiVALZJWJLVICn LDiQ== 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=f3b6fTeC7lBzH9GIhrf1sTCpehDUtpThH12FwAQLS34=; b=mE5uYemTU4H8+Uh0IVI2A8EKEil9uZyEx3FpnXIH3GDmHS4lo2wlxwCMacMFuuDWT4 rj4nQPuAaxPCZ/X+0vXuP7k1Ghgi5kvzBajSUPtzSJnrmsykYewNnmk2QeUGYpUHHteI x/OlguirsBmnB8jX7UPwhnbHmz7/Ap4WEEufMtt8MyGdJOx5aD6oSofXrZ2LgJeRAhP9 tFiun03zw9ACqvnEUb0u4gQ2LCGKQWQ+/puAzhP+GPE3FJfAibeKh96vD+MktfJF80Xb g+/6+gVAZKCgi+/6t+mYUCr4ixmaZ6HHLBFHx7nDxPXk/YhE67lpCWIdMDMDC7JPs8pD /JpA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JqCkgof1; 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=f3b6fTeC7lBzH9GIhrf1sTCpehDUtpThH12FwAQLS34=; b=UF2mrr2bGsvOWCgfs48ka2iH1K9de4IgMNz1eV0uJsnfABpbaNUe0LgkBEXtKd7KWJ keLEAjJef3iN0j5LJ66qN21RzIeDenico5c8voKUYy+E3P6ZmxtPNTbr5e3e9L7OSFRt mgMKhQB81ZyGRIbhqhbJkbf9fd1+Eh1lz3hYY= 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=f3b6fTeC7lBzH9GIhrf1sTCpehDUtpThH12FwAQLS34=; b=nMlhP5YhREynk2/YsDYN/Y3xtzAFYL7oaKKMb1TQtNQevKvDUXAo4TFQ91JbWRVU0H nSedItwvtmEh6inhaQvhP+TpCNScDJK3SpUKp3I6tKWsDgAODv0kpmFpZSacbRlFuuvD 5fRoWug0PgHGD3OGZCILRJtr5t7j77ruOyKhESyl5sikPJoomjksPzqePrhr+rE9n3JT L4G3c6ZL/seL97ki2P+O2+Fnbt+JnUX2kyeNSh4bVD3vUqMAv89KvB1fCpOm3lG6hpoS nw1Ne2oK9TlvWv3ZB7OA3i1gI3zNuPCxcQit3crDm64vN/n0StDWZ+FRtENmSIagsX3N 6lMA== X-Gm-Message-State: AOAM533xoDeNDgIDB3Q2ZKDvNKNBDOOaozTwhNNBvRn1sDP5XDcrsZAu PmYC+xTsfsfKVYRBAUWjMXwJIDqF X-Google-Smtp-Source: ABdhPJyRZrXJAp4eDykIS/P585LPtSsTYtlC0S1Y4BMrxG99TxnefANw2m2/gtDeuPvZJw9u1KD0xg== X-Received: by 2002:a17:90a:df0f:: with SMTP id gp15mr26323140pjb.98.1593584258273; Tue, 30 Jun 2020 23:17:38 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:7143:: with SMTP id g3ls565989pjs.1.gmail; Tue, 30 Jun 2020 23:17:38 -0700 (PDT) X-Received: by 2002:a17:902:8544:: with SMTP id d4mr21356053plo.234.1593584257764; Tue, 30 Jun 2020 23:17:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593584257; cv=none; d=google.com; s=arc-20160816; b=pWwt6+H/b2xrfUkE22FjhIqKOPe80l0IXP1s+KIc31XTFgXEN01d7gbt0UTkThkzNY zN806k4d2JNKV23bKyt/Wd9IfjCwcyRpf7msSm9XDhZIo6aLVp8v+f01DWDZlD8M/D1f z7Dqopu9oi+g7G4bQidXjha5VP9gQ7PAIQugDAPfkKHwu8U/HIYYpDH/M0y1g7J/lmij b3n8IRBEg1x0GEVcZf6mJ1Fw2rA5YW+mfmSWXXAKrTbLXrxXnxpcHeAnC/z3VQ7XrCRw q+TAR9cLE6MeI8rPm/qT1+s//n0Gn7HDiyVPbe7j+2Fs5NPnatYb3+L9Csva/REQcSvN wJPA== 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=iH9E3L0O7L+w/GPGtGgup8mLd4eqGKkz57JBYB7Djo4=; b=pCBNIYxQ71DGw6BrzbMZjkud9o0iTAImHZrnZ/suVD2Fm22s9QbSNuYWGqEf2ZLCCo 3Qx1+DOVs8vOnSCsGVt7RBpOTTJ+bYBmSRvwk/u/ChY4akw9LxROUKPGfbVE+HtSIC+R Fukk9O8MR1F+i+uF9ReLfTZJWfPM5FTm2gpj4ZPg8fZ78/gD+zk40UGb/w9939CoXO9M qGgJ1I0fkFQdKXeGgoB+wm0sBtyulnletdWF09KCYfM+8W6Kk9fXepdYr95ql5B4e+Ji Rdq3XvfOj46mTWL7IDuLjOMcFTZwEP0hyPOhVtnJQUaV11XFgGXp+VbRnoVp27lVqgpJ M6Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=JqCkgof1; 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 e7sor6352251pfn.42.2020.06.30.23.17.37 for (Google Transport Security); Tue, 30 Jun 2020 23:17:37 -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:aa7:8e90:: with SMTP id a16mr21628391pfr.84.1593584257374; Tue, 30 Jun 2020 23:17:37 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:356d:fc3d:92ff:192e]) by smtp.gmail.com with ESMTPSA id n189sm4555744pfn.108.2020.06.30.23.17.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2020 23:17:36 -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 v2 1/4] arm64: dts: rockchip: Trivial cleanups for RockPI N10 Date: Wed, 1 Jul 2020 11:47:14 +0530 Message-Id: <20200701061717.143753-2-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200701061717.143753-1-jagan@amarulasolutions.com> References: <20200701061717.143753-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=JqCkgof1; 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 v2: - updated commit message - add more trivial changes .../dts/rockchip-radxa-dalang-carrier.dtsi | 58 ++++++++++++----- .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 2 +- .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 64 ++++++------------- 3 files changed, 62 insertions(+), 62 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..8b0b03681667 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"; @@ -40,6 +71,14 @@ hym8563: hym8563@51 { }; }; +&pinctrl { + hym8563 { + hym8563_int: hym8563-int { + rockchip,pins = <4 RK_PD6 0 &pcfg_pull_up>; + }; + }; +}; + &pwm0 { status = "okay"; }; @@ -52,10 +91,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 +107,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..0b150881ab6c 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 { @@ -298,15 +266,23 @@ regulator-state-mem { }; &io_domains { - status = "okay"; bt656-supply = <&vcca_1v8>; sdmmc-supply = <&vccio_sd>; gpio1830-supply = <&vccio_3v0>; + status = "okay"; +}; + +&pinctrl { + 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 +293,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"; };