Commit dc7b1fb4 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Shawn Guo

ARM: dts: imx27: 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 c65fee6c
...@@ -54,19 +54,12 @@ user { ...@@ -54,19 +54,12 @@ user {
}; };
}; };
regulators { reg_max5821: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "max5821-reg";
#size-cells = <0>; regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
reg_max5821: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "max5821-reg";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};
}; };
}; };
......
...@@ -54,22 +54,15 @@ led2 { ...@@ -54,22 +54,15 @@ led2 {
}; };
}; };
regulators { reg_lcd: regulator-0 {
#address-cells = <1>; compatible = "regulator-fixed";
#size-cells = <0>; pinctrl-names = "default";
compatible = "simple-bus"; pinctrl-0 = <&pinctrl_lcdreg>;
regulator-name = "LCD";
reg_lcd: regulator@0 { regulator-min-microvolt = <5000000>;
pinctrl-names = "default"; regulator-max-microvolt = <5000000>;
pinctrl-0 = <&pinctrl_lcdreg>; gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>;
compatible = "regulator-fixed"; enable-active-high;
reg = <0>;
regulator-name = "LCD";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpio1 25 GPIO_ACTIVE_HIGH>;
enable-active-high;
};
}; };
}; };
......
...@@ -33,19 +33,12 @@ timing0: 640x480 { ...@@ -33,19 +33,12 @@ timing0: 640x480 {
}; };
}; };
regulators { reg_3v3: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3V3";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3v3: regulator@0 { regulator-always-on;
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
};
}; };
}; };
......
...@@ -37,18 +37,15 @@ timing0: 240x320 { ...@@ -37,18 +37,15 @@ timing0: 240x320 {
}; };
}; };
regulators { regulator-2 {
regulator@2 { compatible = "regulator-fixed";
compatible = "regulator-fixed"; pinctrl-names = "default";
pinctrl-names = "default"; pinctrl-0 = <&pinctrl_csien>;
pinctrl-0 = <&pinctrl_csien>; regulator-name = "CSI_EN";
reg = <2>; regulator-min-microvolt = <3300000>;
regulator-name = "CSI_EN"; regulator-max-microvolt = <3300000>;
regulator-min-microvolt = <3300000>; gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
regulator-max-microvolt = <3300000>; regulator-always-on;
gpio = <&gpio2 24 GPIO_ACTIVE_LOW>;
regulator-always-on;
};
}; };
usbphy { usbphy {
......
...@@ -15,26 +15,18 @@ memory@a0000000 { ...@@ -15,26 +15,18 @@ memory@a0000000 {
reg = <0xa0000000 0x08000000>; reg = <0xa0000000 0x08000000>;
}; };
regulators { reg_3v3: regulator-0 {
compatible = "simple-bus"; compatible = "regulator-fixed";
#address-cells = <1>; regulator-name = "3V3";
#size-cells = <0>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
reg_3v3: regulator@0 { };
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
};
reg_5v0: regulator@1 { reg_5v0: regulator-1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
reg = <1>; regulator-name = "5V0";
regulator-name = "5V0"; regulator-min-microvolt = <5000000>;
regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
};
}; };
usbphy { usbphy {
......
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