[v2] ARM: dts: add mmc aliases for Exynos devices

[PATCH v2 1/2] ARM: dts: exynos: drop mshc aliases

Posted by Henrik Grimler 2 years, 7 months ago

They are no longer needed after commit a13e8ef6008d ("mmc: dw_mmc:
exynos: use common_caps").

Signed-off-by: Henrik Grimler <henrik@grimler.se>
---
 arch/arm/boot/dts/exynos3250.dtsi | 3 ---
 arch/arm/boot/dts/exynos4412.dtsi | 1 -
 arch/arm/boot/dts/exynos5250.dtsi | 4 ----
 arch/arm/boot/dts/exynos5420.dtsi | 3 ---
 4 files changed, 11 deletions(-)

diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
index 54bb323186e4..2d7771c1043b 100644
--- a/arch/arm/boot/dts/exynos3250.dtsi
+++ b/arch/arm/boot/dts/exynos3250.dtsi
@@ -28,9 +28,6 @@ / {
 	aliases {
 		pinctrl0 = &pinctrl_0;
 		pinctrl1 = &pinctrl_1;
-		mshc0 = &mshc_0;
-		mshc1 = &mshc_1;
-		mshc2 = &mshc_2;
 		spi0 = &spi_0;
 		spi1 = &spi_1;
 		i2c0 = &i2c_0;
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 7b4e2c442888..9e97b42638e9 100644
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -28,7 +28,6 @@ aliases {
 		pinctrl3 = &pinctrl_3;
 		fimc-lite0 = &fimc_lite_0;
 		fimc-lite1 = &fimc_lite_1;
-		mshc0 = &mshc_0;
 	};
 
 	cpus {
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index 97e89859ba3d..6ea8a090f602 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -30,10 +30,6 @@ aliases {
 		gsc1 = &gsc_1;
 		gsc2 = &gsc_2;
 		gsc3 = &gsc_3;
-		mshc0 = &mmc_0;
-		mshc1 = &mmc_1;
-		mshc2 = &mmc_2;
-		mshc3 = &mmc_3;
 		i2c4 = &i2c_4;
 		i2c5 = &i2c_5;
 		i2c6 = &i2c_6;
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index b1051a7d07af..6862cbabc172 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -19,9 +19,6 @@ / {
 	compatible = "samsung,exynos5420", "samsung,exynos5";
 
 	aliases {
-		mshc0 = &mmc_0;
-		mshc1 = &mmc_1;
-		mshc2 = &mmc_2;
 		pinctrl0 = &pinctrl_0;
 		pinctrl1 = &pinctrl_1;
 		pinctrl2 = &pinctrl_2;
-- 
2.39.1

Re: [PATCH v2 1/2] ARM: dts: exynos: drop mshc aliases

Posted by Krzysztof Kozlowski 2 years, 7 months ago

On 28/01/2023 14:31, Henrik Grimler wrote:
> They are no longer needed after commit a13e8ef6008d ("mmc: dw_mmc:
> exynos: use common_caps").
> 

Are you sure? That commit explicitly says that the caps should be set
from DT and Exynos DT does not set it everywhere...

plus if alias is missing, then the ctrl_id in dw_mmc.c is 0 and such
caps are applied everywhere - to every DWMMC device.

Best regards,
Krzysztof

Re: [PATCH v2 1/2] ARM: dts: exynos: drop mshc aliases

Posted by Henrik Grimler 2 years, 7 months ago

Hi Krzysztof,

Thanks for reviewing!

On Thu, Feb 09, 2023 at 03:39:37PM +0100, Krzysztof Kozlowski wrote:
> On 28/01/2023 14:31, Henrik Grimler wrote:
> > They are no longer needed after commit a13e8ef6008d ("mmc: dw_mmc:
> > exynos: use common_caps").
> > 
> 
> Are you sure? That commit explicitly says that the caps should be set
> from DT and Exynos DT does not set it everywhere...
> 
> plus if alias is missing, then the ctrl_id in dw_mmc.c is 0 and such
> caps are applied everywhere - to every DWMMC device.

Yeah, you are right, David pointed this out in the ARM64 patchset [1]
as well, so I will look it over again and send new versions (when
discussion on this version is finalised).

> Best regards,
> Krzysztof

[1] https://patchwork.kernel.org/project/linux-samsung-soc/patch/20230203204000.14410-2-henrik@grimler.se/#25197132

Best regards,
Henrik Grimler

Re: [PATCH v2 1/2] ARM: dts: exynos: drop mshc aliases

Posted by Marek Szyprowski 2 years, 7 months ago

On 28.01.2023 14:31, Henrik Grimler wrote:
> They are no longer needed after commit a13e8ef6008d ("mmc: dw_mmc:
> exynos: use common_caps").
>
> Signed-off-by: Henrik Grimler <henrik@grimler.se>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
> ---
>   arch/arm/boot/dts/exynos3250.dtsi | 3 ---
>   arch/arm/boot/dts/exynos4412.dtsi | 1 -
>   arch/arm/boot/dts/exynos5250.dtsi | 4 ----
>   arch/arm/boot/dts/exynos5420.dtsi | 3 ---
>   4 files changed, 11 deletions(-)
>
> diff --git a/arch/arm/boot/dts/exynos3250.dtsi b/arch/arm/boot/dts/exynos3250.dtsi
> index 54bb323186e4..2d7771c1043b 100644
> --- a/arch/arm/boot/dts/exynos3250.dtsi
> +++ b/arch/arm/boot/dts/exynos3250.dtsi
> @@ -28,9 +28,6 @@ / {
>   	aliases {
>   		pinctrl0 = &pinctrl_0;
>   		pinctrl1 = &pinctrl_1;
> -		mshc0 = &mshc_0;
> -		mshc1 = &mshc_1;
> -		mshc2 = &mshc_2;
>   		spi0 = &spi_0;
>   		spi1 = &spi_1;
>   		i2c0 = &i2c_0;
> diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
> index 7b4e2c442888..9e97b42638e9 100644
> --- a/arch/arm/boot/dts/exynos4412.dtsi
> +++ b/arch/arm/boot/dts/exynos4412.dtsi
> @@ -28,7 +28,6 @@ aliases {
>   		pinctrl3 = &pinctrl_3;
>   		fimc-lite0 = &fimc_lite_0;
>   		fimc-lite1 = &fimc_lite_1;
> -		mshc0 = &mshc_0;
>   	};
>   
>   	cpus {
> diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
> index 97e89859ba3d..6ea8a090f602 100644
> --- a/arch/arm/boot/dts/exynos5250.dtsi
> +++ b/arch/arm/boot/dts/exynos5250.dtsi
> @@ -30,10 +30,6 @@ aliases {
>   		gsc1 = &gsc_1;
>   		gsc2 = &gsc_2;
>   		gsc3 = &gsc_3;
> -		mshc0 = &mmc_0;
> -		mshc1 = &mmc_1;
> -		mshc2 = &mmc_2;
> -		mshc3 = &mmc_3;
>   		i2c4 = &i2c_4;
>   		i2c5 = &i2c_5;
>   		i2c6 = &i2c_6;
> diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
> index b1051a7d07af..6862cbabc172 100644
> --- a/arch/arm/boot/dts/exynos5420.dtsi
> +++ b/arch/arm/boot/dts/exynos5420.dtsi
> @@ -19,9 +19,6 @@ / {
>   	compatible = "samsung,exynos5420", "samsung,exynos5";
>   
>   	aliases {
> -		mshc0 = &mmc_0;
> -		mshc1 = &mmc_1;
> -		mshc2 = &mmc_2;
>   		pinctrl0 = &pinctrl_0;
>   		pinctrl1 = &pinctrl_1;
>   		pinctrl2 = &pinctrl_2;

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland