diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-07-14 14:38:12 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-08-06 13:41:41 +0200 |
| commit | 3e766556b2ee3b4092cf17c6c8eadb0e56772479 (patch) | |
| tree | 5600f1ce638cc27d4757f05cf2be752a285033f3 | |
| parent | f5dcba80e3ded65859b552e7e9d00e27f81f2cb8 (diff) | |
linux-toradex: add patches to support sd on old mx8x modules
Older iMX8X modules have the old PMIC deployed that do not support
proper 1.8V switching in SD cards. This commit adds patches to revert
the no-1-8-v removal.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit acbfe83716e6a045d9290d932eec29a9afb468f1)
3 files changed, 70 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch new file mode 100644 index 0000000..befaaf3 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch @@ -0,0 +1,30 @@ +From 802b65177ed08f96c3238ff6b75ba01fc74e93e0 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Tue, 14 Jul 2020 14:40:13 +0200 +Subject: [PATCH 1/2] Revert "ARM64: dts: apalis-imx8x: remove no-1-8-v from + sd-card node" + +This reverts commit ad1860a80539f3e8f579bbf74de2f99d88cf320f. +--- + arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi +index 44437acc7359e..f8755500a8389 100644 +--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi ++++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-apalis.dtsi +@@ -1218,6 +1218,11 @@ + &usdhc2 { + bus-width = <4>; + cd-gpios = <&gpio4 22 GPIO_ACTIVE_LOW>; ++ /* ++ * The PMIC on V1.0A HW generates 1.6V instead of 1.8V which creates ++ * issues with certain SD cards, disable 1.8V signaling for now. ++ */ ++ no-1-8-v; + disable-wp; + pinctrl-names = "default", "state_100mhz", "state_200mhz", "sleep"; + pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; +-- +2.27.0 + diff --git a/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch new file mode 100644 index 0000000..a618db8 --- /dev/null +++ b/recipes-kernel/linux/linux-toradex-4.14-2.3.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch @@ -0,0 +1,30 @@ +From 28192d0f5db9ddcb93d908965f3fdc668f62c099 Mon Sep 17 00:00:00 2001 +From: Philippe Schenker <philippe.schenker@toradex.com> +Date: Tue, 14 Jul 2020 14:40:41 +0200 +Subject: [PATCH 2/2] Revert "ARM64: dts: colibri-imx8x: remove no-1-8-v from + sd-card node" + +This reverts commit b4d382b9ea4904bd6bd54d72c5bd417db69d6018. +--- + arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi +index 20ddd1429971d..ed5293f23b523 100644 +--- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi ++++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-colibri.dtsi +@@ -1283,6 +1283,11 @@ + pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; + pinctrl-3 = <&pinctrl_usdhc2_sleep>, <&pinctrl_usdhc2_gpio_sleep>; + disable-wp; ++ /* ++ * The PMIC on V1.0A HW generates 1.6V instead of 1.8V which creates ++ * issues with certain SD cards, disable 1.8V signaling for now. ++ */ ++ no-1-8-v; + vmmc-supply = <®_module_3v3>; + }; + +-- +2.27.0 + diff --git a/recipes-kernel/linux/linux-toradex_4.14-2.3.x.bb b/recipes-kernel/linux/linux-toradex_4.14-2.3.x.bb index e5e484d..32c1ea6 100644 --- a/recipes-kernel/linux/linux-toradex_4.14-2.3.x.bb +++ b/recipes-kernel/linux/linux-toradex_4.14-2.3.x.bb @@ -8,6 +8,16 @@ SRC_URI = " \ file://defconfig \ " +SRC_URI_append_colibri-imx8x-v10b = " \ + file://0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch \ + file://0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch \ +" + +SRC_URI_append_apalis-imx8x-v11a = " \ + file://0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch \ + file://0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch \ +" + # Load USB functions configurable through configfs (CONFIG_USB_CONFIGFS) KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('COMBINED_FEATURES', 'usbgadget', ' libcomposite', '',d)}" |