diff mbox series

ARM: dts: tbs2910: rename MMC node aliases

Message ID 20201222155908.48600-1-smoch@web.de (mailing list archive)
State New, archived
Headers show
Series ARM: dts: tbs2910: rename MMC node aliases | expand

Commit Message

Soeren Moch Dec. 22, 2020, 3:59 p.m. UTC
to be consistent with kernel versions up to v5.9 (mmc aliases not used here).
usdhc1 is not wired up on this board and therefore cannot be used.
Start mmc aliases with usdhc2.

Signed-off-by: Soeren Moch <smoch@web.de>
Cc: stable@vger.kernel.org                # 5.10.x
---
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Fabio Estevam <festevam@gmail.com>
Cc: linux-arm-kernel@lists.infradead.org
---
 arch/arm/boot/dts/imx6q-tbs2910.dts | 7 +++++++
 1 file changed, 7 insertions(+)

--
2.25.1

Comments

Shawn Guo Jan. 11, 2021, 12:31 a.m. UTC | #1
On Tue, Dec 22, 2020 at 04:59:08PM +0100, Soeren Moch wrote:
> to be consistent with kernel versions up to v5.9 (mmc aliases not used here).
> usdhc1 is not wired up on this board and therefore cannot be used.
> Start mmc aliases with usdhc2.
> 
> Signed-off-by: Soeren Moch <smoch@web.de>
> Cc: stable@vger.kernel.org                # 5.10.x

Can we have a Fixes tag as well?

Shawn

> ---
> Cc: Shawn Guo <shawnguo@kernel.org>
> Cc: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Fabio Estevam <festevam@gmail.com>
> Cc: linux-arm-kernel@lists.infradead.org
> ---
>  arch/arm/boot/dts/imx6q-tbs2910.dts | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
> index cb591233035b..6a6e27b35e34 100644
> --- a/arch/arm/boot/dts/imx6q-tbs2910.dts
> +++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
> @@ -16,6 +16,13 @@ chosen {
>  		stdout-path = &uart1;
>  	};
> 
> +	aliases {
> +		mmc0 = &usdhc2;
> +		mmc1 = &usdhc3;
> +		mmc2 = &usdhc4;
> +		/delete-property/ mmc3;
> +	};
> +
>  	memory@10000000 {
>  		device_type = "memory";
>  		reg = <0x10000000 0x80000000>;
> --
> 2.25.1
>
Shawn Guo Jan. 11, 2021, 12:34 a.m. UTC | #2
On Mon, Jan 11, 2021 at 8:32 AM Shawn Guo <shawnguo@kernel.org> wrote:
>
> On Tue, Dec 22, 2020 at 04:59:08PM +0100, Soeren Moch wrote:
> > to be consistent with kernel versions up to v5.9 (mmc aliases not used here).
> > usdhc1 is not wired up on this board and therefore cannot be used.
> > Start mmc aliases with usdhc2.
> >
> > Signed-off-by: Soeren Moch <smoch@web.de>
> > Cc: stable@vger.kernel.org                # 5.10.x
>
> Can we have a Fixes tag as well?

Doesn't matter, since it's essentially just backport to 5.10 stable kernel.

Applied, thanks.
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/imx6q-tbs2910.dts b/arch/arm/boot/dts/imx6q-tbs2910.dts
index cb591233035b..6a6e27b35e34 100644
--- a/arch/arm/boot/dts/imx6q-tbs2910.dts
+++ b/arch/arm/boot/dts/imx6q-tbs2910.dts
@@ -16,6 +16,13 @@  chosen {
 		stdout-path = &uart1;
 	};

+	aliases {
+		mmc0 = &usdhc2;
+		mmc1 = &usdhc3;
+		mmc2 = &usdhc4;
+		/delete-property/ mmc3;
+	};
+
 	memory@10000000 {
 		device_type = "memory";
 		reg = <0x10000000 0x80000000>;