Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751950AbcCaGBI (ORCPT ); Thu, 31 Mar 2016 02:01:08 -0400 Received: from mail.kernel.org ([198.145.29.136]:47096 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcCaGBG (ORCPT ); Thu, 31 Mar 2016 02:01:06 -0400 Date: Thu, 31 Mar 2016 14:00:34 +0800 From: Shawn Guo 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@vger.kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCHv2 3/8] ARM: dts: imx6-tx6: remove regulator bus 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-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1457424244-14549-4-git-send-email-LW@KARO-electronics.de> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6134 Lines: 212 On Tue, Mar 08, 2016 at 09:03:59AM +0100, Lothar Wa?mann wrote: > DT maintainers don't like the 'simple-bus' container around the > regulator nodes. So remove it. > > Signed-off-by: Lothar Wa?mann > --- > arch/arm/boot/dts/imx6qdl-tx6.dtsi | 178 +++++++++++++++++-------------------- > 1 file changed, 81 insertions(+), 97 deletions(-) > > diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-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 @@ > }; > }; > > - regulators { > - compatible = "simple-bus"; > - #address-cells = <1>; > - #size-cells = <0>; > + reg_3v3_etn: reg-3v3-etn { Please use the following naming schema for fixed regulators. reg_xxx: regulator-xxx { ... } Shawn > + compatible = "regulator-fixed"; > + regulator-name = "3V3_ETN"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_etnphy_power>; > + gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > > - reg_3v3_etn: regulator@0 { > - compatible = "regulator-fixed"; > - reg = <0>; > - regulator-name = "3V3_ETN"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_etnphy_power>; > - gpio = <&gpio3 20 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > - > - reg_2v5: regulator@1 { > - compatible = "regulator-fixed"; > - reg = <1>; > - regulator-name = "2V5"; > - regulator-min-microvolt = <2500000>; > - regulator-max-microvolt = <2500000>; > - regulator-always-on; > - }; > - > - reg_3v3: regulator@2 { > - compatible = "regulator-fixed"; > - reg = <2>; > - regulator-name = "3V3"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-always-on; > - }; > - > - reg_can_xcvr: regulator@3 { > - compatible = "regulator-fixed"; > - reg = <3>; > - regulator-name = "CAN XCVR"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_flexcan_xcvr>; > - gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; > - enable-active-low; > - }; > - > - reg_lcd0_pwr: regulator@4 { > - compatible = "regulator-fixed"; > - reg = <4>; > - regulator-name = "LCD0 POWER"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_lcd0_pwr>; > - gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - reg_lcd1_pwr: regulator@5 { > - compatible = "regulator-fixed"; > - reg = <5>; > - regulator-name = "LCD1 POWER"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_lcd1_pwr>; > - gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - regulator-boot-on; > - regulator-always-on; > - }; > - > - reg_usbh1_vbus: regulator@6 { > - compatible = "regulator-fixed"; > - reg = <6>; > - regulator-name = "usbh1_vbus"; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - pinctrl-names = "default"; > - pinctrl-0 = <&pinctrl_usbh1_vbus>; > - gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; > - enable-active-high; > - }; > - > - reg_usbotg_vbus: regulator@7 { > - compatible = "regulator-fixed"; > - reg = <7>; > - 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; > - }; > + reg_2v5: reg-2v5 { > + compatible = "regulator-fixed"; > + regulator-name = "2V5"; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <2500000>; > + regulator-always-on; > + }; > + > + reg_3v3: reg-3v3 { > + compatible = "regulator-fixed"; > + regulator-name = "3V3"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + regulator-always-on; > + }; > + > + reg_can_xcvr: reg-can-xcvr { > + compatible = "regulator-fixed"; > + regulator-name = "CAN XCVR"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_flexcan_xcvr>; > + gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>; > + enable-active-low; > + }; > + > + reg_lcd0_pwr: reg-lcd0-pwr { > + compatible = "regulator-fixed"; > + regulator-name = "LCD0 POWER"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_lcd0_pwr>; > + gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-boot-on; > + }; > + > + reg_lcd1_pwr: reg-lcd1-pwr { > + compatible = "regulator-fixed"; > + regulator-name = "LCD1 POWER"; > + regulator-min-microvolt = <3300000>; > + regulator-max-microvolt = <3300000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_lcd1_pwr>; > + gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + regulator-boot-on; > + }; > + > + reg_usbh1_vbus: reg-usbh1-vbus { > + compatible = "regulator-fixed"; > + regulator-name = "usbh1_vbus"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_usbh1_vbus>; > + gpio = <&gpio3 31 GPIO_ACTIVE_HIGH>; > + enable-active-high; > + }; > + > + reg_usbotg_vbus: reg-usbotg-vbus { > + compatible = "regulator-fixed"; > + 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 { > -- > 2.1.4 > >