From patchwork Wed Jul 8 10:05:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 1460 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 10BE63F062 for ; Wed, 8 Jul 2020 12:05:58 +0200 (CEST) Received: by mail-pg1-f199.google.com with SMTP id m7sf34559981pgv.12 for ; Wed, 08 Jul 2020 03:05:57 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1594202756; cv=pass; d=google.com; s=arc-20160816; b=GT3HbtZ3yAo3JBjDJMVwWjAtr48SifSGxJOvtAotT8GbGmap0VgEFz7S3LVBIplx7E Z6VrvTDTPmslOFQxO04OBvjvV3NJR5wbS/YYaBKOuGHDjBQVs8kF9Nvab3S7duvMw/xY mVOrCznsozi+V0BtkaF8CRIfFmUWfyJkT6wsTSHRcSSF9aUI/lV0ClHEcU9YcL9cUdhe tyhmQ9LgOV3vHFdle811xC9sq/8AcjkOhNIVJtvt0+7Q3t8Lct3DVIiFACdfWebXJkAb yNJVbf8NZ4qa3NLNTsW5BaS8GR6OF57RcGpXJPPM63CEry+gA51dMpwP7FPJpzWVnaYI AAFQ== 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=KjhZ7PbnTAcBUFqkzWlzU13tF/L6LslfQ08+sYwW9eA=; b=XGjrpbhmBpdjuKewG2ovDLcw3s8oktltU10rZDlvKdP//KLT/gMKT+Q++tKo4hoY6s AUsMLF1LUMCm6FESbhfrvYPhsjBvP2eQFbdUNmJxErcdJ5UN6Kkn/GffIaE+IieNK0Sv JeBsxN3k+1cOhg60BgRdvjb8DiOfNWO39eOUq9tgg2GaUs0GB+8CsecDPdZwzuu8E5pN DWszO/JFZQMNcwA+VBj0vWmrlT/yK+o9vYx8goIzp/+AM9riS0qzzmJ48BR/U2Xhr7X7 MNhptGTKHOC1S+q+8/G3D967oK4o1q1hodpPsmHvsoj4fyyJhpmFdZnsKvEjqSaf+66x W0Dg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kS5X4Zf3; 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=KjhZ7PbnTAcBUFqkzWlzU13tF/L6LslfQ08+sYwW9eA=; b=c0BjbQmsnTP9u7Ve3+LBJ9dPNfOtGEeTWnlisXuOHstCs1GQgJ2542h7OYmXZ7dMmy OjRcXWPu6glG2ONy1HQZ1zZzVfO4Nt+BrPyY2HNFGbGaXGI/HyBfdlV+WUuRYwv7iIAS E50jlOqrste9h0p7mrT+/NuStTRMCGuZN6hIk= 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=KjhZ7PbnTAcBUFqkzWlzU13tF/L6LslfQ08+sYwW9eA=; b=Rr8LkU85yW7aJInGrUIx+8TuR1NTycr6g13UUwd13w1tgkEiT6Z8kYHFSJxbMkQSgE DiY6grdNSvcaSo+zQ9fUdxKn3aNaX38H62AaYlZ+TgNtLstTTG6bdjEjp/8tSSt8CGlG DkUZZ6Qy3KpyU/bJHAJBMzLCdgFp0uxkKzS0KymyDqFNRlUXlSshslo+TCp+RVKNj9+t 0lWHuLeyF42lf0VxvBC7/ODh3LoLa4TwQusuaqm5hkeN3owzzgfvKK49CB4/O/luV2WO vb8N158cYnFEwfkIOE9Ubyczd9v1uxcYLf1h4FHdZo81O/Nb/BtwgOmyjZyJsbjjW/1O prnw== X-Gm-Message-State: AOAM5323mF21X7v2D0MBt2+sG+kyhgbtIjtQv12dzIw8LBN2eNJxstIF DwW8k7lKLCTuzHO7ucQK00MfY1Zu X-Google-Smtp-Source: ABdhPJzW+lVreYdiEfPfYdbrplKWm6wbXSs6oKQmFqpdY4dS7Kh5n1e+tnZB0O/7rAxI9Vp88006lA== X-Received: by 2002:a63:c50a:: with SMTP id f10mr49970605pgd.167.1594202756573; Wed, 08 Jul 2020 03:05:56 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:1b4d:: with SMTP id q71ls823658pjq.2.gmail; Wed, 08 Jul 2020 03:05:56 -0700 (PDT) X-Received: by 2002:a17:90a:7103:: with SMTP id h3mr8845837pjk.34.1594202756053; Wed, 08 Jul 2020 03:05:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594202756; cv=none; d=google.com; s=arc-20160816; b=FGM+eM5jHXoJZERcYEYyKN7OOwQabRykFWFLmbWFkN4qdEZDSEQCVXNtzbRqyXfs22 TGeCz0g8AK/3vw+7kG7Z5jF4FwinclY/4ky+fqNqNw2TkgvacXNemIZ+IBpeFCwru6Vr 64wC6ve43us+sGBYJGXFLeQR9g4yHTG2gMfk9i05MHAcDxn1c/Roh/r7oPpXbIEDUoGy ek/YUNF75Xt+HQ38Zo/zho9POQoQMUjJfYyxJOwIUG6PphlmfvRsxZWdVD878159jgEm y+HojodugysNMZe+Epwjy9eXkSkMwNRSYzjmY5xhScjFn/Fi5q6Ry8q/jhNjMZECf3jt 6eSg== 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=0SPmGytSj/8zEf4KNTts1Clr8NPUNvgI/N005A/TVNY=; b=n9ZI08sJvVTDNzN0AWO8diADLmHmVC05fU/g4XKp5J9QSvZrIztkzAiCn/RK7XsetD EGXDR/uHi6E0lw79ww4D+Wvn3O1Mw/YeVPysNTzfTTU2gm3K3DfSURRgF6Xe51Az1Z1E xFDkHoWcUgf3cGGeB5AnyXQ0fhRBmxjqzgH66h+lP9i/FAUoMYNHacJ6Vfhi4lmyf5pQ 1t9CSGwQkUUAut6SrFKmClI+/gj5X4kP499ylWpHBzXsA/h1KsDamwUCL2mk2H0WLFLc URqtQF3XVhFUuvD0JmRSRR+Zff8dzYw+AsbnrLhdVkdB5RNEE849QvkeHNUMNCpItHq+ qO1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=kS5X4Zf3; 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 i5sor32925544pfe.47.2020.07.08.03.05.56 for (Google Transport Security); Wed, 08 Jul 2020 03:05:56 -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:a62:dd91:: with SMTP id w139mr30763757pff.40.1594202755727; Wed, 08 Jul 2020 03:05:55 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:ade2:f5f3:8cc0:52f9]) by smtp.gmail.com with ESMTPSA id n18sm25726647pfd.99.2020.07.08.03.05.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jul 2020 03:05:54 -0700 (PDT) From: Jagan Teki To: Kever Yang , Philipp Tomsich , Simon Glass Cc: Suniel Mahesh , U-Boot-Denx , linux-rockchip@lists.infradead.org, linux-amarula , Jagan Teki , Tom Cubie Subject: [PATCH v2 5/7] arm64: dts: rockchip: Trivial cleanups for RockPI N10 Date: Wed, 8 Jul 2020 15:35:26 +0530 Message-Id: <20200708100528.419035-6-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200708100528.419035-1-jagan@amarulasolutions.com> References: <20200708100528.419035-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=kS5X4Zf3; 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 --- arch/arm/dts/rk3399pro-rock-pi-n10.dts | 2 +- arch/arm/dts/rk3399pro-vmarc-som.dtsi | 98 ++++++++++--------- .../dts/rockchip-radxa-dalang-carrier.dtsi | 67 ++++++------- 3 files changed, 85 insertions(+), 82 deletions(-) diff --git a/arch/arm/dts/rk3399pro-rock-pi-n10.dts b/arch/arm/dts/rk3399pro-rock-pi-n10.dts index 6ac2d4d721..8001635182 100644 --- a/arch/arm/dts/rk3399pro-rock-pi-n10.dts +++ b/arch/arm/dts/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/arm/dts/rk3399pro-vmarc-som.dtsi b/arch/arm/dts/rk3399pro-vmarc-som.dtsi index 0a516334f1..63eb498b36 100644 --- a/arch/arm/dts/rk3399pro-vmarc-som.dtsi +++ b/arch/arm/dts/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 @@ &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 @@ }; }; -&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 @@ 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"; }; diff --git a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi index df3712aedf..450e5bb5af 100644 --- a/arch/arm/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/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 @@ 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 @@ &uart2 { status = "okay"; }; - -&pinctrl { - hym8563 { - hym8563_int: hym8563-int { - rockchip,pins = - <4 RK_PD6 0 &pcfg_pull_up>; - }; - }; -};