[v2,8/9] arm64: dts: ti: k3-am6*: Fix bus-width property in MMC nodes
Commit Message
Move bus-width property to *main.dtsi, above the OTAP/ITAP
delay values. While there is no error with where it is
currently at, it is easier to read the MMC node if the
bus-width property is located above the OTAP/ITAP delay
values consistently across MMC nodes.
Add missing bus-width for MMC2 in k3-am62-main.
Signed-off-by: Judith Mendez <jm@ti.com>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 -
arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 2 +-
arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++
arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 --
arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
6 files changed, 6 insertions(+), 7 deletions(-)
Comments
Hi Judith,
Am 13.02.24 um 01:24 schrieb Judith Mendez:
> Move bus-width property to *main.dtsi, above the OTAP/ITAP
> delay values. While there is no error with where it is
> currently at, it is easier to read the MMC node if the
> bus-width property is located above the OTAP/ITAP delay
> values consistently across MMC nodes.
>
> Add missing bus-width for MMC2 in k3-am62-main.
>
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
> arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 -
> arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 2 +-
> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++
> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 --
> arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
I think you missed to update all non TI boards.
Regards,
Wadim
> 6 files changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> index 410b390ce5d5..55420eb1c620 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> @@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 {
> clock-names = "clk_ahb", "clk_xin";
> assigned-clocks = <&k3_clks 57 6>;
> assigned-clock-parents = <&k3_clks 57 8>;
> + bus-width = <8>;
> mmc-ddr-1_8v;
> mmc-hs200-1_8v;
> - bus-width = <8>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-mmc-hs = <0x0>;
> @@ -579,6 +579,7 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x8>;
> ti,otap-del-sel-sd-hs = <0x0>;
> @@ -591,7 +592,6 @@ sdhci1: mmc@fa00000 {
> ti,itap-del-sel-sd-hs = <0x1>;
> ti,itap-del-sel-sdr12 = <0xa>;
> ti,itap-del-sel-sdr25 = <0x1>;
> - bus-width = <4>;
> status = "disabled";
> };
>
> @@ -602,6 +602,7 @@ sdhci2: mmc@fa20000 {
> power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x8>;
> ti,otap-del-sel-sd-hs = <0x0>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> index bb6a5837bcb3..a34e0df2ab86 100644
> --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> @@ -842,7 +842,6 @@ &sdhci2 {
> vmmc-supply = <&wlan_en>;
> pinctrl-names = "default";
> pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
> - bus-width = <4>;
> non-removable;
> ti,fails-without-test-cd;
> cap-power-off-card;
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> index ddb76cd66f88..253c1857eedf 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
> @@ -561,6 +561,7 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> @@ -573,7 +574,6 @@ sdhci1: mmc@fa00000 {
> ti,itap-del-sel-sd-hs = <0x0>;
> ti,itap-del-sel-sdr12 = <0x0>;
> ti,itap-del-sel-sdr25 = <0x0>;
> - bus-width = <4>;
> no-1-8-v;
> status = "disabled";
> };
> diff --git a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> index bea05be7cb48..bc9c9ff993e6 100644
> --- a/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am64-main.dtsi
> @@ -626,6 +626,7 @@ sdhci0: mmc@fa10000 {
> power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <8>;
> mmc-ddr-1_8v;
> mmc-hs200-1_8v;
> ti,clkbuf-sel = <0x7>;
> @@ -647,6 +648,7 @@ sdhci1: mmc@fa00000 {
> power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
> clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
> clock-names = "clk_ahb", "clk_xin";
> + bus-width = <4>;
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-sd-hs = <0x0>;
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> index f308076d608a..83f2b00726b5 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> @@ -494,7 +494,6 @@ eeprom@0 {
> /* eMMC */
> &sdhci0 {
> status = "okay";
> - bus-width = <8>;
> non-removable;
> ti,driver-strength-ohm = <50>;
> disable-wp;
> @@ -506,7 +505,6 @@ &sdhci1 {
> status = "okay";
> vmmc-supply = <&vdd_mmc1>;
> pinctrl-names = "default";
> - bus-width = <4>;
> pinctrl-0 = <&main_mmc1_pins_default>;
> disable-wp;
> };
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-sk.dts b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> index b286eaa02ada..67cd41bf806e 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-sk.dts
> @@ -469,7 +469,6 @@ &sdhci1 {
> status = "okay";
> vmmc-supply = <&vdd_mmc1>;
> pinctrl-names = "default";
> - bus-width = <4>;
> pinctrl-0 = <&main_mmc1_pins_default>;
> disable-wp;
> };
On Tue, Feb 13, 2024 at 06:07:28AM +0100, Wadim Egorov wrote:
> Hi Judith,
>
> Am 13.02.24 um 01:24 schrieb Judith Mendez:
> > Move bus-width property to *main.dtsi, above the OTAP/ITAP
> > delay values. While there is no error with where it is
> > currently at, it is easier to read the MMC node if the
> > bus-width property is located above the OTAP/ITAP delay
> > values consistently across MMC nodes.
> >
> > Add missing bus-width for MMC2 in k3-am62-main.
> >
> > Signed-off-by: Judith Mendez <jm@ti.com>
> > ---
> > arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
> > arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 -
> > arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 2 +-
> > arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++
> > arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 --
> > arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
>
> I think you missed to update all non TI boards.
Not sure which boards are you referring to.
I would not change the verdin-am62 boards, the bus-width there is
consistent with the schematics, it's just correct and in the right place
IMO.
Francesco
Am 13.02.24 um 09:19 schrieb Francesco Dolcini:
> On Tue, Feb 13, 2024 at 06:07:28AM +0100, Wadim Egorov wrote:
>> Hi Judith,
>>
>> Am 13.02.24 um 01:24 schrieb Judith Mendez:
>>> Move bus-width property to *main.dtsi, above the OTAP/ITAP
>>> delay values. While there is no error with where it is
>>> currently at, it is easier to read the MMC node if the
>>> bus-width property is located above the OTAP/ITAP delay
>>> values consistently across MMC nodes.
>>>
>>> Add missing bus-width for MMC2 in k3-am62-main.
>>>
>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>> ---
>>> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 5 +++--
>>> arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 -
>>> arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 2 +-
>>> arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 2 ++
>>> arch/arm64/boot/dts/ti/k3-am642-evm.dts | 2 --
>>> arch/arm64/boot/dts/ti/k3-am642-sk.dts | 1 -
>> I think you missed to update all non TI boards.
> Not sure which boards are you referring to.
>
> I would not change the verdin-am62 boards, the bus-width there is
> consistent with the schematics, it's just correct and in the right place
> IMO.
Ah, yes. Agree.
>
> Francesco
>
@@ -559,9 +559,9 @@ sdhci0: mmc@fa10000 {
clock-names = "clk_ahb", "clk_xin";
assigned-clocks = <&k3_clks 57 6>;
assigned-clock-parents = <&k3_clks 57 8>;
+ bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
- bus-width = <8>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-mmc-hs = <0x0>;
@@ -579,6 +579,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>;
@@ -591,7 +592,6 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sd-hs = <0x1>;
ti,itap-del-sel-sdr12 = <0xa>;
ti,itap-del-sel-sdr25 = <0x1>;
- bus-width = <4>;
status = "disabled";
};
@@ -602,6 +602,7 @@ sdhci2: mmc@fa20000 {
power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>;
@@ -842,7 +842,6 @@ &sdhci2 {
vmmc-supply = <&wlan_en>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_pins_default>, <&wifi_32k_clk>;
- bus-width = <4>;
non-removable;
ti,fails-without-test-cd;
cap-power-off-card;
@@ -561,6 +561,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
@@ -573,7 +574,6 @@ sdhci1: mmc@fa00000 {
ti,itap-del-sel-sd-hs = <0x0>;
ti,itap-del-sel-sdr12 = <0x0>;
ti,itap-del-sel-sdr25 = <0x0>;
- bus-width = <4>;
no-1-8-v;
status = "disabled";
};
@@ -626,6 +626,7 @@ sdhci0: mmc@fa10000 {
power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 57 0>, <&k3_clks 57 1>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <8>;
mmc-ddr-1_8v;
mmc-hs200-1_8v;
ti,clkbuf-sel = <0x7>;
@@ -647,6 +648,7 @@ sdhci1: mmc@fa00000 {
power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>;
clocks = <&k3_clks 58 3>, <&k3_clks 58 4>;
clock-names = "clk_ahb", "clk_xin";
+ bus-width = <4>;
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-sd-hs = <0x0>;
@@ -494,7 +494,6 @@ eeprom@0 {
/* eMMC */
&sdhci0 {
status = "okay";
- bus-width = <8>;
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
@@ -506,7 +505,6 @@ &sdhci1 {
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
- bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp;
};
@@ -469,7 +469,6 @@ &sdhci1 {
status = "okay";
vmmc-supply = <&vdd_mmc1>;
pinctrl-names = "default";
- bus-width = <4>;
pinctrl-0 = <&main_mmc1_pins_default>;
disable-wp;
};