ARM: dts: imx53-mba53: create a container for fixed regulators
Subsystems (3)
PATCH 1/2 ARM: dts: imx53-mba53: create a container for fixed regulators
To align with others on fixed regulators bindings, it adds node 'regulators' as the container and move all regulator-fixed nodes into there.
--- arch/arm/boot/dts/imx53-mba53.dts | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)
arch/arm/boot/dts/imx53-mba53.dts +18 -14
@@ -17,14 +17,6 @@ model = "TQ MBa53 starter kit"; compatible = "tq,mba53", "tq,tqma53", "fsl,imx53"; - reg_backlight: fixed at 0 { - compatible = "regulator-fixed"; - regulator-name = "lcd-supply"; - gpio = <&gpio2 5 0>; - startup-delay-us = <5000>; - enable-active-low; - }; - backlight { compatible = "pwm-backlight"; pwms = <&pwm2 0 50000>;
@@ -43,12 +35,24 @@ status = "disabled"; }; - reg_3p2v: 3p2v { - compatible = "regulator-fixed"; - regulator-name = "3P2V"; - regulator-min-microvolt = <3200000>; - regulator-max-microvolt = <3200000>; - regulator-always-on; + regulators { + compatible = "simple-bus"; + + reg_backlight: fixed at 0 { + compatible = "regulator-fixed"; + regulator-name = "lcd-supply"; + gpio = <&gpio2 5 0>; + startup-delay-us = <5000>; + enable-active-low; + }; + + reg_3p2v: 3p2v { + compatible = "regulator-fixed"; + regulator-name = "3P2V"; + regulator-min-microvolt = <3200000>; + regulator-max-microvolt = <3200000>; + regulator-always-on; + }; }; sound {
Signature · 1 line
1.7.9.5
PATCH 2/2 ARM: dts: imx: use generic node name for fixed regulator
The device tree specification recommends that generic name should be used for nodes. So instead of naming those fixed regulator nodes arbitrarily, let's use the generic name 'regulator at num' for those nodes.
--- arch/arm/boot/dts/imx23-evk.dts | 8 ++++++-- arch/arm/boot/dts/imx23-olinuxino.dts | 5 ++++- arch/arm/boot/dts/imx23-stmp378x_devb.dts | 5 ++++- arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts | 5 ++++- arch/arm/boot/dts/imx28-apf28dev.dts | 5 ++++- arch/arm/boot/dts/imx28-apx4devkit.dts | 5 ++++- arch/arm/boot/dts/imx28-cfa10037.dts | 5 ++++- arch/arm/boot/dts/imx28-cfa10049.dts | 5 ++++- arch/arm/boot/dts/imx28-cfa10057.dts | 5 ++++- arch/arm/boot/dts/imx28-cfa10058.dts | 5 ++++- arch/arm/boot/dts/imx28-evk.dts | 23 +++++++++++++++------- arch/arm/boot/dts/imx28-m28cu3.dts | 14 +++++++++---- arch/arm/boot/dts/imx28-m28evk.dts | 14 +++++++++---- arch/arm/boot/dts/imx28-sps1.dts | 5 ++++- arch/arm/boot/dts/imx28-tx28.dts | 23 +++++++++++++++------- arch/arm/boot/dts/imx53-ard.dts | 5 ++++- arch/arm/boot/dts/imx53-m53evk.dts | 5 ++++- arch/arm/boot/dts/imx53-mba53.dts | 8 ++++++-- arch/arm/boot/dts/imx53-qsb.dts | 8 ++++++-- arch/arm/boot/dts/imx53-tqma53.dtsi | 5 ++++- arch/arm/boot/dts/imx53-tx53.dtsi | 5 ++++- arch/arm/boot/dts/imx6q-arm2.dts | 8 ++++++-- arch/arm/boot/dts/imx6q-gw5400-a.dts | 14 +++++++++---- arch/arm/boot/dts/imx6q-sabrelite.dts | 11 ++++++++--- arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 11 ++++++++--- arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 17 +++++++++++----- arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 17 +++++++++++----- arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 14 +++++++++---- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 11 ++++++++--- arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 8 ++++++-- arch/arm/boot/dts/imx6sl-evk.dts | 8 ++++++-- 31 files changed, 212 insertions(+), 75 deletions(-)
arch/arm/boot/dts/imx23-evk.dts +6 -2
@@ -127,17 +127,21 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_vddio_sd0: vddio-sd0 { + reg_vddio_sd0: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio1 29 0>; }; - reg_lcd_3v3: lcd-3v3 { + reg_lcd_3v3: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "lcd-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx23-olinuxino.dts +4 -1
@@ -100,9 +100,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx23-stmp378x_devb.dts +4 -1
@@ -66,9 +66,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_vddio_sd0: vddio-sd0 { + reg_vddio_sd0: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts +4 -1
@@ -37,9 +37,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3v3: 3v3 { + reg_3v3: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3V3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx28-apf28dev.dts +4 -1
@@ -150,9 +150,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx28-apx4devkit.dts +4 -1
@@ -193,9 +193,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx28-cfa10037.dts +4 -1
@@ -72,9 +72,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; pinctrl-names = "default"; pinctrl-0 = <&usb_pins_cfa10037>; regulator-name = "usb1_vbus";
arch/arm/boot/dts/imx28-cfa10049.dts +4 -1
@@ -282,9 +282,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; pinctrl-names = "default"; pinctrl-0 = <&usb_pins_cfa10049>; regulator-name = "usb1_vbus";
arch/arm/boot/dts/imx28-cfa10057.dts +4 -1
@@ -142,9 +142,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; pinctrl-names = "default"; pinctrl-0 = <&usb_pins_cfa10057>; regulator-name = "usb1_vbus";
arch/arm/boot/dts/imx28-cfa10058.dts +4 -1
@@ -109,11 +109,14 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 0 { pinctrl-names = "default"; pinctrl-0 = <&usb_pins_cfa10058>; compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx28-evk.dts +16 -7
@@ -274,33 +274,39 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_vddio_sd0: vddio-sd0 { + reg_vddio_sd0: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 28 0>; }; - reg_fec_3v3: fec-3v3 { + reg_fec_3v3: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "fec-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 15 0>; }; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -308,8 +314,9 @@ enable-active-high; }; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 4 { compatible = "regulator-fixed"; + reg = <4>; regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -317,8 +324,9 @@ enable-active-high; }; - reg_lcd_3v3: lcd-3v3 { + reg_lcd_3v3: regulator at 5 { compatible = "regulator-fixed"; + reg = <5>; regulator-name = "lcd-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -326,8 +334,9 @@ enable-active-high; }; - reg_can_3v3: can-3v3 { + reg_can_3v3: regulator at 6 { compatible = "regulator-fixed"; + reg = <6>; regulator-name = "can-3v3"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx28-m28cu3.dts +10 -4
@@ -229,33 +229,39 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_vddio_sd0: vddio-sd0 { + reg_vddio_sd0: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 29 0>; }; - reg_vddio_sd1: vddio-sd1 { + reg_vddio_sd1: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "vddio-sd1"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio2 19 0>; }; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx28-m28evk.dts +10 -4
@@ -285,33 +285,39 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_vddio_sd0: vddio-sd0 { + reg_vddio_sd0: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; gpio = <&gpio3 28 0>; }; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; gpio = <&gpio3 12 0>; }; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx28-sps1.dts +4 -1
@@ -127,9 +127,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx28-tx28.dts +16 -7
@@ -43,9 +43,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb0_vbus: usb0_vbus { + reg_usb0_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -53,8 +56,9 @@ enable-active-high; }; - reg_usb1_vbus: usb1_vbus { + reg_usb1_vbus: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -62,24 +66,27 @@ enable-active-high; }; - reg_2p5v: 2p5v { + reg_2p5v: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "2P5V"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_can_xcvr: can-xcvr { + reg_can_xcvr: regulator at 4 { compatible = "regulator-fixed"; + reg = <4>; regulator-name = "CAN XCVR"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -89,8 +96,9 @@ pinctrl-0 = <&tx28_flexcan_xcvr_pins>; }; - reg_lcd: lcd-power { + reg_lcd: regulator at 5 { compatible = "regulator-fixed"; + reg = <5>; regulator-name = "LCD POWER"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
@@ -98,8 +106,9 @@ enable-active-high; }; - reg_lcd_reset: lcd-reset { + reg_lcd_reset: regulator at 6 { compatible = "regulator-fixed"; + reg = <6>; regulator-name = "LCD RESET"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx53-ard.dts +4 -1
@@ -49,9 +49,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx53-m53evk.dts +4 -1
@@ -73,9 +73,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p2v: 3p2v { + reg_3p2v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P2V"; regulator-min-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
arch/arm/boot/dts/imx53-mba53.dts +6 -2
@@ -37,17 +37,21 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_backlight: fixed at 0 { + reg_backlight: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "lcd-supply"; gpio = <&gpio2 5 0>; startup-delay-us = <5000>; enable-active-low; }; - reg_3p2v: 3p2v { + reg_3p2v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "3P2V"; regulator-min-microvolt = <3200000>; regulator-max-microvolt = <3200000>;
arch/arm/boot/dts/imx53-qsb.dts +6 -2
@@ -86,17 +86,21 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p2v: 3p2v { + reg_3p2v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P2V"; regulator-min-microvolt = <3200000>; regulator-max-microvolt = <3200000>; regulator-always-on; }; - reg_usb_vbus: usb_vbus { + reg_usb_vbus: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "usb_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx53-tqma53.dtsi +4 -1
@@ -22,9 +22,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx53-tx53.dtsi +4 -1
@@ -21,9 +21,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx6q-arm2.dts +6 -2
@@ -23,17 +23,21 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6q-gw5400-a.dts +10 -4
@@ -73,33 +73,39 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_1p0v: 1p0v { + reg_1p0v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "1P0V"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_usb_h1_vbus: usb_h1_vbus { + reg_usb_h1_vbus: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6q-sabrelite.dts +8 -3
@@ -23,25 +23,30 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_2p5v: 2p5v { + reg_2p5v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "2P5V"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6qdl-gw51xx.dtsi +8 -3
@@ -54,25 +54,30 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_5p0v: 5p0v { + reg_5p0v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "5P0V"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi +12 -5
@@ -62,9 +62,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_1p0v: 1p0v { + reg_1p0v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "1P0V"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
@@ -72,32 +75,36 @@ }; /* remove this fixed regulator once ltc3676__sw2 driver available */ - reg_1p8v: 1p8v { + reg_1p8v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "1P8V"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_5p0v: 5p0v { + reg_5p0v: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "5P0V"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 4 { compatible = "regulator-fixed"; + reg = <4>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi +12 -5
@@ -65,9 +65,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_1p0v: 1p0v { + reg_1p0v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "1P0V"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
@@ -75,32 +78,36 @@ }; /* remove when pmic 1p8 regulator available */ - reg_1p8v: 1p8v { + reg_1p8v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "1P8V"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_usb_h1_vbus: usb_h1_vbus { + reg_usb_h1_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 4 { compatible = "regulator-fixed"; + reg = <4>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi +10 -4
@@ -65,33 +65,39 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_1p0v: 1p0v { + reg_1p0v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "1P0V"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-always-on; }; - reg_usb_h1_vbus: usb_h1_vbus { + reg_usb_h1_vbus: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; regulator-always-on; }; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 3 { compatible = "regulator-fixed"; + reg = <3>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
arch/arm/boot/dts/imx6qdl-sabresd.dtsi +8 -3
@@ -17,9 +17,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb_otg_vbus: usb_otg_vbus { + reg_usb_otg_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb_otg_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -27,8 +30,9 @@ enable-active-high; }; - reg_usb_h1_vbus: usb_h1_vbus { + reg_usb_h1_vbus: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "usb_h1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -36,8 +40,9 @@ enable-active-high; }; - reg_audio: wm8962_supply { + reg_audio: regulator at 2 { compatible = "regulator-fixed"; + reg = <2>; regulator-name = "wm8962-supply"; gpio = <&gpio4 10 0>; enable-active-high;
arch/arm/boot/dts/imx6qdl-wandboard.dtsi +6 -2
@@ -12,17 +12,21 @@ / { regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_2p5v: 2p5v { + reg_2p5v: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "2P5V"; regulator-min-microvolt = <2500000>; regulator-max-microvolt = <2500000>; regulator-always-on; }; - reg_3p3v: 3p3v { + reg_3p3v: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "3P3V"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
arch/arm/boot/dts/imx6sl-evk.dts +6 -2
@@ -20,9 +20,12 @@ regulators { compatible = "simple-bus"; + #address-cells = <1>; + #size-cells = <0>; - reg_usb_otg1_vbus: usb_otg1_vbus { + reg_usb_otg1_vbus: regulator at 0 { compatible = "regulator-fixed"; + reg = <0>; regulator-name = "usb_otg1_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
@@ -30,8 +33,9 @@ enable-active-high; }; - reg_usb_otg2_vbus: usb_otg2_vbus { + reg_usb_otg2_vbus: regulator at 1 { compatible = "regulator-fixed"; + reg = <1>; regulator-name = "usb_otg2_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
Signature · 1 line
1.7.9.5
PATCH 1/2 ARM: dts: imx53-mba53: create a container for fixed regulators
In reply to Shawn GuoHello Shawn,
just a little note, not sure what is correct.
Am 06.11.2013 09:03, wrote Shawn Guo:
Quoted 30 lines
To align with others on fixed regulators bindings, it adds node 'regulators' as the container and move all regulator-fixed nodes into there.
Signed-off-by Shawn Guo <[email protected]>--- arch/arm/boot/dts/imx53-mba53.dts | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-)arch/arm/boot/dts/imx53-mba53.dts +0
-8@@ -17,14 +17,6 @@ model = "TQ MBa53 starter kit"; compatible = "tq,mba53", "tq,tqma53", "fsl,imx53"; - reg_backlight: fixed at 0 { - compatible = "regulator-fixed"; - regulator-name = "lcd-supply"; - gpio = <&gpio2 5 0>; - startup-delay-us = <5000>; - enable-active-low; - }; - backlight { compatible = "pwm-backlight"; pwms = <&pwm2 0 50000>;@@ -43,12 +35,24 @@ status = "disabled";
arch/arm/boot/dts/imx53-mba53.dts line 39
Quoted 10 lines
arch/arm/boot/dts/imx53-mba53.dts +2
-6}; - reg_3p2v: 3p2v { - compatible = "regulator-fixed"; - regulator-name = "3P2V"; - regulator-min-microvolt = <3200000>; - regulator-max-microvolt = <3200000>; - regulator-always-on; + regulators { + compatible = "simple-bus";
No need for additional
#address-cells = <1>; #size-cells = <0>;
here as done in ARM: dts: imx: use generic node name for fixed regulator?
Quoted 10 lines
arch/arm/boot/dts/imx53-mba53.dts +9
-0+ + reg_backlight: fixed at 0 { + compatible = "regulator-fixed"; + regulator-name = "lcd-supply"; + gpio = <&gpio2 5 0>; + startup-delay-us = <5000>; + enable-active-low; + }; +
arch/arm/boot/dts/imx53-mba53.dts line 58
Quoted 10 lines
arch/arm/boot/dts/imx53-mba53.dts +7
-0+ reg_3p2v: 3p2v { + compatible = "regulator-fixed"; + regulator-name = "3P2V"; + regulator-min-microvolt = <3200000>; + regulator-max-microvolt = <3200000>; + regulator-always-on; + }; }; sound {
Markus
PATCH 1/2 ARM: dts: imx53-mba53: create a container for fixed regulators
Quoted 14 lines · Markus Niebel
arch/arm/boot/dts/imx53-mba53.dts line 39
Quoted 12 lines
arch/arm/boot/dts/imx53-mba53.dts +2
-6@@ -43,12 +35,24 @@ status = "disabled"; }; - reg_3p2v: 3p2v { - compatible = "regulator-fixed"; - regulator-name = "3P2V"; - regulator-min-microvolt = <3200000>; - regulator-max-microvolt = <3200000>; - regulator-always-on; + regulators { + compatible = "simple-bus";No need for additional
Quoted 3 lines
#address-cells = <1>; #size-cells = <0>;here as done in ARM: dts: imx: use generic node name for fixed regulator?
It's been done in the patch you mentioned.
Shawn