Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7281795f authored by Lothar Waßmann's avatar Lothar Waßmann Committed by Shawn Guo
Browse files

ARM: dts: imx6-tx6: remove regulator bus 



DT maintainers don't like the 'simple-bus' container around the
regulator nodes. So remove it.

Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent a7574ab0

arch/arm/boot/dts/imx6qdl-tx6.dtsi

+75 −91
Original line number Original line Diff line number Diff line
@@ -97,14 +97,8 @@ 
		};

		};

	};

	};





	regulators {

	reg_3v3_etn: regulator-3v3-etn {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <0>;



		reg_3v3_etn: regulator@0 {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <0>;

		regulator-name = "3V3_ETN";

		regulator-name = "3V3_ETN";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -114,27 +108,24 @@ 
		enable-active-high;

		enable-active-high;

	};

	};





		reg_2v5: regulator@1 {

	reg_2v5: regulator-2v5 {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <1>;

		regulator-name = "2V5";

		regulator-name = "2V5";

		regulator-min-microvolt = <2500000>;

		regulator-min-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

		regulator-max-microvolt = <2500000>;

		regulator-always-on;

		regulator-always-on;

	};

	};





		reg_3v3: regulator@2 {

	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <2>;

		regulator-name = "3V3";

		regulator-name = "3V3";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

		regulator-always-on;

	};

	};





		reg_can_xcvr: regulator@3 {

	reg_can_xcvr: regulator-can-xcvr {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <3>;

		regulator-name = "CAN XCVR";

		regulator-name = "CAN XCVR";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -144,9 +135,8 @@ 
		enable-active-low;

		enable-active-low;

	};

	};





		reg_lcd0_pwr: regulator@4 {

	reg_lcd0_pwr: regulator-lcd0-pwr {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <4>;

		regulator-name = "LCD0 POWER";

		regulator-name = "LCD0 POWER";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -155,12 +145,10 @@ 
		gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio3 29 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		enable-active-high;

		regulator-boot-on;

		regulator-boot-on;

			regulator-always-on;

	};

	};





		reg_lcd1_pwr: regulator@5 {

	reg_lcd1_pwr: regulator-lcd1-pwr {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <5>;

		regulator-name = "LCD1 POWER";

		regulator-name = "LCD1 POWER";

		regulator-min-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;
@@ -169,12 +157,10 @@ 
		gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio2 31 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		enable-active-high;

		regulator-boot-on;

		regulator-boot-on;

			regulator-always-on;

	};

	};





		reg_usbh1_vbus: regulator@6 {

	reg_usbh1_vbus: regulator-usbh1-vbus {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <6>;

		regulator-name = "usbh1_vbus";

		regulator-name = "usbh1_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -184,9 +170,8 @@ 
		enable-active-high;

		enable-active-high;

	};

	};





		reg_usbotg_vbus: regulator@7 {

	reg_usbotg_vbus: regulator-usbotg-vbus {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

			reg = <7>;

		regulator-name = "usbotg_vbus";

		regulator-name = "usbotg_vbus";

		regulator-min-microvolt = <5000000>;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;
@@ -195,7 +180,6 @@ 
		gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		gpio = <&gpio1 7 GPIO_ACTIVE_HIGH>;

		enable-active-high;

		enable-active-high;

	};

	};

	};





	sound {

	sound {

		compatible = "karo,imx6qdl-tx6qdl-sgtl5000",

		compatible = "karo,imx6qdl-tx6qdl-sgtl5000",