diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-09-01 15:26:12 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-09-01 15:08:49 +0000 |
| commit | 8024b3d79e731eb93ab7208f4796671e5e8df556 (patch) | |
| tree | 802094e7a1c5830b366d98d58b5c58e971d46d2e /recipes-kernel/linux | |
| parent | 6db5df32404a9b8faa9e40910b4fa66f8740d0ac (diff) | |
recipes-kernel: Remove revert no-1-8-v patches
those patches currently do not apply, remove them.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'recipes-kernel/linux')
3 files changed, 0 insertions, 70 deletions
diff --git a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch b/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch deleted file mode 100644 index befaaf3..0000000 --- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0001-Revert-ARM64-dts-apalis-imx8x-remove-no-1-8-v-from-s.patch +++ /dev/null @@ -1,30 +0,0 @@ -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-5.4-2.1.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch b/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch deleted file mode 100644 index a618db8..0000000 --- a/recipes-kernel/linux/linux-toradex-5.4-2.1.x/0002-Revert-ARM64-dts-colibri-imx8x-remove-no-1-8-v-from-.patch +++ /dev/null @@ -1,30 +0,0 @@ -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_5.4-2.1.x.bb b/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb index 3b51cbb..4cdb08d 100644 --- a/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb +++ b/recipes-kernel/linux/linux-toradex_5.4-2.1.x.bb @@ -18,16 +18,6 @@ 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)}" |