From patchwork Wed Jul 15 08:34:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11664485 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5A974913 for ; Wed, 15 Jul 2020 08:55:39 +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 333C22064C for ; Wed, 15 Jul 2020 08:55:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="vpsSyYEj"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="J70SNnRz"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=amarulasolutions.com header.i=@amarulasolutions.com header.b="D99E52J1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 333C22064C 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-rockchip-bounces+patchwork-linux-rockchip=patchwork.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=Dmfo06XCkIFF73LaNkRO+VYUImscDdS/wbRK0iWZVEM=; b=vpsSyYEjAcuupK65MzhEJaN8b VcWs4ArwsLWIAp6jOSCKhVvhoGEkXAUeTtJB+vh5Y9gU0yuZuQc81JDIRGcR6t05lJRacxBPkFDk8 ag6UoAceqi03zMtz7sCZu7ZHpHYF8zwNfQyYCdo4OcKO1l69e3rKcPQXRM3ugnkPnoui2EQ+0ewP1 3mwYWLpIGCAIXrSbse3bmBKVymBnXnBZgQqUUpjsMT4pTx3HBh4RuVW2i6NaZ/w5lM1ptpJamVzL4 pysdMdIAWVljUF4S+33mQaHmsuphK3IhDnL+fbQjt5LeySimY9rSdvtwK2BbyYus01XhKFQUOfR1k ANQG+HdTQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvdCS-0002Ii-KH; Wed, 15 Jul 2020 08:55:36 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvdCF-0002BD-0Q for linux-rockchip@merlin.infradead.org; Wed, 15 Jul 2020 08:55:23 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=5Gf+3b18Fng3ehSSzSlGlAKgiKsSEaA+C81WsDyFW3w=; b=J70SNnRzUHXeEDgC/POgeAjiep cqijvpyS5FhmDFq5qTCX8UUya6zuwI9smD/2RtNyOLnjXvYidC/ydBokS0YADLvIPq75jOrX1Fl/h OslDjwgvog4/At8scRBHEwCI+g4aUyNfMlAvYbojq8cr67fUulcxEikkswAh/BDwauIYT6MdW9OmS eq3BD62dDapnYRS4Y9d4glXLcQSnYPT7mfrtzoAoqO/G267cNSX9Hf6BO7aHvv9s6oViu7Mgt+b01 dLWHVpPfHE2UAmmeAhDH3iZaXPZLxKG5pyix1wov23U2N/ua3j7AklRIAG/YzeWslKL4DVUBM2hJp Pdz25khg==; Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by casper.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jvcsa-00070N-5K for linux-rockchip@lists.infradead.org; Wed, 15 Jul 2020 08:35:18 +0000 Received: by mail-pf1-x442.google.com with SMTP id a23so185051pfk.13 for ; Wed, 15 Jul 2020 01:35:03 -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=5Gf+3b18Fng3ehSSzSlGlAKgiKsSEaA+C81WsDyFW3w=; b=D99E52J1/iq4tAHPaGEuMRclM3XBiOV7ywlMdDOotpuwldvPhBvAoAx+ygB/L1RviV pCSOlM21XWp8hkl9ltf+NwiMEZUWobaG2KdzMGV4Wrm9VwYqlXHp0xv0WjDOWhRPogig R23Ki4rlSqAuFyXlVzoOF/smMfIl2YD7+K5j4= 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=5Gf+3b18Fng3ehSSzSlGlAKgiKsSEaA+C81WsDyFW3w=; b=GUawFWEG2bWdnaotGaQ8Fynsv0N2mks/R3uY5eX8MOb9zA62r2epFYX/1eHjhjXYvj iYqmaZ3xLzoObejAh+6XyZv+3mPubNLGqn/evDMYEHO+nPKeWPWD5AEEfyWirjxq8jvM b104VusreLnFHoZgLQ2mWvfXbFv7JKToL2Pz1uJyCckKVuNZBywWS5spoR2oi8rJCENb T/t/fIhaWdziuu9GUpAI9r9ggzwiNQTCdg3OBO37TtyINix3Rkcs+swcL9NmJYtftFmJ 8cEV0nIQ8qYvjglXfYGS9a/XQ8JtWXfdsPZFVHk7kwdnuYLkdho93hkMyptBBHBQe9H0 mWYw== X-Gm-Message-State: AOAM532yc6t0scyutbt/nD6EAo5jmLkj7ii+hGqOJbl2BsuTIdLYFFcU kOQJ/RUd/2fcI1ogl5uvQNb3JG0O4BA= X-Google-Smtp-Source: ABdhPJxRCFCn4iico0x9z8Q/KtWrdVTCJYE4/x2rneR9/RFp7MAaB7H84QREPyZJWuLxOVdY1X5hBQ== X-Received: by 2002:a62:88d4:: with SMTP id l203mr7603870pfd.205.1594802101431; Wed, 15 Jul 2020 01:35:01 -0700 (PDT) Received: from localhost.localdomain ([2405:201:c809:c7d5:9887:56a8:c916:cfdb]) by smtp.gmail.com with ESMTPSA id m92sm1467584pje.13.2020.07.15.01.34.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 01:35:00 -0700 (PDT) From: Jagan Teki To: Heiko Stuebner , Rob Herring Subject: [PATCH v6 4/7] arm64: dts: rk3399pro: vmarc-som: Move common properties into Carrier Date: Wed, 15 Jul 2020 14:04:15 +0530 Message-Id: <20200715083418.112003-5-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200715083418.112003-1-jagan@amarulasolutions.com> References: <20200715083418.112003-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200715_093504_811278_18882980 X-CRM114-Status: GOOD ( 12.86 ) X-Spam-Score: -2.1 (--) X-Spam-Report: SpamAssassin version 3.4.4 on casper.infradead.org summary: Content analysis details: (-2.1 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:442 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Jagan Teki , Suniel Mahesh , Michael Trimarchi , linux-amarula , linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org Some of gmac, sdmmc node properties are common across rk3288 and rk3399pro SOM's so move them into Carrier dtsi. Chosen node is specific to rk3399pro configure SBC, so move it into RockPI N10 dts. Signed-off-by: Jagan Teki --- Changes for v6: - spilt of previous version Trivial patch .../dts/rockchip-radxa-dalang-carrier.dtsi | 18 ++++++++++++---- .../dts/rockchip/rk3399pro-rock-pi-n10.dts | 4 ++++ .../dts/rockchip/rk3399pro-vmarc-som.dtsi | 21 +++++-------------- 3 files changed, 23 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi index 00b200a62263..450e5bb5af0b 100644 --- a/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi +++ b/arch/arm/boot/dts/rockchip-radxa-dalang-carrier.dtsi @@ -8,8 +8,11 @@ #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 { @@ -33,6 +36,15 @@ vcc5v0_sys: vcc5v0-sys-regulator { }; &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"; }; @@ -48,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"; 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 539f4005386d..369de5dc0ebd 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-rock-pi-n10.dts @@ -15,4 +15,8 @@ / { model = "Radxa ROCK Pi N10"; compatible = "radxa,rockpi-n10", "vamrs,rk3399pro-vmarc-som", "rockchip,rk3399pro"; + + chosen { + stdout-path = "serial2:1500000n8"; + }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi index d8fa8127d9dc..37ed95d5f7e9 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399pro-vmarc-som.dtsi @@ -11,13 +11,6 @@ / { 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>; - }; }; &cpu_l0 { @@ -42,17 +35,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 { @@ -335,6 +319,11 @@ &sdhci { status = "okay"; }; +&sdmmc { + cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + max-frequency = <150000000>; +}; + &tsadc { rockchip,hw-tshut-mode = <1>; rockchip,hw-tshut-polarity = <1>;