Skip to contentSkip to conversation

ARM: tegra: nexus7: Add aliases for MMC

PATCH Applied Dmitry Osipenko 2 participants 6 messages Sep 6, 2020 – Sep 17, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ARM: tegra: nexus7: Add aliases for MMC

MMC core now supports binding to a specific ID, which is very handy for embedded devices, like Nexus 7, because MMC ID may change depending on kernel version or configuration which affects MMC driver probe order.

---
 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi +5 -2
index 21387a91c40f..ca44f9596753 100644
@@ -16,6 +16,9 @@ aliases {
 
 		serial1 = &uartc; /* Bluetooth */
 		serial2 = &uartb; /* GPS */
+
+		mmc0 = &sdmmc4;	/* eMMC */
+		mmc1 = &sdmmc3; /* WiFi */
 	};
 
 	/*
@@ -970,7 +973,7 @@ brcm_wifi_pwrseq: wifi-pwrseq {
 		power-off-delay-us = <300>;
 	};
 
-	mmc@78000400 {
+	sdmmc3: mmc@78000400 {
 		status = "okay";
 
 		#address-cells = <1>;
@@ -999,7 +1002,7 @@ wifi@1 {
 		};
 	};
 
-	mmc@78000600 {
+	sdmmc4: mmc@78000600 {
 		status = "okay";
 		bus-width = <8>;
 		vmmc-supply = <&vcore_emmc>;
Signature · 1 line
2.27.0
#1 lore raw

PATCH 2/3 ARM: tegra: acer-a500: Add aliases for MMC

MMC core now supports binding to a specific ID, which is very handy for embedded devices, like Acer A500, because MMC ID may change depending on kernel version or configuration which affects MMC driver probe order.

---
 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +7 -3
index ab3c378e5519..8a7a104b3717 100644
@@ -20,6 +20,10 @@ aliases {
 		serial0 = &uartd; /* Docking station */
 		serial1 = &uartc; /* Bluetooth */
 		serial2 = &uartb; /* GPS */
+
+		mmc0 = &sdmmc4;	/* eMMC */
+		mmc1 = &sdmmc3; /* MicroSD */
+		mmc2 = &sdmmc1; /* WiFi */
 	};
 
 	/*
@@ -738,7 +742,7 @@ brcm_wifi_pwrseq: wifi-pwrseq {
 		power-off-delay-us = <300>;
 	};
 
-	mmc@c8000000 {
+	sdmmc1: mmc@c8000000 {
 		status = "okay";
 
 		#address-cells = <1>;
@@ -767,7 +771,7 @@ wifi@1 {
 		};
 	};
 
-	mmc@c8000400 {
+	sdmmc3: mmc@c8000400 {
 		status = "okay";
 		bus-width = <4>;
 		cd-gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
@@ -776,7 +780,7 @@ mmc@c8000400 {
 		vqmmc-supply = <&vdd_3v3_sys>;
 	};
 
-	mmc@c8000600 {
+	sdmmc4: mmc@c8000600 {
 		status = "okay";
 		bus-width = <8>;
 		vmmc-supply = <&vcore_emmc>;
Signature · 1 line
2.27.0
#2 lore raw

Re: [PATCH v1 2/3] ARM: tegra: acer-a500: Add aliases for MMC

Quoted 8 lines · Dmitry Osipenko

MMC core now supports binding to a specific ID, which is very handy for embedded devices, like Acer A500, because MMC ID may change depending on kernel version or configuration which affects MMC driver probe order.

---
 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Applied to for-5.9/arm/dt, but sorted these alphabetically as well.

Thanks,
Thierry

#3 lore raw

PATCH 3/3 ARM: tegra: acer-a500: Remove atmel,cfg_name property

In reply to Dmitry Osipenko

This property was supposed to be upstreamed, but it was NAKed recently in a favor to a better approach of firmware loading. It also turned out that the firmware loading isn't really necessary because it's stored in a non-volatile memory inside of the touchscreen controller and previously the FW loading was needed in order to get touchscreen working, but it actually was a TS driver problem which is resolved now. Hence remove the unsupported property.

---
 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/tegra20-acer-a500-picasso.dts +0 -2
index 8a7a104b3717..1fdf4d59c188 100644
@@ -443,8 +443,6 @@ touchscreen@4c {
 			compatible = "atmel,maxtouch";
 			reg = <0x4c>;
 
-			atmel,cfg_name = "maxtouch-acer-iconia-tab-a500.cfg";
-
 			interrupt-parent = <&gpio>;
 			interrupts = <TEGRA_GPIO(V, 6) IRQ_TYPE_LEVEL_LOW>;
 
Signature · 1 line
2.27.0
#4 lore raw

Re: [PATCH v1 3/3] ARM: tegra: acer-a500: Remove atmel,cfg_name property

Quoted 8 lines · Dmitry Osipenko

This property was supposed to be upstreamed, but it was NAKed recently in a favor to a better approach of firmware loading. It also turned out that the firmware loading isn't really necessary because it's stored in a non-volatile memory inside of the touchscreen controller and previously the FW loading was needed in order to get touchscreen working, but it actually was a TS driver problem which is resolved now. Hence remove the unsupported property.

Quoted 4 lines
---
 arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 2 --
 1 file changed, 2 deletions(-)

Applied, thanks.

Thierry

#5 lore raw
In reply to Dmitry Osipenko
Quoted 8 lines · Dmitry Osipenko

MMC core now supports binding to a specific ID, which is very handy for embedded devices, like Nexus 7, because MMC ID may change depending on kernel version or configuration which affects MMC driver probe order.

---
 arch/arm/boot/dts/tegra30-asus-nexus7-grouper-common.dtsi | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Applied to for-5.10/arm/dt, though I did move the new aliases so that they are alphabetically sorted.

Thierry