kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: dts: imx7-colibri: move regulators

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

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
This commit is contained in:
Marcel Ziswiler 2022-05-16 15:47:19 +02:00 • committed by Shawn Guo
parent c37e0d58f2
commit 59cb7dfd9b
9 changed files with 35 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

27
arch/arm/boot/dts/imx7-colibri-aster.dtsi
View file

@ -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";
};

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

@ -10,31 +10,6 @@
#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 {

39
arch/arm/boot/dts/imx7-colibri.dtsi
View file

@ -62,20 +62,47 @@
};
};
reg_3v3: regulator-3v3 {
compatible = "regulator-fixed";
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: regulator-module-3v3 {
compatible = "regulator-fixed";
regulator-name = "+V3.3";
regulator-min-microvolt = <3300000>;
regulator-max-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-name = "+V3.3_AVDD_AUDIO";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
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 {

1
arch/arm/boot/dts/imx7d-colibri-aster.dts
View file

@ -36,6 +36,5 @@
};
&usbotg2 {
vbus-supply = <&reg_usbh_vbus>;
status = "okay";
};

1
arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts
View file

@ -17,6 +17,5 @@
};
&usbotg2 {
vbus-supply = <&reg_usbh_vbus>;
status = "okay";
};

1
arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts
View file

@ -16,6 +16,5 @@
};
&usbotg2 {
vbus-supply = <&reg_usbh_vbus>;
status = "okay";
};

1
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi
View file

@ -47,6 +47,7 @@
&usbotg2 {
dr_mode = "host";
vbus-supply = <&reg_usbh_vbus>;
};
&usdhc3 {

1
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts
View file

@ -47,6 +47,5 @@
};
&usbotg2 {
vbus-supply = <&reg_usbh_vbus>;
status = "okay";
};

1
arch/arm/boot/dts/imx7d-colibri.dtsi
View file

@ -29,4 +29,5 @@
&usbotg2 {
dr_mode = "host";
vbus-supply = <&reg_usbh_vbus>;
};