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

ARM: dts: imx6qdl-hummingboard2: rename regulators to match schematic

Make the regulators match the schematic - name the regulators after
one of their schematic supply names, and arrange them into their
heirarchy.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

authored by

Russell King and committed by
Shawn Guo 3b2bbc36 a9ac77c2

+61 -39
+2 -2
arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi
··· 64 64 &usdhc3 { 65 65 pinctrl-names = "default"; 66 66 pinctrl-0 = <&pinctrl_hummingboard2_usdhc3>; 67 - vmmc-supply = <&reg_3p3v>; 68 - vqmmc-supply = <&reg_3p3v>; 67 + vmmc-supply = <&v_3v2>; 68 + vqmmc-supply = <&v_3v2>; 69 69 bus-width = <8>; 70 70 non-removable; 71 71 status = "okay";
+59 -37
arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi
··· 52 52 linux,rc-map-name = "rc-rc6-mce"; 53 53 }; 54 54 55 - reg_3p3v: regulator-3p3v { 55 + v_3v2: regulator-v-3v2 { 56 56 compatible = "regulator-fixed"; 57 - regulator-name = "VCC_3V2"; 58 - regulator-min-microvolt = <3300000>; 59 - regulator-max-microvolt = <3300000>; 60 57 regulator-always-on; 58 + regulator-max-microvolt = <3300000>; 59 + regulator-min-microvolt = <3300000>; 60 + regulator-name = "v_3v2"; 61 61 }; 62 62 63 - reg_1p8v: regulator-1p8v { 63 + v_5v0: regulator-v-5v0 { 64 64 compatible = "regulator-fixed"; 65 - regulator-name = "VCC_1V8"; 66 - regulator-min-microvolt = <1800000>; 67 - regulator-max-microvolt = <1800000>; 68 65 regulator-always-on; 66 + regulator-max-microvolt = <5000000>; 67 + regulator-min-microvolt = <5000000>; 68 + regulator-name = "v_5v0"; 69 + }; 70 + 71 + vcc_1p8: regulator-vcc-1p8 { 72 + compatible = "regulator-fixed"; 73 + regulator-always-on; 74 + regulator-max-microvolt = <1800000>; 75 + regulator-min-microvolt = <1800000>; 76 + regulator-name = "vcc_1p8"; 77 + vin-supply = <&v_3v2>; 69 78 }; 70 79 71 80 v_sd: regulator-v-sd { ··· 87 78 regulator-min-microvolt = <3300000>; 88 79 regulator-name = "v_sd"; 89 80 startup-delay-us = <1000>; 81 + vin-supply = <&v_3v2>; 90 82 }; 91 83 92 - reg_usbh2_vbus: regulator-usb-h1-vbus { 93 - compatible = "regulator-fixed"; 94 - enable-active-high; 95 - gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; 96 - pinctrl-names = "default"; 97 - pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; 98 - regulator-name = "V_USB2"; 99 - regulator-min-microvolt = <5000000>; 100 - regulator-max-microvolt = <5000000>; 101 - regulator-always-on; 102 - }; 103 - 104 - reg_usbotg_vbus: regulator-usb-otg-vbus { 84 + v_usb1: regulator-v-usb1 { 105 85 compatible = "regulator-fixed"; 106 86 enable-active-high; 107 87 gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>; 108 88 pinctrl-names = "default"; 109 89 pinctrl-0 = <&pinctrl_hummingboard2_usbotg_vbus>; 110 - regulator-name = "V_USB1"; 111 - regulator-min-microvolt = <5000000>; 90 + regulator-always-on; 112 91 regulator-max-microvolt = <5000000>; 92 + regulator-min-microvolt = <5000000>; 93 + regulator-name = "v_usb1"; 94 + vin-supply = <&v_5v0>; 113 95 }; 114 96 115 - reg_usbh3_vbus: regulator-usb-h2-vbus { 97 + v_usb2: regulator-v-usb2 { 98 + /* USB hub port 1 */ 116 99 compatible = "regulator-fixed"; 117 100 enable-active-high; 118 - enable-gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; 101 + gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>; 102 + pinctrl-names = "default"; 103 + pinctrl-0 = <&pinctrl_hummingboard2_usbh1_vbus>; 104 + regulator-always-on; 105 + regulator-max-microvolt = <5000000>; 106 + regulator-min-microvolt = <5000000>; 107 + regulator-name = "v_usb2"; 108 + vin-supply = <&v_5v0>; 109 + }; 110 + 111 + v_usb3: regulator-v-usb3 { 112 + /* USB hub port 3 */ 113 + compatible = "regulator-fixed"; 114 + enable-active-high; 115 + gpio = <&gpio2 13 GPIO_ACTIVE_HIGH>; 119 116 pinctrl-names = "default"; 120 117 pinctrl-0 = <&pinctrl_hummingboard2_usbh2_vbus>; 121 - regulator-name = "V_USB3"; 122 - regulator-min-microvolt = <5000000>; 123 - regulator-max-microvolt = <5000000>; 124 118 regulator-always-on; 119 + regulator-max-microvolt = <5000000>; 120 + regulator-min-microvolt = <5000000>; 121 + regulator-name = "v_usb3"; 122 + vin-supply = <&v_5v0>; 125 123 }; 126 124 127 - reg_usbh4_vbus: regulator-usb-h3-vbus { 125 + v_usb4: regulator-v-usb4 { 126 + /* USB hub port 4 */ 128 127 compatible = "regulator-fixed"; 129 128 enable-active-high; 130 - enable-gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>; 129 + gpio = <&gpio7 10 GPIO_ACTIVE_HIGH>; 131 130 pinctrl-names = "default"; 132 131 pinctrl-0 = <&pinctrl_hummingboard2_usbh3_vbus>; 133 - regulator-name = "V_USB4"; 134 - regulator-min-microvolt = <5000000>; 135 - regulator-max-microvolt = <5000000>; 136 132 regulator-always-on; 133 + regulator-max-microvolt = <5000000>; 134 + regulator-min-microvolt = <5000000>; 135 + regulator-name = "v_usb4"; 136 + vin-supply = <&v_5v0>; 137 137 }; 138 138 139 139 sound-sgtl5000 { ··· 194 176 pinctrl-names = "default"; 195 177 pinctrl-0 = <&pinctrl_hummingboard2_sgtl5000>; 196 178 reg = <0x0a>; 197 - VDDA-supply = <&reg_3p3v>; 198 - VDDIO-supply = <&reg_3p3v>; 199 - VDDD-supply = <&reg_1p8v>; 179 + VDDA-supply = <&v_3v2>; 180 + VDDD-supply = <&vcc_1p8>; 181 + VDDIO-supply = <&v_3v2>; 200 182 }; 201 183 }; 202 184 ··· 506 488 disable-over-current; 507 489 pinctrl-names = "default"; 508 490 pinctrl-0 = <&pinctrl_hummingboard2_usbotg_id>; 509 - vbus-supply = <&reg_usbotg_vbus>; 491 + vbus-supply = <&v_usb1>; 510 492 status = "okay"; 511 493 }; 512 494 ··· 533 515 pinctrl-names = "default"; 534 516 pinctrl-0 = <&pinctrl_hummingboard2_uart3>; 535 517 status = "okay"; 518 + }; 519 + 520 + &vcc_3v3 { 521 + vin-supply = <&v_3v2>; 536 522 };