Message ID | 20230329090403.5274-2-clamor95@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | Tegra DTS improvements | expand |
ср, 29 бер. 2023 р. о 12:04 Svyatoslav Ryhel <clamor95@gmail.com> пише: > > Use phandle references for mmc instead of path in aliases. > > Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com> > --- > arch/arm/boot/dts/tegra114-asus-tf701t.dts | 12 ++++++------ > .../boot/dts/tegra30-asus-transformer-common.dtsi | 12 ++++++------ > 2 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/boot/dts/tegra114-asus-tf701t.dts b/arch/arm/boot/dts/tegra114-asus-tf701t.dts > index 84a3eb38e71d..3a420ac969ff 100644 > --- a/arch/arm/boot/dts/tegra114-asus-tf701t.dts > +++ b/arch/arm/boot/dts/tegra114-asus-tf701t.dts > @@ -13,9 +13,9 @@ / { > chassis-type = "convertible"; > > aliases { > - mmc0 = "/mmc@78000600"; /* eMMC */ > - mmc1 = "/mmc@78000400"; /* uSD slot */ > - mmc2 = "/mmc@78000000"; /* WiFi */ > + mmc0 = &sdmmc4; /* eMMC */ > + mmc1 = &sdmmc3; /* uSD slot */ > + mmc2 = &sdmmc1; /* WiFi */ > > rtc0 = &palmas; > rtc1 = "/rtc@7000e000"; > @@ -605,12 +605,12 @@ i2s@70080300 { > }; > }; > > - mmc@78000000 { > + sdmmc1: mmc@78000000 { > /* WiFi */ > }; > > /* MicroSD card */ > - mmc@78000400 { > + sdmmc3: mmc@78000400 { > status = "okay"; > > bus-width = <4>; > @@ -626,7 +626,7 @@ mmc@78000400 { > pinctrl-0 = <&sdmmc3_default>; > }; > > - mmc@78000600 { > + sdmmc4: mmc@78000600 { > /* eMMC */ > }; > > diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi > index 1861b2de2dc3..f32806f07989 100644 > --- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi > +++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi > @@ -12,9 +12,9 @@ / { > chassis-type = "convertible"; > > aliases { > - mmc0 = "/mmc@78000600"; /* eMMC */ > - mmc1 = "/mmc@78000000"; /* uSD slot */ > - mmc2 = "/mmc@78000400"; /* WiFi */ > + mmc0 = &sdmmc4; /* eMMC */ > + mmc1 = &sdmmc1; /* uSD slot */ > + mmc2 = &sdmmc3; /* WiFi */ > > rtc0 = &pmic; > rtc1 = "/rtc@7000e000"; > @@ -1388,7 +1388,7 @@ i2s@70080600 { /* i2s3 */ > }; > }; > > - mmc@78000000 { > + sdmmc1: mmc@78000000 { > status = "okay"; > > /* FIXME: Full 208Mhz clock rate doesn't work reliably */ > @@ -1401,7 +1401,7 @@ mmc@78000000 { > vqmmc-supply = <&vddio_usd>; /* ldo3 */ > }; > > - mmc@78000400 { > + sdmmc3: mmc@78000400 { > status = "okay"; > > #address-cells = <1>; > @@ -1431,7 +1431,7 @@ wifi@1 { > }; > }; > > - mmc@78000600 { > + sdmmc4: mmc@78000600 { > status = "okay"; > bus-width = <8>; > vmmc-supply = <&vcore_emmc>; > -- > 2.37.2 > Hello Thierry! For some reason this commit was not picked while all others in the patchset were. May I know why and how to fix this? Best regards, Svyatoslav R.
diff --git a/arch/arm/boot/dts/tegra114-asus-tf701t.dts b/arch/arm/boot/dts/tegra114-asus-tf701t.dts index 84a3eb38e71d..3a420ac969ff 100644 --- a/arch/arm/boot/dts/tegra114-asus-tf701t.dts +++ b/arch/arm/boot/dts/tegra114-asus-tf701t.dts @@ -13,9 +13,9 @@ / { chassis-type = "convertible"; aliases { - mmc0 = "/mmc@78000600"; /* eMMC */ - mmc1 = "/mmc@78000400"; /* uSD slot */ - mmc2 = "/mmc@78000000"; /* WiFi */ + mmc0 = &sdmmc4; /* eMMC */ + mmc1 = &sdmmc3; /* uSD slot */ + mmc2 = &sdmmc1; /* WiFi */ rtc0 = &palmas; rtc1 = "/rtc@7000e000"; @@ -605,12 +605,12 @@ i2s@70080300 { }; }; - mmc@78000000 { + sdmmc1: mmc@78000000 { /* WiFi */ }; /* MicroSD card */ - mmc@78000400 { + sdmmc3: mmc@78000400 { status = "okay"; bus-width = <4>; @@ -626,7 +626,7 @@ mmc@78000400 { pinctrl-0 = <&sdmmc3_default>; }; - mmc@78000600 { + sdmmc4: mmc@78000600 { /* eMMC */ }; diff --git a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi index 1861b2de2dc3..f32806f07989 100644 --- a/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi +++ b/arch/arm/boot/dts/tegra30-asus-transformer-common.dtsi @@ -12,9 +12,9 @@ / { chassis-type = "convertible"; aliases { - mmc0 = "/mmc@78000600"; /* eMMC */ - mmc1 = "/mmc@78000000"; /* uSD slot */ - mmc2 = "/mmc@78000400"; /* WiFi */ + mmc0 = &sdmmc4; /* eMMC */ + mmc1 = &sdmmc1; /* uSD slot */ + mmc2 = &sdmmc3; /* WiFi */ rtc0 = &pmic; rtc1 = "/rtc@7000e000"; @@ -1388,7 +1388,7 @@ i2s@70080600 { /* i2s3 */ }; }; - mmc@78000000 { + sdmmc1: mmc@78000000 { status = "okay"; /* FIXME: Full 208Mhz clock rate doesn't work reliably */ @@ -1401,7 +1401,7 @@ mmc@78000000 { vqmmc-supply = <&vddio_usd>; /* ldo3 */ }; - mmc@78000400 { + sdmmc3: mmc@78000400 { status = "okay"; #address-cells = <1>; @@ -1431,7 +1431,7 @@ wifi@1 { }; }; - mmc@78000600 { + sdmmc4: mmc@78000600 { status = "okay"; bus-width = <8>; vmmc-supply = <&vcore_emmc>;
Use phandle references for mmc instead of path in aliases. Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com> --- arch/arm/boot/dts/tegra114-asus-tf701t.dts | 12 ++++++------ .../boot/dts/tegra30-asus-transformer-common.dtsi | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)