From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: Re: [PATCHv2 3/8] ARM: dts: imx6-tx6: remove regulator bus Date: Thu, 31 Mar 2016 14:00:34 +0800 Message-ID: <20160331060034.GN28207@tiger> References: <1457424244-14549-1-git-send-email-LW@KARO-electronics.de> <1457424244-14549-4-git-send-email-LW@KARO-electronics.de> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Content-Disposition: inline In-Reply-To: <1457424244-14549-4-git-send-email-LW-bxm8fMRDkQLDiMYJYoSAnRvVK+yQ3ZXh@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Lothar =?iso-8859-1?Q?Wa=DFmann?= Cc: Dan Williams , Ian Campbell , Kumar Gala , Mark Rutland , Pawel Moll , Rob Herring , Russell King , Sascha Hauer , Vinod Koul , devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, dmaengine-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org List-Id: devicetree@vger.kernel.org On Tue, Mar 08, 2016 at 09:03:59AM +0100, Lothar Wa=DFmann wrote: > DT maintainers don't like the 'simple-bus' container around the > regulator nodes. So remove it. >=20 > Signed-off-by: Lothar Wa=DFmann > --- > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 178 +++++++++++++++++----------= ---------- > 1 file changed, 81 insertions(+), 97 deletions(-) >=20 > diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/i= mx6qdl-tx6.dtsi > index 912f284..ec374f5 100644 > --- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi > +++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi > @@ -97,104 +97,88 @@ > }; > }; > =20 > - regulators { > - compatible =3D "simple-bus"; > - #address-cells =3D <1>; > - #size-cells =3D <0>; > + reg_3v3_etn: reg-3v3-etn { Please use the following naming schema for fixed regulators. reg_xxx: regulator-xxx { ... } Shawn > + compatible =3D "regulator-fixed"; > + regulator-name =3D "3V3_ETN"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_etnphy_power>; > + gpio =3D <&gpio3 20 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > =20 > - reg_3v3_etn: regulator@0 { > - compatible =3D "regulator-fixed"; > - reg =3D <0>; > - regulator-name =3D "3V3_ETN"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_etnphy_power>; > - gpio =3D <&gpio3 20 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > - > - reg_2v5: regulator@1 { > - compatible =3D "regulator-fixed"; > - reg =3D <1>; > - regulator-name =3D "2V5"; > - regulator-min-microvolt =3D <2500000>; > - regulator-max-microvolt =3D <2500000>; > - regulator-always-on; > - }; > - > - reg_3v3: regulator@2 { > - compatible =3D "regulator-fixed"; > - reg =3D <2>; > - regulator-name =3D "3V3"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - regulator-always-on; > - }; > - > - reg_can_xcvr: regulator@3 { > - compatible =3D "regulator-fixed"; > - reg =3D <3>; > - regulator-name =3D "CAN XCVR"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_flexcan_xcvr>; > - gpio =3D <&gpio4 21 GPIO_ACTIVE_HIGH>; > - enable-active-low; > - }; > - > - reg_lcd0_pwr: regulator@4 { > - compatible =3D "regulator-fixed"; > - reg =3D <4>; > - regulator-name =3D "LCD0 POWER"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_lcd0_pwr>; > - gpio =3D <&gpio3 29 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - reg_lcd1_pwr: regulator@5 { > - compatible =3D "regulator-fixed"; > - reg =3D <5>; > - regulator-name =3D "LCD1 POWER"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_lcd1_pwr>; > - gpio =3D <&gpio2 31 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - reg_usbh1_vbus: regulator@6 { > - compatible =3D "regulator-fixed"; > - reg =3D <6>; > - regulator-name =3D "usbh1_vbus"; > - regulator-min-microvolt =3D <5000000>; > - regulator-max-microvolt =3D <5000000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_usbh1_vbus>; > - gpio =3D <&gpio3 31 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > - > - reg_usbotg_vbus: regulator@7 { > - compatible =3D "regulator-fixed"; > - reg =3D <7>; > - regulator-name =3D "usbotg_vbus"; > - regulator-min-microvolt =3D <5000000>; > - regulator-max-microvolt =3D <5000000>; > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&pinctrl_usbotg_vbus>; > - gpio =3D <&gpio1 7 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > + reg_2v5: reg-2v5 { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "2V5"; > + regulator-min-microvolt =3D <2500000>; > + regulator-max-microvolt =3D <2500000>; > + regulator-always-on; > + }; > + > + reg_3v3: reg-3v3 { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "3V3"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + regulator-always-on; > + }; > + > + reg_can_xcvr: reg-can-xcvr { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "CAN XCVR"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_flexcan_xcvr>; > + gpio =3D <&gpio4 21 GPIO_ACTIVE_HIGH>; > + enable-active-low; > + }; > + > + reg_lcd0_pwr: reg-lcd0-pwr { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "LCD0 POWER"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_lcd0_pwr>; > + gpio =3D <&gpio3 29 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-boot-on; > + }; > + > + reg_lcd1_pwr: reg-lcd1-pwr { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "LCD1 POWER"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_lcd1_pwr>; > + gpio =3D <&gpio2 31 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-boot-on; > + }; > + > + reg_usbh1_vbus: reg-usbh1-vbus { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "usbh1_vbus"; > + regulator-min-microvolt =3D <5000000>; > + regulator-max-microvolt =3D <5000000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_usbh1_vbus>; > + gpio =3D <&gpio3 31 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_usbotg_vbus: reg-usbotg-vbus { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "usbotg_vbus"; > + regulator-min-microvolt =3D <5000000>; > + regulator-max-microvolt =3D <5000000>; > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&pinctrl_usbotg_vbus>; > + gpio =3D <&gpio1 7 GPIO_ACTIVE_HIGH>; > + enable-active-high; > }; > =20 > sound { > --=20 > 2.1.4 >=20 >=20 -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html