On 24/10/2022 12:44, Dinh Nguyen wrote:
>
>
> On 10/24/22 11:17, Krzysztof Kozlowski wrote:
>> On 24/10/2022 11:21, Dinh Nguyen wrote:
>>> dwmmc0@ff704000: $nodename:0: 'dwmmc0@ff704000' does not match '^mmc(@.*)?$'
>>>
>>> Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxx>
>>> ---
>>> v2: put back mmc0 for "linux,default-trigger"
>>> ---
>>> arch/arm/boot/dts/socfpga.dtsi | 2 +-
>>> arch/arm/boot/dts/socfpga_arria10.dtsi | 2 +-
>>> arch/arm/boot/dts/socfpga_arria5.dtsi | 2 +-
>>> arch/arm/boot/dts/socfpga_arria5_socdk.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5.dtsi | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_chameleon96.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 2 +-
>>> arch/arm/boot/dts/socfpga_vt.dts | 2 +-
>>> 12 files changed, 12 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
>>> index 2459f3cd7dd9..57a5d6c924b1 100644
>>> --- a/arch/arm/boot/dts/socfpga.dtsi
>>> +++ b/arch/arm/boot/dts/socfpga.dtsi
>>> @@ -755,7 +755,7 @@ l3regs@0xff800000 {
>>> reg = <0xff800000 0x1000>;
>>> };
>>>
>>> - mmc: dwmmc0@ff704000 {
>>> + mmc: mmc@ff704000 {
>>> compatible = "altr,socfpga-dw-mshc";
>>> reg = <0xff704000 0x1000>;
>>> interrupts = <0 139 4>;
>>> diff --git a/arch/arm/boot/dts/socfpga_arria10.dtsi b/arch/arm/boot/dts/socfpga_arria10.dtsi
>>> index 4370e3cbbb4b..a06211fcb5c3 100644
>>> --- a/arch/arm/boot/dts/socfpga_arria10.dtsi
>>> +++ b/arch/arm/boot/dts/socfpga_arria10.dtsi
>>> @@ -656,7 +656,7 @@ L2: cache-controller@fffff000 {
>>> arm,shared-override;
>>> };
>>>
>>> - mmc: dwmmc0@ff808000 {
>>> + mmc: mmc@ff808000 {
>>> #address-cells = <1>;
>>> #size-cells = <0>;
>>> compatible = "altr,socfpga-dw-mshc";
>>> diff --git a/arch/arm/boot/dts/socfpga_arria5.dtsi b/arch/arm/boot/dts/socfpga_arria5.dtsi
>>> index 22dbf07afcff..9ce4b4979ecb 100644
>>> --- a/arch/arm/boot/dts/socfpga_arria5.dtsi
>>> +++ b/arch/arm/boot/dts/socfpga_arria5.dtsi
>>> @@ -18,7 +18,7 @@ osc1 {
>>> };
>>> };
>>>
>>> - mmc0: dwmmc0@ff704000 {
>>> + mmc: mmc@ff704000 {
>>> broken-cd;
>>> bus-width = <4>;
>>> cap-mmc-highspeed;
>>> diff --git a/arch/arm/boot/dts/socfpga_arria5_socdk.dts b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
>>> index 7f5458d8fccc..40f12232c150 100644
>>> --- a/arch/arm/boot/dts/socfpga_arria5_socdk.dts
>>> +++ b/arch/arm/boot/dts/socfpga_arria5_socdk.dts
>>> @@ -107,7 +107,7 @@ rtc@68 {
>>> };
>>> };
>>>
>>> -&mmc0 {
>>> +&mmc {
>>
>> This does not look related and was not mentioned in commit msg,
>>
>
> Because I've changed the mmc0 node to 'mmc', this is needed, otherwise
> the build will break.
I know.
Why changing label to mmc? It's not related to this commit and not
explained in commit msg.
Best regards,
Krzysztof
