Skip to contentSkip to conversation

ARM: dts: rockchip: rk3036: remove mshc aliases

PATCH Applied Johan Jonker 3 participants 5 messages Jan 16 – Jan 20

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

PATCH 1/1 ARM: dts: rockchip: rk3036: remove mshc aliases

The use of mshc aliases is deprecated for some while, so remove them from the rk3036.dtsi file.

---
 arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/boot/dts/rockchip/rk3036.dtsi +0 -3
index fca21ebb224b..78afae42f8b2 100644
@@ -23,9 +23,6 @@ aliases {
 		i2c0 = &i2c0;
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
-		mshc0 = &emmc;
-		mshc1 = &sdmmc;
-		mshc2 = &sdio;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;

--
2.39.5

#1 lore raw

Hi Johan,

Quoted 3 lines · Johan Jonker

The use of mshc aliases is deprecated for some while, so remove them from the rk3036.dtsi file.

I noticed that the alias property is still listed in the documentation[1]. Could you please share where it has been formally marked as deprecated? I may have missed the update.

[1] Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Quoted 28 lines
---
  arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 ---
  1 file changed, 3 deletions(-)
arch/arm/boot/dts/rockchip/rk3036.dtsi +0 -4
index fca21ebb224b..78afae42f8b2 100644
@@ -23,9 +23,6 @@ aliases {
  		i2c0 = &i2c0;
  		i2c1 = &i2c1;
  		i2c2 = &i2c2;
-		mshc0 = &emmc;
-		mshc1 = &sdmmc;
-		mshc2 = &sdio;
  		serial0 = &uart0;
  		serial1 = &uart1;
  		serial2 = &uart2;
--

2.39.5

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#2 lore raw
Quoted 8 lines · Shawn Lin

Hi Johan,

Quoted 3 lines · Johan Jonker

The use of mshc aliases is deprecated for some while, so remove them from the rk3036.dtsi file.

Quoted 5 lines

I noticed that the alias property is still listed in the documentation[1]. Could you please share where it has been formally marked as deprecated? I may have missed the update.

[1] Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Mshc aliases driver support was introduced 2018 in dw_mmc.c only and before that a undocumented copy paste entered somehow into dtsi files. The mmc-controller.yaml file change in 2020 mentions a fixed index mmcN format.
A generic alias name "mmc" is now preferred instead of a "mshc" driver specific.

As suggested by Arnd Bergmann and others, the newly added mmc aliases should be board specific

Discussions about Rockchip aliases started around 2021
https://lore.kernel.org/linux-rockchip/CAK8P3a3_uO23Y0tyfdh26tmCVcyp6XM+ur0WUd4khGUoBb32Hw@mail.gmail.com/#t

https://lore.kernel.org/all/CAPDyKFp1zMBUfK7LteW0yEfTpqtU+P+EybLsJBFx_r54HwFdMg@mail.gmail.com/

[PATCH 0/4] mmc: dw_mmc: start deprecating mshcN aliases
https://lore.kernel.org/linux-rockchip/[email protected]/
====

Nov 24, 2015
ARM: dts: rockchip: add core rk3036 dtsi
https://github.com/torvalds/linux/commit/faea098e1808729e4785cdba3a3fc52fae49f1ab

Dec 19, 2015
ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
https://github.com/torvalds/linux/commit/187d7967a5ee630ae062fb543655e59d2f0f91fb

====

Feb 27, 2018
mmc: dw_mmc: Factor out dw_mci_init_slot_caps
https://github.com/torvalds/linux/commit/a4faa4929ed3be15e2d500d2405f992f6dedc8eb

====

Sep 7, 2020
dt-bindings: mmc: document alias support
https://github.com/torvalds/linux/commit/1796164fac7e348f74a0f1f1cae995b22d002315

Sep 7, 2020
mmc: core: Allow setting slot index via device tree alias
https://github.com/torvalds/linux/commit/fa2d0aa96941e8dc347e49a04c75468e3002ee20

Quoted 30 lines
Quoted 29 lines

---
  arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 ---

  1 file changed, 3 deletions(-)
arch/arm/boot/dts/rockchip/rk3036.dtsi +0 -3
index fca21ebb224b..78afae42f8b2 100644
@@ -23,9 +23,6 @@ aliases {
           i2c0 = &i2c0;
           i2c1 = &i2c1;
           i2c2 = &i2c2;
-        mshc0 = &emmc;
-        mshc1 = &sdmmc;
-        mshc2 = &sdio;
           serial0 = &uart0;
           serial1 = &uart1;
           serial2 = &uart2;
Signature · 7 lines
2.39.5


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#3 lore raw
Quoted 15 lines · Johan Jonker
Quoted 12 lines · Shawn Lin

Hi Johan,

Quoted 3 lines · Johan Jonker

The use of mshc aliases is deprecated for some while, so remove them from the rk3036.dtsi file.

I noticed that the alias property is still listed in the documentation[1]. Could you please share where it has been formally marked as deprecated? I may have missed the update.

Quoted 9 lines
Quoted 1 line

[1] Documentation/devicetree/bindings/mmc/mmc-controller.yaml

Mshc aliases driver support was introduced 2018 in dw_mmc.c only and before that a undocumented copy paste entered somehow into dtsi files. The mmc-controller.yaml file change in 2020 mentions a fixed index mmcN format.
A generic alias name "mmc" is now preferred instead of a "mshc" driver specific.

As suggested by Arnd Bergmann and others, the newly added mmc aliases should be board specific

Thanks for these details. Then I'm fine with this patch.

Quoted 65 lines

Discussions about Rockchip aliases started around 2021
https://lore.kernel.org/linux-rockchip/CAK8P3a3_uO23Y0tyfdh26tmCVcyp6XM+ur0WUd4khGUoBb32Hw@mail.gmail.com/#t

https://lore.kernel.org/all/CAPDyKFp1zMBUfK7LteW0yEfTpqtU+P+EybLsJBFx_r54HwFdMg@mail.gmail.com/

[PATCH 0/4] mmc: dw_mmc: start deprecating mshcN aliases
https://lore.kernel.org/linux-rockchip/[email protected]/
====

Nov 24, 2015
ARM: dts: rockchip: add core rk3036 dtsi
https://github.com/torvalds/linux/commit/faea098e1808729e4785cdba3a3fc52fae49f1ab

Dec 19, 2015
ARM: dts: rockchip: add the sdio/sdmmc node for rk3036
https://github.com/torvalds/linux/commit/187d7967a5ee630ae062fb543655e59d2f0f91fb

====

Feb 27, 2018
mmc: dw_mmc: Factor out dw_mci_init_slot_caps
https://github.com/torvalds/linux/commit/a4faa4929ed3be15e2d500d2405f992f6dedc8eb

====

Sep 7, 2020
dt-bindings: mmc: document alias support
https://github.com/torvalds/linux/commit/1796164fac7e348f74a0f1f1cae995b22d002315

Sep 7, 2020
mmc: core: Allow setting slot index via device tree alias
https://github.com/torvalds/linux/commit/fa2d0aa96941e8dc347e49a04c75468e3002ee20

Quoted 30 lines
Quoted 29 lines
---
   arch/arm/boot/dts/rockchip/rk3036.dtsi | 3 ---
   1 file changed, 3 deletions(-)
arch/arm/boot/dts/rockchip/rk3036.dtsi +0 -3
index fca21ebb224b..78afae42f8b2 100644
@@ -23,9 +23,6 @@ aliases {
           i2c0 = &i2c0;
           i2c1 = &i2c1;
           i2c2 = &i2c2;
-        mshc0 = &emmc;
-        mshc1 = &sdmmc;
-        mshc2 = &sdio;
           serial0 = &uart0;
           serial1 = &uart1;
           serial2 = &uart2;
Signature · 7 lines
2.39.5


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#4 lore raw
In reply to Johan Jonker
Quoted 4 lines · Johan Jonker

The use of mshc aliases is deprecated for some while, so remove them from the rk3036.dtsi file.

Applied, thanks!

[1/1] ARM: dts: rockchip: rk3036: remove mshc aliases

      commit: e546c69ac54e907d0c33bc1fde55689db301981f

Best regards,

Signature · 1 line
Heiko Stuebner <[email protected]>