openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: imx53-tx53: remove the regulators bus 

It is not recommended to place the regulator nodes inside 'simple-bus',
so adjust them accordingly.

The motivation for rearranging this is to make it easier to add new
regulator nodes in the future.

Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Lothar Waßmann 2017-10-11 13:07:36 +02:00 committed by Shawn Guo
parent 8771c7493a
commit 08f8275dca
3 changed files with 74 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
arch/arm/boot/dts/imx53-tx53-x03x.dts
View File

@ -203,28 +203,24 @@ backlight: backlight {
default-brightness-level = <50>; default-brightness-level = <50>;
}; };
regulators { reg_lcd_pwr: regulator-lcd-pwr {
reg_lcd_pwr: regulator@5 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "LCD POWER";
reg = <5>; regulator-min-microvolt = <3300000>;
regulator-name = "LCD POWER"; regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
regulator-max-microvolt = <3300000>; enable-active-high;
gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; regulator-boot-on;
enable-active-high; };
regulator-boot-on;
};
reg_lcd_reset: regulator@6 { reg_lcd_reset: regulator-lcd-reset {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "LCD RESET";
regulator-name = "LCD RESET"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; regulator-boot-on;
regulator-boot-on;
};
}; };
}; };

38
arch/arm/boot/dts/imx53-tx53-x13x.dts
View File

@ -99,28 +99,24 @@ backlight1: backlight1 {
default-brightness-level = <50>; default-brightness-level = <50>;
}; };
regulators { reg_lcd_pwr0: regulator-lvds0-pwr {
reg_lcd_pwr0: regulator@5 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; regulator-name = "LVDS0 POWER";
reg = <5>; regulator-min-microvolt = <3300000>;
regulator-name = "LVDS0 POWER"; regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;
regulator-max-microvolt = <3300000>; enable-active-high;
gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; regulator-boot-on;
enable-active-high; };
regulator-boot-on;
};
reg_lcd_pwr1: regulator@6 { reg_lcd_pwr1: regulator-lvds1-pwr {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <6>; regulator-name = "LVDS1 POWER";
regulator-name = "LVDS1 POWER"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;
gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; regulator-boot-on;
regulator-boot-on;
};
}; };
}; };

91
arch/arm/boot/dts/imx53-tx53.dtsi
View File

@ -96,61 +96,50 @@ user {
}; };
}; };
regulators { reg_2v5: regulator-2v5 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "2V5";
#size-cells = <0>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
};
reg_2v5: regulator@0 { reg_3v3: regulator-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <0>; regulator-name = "3V3";
regulator-name = "2V5"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <2500000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <2500000>; };
};
reg_3v3: regulator@1 { reg_can_xcvr: regulator-can-xcvr {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "CAN XCVR";
regulator-name = "3V3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; pinctrl-names = "default";
}; pinctrl-0 = <&pinctrl_can_xcvr>;
gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
};
reg_can_xcvr: regulator@2 { reg_usbh1_vbus: regulator-usbh1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "usbh1_vbus";
regulator-name = "CAN XCVR"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <3300000>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbh1_vbus>;
pinctrl-0 = <&pinctrl_can_xcvr>; gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>;
gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; enable-active-high;
}; };
reg_usbh1_vbus: regulator@3 { reg_usbotg_vbus: regulator-usbotg-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "usbotg_vbus";
regulator-name = "usbh1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usbotg_vbus>;
pinctrl-0 = <&pinctrl_usbh1_vbus>; gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high;
};
reg_usbotg_vbus: regulator@4 {
compatible = "regulator-fixed";
reg = <4>;
regulator-name = "usbotg_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usbotg_vbus>;
gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
sound { sound {