| From f09bf20057f84fc9644d62661f1dff8a0f6bc3ca Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 20 Mar 2020 18:41:01 +0100 |
| Subject: ARM: dts: mmp2-brownstone: Don't redeclare phandle references |
| |
| From: Lubomir Rintel <lkundrak@v3.sk> |
| |
| [ Upstream commit 5a56cf3e8738f5d31d8c024d0c62a4c2bfe76fb2 ] |
| |
| Extend the nodes by their phandle references instead of recreating the |
| tree and declaring references of the same names. |
| |
| Signed-off-by: Lubomir Rintel <lkundrak@v3.sk> |
| Reviewed-by: Rob Herring <robh@kernel.org> |
| Link: https://lore.kernel.org/r/20200320174107.29406-5-lkundrak@v3.sk |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Stable-dep-of: 831e0cd4f9ee ("arm: dts: marvell: Fix maxium->maxim typo in brownstone dts") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/arm/boot/dts/mmp2-brownstone.dts | 332 +++++++++++++------------- |
| 1 file changed, 165 insertions(+), 167 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts b/arch/arm/boot/dts/mmp2-brownstone.dts |
| index aaedc4c742ea5..04f1ae1382e7a 100644 |
| --- a/arch/arm/boot/dts/mmp2-brownstone.dts |
| +++ b/arch/arm/boot/dts/mmp2-brownstone.dts |
| @@ -19,176 +19,174 @@ memory { |
| device_type = "memory"; |
| reg = <0x00000000 0x08000000>; |
| }; |
| +}; |
| + |
| +&uart3 { |
| + status = "okay"; |
| +}; |
| |
| - soc { |
| - apb@d4000000 { |
| - uart3: uart@d4018000 { |
| - status = "okay"; |
| - }; |
| - twsi1: i2c@d4011000 { |
| - status = "okay"; |
| - pmic: max8925@3c { |
| - compatible = "maxium,max8925"; |
| - reg = <0x3c>; |
| - interrupts = <1>; |
| - interrupt-parent = <&intcmux4>; |
| - interrupt-controller; |
| - #interrupt-cells = <1>; |
| - maxim,tsc-irq = <0>; |
| +&twsi1 { |
| + status = "okay"; |
| + pmic: max8925@3c { |
| + compatible = "maxium,max8925"; |
| + reg = <0x3c>; |
| + interrupts = <1>; |
| + interrupt-parent = <&intcmux4>; |
| + interrupt-controller; |
| + #interrupt-cells = <1>; |
| + maxim,tsc-irq = <0>; |
| |
| - regulators { |
| - SDV1 { |
| - regulator-min-microvolt = <637500>; |
| - regulator-max-microvolt = <1425000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - SDV2 { |
| - regulator-min-microvolt = <650000>; |
| - regulator-max-microvolt = <2225000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - SDV3 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO1 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO2 { |
| - regulator-min-microvolt = <650000>; |
| - regulator-max-microvolt = <2250000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO3 { |
| - regulator-min-microvolt = <650000>; |
| - regulator-max-microvolt = <2250000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO4 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO5 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO6 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO7 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO8 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO9 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO10 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - }; |
| - LDO11 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO12 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO13 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO14 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO15 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO16 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO17 { |
| - regulator-min-microvolt = <650000>; |
| - regulator-max-microvolt = <2250000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO18 { |
| - regulator-min-microvolt = <650000>; |
| - regulator-max-microvolt = <2250000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO19 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - LDO20 { |
| - regulator-min-microvolt = <750000>; |
| - regulator-max-microvolt = <3900000>; |
| - regulator-boot-on; |
| - regulator-always-on; |
| - }; |
| - }; |
| - backlight { |
| - maxim,max8925-dual-string = <0>; |
| - }; |
| - charger { |
| - batt-detect = <0>; |
| - topoff-threshold = <1>; |
| - fast-charge = <7>; |
| - no-temp-support = <0>; |
| - no-insert-detect = <0>; |
| - }; |
| - }; |
| - }; |
| - rtc: rtc@d4010000 { |
| - status = "okay"; |
| + regulators { |
| + SDV1 { |
| + regulator-min-microvolt = <637500>; |
| + regulator-max-microvolt = <1425000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + SDV2 { |
| + regulator-min-microvolt = <650000>; |
| + regulator-max-microvolt = <2225000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + SDV3 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO1 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO2 { |
| + regulator-min-microvolt = <650000>; |
| + regulator-max-microvolt = <2250000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO3 { |
| + regulator-min-microvolt = <650000>; |
| + regulator-max-microvolt = <2250000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO4 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO5 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO6 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO7 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO8 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO9 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO10 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| }; |
| + LDO11 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO12 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO13 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO14 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO15 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO16 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO17 { |
| + regulator-min-microvolt = <650000>; |
| + regulator-max-microvolt = <2250000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO18 { |
| + regulator-min-microvolt = <650000>; |
| + regulator-max-microvolt = <2250000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO19 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + LDO20 { |
| + regulator-min-microvolt = <750000>; |
| + regulator-max-microvolt = <3900000>; |
| + regulator-boot-on; |
| + regulator-always-on; |
| + }; |
| + }; |
| + backlight { |
| + maxim,max8925-dual-string = <0>; |
| + }; |
| + charger { |
| + batt-detect = <0>; |
| + topoff-threshold = <1>; |
| + fast-charge = <7>; |
| + no-temp-support = <0>; |
| + no-insert-detect = <0>; |
| }; |
| }; |
| }; |
| + |
| +&rtc { |
| + status = "okay"; |
| +}; |
| -- |
| 2.43.0 |
| |
