summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
diff options
context:
space:
mode:
authorMarcel Ziswiler <marcel.ziswiler@toradex.com>2018-07-11 15:57:59 +0200
committerStefan Agner <stefan.agner@toradex.com>2018-07-27 16:42:39 +0200
commit1ab789fdf72302417ed4aa94393ba6068844a7ad (patch)
tree15886f1a481555b09bc755f690d0555d084c8f9c /recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
parentfc04a6072ca96f1de703550ba8119089290b5d38 (diff)
apalis-t30/tk1-mainline: update patchset
Latest additions: - 0024-apalis_t30-enable-broken-hpi-on-emmc.patch Avoid a rare soft lockup upon installing an image from within Tezi. - 0025-tegra_defconfig-disable-sound-in-tezi-configuration.patch Avoid keyboard/mouse being unresponsive for 10-15 Seconds. - 0026-apalis_t30-fix-mmc1-cmd-pull-up.patch Avoid issues with higher speed SD cards. - 0027-apalis_t30-pull-up-sd-card-detect-pins.patch Avoid floating SD card detect pins. - 0028-Revert-mmc-tegra-Disable-UHS-I-modes-for-Tegra124.patch Allow for UHS-I modes on TK1. - 0029-mmc-tegra-fix-eMMC-DDR-mode.patch Fix eMMC DDR mode. - 0030-apalis-tk1-enable-ddr52-mode-on-emmc.patch Enable eMMC DDR mode. - 0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch Avoid re-ordering of SDMMC controller instances. - 0032-apalis-tk1-fix-pcie-reset-for-reliable-gigabit-ether.patch Fix PCIe gigabit bring-up issue on Apalis TK1. Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> Acked-by: Stefan Agner <stefan.agner@toradex.com>
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch')
-rw-r--r--recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch104
1 files changed, 104 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch b/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
new file mode 100644
index 0000000..1a38fd1
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-mainline-4.14/0031-apalis-tk1-force-fixed-ids-for-sdmmc-controllers.patch
@@ -0,0 +1,104 @@
+From afd589352be71175ac13a3c7139eae7724a37460 Mon Sep 17 00:00:00 2001
+Message-Id: <afd589352be71175ac13a3c7139eae7724a37460.1531317141.git.marcel.ziswiler@toradex.com>
+In-Reply-To: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+References: <6654e1bd342708a683daf47e7558455f709a3e7e.1531317141.git.marcel.ziswiler@toradex.com>
+From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Wed, 11 Jul 2018 10:58:19 +0200
+Subject: [PATCH 31/33] apalis-tk1: force fixed ids for sdmmc controllers
+
+The following, together with kernel patches, forces a fixed assignment
+between device id and sdmmc controller.
+
+I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
+
+Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+---
+ arch/arm/boot/dts/tegra124-apalis-eval.dts | 16 ++++++++++++++--
+ arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 16 ++++++++++++++--
+ 2 files changed, 28 insertions(+), 4 deletions(-)
+
+diff --git a/arch/arm/boot/dts/tegra124-apalis-eval.dts b/arch/arm/boot/dts/tegra124-apalis-eval.dts
+index ecffcd115fa7..7e2b9cf84741 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-eval.dts
++++ b/arch/arm/boot/dts/tegra124-apalis-eval.dts
+@@ -49,6 +49,18 @@
+ compatible = "toradex,apalis-tk1-eval", "toradex,apalis-tk1",
+ "nvidia,tegra124";
+
++ aliases {
++ /*
++ * The following, together with kernel patches, forces a fixed
++ * assignment between device id and SDMMC controllers.
++ *
++ * I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
++ */
++ mmc0 = "/sdhci@700b0600"; /* eMMC */
++ mmc1 = &mmc1; /* MMC1 slot */
++ mmc2 = &sd1; /* SD1 slot */
++ };
++
+ aliases {
+ rtc0 = "/i2c@7000c000/rtc@68";
+ rtc1 = "/i2c@7000d000/pmic@40";
+@@ -176,7 +188,7 @@
+ };
+
+ /* Apalis MMC1 */
+- sdhci@700b0000 {
++ mmc1: sdhci@700b0000 {
+ status = "okay";
+ /* MMC1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+@@ -185,7 +197,7 @@
+ };
+
+ /* Apalis SD1 */
+- sdhci@700b0400 {
++ sd1: sdhci@700b0400 {
+ status = "okay";
+ /* SD1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
+diff --git a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+index 8a8d5fa0ecd1..046a415d5db8 100644
+--- a/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
++++ b/arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts
+@@ -13,6 +13,18 @@
+ compatible = "toradex,apalis-tk1-v1.2-eval", "toradex,apalis-tk1-eval",
+ "toradex,apalis-tk1", "nvidia,tegra124";
+
++ aliases {
++ /*
++ * The following, together with kernel patches, forces a fixed
++ * assignment between device id and SDMMC controllers.
++ *
++ * I.e. the eMMC on SDMMC4 will be /dev/mmcblk0.
++ */
++ mmc0 = "/sdhci@700b0600"; /* eMMC */
++ mmc1 = &mmc1; /* MMC1 slot */
++ mmc2 = &sd1; /* SD1 slot */
++ };
++
+ aliases {
+ rtc0 = "/i2c@7000c000/rtc@68";
+ rtc1 = "/i2c@7000d000/pmic@40";
+@@ -140,7 +152,7 @@
+ };
+
+ /* Apalis MMC1 */
+- sdhci@700b0000 {
++ mmc1: sdhci@700b0000 {
+ status = "okay";
+ /* MMC1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 3) GPIO_ACTIVE_LOW>;
+@@ -149,7 +161,7 @@
+ };
+
+ /* Apalis SD1 */
+- sdhci@700b0400 {
++ sd1: sdhci@700b0400 {
+ status = "okay";
+ /* SD1_CD# */
+ cd-gpios = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_LOW>;
+--
+2.14.4
+