[PATCH v2 0/5] Misc MMC updates

[PATCH v2 0/5] Misc MMC updates

[Judith Mendez]

This patch series includes updates for eMMC and SD nodes across
Sitara K3 SoC boards:

Set eMMC clock parents to default to avoid any potential issues with
non-glitch free muxes when switching eMMC PLL source.
Add boot phase flag to MMC nodes and dependency nodes to support SD and
eMMC boot. 
Add missing itapdlysel for default speed and high speed SDR modes on
am65x SoC. 
Add non-removable flag to eMMC nodes to void having to redetect
eMMC after suspend/resume.
Remove disable-wp for eMMC nodes since property is specific to SD.

Changes since v1:
- Add patch 1 and 2
- remove disable-wp for more boards with eMMCs

Link to v1:
- https://lore.kernel.org/linux-devicetree/20241014194722.358444-1-jm@ti.com/

Judith Mendez (5):
  arm64: dts: ti: k3-am6*: Set eMMC clock parents to default
  arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot
  arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0
  arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC
  arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC

 arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts             | 12 ++++++++++++
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi             |  2 --
 arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi      |  1 -
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts       |  2 +-
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi            |  2 --
 arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi     |  1 -
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts              |  3 ++-
 .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi      |  2 --
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts              |  2 +-
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi       |  2 +-
 arch/arm64/boot/dts/ti/k3-am642-evm.dts              |  1 -
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi             |  2 ++
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts       |  1 -
 .../dts/ti/k3-am6548-iot2050-advanced-common.dtsi    |  1 -
 arch/arm64/boot/dts/ti/k3-am69-sk.dts                |  1 -
 15 files changed, 19 insertions(+), 16 deletions(-)

-- 
2.49.0

[PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Judith Mendez]

Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
for eMMC. This change is necessary since DM is not implementing the
correct procedure to switch PLL clock source for eMMC and we have a
non-glich-free mux. To remove any potential issues, lets switch back to
the defaults.

Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral nodes")
Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0 instance")
Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
 arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
 3 files changed, 6 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 7d355aa73ea21..0c286f600296c 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -552,8 +552,6 @@ sdhci0: mmc@fa10000 {
 		power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 57 5>, <&k3_clks 57 6>;
 		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;
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
index a1daba7b1fad5..455ccc770f16a 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-main.dtsi
@@ -575,8 +575,6 @@ sdhci0: mmc@fa10000 {
 		power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 57 5>, <&k3_clks 57 6>;
 		clock-names = "clk_ahb", "clk_xin";
-		assigned-clocks = <&k3_clks 57 6>;
-		assigned-clock-parents = <&k3_clks 57 8>;
 		bus-width = <8>;
 		mmc-hs200-1_8v;
 		ti,clkbuf-sel = <0x7>;
diff --git a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
index 6e3beb5c2e010..f9b5c97518d68 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi
@@ -564,8 +564,6 @@ sdhci0: mmc@fa10000 {
 		power-domains = <&k3_pds 57 TI_SCI_PD_EXCLUSIVE>;
 		clocks = <&k3_clks 57 1>, <&k3_clks 57 2>;
 		clock-names = "clk_ahb", "clk_xin";
-		assigned-clocks = <&k3_clks 57 2>;
-		assigned-clock-parents = <&k3_clks 57 4>;
 		bus-width = <8>;
 		mmc-ddr-1_8v;
 		mmc-hs200-1_8v;
-- 
2.49.0

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Kumar, Udit]

On 4/18/2025 5:00 AM, Judith Mendez wrote:
> Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
> for eMMC. This change is necessary since DM is not implementing the
> correct procedure to switch PLL clock source for eMMC and we have a
> non-glich-free mux. To remove any potential issues, lets switch back to
> the defaults.

IMO, we need to fix DM  if not then documentation [0] .

Then only this patch is ok because as per document [0]

removed clock by this patch is valid parent for eMMC.

[0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html

Thanks

Udit

>
> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral nodes")
> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0 instance")
> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>   arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>   arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>   3 files changed, 6 deletions(-)
>
> [..]

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Judith Mendez]

Hi Udit,

On 4/19/25 10:00 AM, Kumar, Udit wrote:
> 
> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>> Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
>> for eMMC. This change is necessary since DM is not implementing the
>> correct procedure to switch PLL clock source for eMMC and we have a
>> non-glich-free mux. To remove any potential issues, lets switch back to
>> the defaults.
> 
> IMO, we need to fix DM  if not then documentation [0] .

DM cannot be fixed for only one IP and documentation says what clock
parents are supported, it does not have to say what are the issues
that come with using a specific clock parent.

> 
> Then only this patch is ok because as per document [0]
> 
> removed clock by this patch is valid parent for eMMC.

The clock parent currently set is a valid parent, but we have non-
glitch-free muxes and to avoid any potential issues with these, we
should switch back to the defaults. It seems like we randomly switched
from the default for no good reason and it has been copy paste per
platforms since then, so we are switching back to the defaults now.

~ Judith

> 
> [0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
> 
> Thanks
> 
> Udit
> 
>>
>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral 
>> nodes")
>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0 
>> instance")
>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
>> Signed-off-by: Judith Mendez <jm@ti.com>
>> ---
>>   arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>   arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>   arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>   3 files changed, 6 deletions(-)
>>
>> [..]

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Kumar, Udit]

Thanks Judith

On 4/21/2025 8:06 PM, Judith Mendez wrote:
> Hi Udit,
>
> On 4/19/25 10:00 AM, Kumar, Udit wrote:
>>
>> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>>> Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
>>> for eMMC. This change is necessary since DM is not implementing the
>>> correct procedure to switch PLL clock source for eMMC and we have a
>>> non-glich-free mux. To remove any potential issues, lets switch back to
>>> the defaults.
>>
>> IMO, we need to fix DM  if not then documentation [0] .
>
> DM cannot be fixed for only one IP and documentation says what clock
> parents are supported, it does not have to say what are the issues
> that come with using a specific clock parent.
>
>>
>> Then only this patch is ok because as per document [0]
>>
>> removed clock by this patch is valid parent for eMMC.
>
> The clock parent currently set is a valid parent, but we have non-
> glitch-free muxes and to avoid any potential issues with these, we
> should switch back to the defaults. It seems like we randomly switched
> from the default for no good reason and it has been copy paste per
> platforms since then, so we are switching back to the defaults now.
>
So, if you are saying parent 
3(DEV_MMCSD0_EMMCSS_XIN_CLK_PARENT_POSTDIV4_16FF_MAIN_0_HSDIVOUT5_CLK)
and 
4(DEV_MMCSD0_EMMCSS_XIN_CLK_PARENT_HSDIV4_16FFT_MAIN_2_HSDIVOUT2_CLK) 
can produce a glitch while
clock selection then we should document that in clocking section,
and with note, what care to be taken when above are selected as parent.
Thanks
Udit
> ~ Judith
>
>>
>> [0] 
>> https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
>>
>> Thanks
>>
>> Udit
>>
>>>
>>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral 
>>> nodes")
>>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0 
>>> instance")
>>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more 
>>> IPs")
>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>> ---
>>>   arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>>   arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>>   arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>>   3 files changed, 6 deletions(-)
>>>
>>> [..]
>

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Nishanth Menon]

On 09:36-20250421, Judith Mendez wrote:
> Hi Udit,
> 
> On 4/19/25 10:00 AM, Kumar, Udit wrote:
> > 
> > On 4/18/2025 5:00 AM, Judith Mendez wrote:
> > > Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
> > > for eMMC. This change is necessary since DM is not implementing the
> > > correct procedure to switch PLL clock source for eMMC and we have a
> > > non-glich-free mux. To remove any potential issues, lets switch back to
> > > the defaults.
> > 
> > IMO, we need to fix DM  if not then documentation [0] .
> 
> DM cannot be fixed for only one IP and documentation says what clock
> parents are supported, it does not have to say what are the issues
> that come with using a specific clock parent.

As I understand the arasan IP requirement is that the IP must be held in
reset while the clock is switched, which is not reasonable to implement
given decoupled systems like DM and Linux OS.

> 
> > 
> > Then only this patch is ok because as per document [0]
> > 
> > removed clock by this patch is valid parent for eMMC.
> 
> The clock parent currently set is a valid parent, but we have non-
> glitch-free muxes and to avoid any potential issues with these, we
> should switch back to the defaults. It seems like we randomly switched
> from the default for no good reason and it has been copy paste per
> platforms since then, so we are switching back to the defaults now.
> 
> ~ Judith
> 
> > 
> > [0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
> > 
> > Thanks
> > 
> > Udit
> > 
> > > 
> > > Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral
> > > nodes")
> > > Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0
> > > instance")
> > > Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")

Please follow ./Documentation/process/stable-kernel-rules.rst - this is
easier to backport if these were to be split into 3 different patches.
Please do not forget to add Cc: stable@vger.kernel.org as per the rules
as well.

> > > Signed-off-by: Judith Mendez <jm@ti.com>
> > > ---
> > >   arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
> > >   arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
> > >   arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
> > >   3 files changed, 6 deletions(-)
> > > 
> > > [..]
> 

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Kumar, Udit]

On 4/22/2025 6:07 PM, Nishanth Menon wrote:
> On 09:36-20250421, Judith Mendez wrote:
>> Hi Udit,
>>
>> On 4/19/25 10:00 AM, Kumar, Udit wrote:
>>> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>>>> Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
>>>> for eMMC. This change is necessary since DM is not implementing the
>>>> correct procedure to switch PLL clock source for eMMC and we have a
>>>> non-glich-free mux. To remove any potential issues, lets switch back to
>>>> the defaults.
>>> IMO, we need to fix DM  if not then documentation [0] .
>> DM cannot be fixed for only one IP and documentation says what clock
>> parents are supported, it does not have to say what are the issues
>> that come with using a specific clock parent.
> As I understand the arasan IP requirement is that the IP must be held in
> reset while the clock is switched, which is not reasonable to implement
> given decoupled systems like DM and Linux OS.


Thanks , then fix should be extended to sdhci1 as well


>
>>> Then only this patch is ok because as per document [0]
>>>
>>> removed clock by this patch is valid parent for eMMC.
>> The clock parent currently set is a valid parent, but we have non-
>> glitch-free muxes and to avoid any potential issues with these, we
>> should switch back to the defaults. It seems like we randomly switched
>> from the default for no good reason and it has been copy paste per
>> platforms since then, so we are switching back to the defaults now.
>>
>> ~ Judith
>>
>>> [0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
>>>
>>> Thanks
>>>
>>> Udit
>>>
>>>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral
>>>> nodes")
>>>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0
>>>> instance")
>>>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
> Please follow ./Documentation/process/stable-kernel-rules.rst - this is
> easier to backport if these were to be split into 3 different patches.
> Please do not forget to add Cc: stable@vger.kernel.org as per the rules
> as well.
>
>>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>>> ---
>>>>    arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>>>    arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>>>    arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>>>    3 files changed, 6 deletions(-)
>>>>
>>>> [..]

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Judith Mendez]

Hi Udit,

On 4/22/25 9:08 AM, Kumar, Udit wrote:
> 
> On 4/22/2025 6:07 PM, Nishanth Menon wrote:
>> On 09:36-20250421, Judith Mendez wrote:
>>> Hi Udit,
>>>
>>> On 4/19/25 10:00 AM, Kumar, Udit wrote:
>>>> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>>>>> Set eMMC clock parents to the defaults which is 
>>>>> MAIN_PLL0_HSDIV5_CLKOUT
>>>>> for eMMC. This change is necessary since DM is not implementing the
>>>>> correct procedure to switch PLL clock source for eMMC and we have a
>>>>> non-glich-free mux. To remove any potential issues, lets switch 
>>>>> back to
>>>>> the defaults.
>>>> IMO, we need to fix DM  if not then documentation [0] .
>>> DM cannot be fixed for only one IP and documentation says what clock
>>> parents are supported, it does not have to say what are the issues
>>> that come with using a specific clock parent.
>> As I understand the arasan IP requirement is that the IP must be held in
>> reset while the clock is switched, which is not reasonable to implement
>> given decoupled systems like DM and Linux OS.
> 
> 
> Thanks , then fix should be extended to sdhci1 as well

sdhci1 and sdhci2 should already be using the defaults: 
https://gist.github.com/jmenti/e280232ae3d5bb5097df7b0f04c85e8a
This change is only needed for eMMC.

~ Judith

> 
> 
>>
>>>> Then only this patch is ok because as per document [0]
>>>>
>>>> removed clock by this patch is valid parent for eMMC.
>>> The clock parent currently set is a valid parent, but we have non-
>>> glitch-free muxes and to avoid any potential issues with these, we
>>> should switch back to the defaults. It seems like we randomly switched
>>> from the default for no good reason and it has been copy paste per
>>> platforms since then, so we are switching back to the defaults now.
>>>
>>> ~ Judith
>>>
>>>> [0] 
>>>> https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
>>>>
>>>> Thanks
>>>>
>>>> Udit
>>>>
>>>>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral
>>>>> nodes")
>>>>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0
>>>>> instance")
>>>>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more 
>>>>> IPs")
>> Please follow ./Documentation/process/stable-kernel-rules.rst - this is
>> easier to backport if these were to be split into 3 different patches.
>> Please do not forget to add Cc: stable@vger.kernel.org as per the rules
>> as well.
>>
>>>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>>>> ---
>>>>>    arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>>>>    arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>>>>    arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>>>>    3 files changed, 6 deletions(-)
>>>>>
>>>>> [..]

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Kumar, Udit]

