* [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming
@ 2013-12-05 0:49 Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 1/2] Documentation: dt: OMAP: explicitly state SoC compatible strings Nishanth Menon
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Nishanth Menon @ 2013-12-05 0:49 UTC (permalink / raw)
To: linux-arm-kernel
Originally attempted partially in [1], the missing binding were
reported as part of Rob's report in [2].
So, here is take two of the series, lacking an standard causes issues
that was fixed such as [3]. Ideally, we should never again introduce a
board file without a exact compatible SoC match.
I have stayed a bit away from updating board and SoC dts files yet
to look at the direction we'd like to go here. If we feel things are
good, I would gladly try to clean our mess up.
Nishanth Menon (2):
Documentation: dt: OMAP: explicitly state SoC compatible strings
ARM: OMAP2+: board-generic: update SoC compatibility strings
.../devicetree/bindings/arm/omap/omap.txt | 53 ++++++++++++++++++++
arch/arm/mach-omap2/board-generic.c | 7 +++
2 files changed, 60 insertions(+)
[1] https://patchwork.kernel.org/patch/2998201/
[2] http://marc.info/?l=linux-arm-kernel&m=138378029113665&w=2
[3] https://patchwork.kernel.org/patch/3279281/
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 1/2] Documentation: dt: OMAP: explicitly state SoC compatible strings
2013-12-05 0:49 [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
@ 2013-12-05 0:49 ` Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 2/2] ARM: OMAP2+: board-generic: update SoC compatibility strings Nishanth Menon
2014-01-07 0:47 ` [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2 siblings, 0 replies; 5+ messages in thread
From: Nishanth Menon @ 2013-12-05 0:49 UTC (permalink / raw)
To: linux-arm-kernel
SoC family definitions at the moment are reactive to board needs.
This results in potentially wrong matches taking place for board types.
Eventually, we will have descriptors match only with SoC types and
should not contain anything specific to board handling and pave the
way to getting rid of soc_is_XYZ checks and allow this determination
done with matches at of level.
Existing implicit definitions(as part of board descriptions) are
explicitly documented.
NOTE: Even though we prefer to have dt compatibility to explicit,
"ti,dra7xx", "ti,am33xx", "ti,omap36xx" preexist in current dts and
are maintained for backward compatibility. It is also expected that
any future SoC addition will keep this documentation updated.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
.../devicetree/bindings/arm/omap/omap.txt | 53 ++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt
index 808c154..34dc40c 100644
--- a/Documentation/devicetree/bindings/arm/omap/omap.txt
+++ b/Documentation/devicetree/bindings/arm/omap/omap.txt
@@ -31,6 +31,59 @@ spinlock at 1 {
ti,hwmods = "spinlock";
};
+SoC Type (optional):
+
+- General Purpose devices
+ compatible = "ti,gp"
+- High Security devices
+ compatible = "ti,hs"
+
+SoC Families:
+
+- OMAP2 generic - defaults to OMAP2420
+ compatible = "ti,omap2"
+- OMAP3 generic - defaults to OMAP3430
+ compatible = "ti,omap3"
+- OMAP4 generic - defaults to OMAP4430
+ compatible = "ti,omap4"
+- OMAP5 generic - defaults to OMAP5430
+ compatible = "ti,omap5"
+- DRA7 generic - defaults to DRA742
+ compatible = "ti,dra7"
+- AM43x generic - defaults to AM4372
+ compatible = "ti,am43"
+
+SoCs:
+
+- OMAP2420
+ compatible = "ti,omap2420", "ti,omap2"
+- OMAP2430
+ compatible = "ti,omap2430", "ti,omap2"
+
+- OMAP3430
+ compatible = "ti,omap3430", "ti,omap3"
+- AM3517
+ compatible = "ti,am3517", "ti,omap3"
+- OMAP3630
+ compatible = "ti,omap36xx", "ti,omap3"
+- AM33xx
+ compatible = "ti,am33xx", "ti,omap3"
+
+- OMAP4430
+ compatible = "ti,omap4430", "ti,omap4"
+- OMAP4460
+ compatible = "ti,omap4460", "ti,omap4"
+
+- OMAP5430
+ compatible = "ti,omap5430", "ti,omap5"
+- OMAP5432
+ compatible = "ti,omap5432", "ti,omap5"
+
+- DRA742
+ compatible = "ti,dra7xx", "ti,dra7"
+
+- AM4372
+ compatible = "ti,am4372", "ti,am43"
Boards:
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 2/2] ARM: OMAP2+: board-generic: update SoC compatibility strings
2013-12-05 0:49 [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 1/2] Documentation: dt: OMAP: explicitly state SoC compatible strings Nishanth Menon
@ 2013-12-05 0:49 ` Nishanth Menon
2014-01-07 0:47 ` [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2 siblings, 0 replies; 5+ messages in thread
From: Nishanth Menon @ 2013-12-05 0:49 UTC (permalink / raw)
To: linux-arm-kernel
Now that we have standardized SoC definitions, update the
compatibility strings in board machine descriptors. Eventually, we
should just have SoC compatiblity here and all board specific stuff
should disappear.
Signed-off-by: Nishanth Menon <nm@ti.com>
---
NOTE: To prevent conflict, I have not added am3517 which is addressed in:
https://patchwork.kernel.org/patch/3279281/
arch/arm/mach-omap2/board-generic.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 19f1652..5356a29 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -78,6 +78,7 @@ MACHINE_END
#ifdef CONFIG_ARCH_OMAP3
static const char *omap3_boards_compat[] __initdata = {
+ "ti,omap3430",
"ti,omap3",
NULL,
};
@@ -155,6 +156,8 @@ MACHINE_END
#ifdef CONFIG_ARCH_OMAP4
static const char *omap4_boards_compat[] __initdata = {
+ "ti,omap4460",
+ "ti,omap4430",
"ti,omap4",
NULL,
};
@@ -175,6 +178,8 @@ MACHINE_END
#ifdef CONFIG_SOC_OMAP5
static const char *omap5_boards_compat[] __initdata = {
+ "ti,omap5432",
+ "ti,omap5430",
"ti,omap5",
NULL,
};
@@ -195,6 +200,7 @@ MACHINE_END
#ifdef CONFIG_SOC_AM43XX
static const char *am43_boards_compat[] __initdata = {
+ "ti,am4372",
"ti,am43",
NULL,
};
@@ -212,6 +218,7 @@ MACHINE_END
#ifdef CONFIG_SOC_DRA7XX
static const char *dra7xx_boards_compat[] __initdata = {
+ "ti,dra7xx",
"ti,dra7",
NULL,
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming
2013-12-05 0:49 [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 1/2] Documentation: dt: OMAP: explicitly state SoC compatible strings Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 2/2] ARM: OMAP2+: board-generic: update SoC compatibility strings Nishanth Menon
@ 2014-01-07 0:47 ` Nishanth Menon
2014-01-08 19:18 ` Tony Lindgren
2 siblings, 1 reply; 5+ messages in thread
From: Nishanth Menon @ 2014-01-07 0:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Benoit, Tony,
On Wed, Dec 4, 2013 at 6:49 PM, Nishanth Menon <nm@ti.com> wrote:
> Originally attempted partially in [1], the missing binding were
> reported as part of Rob's report in [2].
Would you like me to send this series again since I do not see this in:
https://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.14/dts
patchwork links:
https://patchwork.kernel.org/patch/3286051/
https://patchwork.kernel.org/patch/3286061/
>
> So, here is take two of the series, lacking an standard causes issues
> that was fixed such as [3]. Ideally, we should never again introduce a
> board file without a exact compatible SoC match.
>
> I have stayed a bit away from updating board and SoC dts files yet
> to look at the direction we'd like to go here. If we feel things are
> good, I would gladly try to clean our mess up.
>
> Nishanth Menon (2):
> Documentation: dt: OMAP: explicitly state SoC compatible strings
> ARM: OMAP2+: board-generic: update SoC compatibility strings
>
> .../devicetree/bindings/arm/omap/omap.txt | 53 ++++++++++++++++++++
> arch/arm/mach-omap2/board-generic.c | 7 +++
> 2 files changed, 60 insertions(+)
>
> [1] https://patchwork.kernel.org/patch/2998201/
> [2] http://marc.info/?l=linux-arm-kernel&m=138378029113665&w=2
> [3] https://patchwork.kernel.org/patch/3279281/
>
> --
> 1.7.9.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming
2014-01-07 0:47 ` [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
@ 2014-01-08 19:18 ` Tony Lindgren
0 siblings, 0 replies; 5+ messages in thread
From: Tony Lindgren @ 2014-01-08 19:18 UTC (permalink / raw)
To: linux-arm-kernel
* Nishanth Menon <nm@ti.com> [140106 16:49]:
> Hi Benoit, Tony,
>
> On Wed, Dec 4, 2013 at 6:49 PM, Nishanth Menon <nm@ti.com> wrote:
> > Originally attempted partially in [1], the missing binding were
> > reported as part of Rob's report in [2].
>
> Would you like me to send this series again since I do not see this in:
> https://git.kernel.org/cgit/linux/kernel/git/bcousson/linux-omap-dt.git/log/?h=for_3.14/dts
No need to and sorry for the delays. I'm applying these into
omap-for-v3.14/fixes-not-urgent as they should not conflict with
other DT related patches.
Regards,
Tony
> patchwork links:
> https://patchwork.kernel.org/patch/3286051/
> https://patchwork.kernel.org/patch/3286061/
>
> >
> > So, here is take two of the series, lacking an standard causes issues
> > that was fixed such as [3]. Ideally, we should never again introduce a
> > board file without a exact compatible SoC match.
> >
> > I have stayed a bit away from updating board and SoC dts files yet
> > to look at the direction we'd like to go here. If we feel things are
> > good, I would gladly try to clean our mess up.
> >
> > Nishanth Menon (2):
> > Documentation: dt: OMAP: explicitly state SoC compatible strings
> > ARM: OMAP2+: board-generic: update SoC compatibility strings
> >
> > .../devicetree/bindings/arm/omap/omap.txt | 53 ++++++++++++++++++++
> > arch/arm/mach-omap2/board-generic.c | 7 +++
> > 2 files changed, 60 insertions(+)
> >
> > [1] https://patchwork.kernel.org/patch/2998201/
> > [2] http://marc.info/?l=linux-arm-kernel&m=138378029113665&w=2
> > [3] https://patchwork.kernel.org/patch/3279281/
> >
> > --
> > 1.7.9.5
> >
> >
> > _______________________________________________
> > linux-arm-kernel mailing list
> > linux-arm-kernel at lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-01-08 19:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-05 0:49 [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 1/2] Documentation: dt: OMAP: explicitly state SoC compatible strings Nishanth Menon
2013-12-05 0:49 ` [PATCH V2 2/2] ARM: OMAP2+: board-generic: update SoC compatibility strings Nishanth Menon
2014-01-07 0:47 ` [PATCH V2 0/2] ARM: OMAP2+/dts: standardize SoC naming Nishanth Menon
2014-01-08 19:18 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).