Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: exynos: Define fixed regulators in root node for consistency in SMDK5420

Remove the regulators node and define fixed regulators directly under
the root node. This makes SMDK5420 board consistent with other Exynos
boards.

Name the fixed regulator nodes consistently.

Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

+24 -33
+24 -33
arch/arm/boot/dts/exynos5420-smdk5420.dts
··· 32 32 }; 33 33 }; 34 34 35 - regulators { 36 - compatible = "simple-bus"; 37 - #address-cells = <1>; 38 - #size-cells = <0>; 39 - 40 - vdd: fixed-regulator@0 { 41 - compatible = "regulator-fixed"; 42 - reg = <0>; 43 - regulator-name = "vdd-supply"; 44 - regulator-min-microvolt = <1800000>; 45 - regulator-max-microvolt = <1800000>; 46 - regulator-always-on; 47 - }; 48 - 49 - dbvdd: fixed-regulator@1 { 50 - compatible = "regulator-fixed"; 51 - reg = <1>; 52 - regulator-name = "dbvdd-supply"; 53 - regulator-min-microvolt = <3300000>; 54 - regulator-max-microvolt = <3300000>; 55 - regulator-always-on; 56 - }; 57 - 58 - spkvdd: fixed-regulator@2 { 59 - compatible = "regulator-fixed"; 60 - reg = <2>; 61 - regulator-name = "spkvdd-supply"; 62 - regulator-min-microvolt = <5000000>; 63 - regulator-max-microvolt = <5000000>; 64 - regulator-always-on; 65 - }; 35 + vdd: regulator-0 { 36 + compatible = "regulator-fixed"; 37 + regulator-name = "vdd-supply"; 38 + regulator-min-microvolt = <1800000>; 39 + regulator-max-microvolt = <1800000>; 40 + regulator-always-on; 66 41 }; 67 42 68 - usb300_vbus_reg: regulator-usb300 { 43 + dbvdd: regulator-1 { 44 + compatible = "regulator-fixed"; 45 + regulator-name = "dbvdd-supply"; 46 + regulator-min-microvolt = <3300000>; 47 + regulator-max-microvolt = <3300000>; 48 + regulator-always-on; 49 + }; 50 + 51 + spkvdd: regulator-2 { 52 + compatible = "regulator-fixed"; 53 + regulator-name = "spkvdd-supply"; 54 + regulator-min-microvolt = <5000000>; 55 + regulator-max-microvolt = <5000000>; 56 + regulator-always-on; 57 + }; 58 + 59 + usb300_vbus_reg: regulator-3 { 69 60 compatible = "regulator-fixed"; 70 61 regulator-name = "VBUS0"; 71 62 regulator-min-microvolt = <5000000>; ··· 67 76 enable-active-high; 68 77 }; 69 78 70 - usb301_vbus_reg: regulator-usb301 { 79 + usb301_vbus_reg: regulator-4 { 71 80 compatible = "regulator-fixed"; 72 81 regulator-name = "VBUS1"; 73 82 regulator-min-microvolt = <5000000>;