On 4/22/2025 10:47 PM, Judith Mendez wrote:
> Hi Udit,
>
> On 4/22/25 9:08 AM, Kumar, Udit wrote:
>>
>> On 4/22/2025 6:07 PM, Nishanth Menon wrote:
>>> On 09:36-20250421, Judith Mendez wrote:
>>>> Hi Udit,
>>>>
>>>> On 4/19/25 10:00 AM, Kumar, Udit wrote:
>>>>> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>>>>>> Set eMMC clock parents to the defaults which is 
>>>>>> MAIN_PLL0_HSDIV5_CLKOUT
>>>>>> for eMMC. This change is necessary since DM is not implementing the
>>>>>> correct procedure to switch PLL clock source for eMMC and we have a
>>>>>> non-glich-free mux. To remove any potential issues, lets switch 
>>>>>> back to
>>>>>> the defaults.
>>>>> IMO, we need to fix DM  if not then documentation [0] .
>>>> DM cannot be fixed for only one IP and documentation says what clock
>>>> parents are supported, it does not have to say what are the issues
>>>> that come with using a specific clock parent.
>>> As I understand the arasan IP requirement is that the IP must be 
>>> held in
>>> reset while the clock is switched, which is not reasonable to implement
>>> given decoupled systems like DM and Linux OS.
>>
>>
>> Thanks , then fix should be extended to sdhci1 as well
>
> sdhci1 and sdhci2 should already be using the defaults: 
> https://gist.github.com/jmenti/e280232ae3d5bb5097df7b0f04c85e8a
> This change is only needed for eMMC.
>
> ~ Judith

