[PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Adam Ford]

The sdhci driver has been around for several years, and it supports
the OMAP3 family.  Instead of using the older driver, let's finally
migrate to the newer one.

Signed-off-by: Adam Ford <aford173@gmail.com>

diff --git a/arch/arm/boot/dts/ti/omap/omap3.dtsi b/arch/arm/boot/dts/ti/omap/omap3.dtsi
index 92cd4c99dae7..218d7212c749 100644
--- a/arch/arm/boot/dts/ti/omap/omap3.dtsi
+++ b/arch/arm/boot/dts/ti/omap/omap3.dtsi
@@ -507,7 +507,7 @@ hdqw1w: 1w@480b2000 {
 		};
 
 		mmc1: mmc@4809c000 {
-			compatible = "ti,omap3-hsmmc";
+			compatible = "ti,omap3-sdhci";
 			reg = <0x4809c000 0x200>;
 			interrupts = <83>;
 			ti,hwmods = "mmc1";
@@ -518,7 +518,7 @@ mmc1: mmc@4809c000 {
 		};
 
 		mmc2: mmc@480b4000 {
-			compatible = "ti,omap3-hsmmc";
+			compatible = "ti,omap3-sdhci";
 			reg = <0x480b4000 0x200>;
 			interrupts = <86>;
 			ti,hwmods = "mmc2";
@@ -527,7 +527,7 @@ mmc2: mmc@480b4000 {
 		};
 
 		mmc3: mmc@480ad000 {
-			compatible = "ti,omap3-hsmmc";
+			compatible = "ti,omap3-sdhci";
 			reg = <0x480ad000 0x200>;
 			interrupts = <94>;
 			ti,hwmods = "mmc3";
-- 
2.43.0

Re: [PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Tony Lindgren]

* Adam Ford <aford173@gmail.com> [240213 12:41]:
> The sdhci driver has been around for several years, and it supports
> the OMAP3 family.  Instead of using the older driver, let's finally
> migrate to the newer one.

I think we also should do these to avoid incomplete conversion:

- ti,dual-volt property can be dropped

- ti,non-removable should become non-removable

- ti,omap3-pre-es3-hsmmc probably should not be needed with sdhci

Regards,

Tony

Re: [PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Tony Lindgren]

* Tony Lindgren <tony@atomide.com> [240213 12:56]:
> * Adam Ford <aford173@gmail.com> [240213 12:41]:
> > The sdhci driver has been around for several years, and it supports
> > the OMAP3 family.  Instead of using the older driver, let's finally
> > migrate to the newer one.
> 
> I think we also should do these to avoid incomplete conversion:
> 
> - ti,dual-volt property can be dropped
> 
> - ti,non-removable should become non-removable
> 
> - ti,omap3-pre-es3-hsmmc probably should not be needed with sdhci

Hmm actually we may need to set SDHCI_QUIRK_NO_MULTIBLOCK for
compatible ti,omap3-pre-es3-hsmmc.

Regards,

Tony

Re: [PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Adam Ford]

On Tue, Feb 13, 2024 at 7:02 AM Tony Lindgren <tony@atomide.com> wrote:
>
> * Tony Lindgren <tony@atomide.com> [240213 12:56]:
> > * Adam Ford <aford173@gmail.com> [240213 12:41]:
> > > The sdhci driver has been around for several years, and it supports
> > > the OMAP3 family.  Instead of using the older driver, let's finally
> > > migrate to the newer one.
> >
> > I think we also should do these to avoid incomplete conversion:
> >
> > - ti,dual-volt property can be dropped
> >
> > - ti,non-removable should become non-removable

I'll do a more comprehensive search for these flags.  When I did my
testing on the AM3517, I didn't notice these, but I see now that
others might.  I'll do a multi-patch series to first address the
multi-block, then  omap3-ldp.dts, then migrate the omap3.dtsi to the
new driver while dropping the flags, and lastly update the individual
boards accordingly.  I just have one question below.
> >
> > - ti,omap3-pre-es3-hsmmc probably should not be needed with sdhci
>
> Hmm actually we may need to set SDHCI_QUIRK_NO_MULTIBLOCK for
> compatible ti,omap3-pre-es3-hsmmc.

Should I update the driver and binding to add  ti,omap3-pre-es3-sdhci
to set that flag, or should we create a boolean (maybe
'ti,sdhci-no-multiblock') to the device tree options for that driver?

adam
>
> Regards,
>
> Tony

Re: [PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Tony Lindgren]

* Adam Ford <aford173@gmail.com> [240213 13:29]:
> On Tue, Feb 13, 2024 at 7:02 AM Tony Lindgren <tony@atomide.com> wrote:
> >
> > * Tony Lindgren <tony@atomide.com> [240213 12:56]:
> > > * Adam Ford <aford173@gmail.com> [240213 12:41]:
> > > > The sdhci driver has been around for several years, and it supports
> > > > the OMAP3 family.  Instead of using the older driver, let's finally
> > > > migrate to the newer one.
> > >
> > > I think we also should do these to avoid incomplete conversion:
> > >
> > > - ti,dual-volt property can be dropped
> > >
> > > - ti,non-removable should become non-removable
> 
> I'll do a more comprehensive search for these flags.  When I did my
> testing on the AM3517, I didn't notice these, but I see now that
> others might.  I'll do a multi-patch series to first address the
> multi-block, then  omap3-ldp.dts, then migrate the omap3.dtsi to the
> new driver while dropping the flags, and lastly update the individual
> boards accordingly.  I just have one question below.

OK sounds good to me :)

> > > - ti,omap3-pre-es3-hsmmc probably should not be needed with sdhci
> >
> > Hmm actually we may need to set SDHCI_QUIRK_NO_MULTIBLOCK for
> > compatible ti,omap3-pre-es3-hsmmc.
> 
> Should I update the driver and binding to add  ti,omap3-pre-es3-sdhci
> to set that flag, or should we create a boolean (maybe
> 'ti,sdhci-no-multiblock') to the device tree options for that driver?

Probably best to set up some sdhci generic property for it that then
sets SDHCI_QUIRK_NO_MULTIBLOCK.

Regards,

Tony

Re: [PATCH] arm: dts: omap3: Migrate hsmmc driver to sdhci driver

[Adam Ford]

On Tue, Feb 13, 2024 at 7:36 AM Tony Lindgren <tony@atomide.com> wrote:
>
> * Adam Ford <aford173@gmail.com> [240213 13:29]:
> > On Tue, Feb 13, 2024 at 7:02 AM Tony Lindgren <tony@atomide.com> wrote:
> > >
> > > * Tony Lindgren <tony@atomide.com> [240213 12:56]:
> > > > * Adam Ford <aford173@gmail.com> [240213 12:41]:
> > > > > The sdhci driver has been around for several years, and it supports
> > > > > the OMAP3 family.  Instead of using the older driver, let's finally
> > > > > migrate to the newer one.
> > > >
> > > > I think we also should do these to avoid incomplete conversion:
> > > >
> > > > - ti,dual-volt property can be dropped
> > > >
> > > > - ti,non-removable should become non-removable
> >
> > I'll do a more comprehensive search for these flags.  When I did my
> > testing on the AM3517, I didn't notice these, but I see now that
> > others might.  I'll do a multi-patch series to first address the
> > multi-block, then  omap3-ldp.dts, then migrate the omap3.dtsi to the
> > new driver while dropping the flags, and lastly update the individual
> > boards accordingly.  I just have one question below.
>
> OK sounds good to me :)
>
> > > > - ti,omap3-pre-es3-hsmmc probably should not be needed with sdhci
> > >
> > > Hmm actually we may need to set SDHCI_QUIRK_NO_MULTIBLOCK for
> > > compatible ti,omap3-pre-es3-hsmmc.
> >
> > Should I update the driver and binding to add  ti,omap3-pre-es3-sdhci
> > to set that flag, or should we create a boolean (maybe
> > 'ti,sdhci-no-multiblock') to the device tree options for that driver?
>
> Probably best to set up some sdhci generic property for it that then
> sets SDHCI_QUIRK_NO_MULTIBLOCK.

Sounds good.  I'll try to work on this tonight, but it might be a day
or two before I get the more comprehensive update out.  Hopefully in
the meantime, people may respond with other comments too.  I also want
to retest my OMAP35 and DM37 boards.  It's been since kernel 6.1 since
I tested them all.

adam
>
> Regards,
>
> Tony