From patchwork Wed Sep 2 16:51:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 293061 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=-13.0 required=3.0 tests=BAYES_00, 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 16666C2BC11 for ; Wed, 2 Sep 2020 16:52:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EEB64207EA for ; Wed, 2 Sep 2020 16:52:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726467AbgIBQwy (ORCPT ); Wed, 2 Sep 2020 12:52:54 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:47729 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726742AbgIBQwv (ORCPT ); Wed, 2 Sep 2020 12:52:51 -0400 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N8GhM-1ki9qG2hou-0148ao; Wed, 02 Sep 2020 18:52:44 +0200 From: Adrian Schmutzler To: Andy Gross , Bjorn Andersson , Rob Herring , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 1/2] ARM: dts: qcom: add additional DT labels in qcom-ipq8064.dtsi Date: Wed, 2 Sep 2020 18:51:58 +0200 Message-Id: <20200902165159.7733-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:vS8tUETFjn0IRx8x+XCStfB8ARWiO6kwPhmjzJ4J63GrHhBhPp6 Fufc0fRol1yccyKcxDSh6+dCi84gyssTgFenSS9ho2clrRDFy4K3SJeFydhCA2ztVM0EHJf YYSOpASvgA47bqIJ0AEbThXvJMHuBoCs/Ia+DKx70AfPyFQbmZyNnfvDdDDP9FYawAKx1C9 rU4AsGjE4gsJlDYNID7ZQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:tGraHwQjY2Q=:oYb316oOyU+0XC7vpU23FS 5ZwwuQHslDTB5C1mfzDzv5XOlkYIIQJdce8GKIw5WGTCW4eLv6zl04O/nKNts8X0Ifel4fgAl Q5RSOwgScaLCWzHSk1VQkL3ywh0KCzBhfi3zoBIHa1jCrwj+tEj4wx2XIKXRv9v28/ECOmEs+ 5zcluq/unqu/6DLjxna9Et3N7Z9Ii24TzMMrHvs6kHqDByxtenZuZ5Dfto5GKxvXmrmh4cZ9W Ul1CiZN3A34njCaCKBCQWgwgbOI+KFSpPz3B1wyf5FC/wst64JVbOp5q/e4maQq3Y4UwvNGTf vUmnSnAAZYvct3OQQnv/mjg2dGht/RLryA/TfZK5KKkj3cFKJkMxHqdel8i6a5JmqAtLb1+7j qEz6qS8iZ/2r0gBW+yaoEiQqe4r+V2v7TKbYnPTEX4FsmXoLqYjMCHbZUpvFCAKlOW6+gQKiY ArjU3jCGhVjhwvNYfxWOPVPy1yZONMn8MszEbTqI9yceU5gyqcPNBP3KZavYQ3HfkczFKjgrP v7ceQOKBJ2ifEWbYG6mhz69qBboJKVixI2x27EB/6d7XKgckddv4FNYMujAaJxefsfPIJL7Hn JLWsrR4wgzjwQkvHWqtFgPDr/F7y42sRkIIC72Y8R/rVFhvvt/8kpJGTjWA3bKrTu2GmeY2jn wsTkfoKRBLQ/778L589cOXzRfO9b4fpu6zRn53TU10xnkI/hyXlWfkbw+HvPEoBGm2KC/Efci j7BUXNEKIZtXRUyW14YlcyDQefzuZddnDN4r24RMRbJ83cZr9lrHFpFrqWpgxWNiGxYJzGERd LlZNII9DhB7pzc9ZkNiHFVYHMCnNrH9iISFcc1sWpiv1XNzUYJGzqWDh6wjvKpGPWRcq8eksn Qvh+w6rRjqvpVvwAziOw== Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This adds some additional DT labels which are handy when referring to the nodes in derived DTS(I) files. It will also make the definitions more consistent, e.g. by adding gsbi2_serial and gsbi5_serial where we previously "only" had gsbi4_serial defined. While at it, add missing spaces after some DT labels and remove one useless empty line. Signed-off-by: Adrian Schmutzler --- arch/arm/boot/dts/qcom-ipq8064.dtsi | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi index c51481405e7f..c51f9fb4a0eb 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -20,7 +20,7 @@ #address-cells = <1>; #size-cells = <0>; - cpu@0 { + cpu0: cpu@0 { compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v1"; device_type = "cpu"; @@ -30,7 +30,7 @@ qcom,saw = <&saw0>; }; - cpu@1 { + cpu1: cpu@1 { compatible = "qcom,krait"; enable-method = "qcom,kpss-acc-v1"; device_type = "cpu"; @@ -67,7 +67,7 @@ no-map; }; - smem@41000000 { + smem: smem@41000000 { reg = <0x41000000 0x200000>; no-map; }; @@ -251,7 +251,7 @@ syscon-tcsr = <&tcsr>; - serial@12490000 { + gsbi2_serial: serial@12490000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x12490000 0x1000>, <0x12480000 0x1000>; @@ -273,7 +273,6 @@ #address-cells = <1>; #size-cells = <0>; }; - }; gsbi4: gsbi@16300000 { @@ -326,7 +325,7 @@ syscon-tcsr = <&tcsr>; - serial@1a240000 { + gsbi5_serial: serial@1a240000 { compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; reg = <0x1a240000 0x1000>, <0x1a200000 0x1000>; @@ -397,7 +396,7 @@ status = "disabled"; }; - sata@29000000 { + sata: sata@29000000 { compatible = "qcom,ipq806x-ahci", "generic-ahci"; reg = <0x29000000 0x180>; @@ -720,7 +719,7 @@ regulator-always-on; }; - sdcc1bam:dma@12402000 { + sdcc1bam: dma@12402000 { compatible = "qcom,bam-v1.3.0"; reg = <0x12402000 0x8000>; interrupts = ; @@ -730,7 +729,7 @@ qcom,ee = <0>; }; - sdcc3bam:dma@12182000 { + sdcc3bam: dma@12182000 { compatible = "qcom,bam-v1.3.0"; reg = <0x12182000 0x8000>; interrupts = ; @@ -740,13 +739,13 @@ qcom,ee = <0>; }; - amba { + amba: amba { compatible = "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; - sdcc@12400000 { + sdcc1: sdcc@12400000 { status = "disabled"; compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; @@ -766,7 +765,7 @@ dma-names = "tx", "rx"; }; - sdcc@12180000 { + sdcc3: sdcc@12180000 { compatible = "arm,pl18x", "arm,primecell"; arm,primecell-periphid = <0x00051180>; status = "disabled"; From patchwork Wed Sep 2 16:51:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 250445 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=-13.0 required=3.0 tests=BAYES_00, 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 A231AC433E2 for ; Wed, 2 Sep 2020 16:52:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8683020829 for ; Wed, 2 Sep 2020 16:52:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726426AbgIBQwx (ORCPT ); Wed, 2 Sep 2020 12:52:53 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:42755 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726467AbgIBQwv (ORCPT ); Wed, 2 Sep 2020 12:52:51 -0400 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MYedH-1k8H3n3bf9-00Vd7Z; Wed, 02 Sep 2020 18:52:44 +0200 From: Adrian Schmutzler To: Andy Gross , Bjorn Andersson , Rob Herring , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [PATCH 2/2] ARM: dts: qcom: remove commented mmc-ddr-1_8v for sdcc3 Date: Wed, 2 Sep 2020 18:51:59 +0200 Message-Id: <20200902165159.7733-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200902165159.7733-1-freifunk@adrianschmutzler.de> References: <20200902165159.7733-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:eoj5L3YYb23t4BdVNP7rzmbK9HUIg7FQUhwepVLrO3/vAiXwMO1 mmbfxJ9BqMbHIAM3SupAfa42tr2Qw7L8uq5jEYf4TA1nNYXTtoT/nR53QeOQ7Vb7IeOZgkx 24Cf6ukbZ8cKRh6x4A8s5yrcHgJuQdE32TLZtHpiRg+uzkVxMqmXTUjw+FpCTdhlbgLN+IW ptXGGAgaMdMQsuDQYWK7Q== X-UI-Out-Filterresults: notjunk:1; V03:K0:H8UhXfaI/ng=:LvXsXRdXQTxXk7CSxK7lc7 F3/6fAgRrxFYiYeQdjVKhBUzOB0p9RxQgDCDR+ClO3mIr399WDcaoWz8gYjn1Gz9Ve49VOz3T pO3Jv4H90Eu5EqiwShHaO9az5POHDm1MlsOik+e+GptdX6yATfoChck9wxLvCp4dpAO5lZO1r CWWF1XtdK9VI8og0+LCI/Vli16qyS91qRybMOs46svcfscXFz+tIWXJsHfPFK1ZRVDJJP2bn5 1rS+UL2QsY+O+gezz6ffaJQSQib3lV2ENlepp1PdS62kW0U5K0ESve/bvsbsImgUhEKwpkwxH O+ogiPkzhJ7HEwuYM6FI2xpiC9ElEWXcpqfPQ7hCuh46YsHFB78xeGLZLRaDU01ZivB1ZO9xx mCS5rj82yApCqsoEzEWhbe9+xk6KufR4g8+9iF1lYnqDfZ3LNKGGgE7QpFj+71nD8fWwiRjm/ KK3E06G5iFyn3UgCTRQQwvmY7gXIxupc+k8qxAiTqvs2PEe64nmXgknJsV8a5kMP3Js59lqj3 FEGRlua6ndVc9LKwKUq0qnWK7f0KQExAEfoJeuFkQFydGaGpC6MiK8aiEKJIfoKqhqIyQrVzH G4Pzq1Tq5z45Vx/NLsoZyBJn20TBa9sKgy3facapfX5/j8STV3YqMKMZ+AAcdlGLlIUTPLqHh khpyolU2u8qq7eXjPdmb3ZzMuAil7P4xWzkNOaY5VA+PJpMYyNJKLFkw+MZ6zkn21C5eGaP7Y EVO2KruHhJ+9SVYxM8X2SbFtkrKpOMCNHtMq1PkWh9oxeB+KxVex/1wlhhDd+VSjCXpC9yZhq Er1Kxqc0BnncYyQZzaCoTZoqjGUAmGbPPaL1pQKfjuLSwg1tYH2aZw9/Py6n5Ltx88weVvP0M pBJoAPW8kZNCDbVlp4JA== Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This property appears to be commented out, so we can remove it as well. Signed-off-by: Adrian Schmutzler --- arch/arm/boot/dts/qcom-ipq8064.dtsi | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi index c51f9fb4a0eb..c4667dff613e 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -778,7 +778,6 @@ cap-sd-highspeed; cap-mmc-highspeed; max-frequency = <192000000>; - #mmc-ddr-1_8v; sd-uhs-sdr104; sd-uhs-ddr50; vqmmc-supply = <&vsdcc_fixed>;