Ok, thanks for confirmation


Acked-by: Udit Kumar <u-kumar1@ti.com>


>
>>
>>
>>>
>>>>> Then only this patch is ok because as per document [0]
>>>>>
>>>>> removed clock by this patch is valid parent for eMMC.
>>>> The clock parent currently set is a valid parent, but we have non-
>>>> glitch-free muxes and to avoid any potential issues with these, we
>>>> should switch back to the defaults. It seems like we randomly switched
>>>> from the default for no good reason and it has been copy paste per
>>>> platforms since then, so we are switching back to the defaults now.
>>>>
>>>> ~ Judith
>>>>
>>>>> [0] 
>>>>> https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html 
>>>>>
>>>>>
>>>>> Thanks
>>>>>
>>>>> Udit
>>>>>
>>>>>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral
>>>>>> nodes")
>>>>>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0
>>>>>> instance")
>>>>>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for 
>>>>>> more IPs")
>>> Please follow ./Documentation/process/stable-kernel-rules.rst - this is
>>> easier to backport if these were to be split into 3 different patches.
>>> Please do not forget to add Cc: stable@vger.kernel.org as per the rules
>>> as well.
>>>
>>>>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>>>>> ---
>>>>>> arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>>>>> arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>>>>> arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>>>>>    3 files changed, 6 deletions(-)
>>>>>>
>>>>>> [..]
>

Re: [PATCH v2 1/5] arm64: dts: ti: k3-am6*: Set eMMC clock parents to default

[Judith Mendez]

Hi Nishanth,

