diff options
author | Philippe Schenker <philippe.schenker@toradex.com> | 2022-11-22 18:03:30 +0100 |
---|---|---|
committer | Philippe Schenker <philippe.schenker@toradex.com> | 2022-11-22 18:15:12 +0100 |
commit | f114e9f469fb380846028e2f9b5b97073857f19e (patch) | |
tree | 140efe145b3f8222e6bed0273152d72866ca91ae | |
parent | ba86dd56a6d9ffc8a381db6b070aa4e015d136ed (diff) |
linux-toradex-mainline: Backport disable usb-over-current series
This commit backports the patch series "Unify USB Over Current Settings
on Toradex Boards".
https://lore.kernel.org/linux-devicetree/20221122155439.456142-1-dev@pschenker.ch/T/#t
Related-to: ELB-4822
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
5 files changed, 451 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-apalis-imx6-Disable-usb-over-current.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-apalis-imx6-Disable-usb-over-current.patch new file mode 100644 index 0000000..65f48c8 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-git/0001-ARM-dts-apalis-imx6-Disable-usb-over-current.patch @@ -0,0 +1,95 @@ +From 4d3a1be57ebd27239e39a8129b9a8dbb20b5fca1 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Mon, 21 Nov 2022 18:15:44 +0100 +Subject: [PATCH 1/4] 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. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-devicetree/20221122155439.456142-2-dev@pschenker.ch/T/#u] +Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> +--- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 ++ + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 ++ + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 ++ + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 - + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts +index fa160a389870..3fc079dfd61e 100644 +--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts ++++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts +@@ -147,11 +147,13 @@ &uart5 { + }; + + &usbh1 { ++ disable-over-current; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + vbus-supply = <®_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 f9f7d99bd4db..717decda0ceb 100644 +--- 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 @@ &uart5 { + }; + + &usbh1 { ++ disable-over-current; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + vbus-supply = <®_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 ce39c6a3f640..f338be435277 100644 +--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts ++++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts +@@ -151,11 +151,13 @@ &uart5 { + }; + + &usbh1 { ++ disable-over-current; + vbus-supply = <®_usb_host_vbus>; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + vbus-supply = <®_usb_otg_vbus>; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi +index 7c17b91f0965..f912697bfdb3 100644 +--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi +@@ -824,7 +824,6 @@ &uart5 { + }; + + &usbotg { +- disable-over-current; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usbotg>; + status = "disabled"; +-- +2.35.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0002-ARM-dts-colibri-imx6-Disable-usb-over-current.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0002-ARM-dts-colibri-imx6-Disable-usb-over-current.patch new file mode 100644 index 0000000..210e0b1 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-git/0002-ARM-dts-colibri-imx6-Disable-usb-over-current.patch @@ -0,0 +1,92 @@ +From 3e2299b86bce54c5ce070a177197595d2f2215f0 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Mon, 21 Nov 2022 18:11:51 +0100 +Subject: [PATCH 2/4] ARM: dts: colibri-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-colibri.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. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-devicetree/20221122155439.456142-3-dev@pschenker.ch/T/#u] +Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> +--- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 2 ++ + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 ++ + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 2 ++ + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 - + 4 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/boot/dts/imx6dl-colibri-aster.dts b/arch/arm/boot/dts/imx6dl-colibri-aster.dts +index a28e083f29d5..82a0d1a28d12 100644 +--- a/arch/arm/boot/dts/imx6dl-colibri-aster.dts ++++ b/arch/arm/boot/dts/imx6dl-colibri-aster.dts +@@ -99,10 +99,12 @@ &uart3 { + }; + + &usbh1 { ++ disable-over-current; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +index a02981d4a3fc..f50a26dd34c0 100644 +--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts ++++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +@@ -111,10 +111,12 @@ &uart3 { + }; + + &usbh1 { ++ disable-over-current; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx6dl-colibri-iris.dts b/arch/arm/boot/dts/imx6dl-colibri-iris.dts +index c5797ff35b71..4303c88bb2a9 100644 +--- a/arch/arm/boot/dts/imx6dl-colibri-iris.dts ++++ b/arch/arm/boot/dts/imx6dl-colibri-iris.dts +@@ -138,10 +138,12 @@ &uart3 { + }; + + &usbh1 { ++ disable-over-current; + status = "okay"; + }; + + &usbotg { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx6qdl-colibri.dtsi b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +index d8f985f297e4..f894d6907604 100644 +--- a/arch/arm/boot/dts/imx6qdl-colibri.dtsi ++++ b/arch/arm/boot/dts/imx6qdl-colibri.dtsi +@@ -684,7 +684,6 @@ &usbh1 { + + /* Colibri USBC */ + &usbotg { +- disable-over-current; + dr_mode = "otg"; + extcon = <0>, <&extcon_usbc_det>; + status = "disabled"; +-- +2.35.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0003-ARM-dts-colibri-imx6ull-Disable-usb-over-current.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0003-ARM-dts-colibri-imx6ull-Disable-usb-over-current.patch new file mode 100644 index 0000000..e460eb8 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-git/0003-ARM-dts-colibri-imx6ull-Disable-usb-over-current.patch @@ -0,0 +1,78 @@ +From 7dbcb7e460bf636ba450a0acd1786af9cf63d377 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Mon, 21 Nov 2022 18:03:55 +0100 +Subject: [PATCH 3/4] ARM: dts: colibri-imx6ull: 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. + +This will prevent the warning "No over current polarity defined" from +being printed on boot. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-devicetree/20221122155439.456142-4-dev@pschenker.ch/T/#u] +Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> +--- + arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 2 ++ + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 2 ++ + arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 2 ++ + 3 files changed, 6 insertions(+) + +diff --git a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi +index c9133ba2d705..de4dc7c1a03a 100644 +--- a/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi ++++ b/arch/arm/boot/dts/imx6ull-colibri-aster.dtsi +@@ -130,11 +130,13 @@ &uart5 { + }; + + &usbotg1 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; + + &usbotg2 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +index e29907428c20..692ef26fbab3 100644 +--- a/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi +@@ -106,11 +106,13 @@ &uart5 { + }; + + &usbotg1 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; + + &usbotg2 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +index 7f3b37baba88..0be98be70b00 100644 +--- a/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi ++++ b/arch/arm/boot/dts/imx6ull-colibri-iris.dtsi +@@ -117,11 +117,13 @@ &uart5 { + }; + + &usbotg1 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; + + &usbotg2 { ++ disable-over-current; + vbus-supply = <®_usbh_vbus>; + status = "okay"; + }; +-- +2.35.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline-git/0004-ARM-dts-colibri-imx7-Disable-usb-over-current.patch b/recipes-kernel/linux/linux-toradex-mainline-git/0004-ARM-dts-colibri-imx7-Disable-usb-over-current.patch new file mode 100644 index 0000000..25ec40b --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-mainline-git/0004-ARM-dts-colibri-imx7-Disable-usb-over-current.patch @@ -0,0 +1,182 @@ +From 61a09a290a5997387d06137bcd37fdfaea2b1052 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Mon, 21 Nov 2022 18:21:07 +0100 +Subject: [PATCH 4/4] ARM: dts: colibri-imx7: 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. + +This will prevent the warning "No over current polarity defined" from +being printed on boot. + +Upstream-Status: Submitted [https://lore.kernel.org/linux-devicetree/20221122155439.456142-5-dev@pschenker.ch/T/#u] +Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> +--- + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris.dts | 1 + + 13 files changed, 13 insertions(+) + +diff --git a/arch/arm/boot/dts/imx7-colibri-aster.dtsi b/arch/arm/boot/dts/imx7-colibri-aster.dtsi +index fa488a6de0d4..01612741f792 100644 +--- a/arch/arm/boot/dts/imx7-colibri-aster.dtsi ++++ b/arch/arm/boot/dts/imx7-colibri-aster.dtsi +@@ -70,6 +70,7 @@ &uart3 { + + /* Colibri USBC */ + &usbotg1 { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +index 826f13da5b81..326440f2b4f4 100644 +--- a/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi ++++ b/arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +@@ -101,6 +101,7 @@ &uart3 { + + /* Colibri USBC */ + &usbotg1 { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi +index 6e199613583c..b687727f956a 100644 +--- a/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi ++++ b/arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi +@@ -99,6 +99,7 @@ &uart3 { + + /* Colibri USBC */ + &usbotg1 { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx7-colibri-iris.dtsi b/arch/arm/boot/dts/imx7-colibri-iris.dtsi +index 175c5d478d2e..6a9e5ab59691 100644 +--- a/arch/arm/boot/dts/imx7-colibri-iris.dtsi ++++ b/arch/arm/boot/dts/imx7-colibri-iris.dtsi +@@ -99,6 +99,7 @@ &uart3 { + + /* Colibri USBC */ + &usbotg1 { ++ disable-over-current; + status = "okay"; + }; + +diff --git a/arch/arm/boot/dts/imx7d-colibri-aster.dts b/arch/arm/boot/dts/imx7d-colibri-aster.dts +index 90aaeddfb4f6..00ab92e56da4 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-aster.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-aster.dts +@@ -36,5 +36,6 @@ &panel_dpi { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts +index 3ec9ef6baaa4..d9c7045a55ba 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts +@@ -18,5 +18,6 @@ / { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +index 6d505cb02aad..96b599439dde 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +@@ -17,5 +17,6 @@ / { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts +index 7347659557f3..5eccb837b158 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts +@@ -17,5 +17,6 @@ / { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts b/arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts +index 5324c92e368d..ae10e8a66ff1 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts +@@ -17,5 +17,6 @@ / { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +index 2fb4d2133a1b..3740e34ef99f 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi ++++ b/arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +@@ -51,6 +51,7 @@ &gpio6 { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + dr_mode = "host"; + vbus-supply = <®_usbh_vbus>; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +index c7a8b5aa2408..33d787617db0 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +@@ -52,5 +52,6 @@ &pwm3 { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-iris-v2.dts b/arch/arm/boot/dts/imx7d-colibri-iris-v2.dts +index 5762f51d5f0f..afdb1d06c7f6 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-iris-v2.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-iris-v2.dts +@@ -79,5 +79,6 @@ &panel_dpi { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +diff --git a/arch/arm/boot/dts/imx7d-colibri-iris.dts b/arch/arm/boot/dts/imx7d-colibri-iris.dts +index 9c63cb9d9a64..531b0b99bd5a 100644 +--- a/arch/arm/boot/dts/imx7d-colibri-iris.dts ++++ b/arch/arm/boot/dts/imx7d-colibri-iris.dts +@@ -52,5 +52,6 @@ &pwm3 { + + /* Colibri USBH */ + &usbotg2 { ++ disable-over-current; + status = "okay"; + }; +-- +2.35.3 + diff --git a/recipes-kernel/linux/linux-toradex-mainline_git.bb b/recipes-kernel/linux/linux-toradex-mainline_git.bb index 6fdc488..58ef3f3 100644 --- a/recipes-kernel/linux/linux-toradex-mainline_git.bb +++ b/recipes-kernel/linux/linux-toradex-mainline_git.bb @@ -36,6 +36,10 @@ SRC_URI:append = " \ file://0001-ARM-dts-colibri-imx6ull-Enable-dual-role-switching.patch \ file://0002-drivers-chipidea-disable-runtime-pm-for-imx6ul.patch \ file://0001-rtc-snvs-Allow-a-time-difference-on-clock-register-r.patch \ + file://0001-ARM-dts-apalis-imx6-Disable-usb-over-current.patch \ + file://0002-ARM-dts-colibri-imx6-Disable-usb-over-current.patch \ + file://0003-ARM-dts-colibri-imx6ull-Disable-usb-over-current.patch \ + file://0004-ARM-dts-colibri-imx7-Disable-usb-over-current.patch \ " LINUX_VERSION ?= "6.0.6" |