| Message ID | 1393084424-31099-14-git-send-email-hdegoede@redhat.com |
|---|---|
| State | Not Applicable |
| Delegated to: | David Miller |
| Headers | show |
Hi, On Sat, Feb 22, 2014 at 04:53:42PM +0100, Hans de Goede wrote: > According to Documentation/devicetree/bindings/regulator/regulator.txt > regulator nodes should not be placed under 'simple-bus'. > > Mark Rutland also explains about it at: > http://www.spinics.net/lists/linux-usb/msg101497.html > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> Applied in my sunxi/dt-for-3.15 branch. Thanks! Maxime
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi, On 02/22/2014 10:44 PM, Maxime Ripard wrote: > Hi, > > On Sat, Feb 22, 2014 at 04:53:42PM +0100, Hans de Goede wrote: >> According to Documentation/devicetree/bindings/regulator/regulator.txt regulator nodes should not be placed under 'simple-bus'. >> >> Mark Rutland also explains about it at: http://www.spinics.net/lists/linux-usb/msg101497.html >> >> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Applied in my sunxi/dt-for-3.15 branch. Thanks, I assume this only applies to this patch, since we were still discussing the common regulator bits of the ahci enablement dts patches ? I'm not seeing any of your recent merges here: https://github.com/mripard/linux/commits/sunxi/dt-for-3.15 Did you not push them, or am I looking at the wrong tree ? Regards, Hans -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iEYEARECAAYFAlMJq18ACgkQF3VEtJrzE/vngACfbYd5K2ZixBm45Y+e3cMFSq9M v68Anjze6R6meI1Z5R0l4nFCNS8txl9p =0XGo -----END PGP SIGNATURE----- -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sun, Feb 23, 2014 at 09:03:48AM +0100, Hans de Goede wrote: > Thanks, I assume this only applies to this patch, since we were still > discussing the common regulator bits of the ahci enablement dts patches ? Yes. > I'm not seeing any of your recent merges here: > https://github.com/mripard/linux/commits/sunxi/dt-for-3.15 > > Did you not push them, or am I looking at the wrong tree ? I forgot to push it. It's fixed now. Thanks! Maxime
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index d4b081d..cbd2e13 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -80,18 +80,14 @@ }; }; - regulators { - compatible = "simple-bus"; - - reg_emac_3v3: emac-3v3 { - compatible = "regulator-fixed"; - pinctrl-names = "default"; - pinctrl-0 = <&emac_power_pin_a1000>; - regulator-name = "emac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpio = <&pio 7 15 0>; - }; + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + pinctrl-names = "default"; + pinctrl-0 = <&emac_power_pin_a1000>; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 15 0>; }; }; diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts index 3a1595f..6692d336 100644 --- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts +++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts @@ -54,16 +54,12 @@ }; }; - regulators { - compatible = "simple-bus"; - - reg_emac_3v3: emac-3v3 { - compatible = "regulator-fixed"; - regulator-name = "emac-3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - enable-active-high; - gpio = <&pio 7 19 0>; - }; + reg_emac_3v3: emac-3v3 { + compatible = "regulator-fixed"; + regulator-name = "emac-3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + enable-active-high; + gpio = <&pio 7 19 0>; }; };
According to Documentation/devicetree/bindings/regulator/regulator.txt regulator nodes should not be placed under 'simple-bus'. Mark Rutland also explains about it at: http://www.spinics.net/lists/linux-usb/msg101497.html Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 22 +++++++++------------- arch/arm/boot/dts/sun4i-a10-hackberry.dts | 18 +++++++----------- 2 files changed, 16 insertions(+), 24 deletions(-)