From patchwork Wed Aug 10 08:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12940331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1068DC28B2B for ; Wed, 10 Aug 2022 08:05:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230319AbiHJIF3 (ORCPT ); Wed, 10 Aug 2022 04:05:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54604 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231279AbiHJIF0 (ORCPT ); Wed, 10 Aug 2022 04:05:26 -0400 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [IPv6:2a00:1450:4864:20::12c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CAEF18B08 for ; Wed, 10 Aug 2022 01:05:21 -0700 (PDT) Received: by mail-lf1-x12c.google.com with SMTP id u1so20177221lfq.4 for ; Wed, 10 Aug 2022 01:05:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=SY2OoAfsF4MYoa6h99uP/2obN/ZrDWllYHQX/C3kJVA=; b=FxhZVAucdj6VN0wr124P8kxAetiDiR8K0mOn6xHu5BJEA6s/S5v8/6kaWpBnS3CIaL lsf6WiwciuriDdNCoqEsf42dfhWqvR9/7xzbPT9euUR7mu1+TiSouF4+Ox+1LvRI+2Xn kL1Htd3LRxYBfZiwHtbReA3BAr6Ho20lHQwT4lrsR9XxamIUHAmKPaDpe7d+pKN6RGIr YQgrPIrkx18+v26Vh1gFXdL+nh2n1N0+kpwx8TKHJFbgcZ3qi0p/SWVznImxKYnZU8t5 Gvp7AcYHuj+Dx+4TslOGxFIKakVbGxdZx7gyMoKzogi+uQ6Nr1JO38bjNJU7Jh0nHPll NtDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=SY2OoAfsF4MYoa6h99uP/2obN/ZrDWllYHQX/C3kJVA=; b=t20WGQGnqUmYCpvE/O4pXoJF2sl43zWvdbPNKzq+7e1S4waJ7UtR2BEMd7z34rPcA8 AXxYMUiAQ1ySncyw2XiyeUWJynnSwl9b/mgOKta61ylIerD+X6/ZFJJKIFMNws5XvqG4 STDfcc7UE25VCI0NBlTlgbp9os7j2hNFWuLKOp7Fa+EsxOaBarEhKseEkPMsGHHsun8W G4QUtSm+D/lwQ//pe6jjW36bbvoNPdI+Ih7d+8GG2PMQLLYzRE1AIf8GT5KXFJJujXSk YQP59NGnkzxEejfIZ77QZIa+fddGHdWKX9N7qx3vb5E9bxHf5fFx/5pEmiEQNXV+yGgQ rduQ== X-Gm-Message-State: ACgBeo0R0pUmDMa0FuHKq2yTY3OygaR0XLbw18QyQZfF081ikx7jN2QI o2Yc9OgFbe2H5kXZ88V6HwRHwg== X-Google-Smtp-Source: AA6agR5ZxuXXlNZZnrf9zYBhLagTd8As9w8sPTAJKg/pEve75aXcYls4AGYGlb56gislzWrg/3OkWA== X-Received: by 2002:a05:6512:3342:b0:48b:4178:e8a5 with SMTP id y2-20020a056512334200b0048b4178e8a5mr7706400lfd.43.1660118719855; Wed, 10 Aug 2022 01:05:19 -0700 (PDT) Received: from localhost.localdomain ([83.146.140.105]) by smtp.gmail.com with ESMTPSA id h12-20020a2ea48c000000b0025e040510e7sm309571lji.74.2022.08.10.01.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 01:05:19 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/4] ARM: dts: qcom: msm8960: override nodes by label Date: Wed, 10 Aug 2022 11:05:13 +0300 Message-Id: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Using node paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). This also reduces the indentation making the code easier to read. The pre/post DTBS are the same. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8960-cdp.dts | 623 ++++++++++++------------- arch/arm/boot/dts/qcom-msm8960.dtsi | 6 +- 2 files changed, 314 insertions(+), 315 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8960-cdp.dts b/arch/arm/boot/dts/qcom-msm8960-cdp.dts index d1fd0fe12ffe..9157e3c4f48f 100644 --- a/arch/arm/boot/dts/qcom-msm8960-cdp.dts +++ b/arch/arm/boot/dts/qcom-msm8960-cdp.dts @@ -15,318 +15,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - soc { - gsbi@16400000 { - status = "okay"; - qcom,mode = ; - serial@16440000 { - status = "okay"; - }; - }; - - amba { - /* eMMC */ - sdcc1: mmc@12400000 { - status = "okay"; - }; - - /* External micro SD card */ - sdcc3: mmc@12180000 { - status = "okay"; - }; - }; - - rpm@108000 { - regulators { - compatible = "qcom,rpm-pm8921-regulators"; - vin_lvs1_3_6-supply = <&pm8921_s4>; - vin_lvs2-supply = <&pm8921_s4>; - vin_lvs4_5_7-supply = <&pm8921_s4>; - vdd_ncp-supply = <&pm8921_l6>; - vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; - vdd_l21_l23_l29-supply = <&pm8921_s8>; - vdd_l24-supply = <&pm8921_s1>; - vdd_l25-supply = <&pm8921_s1>; - vdd_l27-supply = <&pm8921_s7>; - vdd_l28-supply = <&pm8921_s7>; - - /* Buck SMPS */ - pm8921_s1: s1 { - regulator-always-on; - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1225000>; - qcom,switch-mode-frequency = <3200000>; - bias-pull-down; - }; - - pm8921_s2: s2 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1300000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - pm8921_s3: s3 { - regulator-min-microvolt = <500000>; - regulator-max-microvolt = <1150000>; - qcom,switch-mode-frequency = <4800000>; - bias-pull-down; - }; - - pm8921_s4: s4 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - qcom,force-mode = ; - }; - - pm8921_s7: s7 { - regulator-min-microvolt = <1150000>; - regulator-max-microvolt = <1150000>; - qcom,switch-mode-frequency = <3200000>; - bias-pull-down; - }; - - pm8921_s8: s8 { - regulator-always-on; - regulator-min-microvolt = <2050000>; - regulator-max-microvolt = <2050000>; - qcom,switch-mode-frequency = <1600000>; - bias-pull-down; - }; - - /* PMOS LDO */ - pm8921_l1: l1 { - regulator-always-on; - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - bias-pull-down; - }; - - pm8921_l2: l2 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - bias-pull-down; - }; - - pm8921_l3: l3 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3075000>; - bias-pull-down; - }; - - pm8921_l4: l4 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - bias-pull-down; - }; - - pm8921_l5: l5 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8921_l6: l6 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8921_l7: l7 { - regulator-always-on; - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8921_l8: l8 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <3000000>; - bias-pull-down; - }; - - pm8921_l9: l9 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - bias-pull-down; - }; - - pm8921_l10: l10 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - bias-pull-down; - }; - - pm8921_l11: l11 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - bias-pull-down; - }; - - pm8921_l12: l12 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - bias-pull-down; - }; - - pm8921_l14: l14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - bias-pull-down; - }; - - pm8921_l15: l15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8921_l16: l16 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - bias-pull-down; - }; - - pm8921_l17: l17 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - bias-pull-down; - }; - - pm8921_l18: l18 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1300000>; - bias-pull-down; - }; - - pm8921_l21: l21 { - regulator-min-microvolt = <1900000>; - regulator-max-microvolt = <1900000>; - bias-pull-down; - }; - - pm8921_l22: l22 { - regulator-min-microvolt = <2750000>; - regulator-max-microvolt = <2750000>; - bias-pull-down; - }; - - pm8921_l23: l23 { - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - bias-pull-down; - }; - - pm8921_l24: l24 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <1150000>; - bias-pull-down; - }; - - pm8921_l25: l25 { - regulator-always-on; - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1250000>; - bias-pull-down; - }; - - /* Low Voltage Switch */ - pm8921_lvs1: lvs1 { - bias-pull-down; - }; - - pm8921_lvs2: lvs2 { - bias-pull-down; - }; - - pm8921_lvs3: lvs3 { - bias-pull-down; - }; - - pm8921_lvs4: lvs4 { - bias-pull-down; - }; - - pm8921_lvs5: lvs5 { - bias-pull-down; - }; - - pm8921_lvs6: lvs6 { - bias-pull-down; - }; - - pm8921_lvs7: lvs7 { - bias-pull-down; - }; - - pm8921_ncp: ncp { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - qcom,switch-mode-frequency = <1600000>; - }; - }; - }; - - gsbi@16000000 { - status = "okay"; - qcom,mode = ; - pinctrl-names = "default"; - pinctrl-0 = <&spi1_default>; - spi@16080000 { - status = "okay"; - ethernet@0 { - compatible = "micrel,ks8851"; - reg = <0>; - interrupt-parent = <&msmgpio>; - interrupts = <90 8>; - spi-max-frequency = <5400000>; - vdd-supply = <&ext_l2>; - vdd-io-supply = <&pm8921_lvs6>; - reset-gpios = <&msmgpio 89 0>; - }; - }; - }; - - pinctrl@800000 { - spi1_default: spi1_default { - mux { - pins = "gpio6", "gpio7", "gpio9"; - function = "gsbi1"; - }; - - mosi { - pins = "gpio6"; - drive-strength = <12>; - bias-disable; - }; - - miso { - pins = "gpio7"; - drive-strength = <12>; - bias-disable; - }; - - cs { - pins = "gpio8"; - drive-strength = <12>; - bias-disable; - output-low; - }; - - clk { - pins = "gpio9"; - drive-strength = <12>; - bias-disable; - }; - }; - }; - }; - regulators { compatible = "simple-bus"; @@ -340,6 +28,71 @@ ext_l2: gpio-regulator@91 { }; }; +&gsbi1 { + qcom,mode = ; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_default>; + status = "okay"; +}; + +&gsbi1_spi { + status = "okay"; + + ethernet@0 { + compatible = "micrel,ks8851"; + reg = <0>; + interrupt-parent = <&msmgpio>; + interrupts = <90 8>; + spi-max-frequency = <5400000>; + vdd-supply = <&ext_l2>; + vdd-io-supply = <&pm8921_lvs6>; + reset-gpios = <&msmgpio 89 0>; + }; +}; + +&gsbi5 { + qcom,mode = ; + status = "okay"; +}; + +&gsbi5_serial { + status = "okay"; +}; + +&msmgpio { + spi1_default: spi1_default { + mux { + pins = "gpio6", "gpio7", "gpio9"; + function = "gsbi1"; + }; + + mosi { + pins = "gpio6"; + drive-strength = <12>; + bias-disable; + }; + + miso { + pins = "gpio7"; + drive-strength = <12>; + bias-disable; + }; + + cs { + pins = "gpio8"; + drive-strength = <12>; + bias-disable; + output-low; + }; + + clk { + pins = "gpio9"; + drive-strength = <12>; + bias-disable; + }; + }; +}; + &pmicintc { keypad@148 { linux,keymap = < @@ -352,3 +105,249 @@ MATRIX_KEY(0, 3, KEY_CAMERA) keypad,num-columns = <5>; }; }; + +&rpm { + regulators { + compatible = "qcom,rpm-pm8921-regulators"; + vin_lvs1_3_6-supply = <&pm8921_s4>; + vin_lvs2-supply = <&pm8921_s4>; + vin_lvs4_5_7-supply = <&pm8921_s4>; + vdd_ncp-supply = <&pm8921_l6>; + vdd_l1_l2_l12_l18-supply = <&pm8921_s4>; + vdd_l21_l23_l29-supply = <&pm8921_s8>; + vdd_l24-supply = <&pm8921_s1>; + vdd_l25-supply = <&pm8921_s1>; + vdd_l27-supply = <&pm8921_s7>; + vdd_l28-supply = <&pm8921_s7>; + + /* Buck SMPS */ + pm8921_s1: s1 { + regulator-always-on; + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; + qcom,switch-mode-frequency = <3200000>; + bias-pull-down; + }; + + pm8921_s2: s2 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + pm8921_s3: s3 { + regulator-min-microvolt = <500000>; + regulator-max-microvolt = <1150000>; + qcom,switch-mode-frequency = <4800000>; + bias-pull-down; + }; + + pm8921_s4: s4 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + qcom,force-mode = ; + }; + + pm8921_s7: s7 { + regulator-min-microvolt = <1150000>; + regulator-max-microvolt = <1150000>; + qcom,switch-mode-frequency = <3200000>; + bias-pull-down; + }; + + pm8921_s8: s8 { + regulator-always-on; + regulator-min-microvolt = <2050000>; + regulator-max-microvolt = <2050000>; + qcom,switch-mode-frequency = <1600000>; + bias-pull-down; + }; + + /* PMOS LDO */ + pm8921_l1: l1 { + regulator-always-on; + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + bias-pull-down; + }; + + pm8921_l2: l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + bias-pull-down; + }; + + pm8921_l3: l3 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; + bias-pull-down; + }; + + pm8921_l4: l4 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + bias-pull-down; + }; + + pm8921_l5: l5 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8921_l6: l6 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8921_l7: l7 { + regulator-always-on; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8921_l8: l8 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <3000000>; + bias-pull-down; + }; + + pm8921_l9: l9 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + bias-pull-down; + }; + + pm8921_l10: l10 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + bias-pull-down; + }; + + pm8921_l11: l11 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + bias-pull-down; + }; + + pm8921_l12: l12 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + bias-pull-down; + }; + + pm8921_l14: l14 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + bias-pull-down; + }; + + pm8921_l15: l15 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8921_l16: l16 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + bias-pull-down; + }; + + pm8921_l17: l17 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + bias-pull-down; + }; + + pm8921_l18: l18 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + bias-pull-down; + }; + + pm8921_l21: l21 { + regulator-min-microvolt = <1900000>; + regulator-max-microvolt = <1900000>; + bias-pull-down; + }; + + pm8921_l22: l22 { + regulator-min-microvolt = <2750000>; + regulator-max-microvolt = <2750000>; + bias-pull-down; + }; + + pm8921_l23: l23 { + regulator-always-on; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + bias-pull-down; + }; + + pm8921_l24: l24 { + regulator-min-microvolt = <750000>; + regulator-max-microvolt = <1150000>; + bias-pull-down; + }; + + pm8921_l25: l25 { + regulator-always-on; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; + bias-pull-down; + }; + + /* Low Voltage Switch */ + pm8921_lvs1: lvs1 { + bias-pull-down; + }; + + pm8921_lvs2: lvs2 { + bias-pull-down; + }; + + pm8921_lvs3: lvs3 { + bias-pull-down; + }; + + pm8921_lvs4: lvs4 { + bias-pull-down; + }; + + pm8921_lvs5: lvs5 { + bias-pull-down; + }; + + pm8921_lvs6: lvs6 { + bias-pull-down; + }; + + pm8921_lvs7: lvs7 { + bias-pull-down; + }; + + pm8921_ncp: ncp { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + qcom,switch-mode-frequency = <1600000>; + }; + }; +}; + +/* eMMC */ +&sdcc1 { + status = "okay"; +}; + +/* External micro SD card */ +&sdcc3 { + status = "okay"; +}; diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index 19554f3b5196..a5f1eda707b5 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -152,7 +152,7 @@ l2cc: clock-controller@2011000 { reg = <0x2011000 0x1000>; }; - rpm@108000 { + rpm: rpm@108000 { compatible = "qcom,rpm-msm8960"; reg = <0x108000 0x1000>; qcom,ipc = <&l2cc 0x8 2>; @@ -307,7 +307,7 @@ tcsr: syscon@1a400000 { reg = <0x1a400000 0x100>; }; - gsbi@16000000 { + gsbi1: gsbi@16000000 { compatible = "qcom,gsbi-v1.0.0"; cell-index = <1>; reg = <0x16000000 0x100>; @@ -317,7 +317,7 @@ gsbi@16000000 { #size-cells = <1>; ranges; - spi@16080000 { + gsbi1_spi: spi@16080000 { compatible = "qcom,spi-qup-v1.1.1"; #address-cells = <1>; #size-cells = <0>; From patchwork Wed Aug 10 08:05:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12940328 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEC85C25B08 for ; Wed, 10 Aug 2022 08:05:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231392AbiHJIF0 (ORCPT ); Wed, 10 Aug 2022 04:05:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230208AbiHJIFZ (ORCPT ); Wed, 10 Aug 2022 04:05:25 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FC4D1EEC9 for ; Wed, 10 Aug 2022 01:05:22 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id f20so20121193lfc.10 for ; Wed, 10 Aug 2022 01:05:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=dwg6yv71NfB5knx8pj12cTQqtHRrsNvcyNO++oQeMQA=; b=FMNSBXCSpo4ArITqBSQAN1d8gM+7xmtOI+8DrB0WnI8PAeHdkhICrAoJWNu2dHGuR/ H5CNqruS5J0MNMXf8VZyyL+XDY1fEtVJ5u2e6oY0MXACTInHRMahYPCgeZQqJfKFjl70 E1GBCRKDZyj+DVUksuf+9nGIq3xLxYdMjPLq3C7nfz7AqHLCsk0fRvq4LNEYwZ254waj if3206/LlbgMjty5Jfoo/mJ0Assx/E9psijN0hPaJQ+MQYsOHS6PTXb3X2N6SZyJx5LW fU+InTPHHsPGNXX4wgI56vuC53p/8vsP8ByDvQMLJWl09DMLnf+uMk5CHsx/Z4QS7THd OBug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=dwg6yv71NfB5knx8pj12cTQqtHRrsNvcyNO++oQeMQA=; b=Z5FT7oo5A8FeIHyVx7ddxkDz9g/8eNdMjrwtdv+fCF9+/EBGzytj5Lq6rhx2z4SFul dri/+bX5VGfAr4b7KAwU0ZOLagQWNPw0EkuimAyRmzkWH2V4efcn3IptY2ubqSVMGf8T NNHCLvoi1DG6NBkKkMV5Quy3mNYt5O8ckBZMl2wjetUI1hGysZY3hYg7aIwBDqW/46oL z2ggSx1K8RQeh2/1yYg/BnJo74g9pXR1o8UG7h7ygN0aGiAjSHVY7CM3Sh1UEli/MHoI 9445EDmglQzSo8ymiq3y/9fvMh4sCGb2vRaAwTv0pcqU7dSUkvtZ8fR4G6TJCMtwQdQ+ aNIw== X-Gm-Message-State: ACgBeo19R+1snWwfJ03MROMgnnlTOrZFm9IG1uApnl9vivrLvA+6giNc KBE27oPR/6db9o3qEhIoNLmHZw== X-Google-Smtp-Source: AA6agR5dKLBqtcVBYIHtAAnB7lVoZAYXipJKiodI92zWu+Uo21MR5j32O9atljdkQ/ByXQPhGXe6ZQ== X-Received: by 2002:a05:6512:3d0e:b0:48b:3976:b319 with SMTP id d14-20020a0565123d0e00b0048b3976b319mr8415597lfv.362.1660118720844; Wed, 10 Aug 2022 01:05:20 -0700 (PDT) Received: from localhost.localdomain ([83.146.140.105]) by smtp.gmail.com with ESMTPSA id h12-20020a2ea48c000000b0025e040510e7sm309571lji.74.2022.08.10.01.05.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 01:05:20 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/4] ARM: dts: qcom: msm8226: override nodes by label Date: Wed, 10 Aug 2022 11:05:14 +0300 Message-Id: <20220810080516.166866-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> References: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Using node paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). This also reduces the indentation making the code easier to read. The pre/post DTBS are the same. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts b/arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts index d159188c8b95..290e1df631f0 100644 --- a/arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts +++ b/arch/arm/boot/dts/qcom-msm8226-samsung-s3ve3g.dts @@ -18,8 +18,6 @@ chosen { }; }; -&soc { - serial@f991f000 { - status = "ok"; - }; +&blsp1_uart3 { + status = "ok"; }; From patchwork Wed Aug 10 08:05:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12940329 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C861C25B0C for ; Wed, 10 Aug 2022 08:05:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229636AbiHJIF2 (ORCPT ); Wed, 10 Aug 2022 04:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231272AbiHJIF0 (ORCPT ); Wed, 10 Aug 2022 04:05:26 -0400 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [IPv6:2a00:1450:4864:20::129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A8C425C6B for ; Wed, 10 Aug 2022 01:05:23 -0700 (PDT) Received: by mail-lf1-x129.google.com with SMTP id t1so20164738lft.8 for ; Wed, 10 Aug 2022 01:05:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=BpcLPBAGuiZcpVrA8pcR24viGnpJaVJd3XMXiJb1Rfg=; b=huxWhU8+f11jDxhBwD0M/5LlAFH+ebBTILIwhjbkIe0sEzWtGUi7Rw4KpaIs2JvgTG OcC2MiMXatY5dRFtuFsC12r8sRuOO97nA7JptuozHen0gHM94+uF4UVzJ1cZql0aNpeE 6vjuxGrA+K0FUYg4z0gY5uGsNpmdM+dGEQBpm1xYY8GqMevp2rRlv1plnAndv6lgsm2n 6xnZt1naQN89p2EDZdnpmUMnMeahCzvDck4eUcU80IE8W/tvO4+x5BThnJNS8eDUpHds HmuUIYk++sPiL3jUBmou8Qc3c1yHHqQ4OpfoQ/k/lY1ygVqv6gPFcNbk5L4Qw62qD+jL VcgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=BpcLPBAGuiZcpVrA8pcR24viGnpJaVJd3XMXiJb1Rfg=; b=147mjH5l3BmcIVh+9tFSE++ilHDWECS8ShNmaGql3AZHcCZzWLaf5o+//7X+Se3e/Q 1cU9akM4ee8nWPLTK6GTsdYpSMje6UQGjnSYMdkpEAAXPzPd5SiIgtafsl6GsTTIlApl espaOqFKQ1gFM7lxRDkEpEqoP6GBZvXx/KDqzXF88FDCS1ocMeKpC9P2JuAC7nnvFVa5 3UTJsB72rmQslP+f9vG0VnilMH6JkkobXv2qXfLqAeJ+RV3pzsQQdZR9wx6nuTONl6d7 e8HnLOwMMYZBh0XSL5AmItDWpyzBFtVTjRACsdq5HhzpxpFL2KqqK4Hfqse1ghn7vwZu egjA== X-Gm-Message-State: ACgBeo0wTIuk/TqSBYlHTdlPSI2Wl8ZzIW+voRyIi14h5qfnkTYXhxGn V6RKfbDlfWm9fw/czLPqTlsIdQ== X-Google-Smtp-Source: AA6agR4u4BvlM/9iAHgtwXaT7uSI8+FBhSL8xrlmU3bF+vRMEGIsIBnljKY7isbFKHhLwk9D2IpIOg== X-Received: by 2002:a05:6512:2989:b0:48a:f4b9:84bf with SMTP id du9-20020a056512298900b0048af4b984bfmr9836809lfb.39.1660118721868; Wed, 10 Aug 2022 01:05:21 -0700 (PDT) Received: from localhost.localdomain ([83.146.140.105]) by smtp.gmail.com with ESMTPSA id h12-20020a2ea48c000000b0025e040510e7sm309571lji.74.2022.08.10.01.05.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 01:05:21 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/4] ARM: dts: qcom: msm8660: override nodes by label Date: Wed, 10 Aug 2022 11:05:15 +0300 Message-Id: <20220810080516.166866-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> References: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Using node paths to extend or override a device tree node is error prone. If there was a typo error, a new node will be created instead of extending the existing node. This will lead to run-time errors that could be hard to detect. A mistyped label on the other hand, will cause a dtc compile error (during build time). This also reduces the indentation making the code easier to read. The pre/post DTBS are the same. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8660-surf.dts | 41 ++++++++++++------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts index 414280d9bdba..63b8f4285ace 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -16,14 +16,6 @@ chosen { }; soc { - gsbi@19c00000 { - status = "okay"; - qcom,mode = ; - serial@19c40000 { - status = "okay"; - }; - }; - /* Temporary fixed regulator */ vsdcc_fixed: vsdcc-regulator { compatible = "regulator-fixed"; @@ -32,21 +24,16 @@ vsdcc_fixed: vsdcc-regulator { regulator-max-microvolt = <2700000>; regulator-always-on; }; + }; +}; - amba { - /* eMMC */ - sdcc1: mmc@12400000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; +&gsbi12 { + qcom,mode = ; + status = "okay"; +}; - /* External micro SD card */ - sdcc3: mmc@12180000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; - }; - }; +&gsbi12_serial { + status = "okay"; }; &pm8058 { @@ -76,3 +63,15 @@ MATRIX_KEY(5, 4, KEY_MENU) keypad,num-columns = <5>; }; }; + +/* eMMC */ +&sdcc1 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +}; + +/* External micro SD card */ +&sdcc3 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +}; From patchwork Wed Aug 10 08:05:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12940330 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6FF69C3F6B0 for ; Wed, 10 Aug 2022 08:05:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231501AbiHJIF1 (ORCPT ); Wed, 10 Aug 2022 04:05:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbiHJIF0 (ORCPT ); Wed, 10 Aug 2022 04:05:26 -0400 Received: from mail-lj1-x234.google.com (mail-lj1-x234.google.com [IPv6:2a00:1450:4864:20::234]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8618527B29 for ; Wed, 10 Aug 2022 01:05:24 -0700 (PDT) Received: by mail-lj1-x234.google.com with SMTP id x9so11611609ljj.13 for ; Wed, 10 Aug 2022 01:05:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=b288XWNSqBMApoeh+XjyRkXNonxHbmNcMipW3aFN8V0=; b=z50SFZcygtyBvQCgqQgd3LYcRf50PshwjIXeeJIdfx/5vjhdUvzLLbHdZ2pE1YNu7T BRObKtVX18NmOjhCXalI7i1PwUV8ajDNc8U88xQHqZj0WguMLye56DW1IqQE/UqkxTgU xayVaMAdNwVNBGewiKHpSm84Fo5+R7D1XTPL8er/mHMuU68iNGSZ6dbr+kaG84KXAVxz HuYUnu5QlhXNWeD7/0LZ3WKZR2z075PhNpfAHmgQWvj8wxgwQDmHFkLCaQJ0wc6CBRl4 s0wii3TXQFKx0NkI5+O1Ji01swsreUV5aaRhObt/l2MN0yhwN70IXA1j1X9gqSlhsY/3 MkJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=b288XWNSqBMApoeh+XjyRkXNonxHbmNcMipW3aFN8V0=; b=Mic+E/0vQYt04WJONjxH7ywl323LIVma+NTdxPWS+w01zKpM+Y9k2zSSWl4QfZ9ZzO HrreTliPU8jIQRudXHVjogZXDk2g2mGImlkFa43KC6pnQAjv8PT321hBevcuLfagGHXQ UCT6urD8Ud85O0fLgTOUiCcKmx3vuLzUi3dYZrXbTiJAxS5dO7FiQP6PUJtLs79RmaYN voTHeC46Foof+ffaN12UY1oWiE2E18N+P3cdCu794sU5XSToMfFYy3NwKMpEoIIw8Wej dFBPTTW6n7fHgDW3GPD34dZB11ZqphoQLBgcktRbeB5aZ6qo4+hxWeeWS5N2FdM0SHlf TSig== X-Gm-Message-State: ACgBeo2lfHdb4tQO8KcqEqlyi9EJpX8bFI/wzNdPXjlXiAoOlkCqpYWw FWWqYlyQbmRDCa3NMro0DP1tDg== X-Google-Smtp-Source: AA6agR4pYmCEarPFE/nntgiaSJnKpL5k1y2SHONUiqSR4mVkriKF+WzK37ov/Fn+C9KVMndmIPmQfQ== X-Received: by 2002:a05:651c:886:b0:25e:3440:9518 with SMTP id d6-20020a05651c088600b0025e34409518mr8855935ljq.248.1660118722926; Wed, 10 Aug 2022 01:05:22 -0700 (PDT) Received: from localhost.localdomain ([83.146.140.105]) by smtp.gmail.com with ESMTPSA id h12-20020a2ea48c000000b0025e040510e7sm309571lji.74.2022.08.10.01.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 01:05:22 -0700 (PDT) From: Krzysztof Kozlowski To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/4] ARM: dts: qcom: msm8660-surf: move fixed regulator out of soc Date: Wed, 10 Aug 2022 11:05:16 +0300 Message-Id: <20220810080516.166866-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> References: <20220810080516.166866-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Fixed regulators, like stub for SDCC Power, are not part of SoC, so they should be outside of the soc node. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom-msm8660-surf.dts | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/qcom-msm8660-surf.dts b/arch/arm/boot/dts/qcom-msm8660-surf.dts index 63b8f4285ace..be18f1be29a1 100644 --- a/arch/arm/boot/dts/qcom-msm8660-surf.dts +++ b/arch/arm/boot/dts/qcom-msm8660-surf.dts @@ -15,15 +15,13 @@ chosen { stdout-path = "serial0:115200n8"; }; - soc { - /* Temporary fixed regulator */ - vsdcc_fixed: vsdcc-regulator { - compatible = "regulator-fixed"; - regulator-name = "SDCC Power"; - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - regulator-always-on; - }; + /* Temporary fixed regulator */ + vsdcc_fixed: vsdcc-regulator { + compatible = "regulator-fixed"; + regulator-name = "SDCC Power"; + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + regulator-always-on; }; };