Commit 59cb7dfd authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Shawn Guo
Browse files

ARM: dts: imx7-colibri: move regulators 



Move regulators to module-level device tree given they are standard
Colibri functionalities.

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent c37e0d58

arch/arm/boot/dts/imx7-colibri-aster.dtsi

+0 −27
Original line number Diff line number Diff line
@@ -3,33 +3,6 @@ 
 * Copyright 2017-2022 Toradex

 */



/ {

	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-name = "5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh_reg>;

		regulator-name = "VCC_USB[1-4]";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;

		vin-supply = <&reg_5v0>;

	};

};



&adc1 {

	status = "okay";

};

arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi

+0 −25
Original line number Diff line number Diff line
@@ -10,31 +10,6 @@ clk16m: clk16m { 
		#clock-cells = <0>;

		clock-frequency = <16000000>;

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-name = "5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

	};



	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh_reg>;

		regulator-name = "VCC_USB[1-4]";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;

		vin-supply = <&reg_5v0>;

	};

};



&adc1 {

arch/arm/boot/dts/imx7-colibri.dtsi

+33 −6
Original line number Diff line number Diff line
@@ -62,20 +62,47 @@ lcd_panel_in: endpoint { 
		};

	};



	reg_module_3v3: regulator-module-3v3 {

	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "+V3.3";

		regulator-min-microvolt = <3300000>;

		regulator-always-on;

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-name = "3.3V";

	};



	reg_5v0: regulator-5v0 {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-max-microvolt = <5000000>;

		regulator-min-microvolt = <5000000>;

		regulator-name = "5V";

	};



	reg_module_3v3_avdd: regulator-module-3v3-avdd {

	reg_module_3v3: regulator-module-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "+V3.3_AVDD_AUDIO";

		regulator-min-microvolt = <3300000>;

		regulator-always-on;

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-name = "+V3.3";

	};



	reg_module_3v3_avdd: regulator-module-3v3-avdd {

		compatible = "regulator-fixed";

		regulator-always-on;

		regulator-max-microvolt = <3300000>;

		regulator-min-microvolt = <3300000>;

		regulator-name = "+V3.3_AVDD_AUDIO";

	};



	reg_usbh_vbus: regulator-usbh-vbus {

		compatible = "regulator-fixed";

		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; /* SODIMM 129 / USBH_PEN */

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbh_reg>;

		regulator-max-microvolt = <5000000>;

		regulator-min-microvolt = <5000000>;

		regulator-name = "VCC_USB[1-4]";

		vin-supply = <&reg_5v0>;

	};



	sound {

arch/arm/boot/dts/imx7d-colibri-aster.dts

+0 −1
Original line number Diff line number Diff line
@@ -36,6 +36,5 @@ &panel_dpi { 
};



&usbotg2 {

	vbus-supply = <&reg_usbh_vbus>;

	status = "okay";

};

arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts

+0 −1
Original line number Diff line number Diff line
@@ -17,6 +17,5 @@ / { 
};



&usbotg2 {

	vbus-supply = <&reg_usbh_vbus>;

	status = "okay";

};