mbox series

[RFC,0/2] Convert omap.txt to DT schema

Message ID 20230216153339.19987-1-afd@ti.com
Headers show
Series Convert omap.txt to DT schema | expand

Message

Andrew Davis Feb. 16, 2023, 3:33 p.m. UTC
Hello all,

I saw there was some more talk on the lists about converting
the omap.txt over to DT schema. I remembered that I had made
an attempt at this and wanted to post it as a WIP example.
It is not perfect or even very good, but might serve as
a base for someone.

Thanks,
Andrew

Andrew Davis (2):
  ARM: dts: omap: Drop ti,omap36xx compatible
  WIP: dt-bindings: omap: Convert omap.txt to yaml

 .../devicetree/bindings/arm/omap/omap.yaml    | 174 ++++++++++++++++++
 arch/arm/boot/dts/omap3-beagle-xm.dts         |   2 +-
 arch/arm/boot/dts/omap3-cm-t3730.dts          |   2 +-
 arch/arm/boot/dts/omap3-igep0020-rev-f.dts    |   2 +-
 arch/arm/boot/dts/omap3-igep0020.dts          |   2 +-
 arch/arm/boot/dts/omap3-igep0030-rev-g.dts    |   2 +-
 arch/arm/boot/dts/omap3-igep0030.dts          |   2 +-
 arch/arm/boot/dts/omap3-lilly-dbb056.dts      |   2 +-
 arch/arm/boot/dts/omap3-n9.dts                |   2 +-
 arch/arm/boot/dts/omap3-n950.dts              |   2 +-
 .../arm/boot/dts/omap3-overo-storm-alto35.dts |   2 +-
 .../boot/dts/omap3-overo-storm-chestnut43.dts |   2 +-
 .../boot/dts/omap3-overo-storm-gallop43.dts   |   2 +-
 .../arm/boot/dts/omap3-overo-storm-palo35.dts |   2 +-
 .../arm/boot/dts/omap3-overo-storm-palo43.dts |   2 +-
 .../arm/boot/dts/omap3-overo-storm-summit.dts |   2 +-
 arch/arm/boot/dts/omap3-overo-storm-tobi.dts  |   2 +-
 .../boot/dts/omap3-overo-storm-tobiduo.dts    |   2 +-
 arch/arm/boot/dts/omap3-pandora-1ghz.dts      |   2 +-
 arch/arm/boot/dts/omap3-sbc-t3730.dts         |   2 +-
 arch/arm/boot/dts/omap3-sniper.dts            |   2 +-
 arch/arm/boot/dts/omap3-zoom3.dts             |   2 +-
 22 files changed, 195 insertions(+), 21 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/omap.yaml

Comments

Tony Lindgren Feb. 17, 2023, 5:48 a.m. UTC | #1
* Andrew Davis <afd@ti.com> [230216 15:33]:
> I saw there was some more talk on the lists about converting
> the omap.txt over to DT schema. I remembered that I had made
> an attempt at this and wanted to post it as a WIP example.
> It is not perfect or even very good, but might serve as
> a base for someone.

Hey that's great :)

Tony
Andreas Kemnade March 27, 2023, 7:18 p.m. UTC | #2
On Thu, 16 Feb 2023 09:33:38 -0600
Andrew Davis <afd@ti.com> wrote:

> This was not matched anywhere and provides no additional information.
> 
> Signed-off-by: Andrew Davis <afd@ti.com>
> ---
>  arch/arm/boot/dts/omap3-beagle-xm.dts              | 2 +-
>  arch/arm/boot/dts/omap3-cm-t3730.dts               | 2 +-
>  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         | 2 +-
>  arch/arm/boot/dts/omap3-igep0020.dts               | 2 +-
>  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         | 2 +-
>  arch/arm/boot/dts/omap3-igep0030.dts               | 2 +-
>  arch/arm/boot/dts/omap3-lilly-dbb056.dts           | 2 +-
>  arch/arm/boot/dts/omap3-n9.dts                     | 2 +-
>  arch/arm/boot/dts/omap3-n950.dts                   | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-alto35.dts     | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-palo35.dts     | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-palo43.dts     | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-summit.dts     | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-tobi.dts       | 2 +-
>  arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts    | 2 +-
>  arch/arm/boot/dts/omap3-pandora-1ghz.dts           | 2 +-
>  arch/arm/boot/dts/omap3-sbc-t3730.dts              | 2 +-
>  arch/arm/boot/dts/omap3-sniper.dts                 | 2 +-
>  arch/arm/boot/dts/omap3-zoom3.dts                  | 2 +-
>  21 files changed, 21 insertions(+), 21 deletions(-)
> 
hmm, we have
drivers/clk/ti/dpll.c:         of_machine_is_compatible("ti,omap36xx"))

