Skip to content

L
linux
Commit 29e0e9b4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Shawn Guo
Browse files
Options

ARM: dts: imx28: drop incorrect reg in fixed regulators 

Fixed regulators are not in some bus and bindings do not allow a "reg"
property.  Move them out of "regulators" node to top-level.
Signed-off-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent dc7b1fb4
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 191 deletions
arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts
View file @ 29e0e9b4
...@@ -10,28 +10,20 @@ / { ...@@ -10,28 +10,20 @@ / {
model = "Armadeus Systems APF28Dev docking/development board"; model = "Armadeus Systems APF28Dev docking/development board";
compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28"; compatible = "armadeus,imx28-apf28dev", "armadeus,imx28-apf28", "fsl,imx28";
regulators { reg_usb0_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "usb0_vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
reg_usb0_vbus: regulator@0 { gpio = <&gpio1 23 1>;
compatible = "regulator-fixed"; enable-active-high;
reg = <0>; };
regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 23 1>;
enable-active-high;
};
reg_can0_vcc: regulator@1 { reg_can0_vcc: regulator-1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "can0_vcc";
regulator-name = "can0_vcc"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
}; };
leds { leds {
......
arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts
View file @ 29e0e9b4
...@@ -64,20 +64,13 @@ mac0: ethernet@800f0000 { ...@@ -64,20 +64,13 @@ mac0: ethernet@800f0000 {
}; };
}; };
regulators { reg_usb1_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&usb_pins_cfa10037>;
regulator-name = "usb1_vbus";
reg_usb1_vbus: regulator@0 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
reg = <0>; gpio = <&gpio0 7 1>;
pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10037>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio0 7 1>;
};
}; };
}; };
arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts
View file @ 29e0e9b4
...@@ -78,21 +78,14 @@ pca9555: pca9555@20 { ...@@ -78,21 +78,14 @@ pca9555: pca9555@20 {
}; };
}; };
regulators { reg_usb1_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&usb_pins_cfa10049>;
regulator-name = "usb1_vbus";
reg_usb1_vbus: regulator@0 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
reg = <0>; gpio = <&gpio0 7 1>;
pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10049>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio0 7 1>;
};
}; };
spi-2 { spi-2 {
......
arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts
View file @ 29e0e9b4
...@@ -14,21 +14,14 @@ / { ...@@ -14,21 +14,14 @@ / {
model = "Crystalfontz CFA-10057 Board"; model = "Crystalfontz CFA-10057 Board";
compatible = "crystalfontz,cfa10057", "crystalfontz,cfa10036", "fsl,imx28"; compatible = "crystalfontz,cfa10057", "crystalfontz,cfa10036", "fsl,imx28";
regulators { reg_usb1_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&usb_pins_cfa10057>;
regulator-name = "usb1_vbus";
reg_usb1_vbus: regulator@0 { regulator-min-microvolt = <5000000>;
compatible = "regulator-fixed"; regulator-max-microvolt = <5000000>;
reg = <0>; gpio = <&gpio0 7 1>;
pinctrl-names = "default";
pinctrl-0 = <&usb_pins_cfa10057>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio0 7 1>;
};
}; };
backlight { backlight {
......
arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts
View file @ 29e0e9b4
...@@ -14,21 +14,14 @@ / { ...@@ -14,21 +14,14 @@ / {
model = "Crystalfontz CFA-10058 Board"; model = "Crystalfontz CFA-10058 Board";
compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28"; compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28";
regulators { reg_usb1_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; pinctrl-names = "default";
#size-cells = <0>; pinctrl-0 = <&usb_pins_cfa10058>;
regulator-name = "usb1_vbus";
reg_usb1_vbus: regulator@0 { regulator-min-microvolt = <5000000>;
pinctrl-names = "default"; regulator-max-microvolt = <5000000>;
pinctrl-0 = <&usb_pins_cfa10058>; gpio = <&gpio0 7 1>;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb1_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio0 7 1>;
};
}; };
backlight { backlight {
......
arch/arm/boot/dts/nxp/mxs/imx28-eukrea-mbmx28lc.dtsi
View file @ 29e0e9b4
...@@ -69,55 +69,45 @@ led1 { ...@@ -69,55 +69,45 @@ led1 {
}; };
}; };
regulators { reg_3p3v: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_lcd_3v3: regulator@1 { reg_lcd_3v3: regulator-1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&reg_lcd_3v3_pins_mbmx28lc>;
pinctrl-0 = <&reg_lcd_3v3_pins_mbmx28lc>; regulator-name = "lcd-3v3";
regulator-name = "lcd-3v3"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>;
gpio = <&gpio3 30 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb0_vbus: regulator@2 { reg_usb0_vbus: regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&reg_usb0_vbus_pins_mbmx28lc>;
pinctrl-0 = <&reg_usb0_vbus_pins_mbmx28lc>; regulator-name = "usb0_vbus";
regulator-name = "usb0_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 18 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high; };
};
reg_usb1_vbus: regulator@3 { reg_usb1_vbus: regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&reg_usb1_vbus_pins_mbmx28lc>;
pinctrl-0 = <&reg_usb1_vbus_pins_mbmx28lc>; regulator-name = "usb1_vbus";
regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio1 19 GPIO_ACTIVE_HIGH>;
gpio = <&gpio1 19 GPIO_ACTIVE_HIGH>; enable-active-high;
enable-active-high;
};
}; };
sound { sound {
......
arch/arm/boot/dts/nxp/mxs/imx28-m28.dtsi
View file @ 29e0e9b4
...@@ -14,19 +14,12 @@ memory@40000000 { ...@@ -14,19 +14,12 @@ memory@40000000 {
reg = <0x40000000 0x08000000>; reg = <0x40000000 0x08000000>;
}; };
regulators { reg_3p3v: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
}; };
}; };
......
arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts
View file @ 29e0e9b4
...@@ -40,47 +40,37 @@ user2 { ...@@ -40,47 +40,37 @@ user2 {
}; };
}; };
regulators { reg_3p3v: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3P3V";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3p3v: regulator@0 { regulator-always-on;
compatible = "regulator-fixed"; };
reg = <0>;
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
reg_vddio_sd0: regulator@1 { reg_vddio_sd0: regulator-1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "vddio-sd0";
regulator-name = "vddio-sd0"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio3 29 0>;
gpio = <&gpio3 29 0>; };
};
reg_vddio_sd1: regulator@2 { reg_vddio_sd1: regulator-2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <2>; regulator-name = "vddio-sd1";
regulator-name = "vddio-sd1"; regulator-min-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; gpio = <&gpio2 19 0>;
gpio = <&gpio2 19 0>; };
};
reg_usb1_vbus: regulator@3 { reg_usb1_vbus: regulator-3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <3>; regulator-name = "usb1_vbus";
regulator-name = "usb1_vbus"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; gpio = <&gpio3 8 0>;
gpio = <&gpio3 8 0>; enable-active-high;
enable-active-high;
};
}; };
}; };
......
arch/arm/boot/dts/nxp/mxs/imx28-sps1.dts
View file @ 29e0e9b4
...@@ -15,19 +15,12 @@ memory@40000000 { ...@@ -15,19 +15,12 @@ memory@40000000 {
reg = <0x40000000 0x08000000>; reg = <0x40000000 0x08000000>;
}; };
regulators { reg_usb0_vbus: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "usb0_vbus";
#size-cells = <0>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
reg_usb0_vbus: regulator@0 { gpio = <&gpio3 9 0>;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "usb0_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio3 9 0>;
};
}; };
leds { leds {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7