diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2022-08-10 11:05:15 +0300 |
|---|---|---|
| committer | Bjorn Andersson <andersson@kernel.org> | 2022-08-29 16:46:45 -0500 |
| commit | 5bd858a82ab77333b41bda9049fbaf6f878c11ab (patch) | |
| tree | b9e9f6416d7cc90076719ef2332523710def9254 /arch/arm/boot/dts/qcom-msm8660-surf.dts | |
| parent | c77ad7f3ba7ffa05f49516732886f5feed95793b (diff) | |
| download | lwn-5bd858a82ab77333b41bda9049fbaf6f878c11ab.tar.gz lwn-5bd858a82ab77333b41bda9049fbaf6f878c11ab.zip | |
ARM: dts: qcom: msm8660: override nodes by label
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 <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20220810080516.166866-3-krzysztof.kozlowski@linaro.org
Diffstat (limited to 'arch/arm/boot/dts/qcom-msm8660-surf.dts')
| -rw-r--r-- | arch/arm/boot/dts/qcom-msm8660-surf.dts | 41 |
1 files 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 @@ }; soc { - gsbi@19c00000 { - status = "okay"; - qcom,mode = <GSBI_PROT_I2C_UART>; - serial@19c40000 { - status = "okay"; - }; - }; - /* Temporary fixed regulator */ vsdcc_fixed: vsdcc-regulator { compatible = "regulator-fixed"; @@ -32,21 +24,16 @@ regulator-max-microvolt = <2700000>; regulator-always-on; }; + }; +}; - amba { - /* eMMC */ - sdcc1: mmc@12400000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; +&gsbi12 { + qcom,mode = <GSBI_PROT_I2C_UART>; + status = "okay"; +}; - /* External micro SD card */ - sdcc3: mmc@12180000 { - status = "okay"; - vmmc-supply = <&vsdcc_fixed>; - }; - }; - }; +&gsbi12_serial { + status = "okay"; }; &pm8058 { @@ -76,3 +63,15 @@ keypad,num-columns = <5>; }; }; + +/* eMMC */ +&sdcc1 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +}; + +/* External micro SD card */ +&sdcc3 { + vmmc-supply = <&vsdcc_fixed>; + status = "okay"; +}; |