but that is more completely
  if ((of_machine_is_compatible("ti,omap3630") ||
             of_machine_is_compatible("ti,omap36xx")) &&

so missing omap36xx will not harm if 3630 is there. SO this should
be probably ok.

Regards,
Andreas
Tony Lindgren March 28, 2023, 5:01 a.m. UTC | #3
* Andreas Kemnade <andreas@kemnade.info> [230327 19:18]:
> On Thu, 16 Feb 2023 09:33:38 -0600
> Andrew Davis <afd@ti.com> wrote:
> 
> > This was not matched anywhere and provides no additional information.
> > 
> > Signed-off-by: Andrew Davis <afd@ti.com>
> > ---
> >  arch/arm/boot/dts/omap3-beagle-xm.dts              | 2 +-
> >  arch/arm/boot/dts/omap3-cm-t3730.dts               | 2 +-
> >  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         | 2 +-
> >  arch/arm/boot/dts/omap3-igep0020.dts               | 2 +-
> >  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         | 2 +-
> >  arch/arm/boot/dts/omap3-igep0030.dts               | 2 +-
> >  arch/arm/boot/dts/omap3-lilly-dbb056.dts           | 2 +-
> >  arch/arm/boot/dts/omap3-n9.dts                     | 2 +-
> >  arch/arm/boot/dts/omap3-n950.dts                   | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-alto35.dts     | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-palo35.dts     | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-palo43.dts     | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-summit.dts     | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-tobi.dts       | 2 +-
> >  arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts    | 2 +-
> >  arch/arm/boot/dts/omap3-pandora-1ghz.dts           | 2 +-
> >  arch/arm/boot/dts/omap3-sbc-t3730.dts              | 2 +-
> >  arch/arm/boot/dts/omap3-sniper.dts                 | 2 +-
> >  arch/arm/boot/dts/omap3-zoom3.dts                  | 2 +-
> >  21 files changed, 21 insertions(+), 21 deletions(-)
> > 
> hmm, we have
> drivers/clk/ti/dpll.c:         of_machine_is_compatible("ti,omap36xx"))
> 
> but that is more completely
>   if ((of_machine_is_compatible("ti,omap3630") ||
>              of_machine_is_compatible("ti,omap36xx")) &&
> 
> so missing omap36xx will not harm if 3630 is there. SO this should
> be probably ok.

Looks like we still have these that should be patched away first:

drivers/cpufreq/ti-cpufreq.c-   { .compatible = "ti,omap34xx", .data = &omap34xx_soc_data, },
drivers/cpufreq/ti-cpufreq.c:   { .compatible = "ti,omap36xx", .data = &omap36xx_soc_data, },

Regards,

Tony
Andreas Kemnade March 28, 2023, 7:06 a.m. UTC | #4
On Tue, 28 Mar 2023 08:01:15 +0300
Tony Lindgren <tony@atomide.com> wrote:

> * Andreas Kemnade <andreas@kemnade.info> [230327 19:18]:
> > On Thu, 16 Feb 2023 09:33:38 -0600
> > Andrew Davis <afd@ti.com> wrote:
> >   
> > > This was not matched anywhere and provides no additional information.
> > > 
> > > Signed-off-by: Andrew Davis <afd@ti.com>
> > > ---
> > >  arch/arm/boot/dts/omap3-beagle-xm.dts              | 2 +-
> > >  arch/arm/boot/dts/omap3-cm-t3730.dts               | 2 +-
> > >  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         | 2 +-
> > >  arch/arm/boot/dts/omap3-igep0020.dts               | 2 +-
> > >  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         | 2 +-
> > >  arch/arm/boot/dts/omap3-igep0030.dts               | 2 +-
> > >  arch/arm/boot/dts/omap3-lilly-dbb056.dts           | 2 +-
> > >  arch/arm/boot/dts/omap3-n9.dts                     | 2 +-
> > >  arch/arm/boot/dts/omap3-n950.dts                   | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-alto35.dts     | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-palo35.dts     | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-palo43.dts     | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-summit.dts     | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-tobi.dts       | 2 +-
> > >  arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts    | 2 +-
> > >  arch/arm/boot/dts/omap3-pandora-1ghz.dts           | 2 +-
> > >  arch/arm/boot/dts/omap3-sbc-t3730.dts              | 2 +-
> > >  arch/arm/boot/dts/omap3-sniper.dts                 | 2 +-
> > >  arch/arm/boot/dts/omap3-zoom3.dts                  | 2 +-
> > >  21 files changed, 21 insertions(+), 21 deletions(-)
> > >   
> > hmm, we have
> > drivers/clk/ti/dpll.c:         of_machine_is_compatible("ti,omap36xx"))
> > 
> > but that is more completely
> >   if ((of_machine_is_compatible("ti,omap3630") ||
> >              of_machine_is_compatible("ti,omap36xx")) &&
> > 
> > so missing omap36xx will not harm if 3630 is there. SO this should
> > be probably ok.  
> 
> Looks like we still have these that should be patched away first:
> 
> drivers/cpufreq/ti-cpufreq.c-   { .compatible = "ti,omap34xx", .data = &omap34xx_soc_data, },
> drivers/cpufreq/ti-cpufreq.c:   { .compatible = "ti,omap36xx", .data = &omap36xx_soc_data, },
>
seen that but there is also
    { .compatible = "ti,omap3430", .data = &omap34xx_soc_data, },
    { .compatible = "ti,omap3630", .data = &omap36xx_soc_data, },

so, no trouble will appear when omap36xx is removed.

Regards,
Andreas
Tony Lindgren March 28, 2023, 7:08 a.m. UTC | #5
* Andreas Kemnade <andreas@kemnade.info> [230328 07:06]:
> On Tue, 28 Mar 2023 08:01:15 +0300
> Tony Lindgren <tony@atomide.com> wrote:
> 
> > * Andreas Kemnade <andreas@kemnade.info> [230327 19:18]:
> > > On Thu, 16 Feb 2023 09:33:38 -0600
> > > Andrew Davis <afd@ti.com> wrote:
> > >   
> > > > This was not matched anywhere and provides no additional information.
> > > > 
> > > > Signed-off-by: Andrew Davis <afd@ti.com>
> > > > ---
> > > >  arch/arm/boot/dts/omap3-beagle-xm.dts              | 2 +-
> > > >  arch/arm/boot/dts/omap3-cm-t3730.dts               | 2 +-
> > > >  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         | 2 +-
> > > >  arch/arm/boot/dts/omap3-igep0020.dts               | 2 +-
> > > >  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         | 2 +-
> > > >  arch/arm/boot/dts/omap3-igep0030.dts               | 2 +-
> > > >  arch/arm/boot/dts/omap3-lilly-dbb056.dts           | 2 +-
> > > >  arch/arm/boot/dts/omap3-n9.dts                     | 2 +-
> > > >  arch/arm/boot/dts/omap3-n950.dts                   | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-alto35.dts     | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-palo35.dts     | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-palo43.dts     | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-summit.dts     | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-tobi.dts       | 2 +-
> > > >  arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts    | 2 +-
> > > >  arch/arm/boot/dts/omap3-pandora-1ghz.dts           | 2 +-
> > > >  arch/arm/boot/dts/omap3-sbc-t3730.dts              | 2 +-
> > > >  arch/arm/boot/dts/omap3-sniper.dts                 | 2 +-
> > > >  arch/arm/boot/dts/omap3-zoom3.dts                  | 2 +-
> > > >  21 files changed, 21 insertions(+), 21 deletions(-)
> > > >   
> > > hmm, we have
> > > drivers/clk/ti/dpll.c:         of_machine_is_compatible("ti,omap36xx"))
> > > 
> > > but that is more completely
> > >   if ((of_machine_is_compatible("ti,omap3630") ||
> > >              of_machine_is_compatible("ti,omap36xx")) &&
> > > 
> > > so missing omap36xx will not harm if 3630 is there. SO this should
> > > be probably ok.  
> > 
> > Looks like we still have these that should be patched away first:
> > 
> > drivers/cpufreq/ti-cpufreq.c-   { .compatible = "ti,omap34xx", .data = &omap34xx_soc_data, },
> > drivers/cpufreq/ti-cpufreq.c:   { .compatible = "ti,omap36xx", .data = &omap36xx_soc_data, },
> >
> seen that but there is also
>     { .compatible = "ti,omap3430", .data = &omap34xx_soc_data, },
>     { .compatible = "ti,omap3630", .data = &omap36xx_soc_data, },
> 
> so, no trouble will appear when omap36xx is removed.

Oh OK, thanks for pointing that out, looks like I missed it. Seems like
we should apply this patch already if no issues.

Regards,

Tony
Tony Lindgren March 28, 2023, 7:27 a.m. UTC | #6
* Tony Lindgren <tony@atomide.com> [230328 07:08]:
> * Andreas Kemnade <andreas@kemnade.info> [230328 07:06]:
> > On Tue, 28 Mar 2023 08:01:15 +0300
> > Tony Lindgren <tony@atomide.com> wrote:
> > 
> > > * Andreas Kemnade <andreas@kemnade.info> [230327 19:18]:
> > > > On Thu, 16 Feb 2023 09:33:38 -0600
> > > > Andrew Davis <afd@ti.com> wrote:
> > > >   
> > > > > This was not matched anywhere and provides no additional information.
> > > > > 
> > > > > Signed-off-by: Andrew Davis <afd@ti.com>
> > > > > ---
> > > > >  arch/arm/boot/dts/omap3-beagle-xm.dts              | 2 +-
> > > > >  arch/arm/boot/dts/omap3-cm-t3730.dts               | 2 +-
> > > > >  arch/arm/boot/dts/omap3-igep0020-rev-f.dts         | 2 +-
> > > > >  arch/arm/boot/dts/omap3-igep0020.dts               | 2 +-
> > > > >  arch/arm/boot/dts/omap3-igep0030-rev-g.dts         | 2 +-
> > > > >  arch/arm/boot/dts/omap3-igep0030.dts               | 2 +-
> > > > >  arch/arm/boot/dts/omap3-lilly-dbb056.dts           | 2 +-
> > > > >  arch/arm/boot/dts/omap3-n9.dts                     | 2 +-
> > > > >  arch/arm/boot/dts/omap3-n950.dts                   | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-alto35.dts     | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-gallop43.dts   | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-palo35.dts     | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-palo43.dts     | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-summit.dts     | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-tobi.dts       | 2 +-
> > > > >  arch/arm/boot/dts/omap3-overo-storm-tobiduo.dts    | 2 +-
> > > > >  arch/arm/boot/dts/omap3-pandora-1ghz.dts           | 2 +-
> > > > >  arch/arm/boot/dts/omap3-sbc-t3730.dts              | 2 +-
> > > > >  arch/arm/boot/dts/omap3-sniper.dts                 | 2 +-
> > > > >  arch/arm/boot/dts/omap3-zoom3.dts                  | 2 +-
> > > > >  21 files changed, 21 insertions(+), 21 deletions(-)
> > > > >   
> > > > hmm, we have
> > > > drivers/clk/ti/dpll.c:         of_machine_is_compatible("ti,omap36xx"))
> > > > 
> > > > but that is more completely
> > > >   if ((of_machine_is_compatible("ti,omap3630") ||
> > > >              of_machine_is_compatible("ti,omap36xx")) &&
> > > > 
> > > > so missing omap36xx will not harm if 3630 is there. SO this should
> > > > be probably ok.  
> > > 
> > > Looks like we still have these that should be patched away first:
> > > 
> > > drivers/cpufreq/ti-cpufreq.c-   { .compatible = "ti,omap34xx", .data = &omap34xx_soc_data, },
> > > drivers/cpufreq/ti-cpufreq.c:   { .compatible = "ti,omap36xx", .data = &omap36xx_soc_data, },
> > >
> > seen that but there is also
> >     { .compatible = "ti,omap3430", .data = &omap34xx_soc_data, },
> >     { .compatible = "ti,omap3630", .data = &omap36xx_soc_data, },
> > 
> > so, no trouble will appear when omap36xx is removed.
> 
> Oh OK, thanks for pointing that out, looks like I missed it. Seems like
> we should apply this patch already if no issues.

Applied this one to omap-for-v6.4/dt and pushed out.

Regards,

Tony