On 4/22/25 7:37 AM, Nishanth Menon wrote:
> On 09:36-20250421, Judith Mendez wrote:
>> Hi Udit,
>>
>> On 4/19/25 10:00 AM, Kumar, Udit wrote:
>>>
>>> On 4/18/2025 5:00 AM, Judith Mendez wrote:
>>>> Set eMMC clock parents to the defaults which is MAIN_PLL0_HSDIV5_CLKOUT
>>>> for eMMC. This change is necessary since DM is not implementing the
>>>> correct procedure to switch PLL clock source for eMMC and we have a
>>>> non-glich-free mux. To remove any potential issues, lets switch back to
>>>> the defaults.
>>>
>>> IMO, we need to fix DM  if not then documentation [0] .
>>
>> DM cannot be fixed for only one IP and documentation says what clock
>> parents are supported, it does not have to say what are the issues
>> that come with using a specific clock parent.
> 
> As I understand the arasan IP requirement is that the IP must be held in
> reset while the clock is switched, which is not reasonable to implement
> given decoupled systems like DM and Linux OS.
> 
>>
>>>
>>> Then only this patch is ok because as per document [0]
>>>
>>> removed clock by this patch is valid parent for eMMC.
>>
>> The clock parent currently set is a valid parent, but we have non-
>> glitch-free muxes and to avoid any potential issues with these, we
>> should switch back to the defaults. It seems like we randomly switched
>> from the default for no good reason and it has been copy paste per
>> platforms since then, so we are switching back to the defaults now.
>>
>> ~ Judith
>>
>>>
>>> [0] https://software-dl.ti.com/tisci/esd/latest/5_soc_doc/j722s/clocks.html
>>>
>>> Thanks
>>>
>>> Udit
>>>
>>>>
>>>> Fixes: c37c58fdeb8a ("arm64: dts: ti: k3-am62: Add more peripheral
>>>> nodes")
>>>> Fixes: d3ae4e8d8b6a ("arm64: dts: ti: k3-am62a-main: Add sdhci0
>>>> instance")
>>>> Fixes: b5080c7c1f7e ("arm64: dts: ti: k3-am62p: Add nodes for more IPs")
> 
> Please follow ./Documentation/process/stable-kernel-rules.rst - this is
> easier to backport if these were to be split into 3 different patches.
> Please do not forget to add Cc: stable@vger.kernel.org as per the rules
> as well.

Understood, will split-up this series and respin, thanks.

~ Judith

> 
>>>> Signed-off-by: Judith Mendez <jm@ti.com>
>>>> ---
>>>>    arch/arm64/boot/dts/ti/k3-am62-main.dtsi               | 2 --
>>>>    arch/arm64/boot/dts/ti/k3-am62a-main.dtsi              | 2 --
>>>>    arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 2 --
>>>>    3 files changed, 6 deletions(-)
>>>>
>>>> [..]
>>
> 

[PATCH v2 2/5] arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot

[Judith Mendez]

The bootph-all flag was introduced in dt-schema
(dtschema/schemas/bootph.yaml) to define node usage across
different boot phases.

For eMMC and SD boot modes, voltage regulator nodes, io-expander
nodes, gpio nodes, and MMC nodes need to be present in all boot
stages, so add missing bootph-all phase flag to these nodes to
support SD boot and eMMC boot.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 12 ++++++++++++
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts  |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
index 8e9fc00a6b3c7..aafdb90c0eb70 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
@@ -69,6 +69,7 @@ vddshv_sdio: regulator-4 {
 		gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
 		states = <1800000 0x0>,
 			 <3300000 0x1>;
+		bootph-all;
 	};
 };
 
@@ -77,12 +78,14 @@ vddshv_sdio_pins_default: vddshv-sdio-default-pins {
 		pinctrl-single,pins = <
 			AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
 		>;
+		bootph-all;
 	};
 
 	main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
 		pinctrl-single,pins = <
 			AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */
 		>;
+		bootph-all;
 	};
 
 	pmic_irq_pins_default: pmic-irq-default-pins {
@@ -118,6 +121,7 @@ exp1: gpio@22 {
 
 		pinctrl-names = "default";
 		pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>;
+		bootph-all;
 	};
 
 	exp2: gpio@23 {
@@ -229,6 +233,14 @@ &tlv320aic3106 {
 	DVDD-supply = <&buck2_reg>;
 };
 
+&main_gpio0 {
+	bootph-all;
+};
+
+&main_gpio1 {
+	bootph-all;
+};
+
 &gpmc0 {
 	ranges = <0 0 0x00 0x51000000 0x01000000>; /* CS0 space. Min partition = 16MB */
 };
diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
index 1c9d95696c839..7de4a9f139ad4 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
@@ -313,6 +313,7 @@ AM62AX_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
 			AM62AX_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
 			AM62AX_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
 		>;
+		bootph-all;
 	};
 
 	main_mmc1_pins_default: main-mmc1-default-pins {
@@ -615,6 +616,7 @@ &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
 	disable-wp;
+	bootph-all;
 };
 
 &sdhci1 {
-- 
2.49.0

Re: [PATCH v2 2/5] arm64: dts: ti: k3-am6*: Add boot phase flag to support MMC boot

[Moteen Shah]

Hey Judith,

On 18/04/25 05:00, Judith Mendez wrote:
> The bootph-all flag was introduced in dt-schema
> (dtschema/schemas/bootph.yaml) to define node usage across
> different boot phases.
>
> For eMMC and SD boot modes, voltage regulator nodes, io-expander
> nodes, gpio nodes, and MMC nodes need to be present in all boot
> stages, so add missing bootph-all phase flag to these nodes to
> support SD boot and eMMC boot.
>
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 12 ++++++++++++
>   arch/arm64/boot/dts/ti/k3-am62a7-sk.dts  |  2 ++
>   2 files changed, 14 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
> index 8e9fc00a6b3c7..aafdb90c0eb70 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts
> @@ -69,6 +69,7 @@ vddshv_sdio: regulator-4 {
>   		gpios = <&main_gpio0 31 GPIO_ACTIVE_HIGH>;
>   		states = <1800000 0x0>,
>   			 <3300000 0x1>;
> +		bootph-all;
>   	};
>   };
>   
> @@ -77,12 +78,14 @@ vddshv_sdio_pins_default: vddshv-sdio-default-pins {
>   		pinctrl-single,pins = <
>   			AM62X_IOPAD(0x07c, PIN_OUTPUT, 7) /* (M19) GPMC0_CLK.GPIO0_31 */
>   		>;
> +		bootph-all;
>   	};
>   
>   	main_gpio1_ioexp_intr_pins_default: main-gpio1-ioexp-intr-default-pins {
>   		pinctrl-single,pins = <
>   			AM62X_IOPAD(0x01d4, PIN_INPUT, 7) /* (C13) UART0_RTSn.GPIO1_23 */
>   		>;
> +		bootph-all;
>   	};
>   
>   	pmic_irq_pins_default: pmic-irq-default-pins {
> @@ -118,6 +121,7 @@ exp1: gpio@22 {
>   
>   		pinctrl-names = "default";
>   		pinctrl-0 = <&main_gpio1_ioexp_intr_pins_default>;
> +		bootph-all;
>   	};
>   
>   	exp2: gpio@23 {
> @@ -229,6 +233,14 @@ &tlv320aic3106 {
>   	DVDD-supply = <&buck2_reg>;
>   };
>   
> +&main_gpio0 {
> +	bootph-all;
> +};
> +
> +&main_gpio1 {
> +	bootph-all;
> +};
> +
>   &gpmc0 {
>   	ranges = <0 0 0x00 0x51000000 0x01000000>; /* CS0 space. Min partition = 16MB */
>   };
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> index 1c9d95696c839..7de4a9f139ad4 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> @@ -313,6 +313,7 @@ AM62AX_IOPAD(0x200, PIN_INPUT_PULLUP, 0) /* (AC1) MMC0_DAT5 */
>   			AM62AX_IOPAD(0x1fc, PIN_INPUT_PULLUP, 0) /* (AD2) MMC0_DAT6 */
>   			AM62AX_IOPAD(0x1f8, PIN_INPUT_PULLUP, 0) /* (AC2) MMC0_DAT7 */
>   		>;
> +		bootph-all;
>   	};
>   
>   	main_mmc1_pins_default: main-mmc1-default-pins {
> @@ -615,6 +616,7 @@ &sdhci0 {
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&main_mmc0_pins_default>;
>   	disable-wp;
> +	bootph-all;
>   };
>   

Do we have the bootph-all flags in *-uboot.dtsi for the board to boot up?
If yes we will have to clean that up after this series gets merged.

Reviewed-by: Moteen Shah <m-shah@ti.com>

Regards,
Moteen Shah

>   &sdhci1 {

[PATCH v2 3/5] arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0

[Judith Mendez]

For am65x, add missing ITAPDLYSEL values for Default Speed and High
Speed SDR modes to sdhci0 node according to the device datasheet [0].

Fixes: eac99d38f861 ("arm64: dts: ti: k3-am654-main: Update otap-del-sel values")
[0] https://www.ti.com/lit/gpn/am6548
Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 94a812a1355ba..5ebf7ada6e485 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -449,6 +449,8 @@ sdhci0: mmc@4f80000 {
 		ti,otap-del-sel-mmc-hs = <0x0>;
 		ti,otap-del-sel-ddr52 = <0x5>;
 		ti,otap-del-sel-hs200 = <0x5>;
+		ti,itap-del-sel-legacy = <0xa>;
+		ti,itap-del-sel-mmc-hs = <0x1>;
 		ti,itap-del-sel-ddr52 = <0x0>;
 		dma-coherent;
 		status = "disabled";
-- 
2.49.0

Re: [PATCH v2 3/5] arm64: dts: ti: k3-am65-main: Add missing taps to sdhci0

[Moteen Shah]

On 18/04/25 05:00, Judith Mendez wrote:
> For am65x, add missing ITAPDLYSEL values for Default Speed and High
> Speed SDR modes to sdhci0 node according to the device datasheet [0].
>
> Fixes: eac99d38f861 ("arm64: dts: ti: k3-am654-main: Update otap-del-sel values")
> [0] https://www.ti.com/lit/gpn/am6548
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> index 94a812a1355ba..5ebf7ada6e485 100644
> --- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
> @@ -449,6 +449,8 @@ sdhci0: mmc@4f80000 {
>   		ti,otap-del-sel-mmc-hs = <0x0>;
>   		ti,otap-del-sel-ddr52 = <0x5>;
>   		ti,otap-del-sel-hs200 = <0x5>;
> +		ti,itap-del-sel-legacy = <0xa>;
> +		ti,itap-del-sel-mmc-hs = <0x1>;

Reviewed-by: Moteen Shah <m-shah@ti.com>

>   		ti,itap-del-sel-ddr52 = <0x0>;
>   		dma-coherent;
>   		status = "disabled";

[PATCH v2 4/5] arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC

[Judith Mendez]

EMMC device is non-removable so add 'non-removable' DT
property to avoid having to redetect the eMMC after
suspend/resume.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 +
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts        | 1 +
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 1 +
 3 files changed, 3 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
index a5469f2712f09..1c8b4d13fb491 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
@@ -832,6 +832,7 @@ &main_spi2 {
 
 &sdhci0 {
 	bootph-all;
+	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_pins_default>;
 	disable-wp;
diff --git a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
index d29f524600af0..43fcb57b34ebf 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
@@ -454,6 +454,7 @@ &main_i2c2 {
 
 &sdhci0 {
 	status = "okay";
+	non-removable;
 	ti,driver-strength-ohm = <50>;
 	disable-wp;
 	bootph-all;
diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
index d52cb2a5a589a..561916c6e151c 100644
--- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
@@ -434,6 +434,7 @@ &main_i2c2 {
 &sdhci0 {
 	bootph-all;
 	status = "okay";
+	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
 	disable-wp;
-- 
2.49.0

Re: [PATCH v2 4/5] arm64: dts: ti: k3-am62*: Add non-removable flag for eMMC

[Kumar, Udit]

On 4/18/2025 5:00 AM, Judith Mendez wrote:
> EMMC device is non-removable so add 'non-removable' DT
> property to avoid having to redetect the eMMC after
> suspend/resume.
>
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 1 +
>   arch/arm64/boot/dts/ti/k3-am62p5-sk.dts        | 1 +
>   arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 1 +
>   3 files changed, 3 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> index a5469f2712f09..1c8b4d13fb491 100644
> --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> @@ -832,6 +832,7 @@ &main_spi2 {
>   
>   &sdhci0 {
>   	bootph-all;
> +	non-removable;
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&emmc_pins_default>;
>   	disable-wp;


Reviewed-by: Udit Kumar <u-kumar1@ti.com>

> diff --git a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> index d29f524600af0..43fcb57b34ebf 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> @@ -454,6 +454,7 @@ &main_i2c2 {
> [..]

[PATCH v2 5/5] arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC

[Judith Mendez]

Remove disable-wp flag for eMMC nodes since this flag is
only applicable to SD according to the binding doc
(mmc/mmc-controller-common.yaml).

For eMMC, this flag should be ignored but lets remove
anyways to cleanup sdhci nodes.

Signed-off-by: Judith Mendez <jm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi               | 1 -
 arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts                | 1 -
 arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi              | 1 -
 arch/arm64/boot/dts/ti/k3-am62a7-sk.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am62p5-sk.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi                | 1 -
 arch/arm64/boot/dts/ti/k3-am642-evm.dts                       | 1 -
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts                | 1 -
 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 1 -
 arch/arm64/boot/dts/ti/k3-am69-sk.dts                         | 1 -
 10 files changed, 10 deletions(-)

diff --git a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
index 55ed418c023bc..e5be92aa12189 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
@@ -381,7 +381,6 @@ serial_flash: flash@0 {
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	non-removable;
 	bootph-all;
 	status = "okay";
diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
index 1c8b4d13fb491..72b09f9c69d8c 100644
--- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
+++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
@@ -835,7 +835,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&emmc_pins_default>;
-	disable-wp;
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
index 147d56b879843..0d4115590b9c3 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
@@ -338,7 +338,6 @@ serial_flash: flash@0 {
 &sdhci0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	non-removable;
 	bootph-all;
 	status = "okay";
diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
index 7de4a9f139ad4..625ce8f8958b7 100644
--- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
@@ -615,7 +615,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 	bootph-all;
 };
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
index 43fcb57b34ebf..1025062c77d57 100644
--- a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
@@ -456,7 +456,6 @@ &sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 	bootph-all;
 };
 
diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
index 561916c6e151c..9d933e837dd4b 100644
--- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
@@ -437,7 +437,6 @@ &sdhci0 {
 	non-removable;
 	pinctrl-names = "default";
 	pinctrl-0 = <&main_mmc0_pins_default>;
-	disable-wp;
 };
 
 &sdhci1 {
diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
index f8ec40523254b..5c6197ba842e4 100644
--- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
+++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
@@ -597,7 +597,6 @@ &sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 	bootph-all;
 };
 
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index aa7139cc8a92b..c30425960398e 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -456,7 +456,6 @@ &sdhci0 {
 	bus-width = <8>;
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
 
 /*
diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
index ae842b85b70de..12af6cb7f65cf 100644
--- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
@@ -50,5 +50,4 @@ &sdhci0 {
 	bus-width = <8>;
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
diff --git a/arch/arm64/boot/dts/ti/k3-am69-sk.dts b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
index b85227052f97e..f28375629739c 100644
--- a/arch/arm64/boot/dts/ti/k3-am69-sk.dts
+++ b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
@@ -940,7 +940,6 @@ &main_sdhci0 {
 	status = "okay";
 	non-removable;
 	ti,driver-strength-ohm = <50>;
-	disable-wp;
 };
 
 &main_sdhci1 {
-- 
2.49.0

Re: [PATCH v2 5/5] arm64: dts: ti: k3-am6*: Remove disable-wp for eMMC

[Moteen Shah]

On 18/04/25 05:00, Judith Mendez wrote:
> Remove disable-wp flag for eMMC nodes since this flag is
> only applicable to SD according to the binding doc
> (mmc/mmc-controller-common.yaml).
>
> For eMMC, this flag should be ignored but lets remove
> anyways to cleanup sdhci nodes.
>
> Signed-off-by: Judith Mendez <jm@ti.com>
> ---
>   arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi               | 1 -
>   arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts                | 1 -
>   arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi              | 1 -
>   arch/arm64/boot/dts/ti/k3-am62a7-sk.dts                       | 1 -
>   arch/arm64/boot/dts/ti/k3-am62p5-sk.dts                       | 1 -
>   arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi                | 1 -
>   arch/arm64/boot/dts/ti/k3-am642-evm.dts                       | 1 -
>   arch/arm64/boot/dts/ti/k3-am654-base-board.dts                | 1 -
>   arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi | 1 -
>   arch/arm64/boot/dts/ti/k3-am69-sk.dts                         | 1 -
>   10 files changed, 10 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
> index 55ed418c023bc..e5be92aa12189 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi
> @@ -381,7 +381,6 @@ serial_flash: flash@0 {
>   &sdhci0 {
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&main_mmc0_pins_default>;
> -	disable-wp;
>   	non-removable;
>   	bootph-all;
>   	status = "okay";
> diff --git a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> index 1c8b4d13fb491..72b09f9c69d8c 100644
> --- a/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts
> @@ -835,7 +835,6 @@ &sdhci0 {
>   	non-removable;
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&emmc_pins_default>;
> -	disable-wp;
>   	status = "okay";
>   };
>   
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> index 147d56b879843..0d4115590b9c3 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi
> @@ -338,7 +338,6 @@ serial_flash: flash@0 {
>   &sdhci0 {
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&main_mmc0_pins_default>;
> -	disable-wp;
>   	non-removable;
>   	bootph-all;
>   	status = "okay";
> diff --git a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> index 7de4a9f139ad4..625ce8f8958b7 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62a7-sk.dts
> @@ -615,7 +615,6 @@ &sdhci0 {
>   	non-removable;
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&main_mmc0_pins_default>;
> -	disable-wp;
>   	bootph-all;
>   };
>   
> diff --git a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> index 43fcb57b34ebf..1025062c77d57 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am62p5-sk.dts
> @@ -456,7 +456,6 @@ &sdhci0 {
>   	status = "okay";
>   	non-removable;
>   	ti,driver-strength-ohm = <50>;
> -	disable-wp;
>   	bootph-all;
>   };
>   
> diff --git a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> index 561916c6e151c..9d933e837dd4b 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
> @@ -437,7 +437,6 @@ &sdhci0 {
>   	non-removable;
>   	pinctrl-names = "default";
>   	pinctrl-0 = <&main_mmc0_pins_default>;
> -	disable-wp;
>   };
>   
>   &sdhci1 {
> diff --git a/arch/arm64/boot/dts/ti/k3-am642-evm.dts b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> index f8ec40523254b..5c6197ba842e4 100644
> --- a/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am642-evm.dts
> @@ -597,7 +597,6 @@ &sdhci0 {
>   	status = "okay";
>   	non-removable;
>   	ti,driver-strength-ohm = <50>;
> -	disable-wp;
>   	bootph-all;
>   };
>   
> diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> index aa7139cc8a92b..c30425960398e 100644
> --- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
> @@ -456,7 +456,6 @@ &sdhci0 {
>   	bus-width = <8>;
>   	non-removable;
>   	ti,driver-strength-ohm = <50>;
> -	disable-wp;
>   };
>   
>   /*
> diff --git a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
> index ae842b85b70de..12af6cb7f65cf 100644
> --- a/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-common.dtsi
> @@ -50,5 +50,4 @@ &sdhci0 {
>   	bus-width = <8>;
>   	non-removable;
>   	ti,driver-strength-ohm = <50>;
> -	disable-wp;
>   };
> diff --git a/arch/arm64/boot/dts/ti/k3-am69-sk.dts b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
> index b85227052f97e..f28375629739c 100644
> --- a/arch/arm64/boot/dts/ti/k3-am69-sk.dts
> +++ b/arch/arm64/boot/dts/ti/k3-am69-sk.dts
> @@ -940,7 +940,6 @@ &main_sdhci0 {
>   	status = "okay";
>   	non-removable;
>   	ti,driver-strength-ohm = <50>;
> -	disable-wp;
>   };

Reviewed-by: Moteen Shah <m-shah@ti.com>

Regards,
Moteen Shah

>   
>   &main_sdhci1 {