mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-30 02:31:46 +00:00
173 lines
5 KiB
Diff
173 lines
5 KiB
Diff
diff --git a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
|
|
index 14fff4ee6516..b20508237046 100644
|
|
--- a/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-cubox-i.dtsi
|
|
@@ -64,38 +64,34 @@
|
|
};
|
|
};
|
|
|
|
- regulators {
|
|
- compatible = "simple-bus";
|
|
-
|
|
- reg_3p3v: 3p3v {
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "3P3V";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- regulator-always-on;
|
|
- };
|
|
+ reg_3p3v: 3p3v {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "3P3V";
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-always-on;
|
|
+ };
|
|
|
|
- reg_usbh1_vbus: usb-h1-vbus {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio1 0 0>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
|
|
- regulator-name = "usb_h1_vbus";
|
|
- regulator-min-microvolt = <5000000>;
|
|
- regulator-max-microvolt = <5000000>;
|
|
- };
|
|
+ reg_usbh1_vbus: usb-h1-vbus {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpio = <&gpio1 0 0>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_cubox_i_usbh1_vbus>;
|
|
+ regulator-name = "usb_h1_vbus";
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
+ };
|
|
|
|
- reg_usbotg_vbus: usb-otg-vbus {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio3 22 0>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
|
|
- regulator-name = "usb_otg_vbus";
|
|
- regulator-min-microvolt = <5000000>;
|
|
- regulator-max-microvolt = <5000000>;
|
|
- };
|
|
+ reg_usbotg_vbus: usb-otg-vbus {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpio = <&gpio3 22 0>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_cubox_i_usbotg_vbus>;
|
|
+ regulator-name = "usb_otg_vbus";
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
};
|
|
|
|
sound-spdif {
|
|
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
|
|
index 37c07c0748aa..0a0a7e4b956b 100644
|
|
--- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
|
|
@@ -53,38 +53,34 @@
|
|
pinctrl-0 = <&pinctrl_hummingboard_gpio3_5>;
|
|
};
|
|
|
|
- regulators {
|
|
- compatible = "simple-bus";
|
|
-
|
|
- reg_3p3v: 3p3v {
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "3P3V";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- regulator-always-on;
|
|
- };
|
|
+ reg_3p3v: 3p3v {
|
|
+ compatible = "regulator-fixed";
|
|
+ regulator-name = "3P3V";
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ regulator-always-on;
|
|
+ };
|
|
|
|
- reg_usbh1_vbus: usb-h1-vbus {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
|
|
- regulator-name = "usb_h1_vbus";
|
|
- regulator-min-microvolt = <5000000>;
|
|
- regulator-max-microvolt = <5000000>;
|
|
- };
|
|
+ reg_usbh1_vbus: usb-h1-vbus {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpio = <&gpio1 0 GPIO_ACTIVE_HIGH>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_hummingboard_usbh1_vbus>;
|
|
+ regulator-name = "usb_h1_vbus";
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
+ };
|
|
|
|
- reg_usbotg_vbus: usb-otg-vbus {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
|
|
- regulator-name = "usb_otg_vbus";
|
|
- regulator-min-microvolt = <5000000>;
|
|
- regulator-max-microvolt = <5000000>;
|
|
- };
|
|
+ reg_usbotg_vbus: usb-otg-vbus {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpio = <&gpio3 22 GPIO_ACTIVE_HIGH>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_hummingboard_usbotg_vbus>;
|
|
+ regulator-name = "usb_otg_vbus";
|
|
+ regulator-min-microvolt = <5000000>;
|
|
+ regulator-max-microvolt = <5000000>;
|
|
};
|
|
|
|
sound-sgtl5000 {
|
|
diff --git a/arch/arm/boot/dts/imx6qdl-microsom.dtsi b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
|
|
index 6a410160c9ee..f7266ae2534c 100644
|
|
--- a/arch/arm/boot/dts/imx6qdl-microsom.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-microsom.dtsi
|
|
@@ -48,20 +48,16 @@
|
|
enable-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
|
|
- regulators {
|
|
- compatible = "simple-bus";
|
|
-
|
|
- reg_brcm: brcm-reg {
|
|
- compatible = "regulator-fixed";
|
|
- enable-active-high;
|
|
- gpio = <&gpio3 19 0>;
|
|
- pinctrl-names = "default";
|
|
- pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
|
|
- regulator-name = "brcm_reg";
|
|
- regulator-min-microvolt = <3300000>;
|
|
- regulator-max-microvolt = <3300000>;
|
|
- startup-delay-us = <200000>;
|
|
- };
|
|
+ reg_brcm: brcm-reg {
|
|
+ compatible = "regulator-fixed";
|
|
+ enable-active-high;
|
|
+ gpio = <&gpio3 19 0>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_microsom_brcm_reg>;
|
|
+ regulator-name = "brcm_reg";
|
|
+ regulator-min-microvolt = <3300000>;
|
|
+ regulator-max-microvolt = <3300000>;
|
|
+ startup-delay-us = <200000>;
|
|
};
|
|
|
|
usdhc1_pwrseq: usdhc1_pwrseq {
|