ARM: dts: apalis-imx6: Disable usb over-current

Disable usb over-current of the chipidea driver on all Carrier-Boards
used by Toradex. Do this as we don't want to use this functionality on
our Carrier Boards and to leave it open to someone who includes our
module-level device-trees.

Remove the now obsolete disable-over-current flag from module-level
device-tree imx6qdl-apalis.dtsi and leave it as already mentioned to
the people actually implementing the carrier-board to implement this.

This will prevent the warning "No over current polarity defined" from
being printed on boot.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index fa160a3898704d1e58db4aefb6a2d79212a55207..3fc079dfd61eed40ed9d13b8e13e922ffcf04ae0 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -147,11 +147,13 @@
 };
 
 &usbh1 {
+       disable-over-current;
        vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 
 &usbotg {
+       disable-over-current;
        vbus-supply = <&reg_usb_otg_vbus>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
index f9f7d99bd4db8516716423927e455daea8db315e..717decda0cebd5138a0febfed8e56c6a55fb67a3 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts
@@ -202,11 +202,13 @@
 };
 
 &usbh1 {
+       disable-over-current;
        vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 
 &usbotg {
+       disable-over-current;
        vbus-supply = <&reg_usb_otg_vbus>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index ce39c6a3f64045c3aab5414faef2249e2682dba0..f338be4352779adf8a3a4428c9eab0003005a798 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -151,11 +151,13 @@
 };
 
 &usbh1 {
+       disable-over-current;
        vbus-supply = <&reg_usb_host_vbus>;
        status = "okay";
 };
 
 &usbotg {
+       disable-over-current;
        vbus-supply = <&reg_usb_otg_vbus>;
        status = "okay";
 };

diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index 7c17b91f09655837bf968af963a552ef840bf261..f912697bfdb3cacbfd4ac8f96f25242e291ebb4d 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -824,7 +824,6 @@
 };
 
 &usbotg {
-       disable-over-current;
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_usbotg>;
        status = "disabled";