diff mbox series

ARM: dts: bcm2711-rpi-4-b: Use aliases to set custom MMC device index

Message ID 20220608123233.13439-1-ariel.dalessandro@collabora.com (mailing list archive)
State New, archived
Headers show
Series ARM: dts: bcm2711-rpi-4-b: Use aliases to set custom MMC device index | expand

Commit Message

Ariel D'Alessandro June 8, 2022, 12:32 p.m. UTC
Add MMC aliases to ensure that the /dev/mmcblk ID for SD card won't
change depending on the probe order of the MMC drivers.

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
---
 arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Peter Robinson June 12, 2022, 8:38 p.m. UTC | #1
On Wed, Jun 8, 2022 at 1:35 PM Ariel D'Alessandro
<ariel.dalessandro@collabora.com> wrote:
>
> Add MMC aliases to ensure that the /dev/mmcblk ID for SD card won't
> change depending on the probe order of the MMC drivers.

Is  the bcm2711-rpi.dtsi a better place for it given there's other
aliases there and it will be consistent across variations?

> Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
> ---
>  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
> index 4432412044de..780812542bad 100644
> --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
> +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
> @@ -14,6 +14,10 @@ chosen {
>                 stdout-path = "serial1:115200n8";
>         };
>
> +       aliases {
> +               mmc0 = &emmc2;  /* mmcblk0 for SD */
> +       };
> +
>         leds {
>                 led-act {
>                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
> --
> 2.34.1
>
>
> _______________________________________________
> linux-rpi-kernel mailing list
> linux-rpi-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel
Ariel D'Alessandro June 13, 2022, 12:46 p.m. UTC | #2
Hi Peter,

On 6/12/22 17:38, Peter Robinson wrote:
> On Wed, Jun 8, 2022 at 1:35 PM Ariel D'Alessandro
> <ariel.dalessandro@collabora.com> wrote:
>>
>> Add MMC aliases to ensure that the /dev/mmcblk ID for SD card won't
>> change depending on the probe order of the MMC drivers.
> 
> Is  the bcm2711-rpi.dtsi a better place for it given there's other
> aliases there and it will be consistent across variations?

Yes, indeed, it makes sense moving it to bcm2711-rpi.dtsi

The other board what will be affected by this alias is the Raspberry Pi
Compute Module 4 IO Board, on which emmc2 is the eMMC. However, the
alias makes sense, to have that as the first mmc device.

Maybe we can add the alias as follows?

    mmc0 = &emmc2;  /* mmcblk0 for eMMC/SD */

Regards,
Ariel

> 
>> Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
>> ---
>>  arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
>> index 4432412044de..780812542bad 100644
>> --- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
>> +++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
>> @@ -14,6 +14,10 @@ chosen {
>>                 stdout-path = "serial1:115200n8";
>>         };
>>
>> +       aliases {
>> +               mmc0 = &emmc2;  /* mmcblk0 for SD */
>> +       };
>> +
>>         leds {
>>                 led-act {
>>                         gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;
>> --
>> 2.34.1
>>
>>
>> _______________________________________________
>> linux-rpi-kernel mailing list
>> linux-rpi-kernel@lists.infradead.org
>> http://lists.infradead.org/mailman/listinfo/linux-rpi-kernel
Florian Fainelli June 13, 2022, 11:34 p.m. UTC | #3
On 6/13/22 05:46, Ariel D'Alessandro wrote:
> Hi Peter,
> 
> On 6/12/22 17:38, Peter Robinson wrote:
>> On Wed, Jun 8, 2022 at 1:35 PM Ariel D'Alessandro
>> <ariel.dalessandro@collabora.com> wrote:
>>>
>>> Add MMC aliases to ensure that the /dev/mmcblk ID for SD card won't
>>> change depending on the probe order of the MMC drivers.
>>
>> Is  the bcm2711-rpi.dtsi a better place for it given there's other
>> aliases there and it will be consistent across variations?
> 
> Yes, indeed, it makes sense moving it to bcm2711-rpi.dtsi
> 
> The other board what will be affected by this alias is the Raspberry Pi
> Compute Module 4 IO Board, on which emmc2 is the eMMC. However, the
> alias makes sense, to have that as the first mmc device.
> 
> Maybe we can add the alias as follows?
> 
>      mmc0 = &emmc2;  /* mmcblk0 for eMMC/SD */

You have made a typo on the bcm-kernel-feedback-list meaning that this 
won't reach the patchwork instance I use to manage and apply patches, 
can you please fix that up for your v2? Thanks!
Stefan Wahren June 14, 2022, 6:34 a.m. UTC | #4
Am 14.06.22 um 01:34 schrieb Florian Fainelli:
> On 6/13/22 05:46, Ariel D'Alessandro wrote:
>> Hi Peter,
>>
>> On 6/12/22 17:38, Peter Robinson wrote:
>>> On Wed, Jun 8, 2022 at 1:35 PM Ariel D'Alessandro
>>> <ariel.dalessandro@collabora.com> wrote:
>>>>
>>>> Add MMC aliases to ensure that the /dev/mmcblk ID for SD card won't
>>>> change depending on the probe order of the MMC drivers.
>>>
>>> Is  the bcm2711-rpi.dtsi a better place for it given there's other
>>> aliases there and it will be consistent across variations?
>>
>> Yes, indeed, it makes sense moving it to bcm2711-rpi.dtsi
>>
>> The other board what will be affected by this alias is the Raspberry Pi
>> Compute Module 4 IO Board, on which emmc2 is the eMMC. However, the
>> alias makes sense, to have that as the first mmc device.
>>
>> Maybe we can add the alias as follows?
>>
>>      mmc0 = &emmc2;  /* mmcblk0 for eMMC/SD */
>
> You have made a typo on the bcm-kernel-feedback-list meaning that this 
> won't reach the patchwork instance I use to manage and apply patches, 
> can you please fix that up for your v2? Thanks!
Not just the bcm-kernel-feedback-list is affected, also the address of 
Krzysztof, Rob and Nicolas has a g prepended.
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
index 4432412044de..780812542bad 100644
--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
@@ -14,6 +14,10 @@  chosen {
 		stdout-path = "serial1:115200n8";
 	};
 
+	aliases {
+		mmc0 = &emmc2;	/* mmcblk0 for SD */
+	};
+
 	leds {
 		led-act {
 			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;