LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] ARM: dts: re-fromat AT91 part to match other entries
       [not found] <20150112224203.GL22090@quad.lixom.net>
@ 2015-01-13 14:43 ` Nicolas Ferre
  2015-01-13 23:09   ` Olof Johansson
  0 siblings, 1 reply; 6+ messages in thread
From: Nicolas Ferre @ 2015-01-13 14:43 UTC (permalink / raw)
  To: Olof Johansson, Arnd Bergmann, ARM Maintainers
  Cc: Alexandre Belloni, Boris BREZILLON,
	Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel,
	Nicolas Ferre

The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
options may be removed in the near future.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
Hi Olof,

This is an attempt to match other ARM SoC families format.
If you feel that the patch can be good, do not hesitate to take it yourself. I
don't plan to integrate it in any of my pull-request so it can appear quickly in
arm-soc and can be used by everyone.

 arch/arm/boot/dts/Makefile | 90 +++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 50 deletions(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f62d81..66ea13037dbc 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1,56 +1,46 @@
 ifeq ($(CONFIG_OF),y)
 
 # Keep at91 dtb files sorted alphabetically for each SoC
-# rm9200
-dtb-$(CONFIG_ARCH_AT91) += at91rm9200ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += mpa1600.dtb
-# sam9260
-dtb-$(CONFIG_ARCH_AT91) += animeo_ip.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-qil_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += aks-cdu.dtb
-dtb-$(CONFIG_ARCH_AT91) += ethernut5.dtb
-dtb-$(CONFIG_ARCH_AT91) += evk-pro3.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9260.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9260.dtb
-# sam9261
-dtb-$(CONFIG_ARCH_AT91) += at91sam9261ek.dtb
-# sam9263
-dtb-$(CONFIG_ARCH_AT91) += at91sam9263ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9263.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9263.dtb
-# sam9g20
-dtb-$(CONFIG_ARCH_AT91) += at91-foxg20.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g20ek_2mmc.dtb
-dtb-$(CONFIG_ARCH_AT91) += kizbox.dtb
-dtb-$(CONFIG_ARCH_AT91) += tny_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20.dtb
-dtb-$(CONFIG_ARCH_AT91) += usb_a9g20_lpw.dtb
-# sam9g45
-dtb-$(CONFIG_ARCH_AT91) += at91sam9m10g45ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += pm9g45.dtb
-# sam9n12
-dtb-$(CONFIG_ARCH_AT91) += at91sam9n12ek.dtb
-# sam9rl
-dtb-$(CONFIG_ARCH_AT91) += at91sam9rlek.dtb
-# sam9x5
-dtb-$(CONFIG_ARCH_AT91) += at91-ariag25.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91-cosino_mega2560.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g15ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9g35ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x25ek.dtb
-dtb-$(CONFIG_ARCH_AT91) += at91sam9x35ek.dtb
-# sama5d3
-dtb-$(CONFIG_ARCH_AT91)	+= at91-sama5d3_xplained.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d31ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d33ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d35ek.dtb
-dtb-$(CONFIG_ARCH_AT91)	+= sama5d36ek.dtb
-# sama5d4
-dtb-$(CONFIG_ARCH_AT91)	+= at91-sama5d4ek.dtb
-
+dtb-$(CONFIG_SOC_SAM_V4_V5) += \
+	at91rm9200ek.dtb \
+	mpa1600.dtb \
+	animeo_ip.dtb \
+	at91-qil_a9260.dtb \
+	aks-cdu.dtb \
+	ethernut5.dtb \
+	evk-pro3.dtb \
+	tny_a9260.dtb \
+	usb_a9260.dtb \
+	at91sam9261ek.dtb \
+	at91sam9263ek.dtb \
+	tny_a9263.dtb \
+	usb_a9263.dtb \
+	at91-foxg20.dtb \
+	at91sam9g20ek.dtb \
+	at91sam9g20ek_2mmc.dtb \
+	kizbox.dtb \
+	tny_a9g20.dtb \
+	usb_a9g20.dtb \
+	usb_a9g20_lpw.dtb \
+	at91sam9m10g45ek.dtb \
+	pm9g45.dtb \
+	at91sam9n12ek.dtb \
+	at91sam9rlek.dtb \
+	at91-ariag25.dtb \
+	at91-cosino_mega2560.dtb \
+	at91sam9g15ek.dtb \
+	at91sam9g25ek.dtb \
+	at91sam9g35ek.dtb \
+	at91sam9x25ek.dtb \
+	at91sam9x35ek.dtb
+dtb-$(CONFIG_SOC_SAM_V7) += \
+	at91-sama5d3_xplained.dtb \
+	sama5d31ek.dtb \
+	sama5d33ek.dtb \
+	sama5d34ek.dtb \
+	sama5d35ek.dtb \
+	sama5d36ek.dtb \
+	at91-sama5d4ek.dtb
 dtb-$(CONFIG_ARCH_ATLAS6) += \
 	atlas6-evb.dtb
 dtb-$(CONFIG_ARCH_AXXIA) += \
-- 
2.1.3


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
  2015-01-13 14:43 ` [PATCH] ARM: dts: re-fromat AT91 part to match other entries Nicolas Ferre
@ 2015-01-13 23:09   ` Olof Johansson
  2015-01-13 23:47     ` Alexandre Belloni
  0 siblings, 1 reply; 6+ messages in thread
From: Olof Johansson @ 2015-01-13 23:09 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: Arnd Bergmann, ARM Maintainers, Alexandre Belloni,
	Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
	linux-arm-kernel, linux-kernel

On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> options may be removed in the near future.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
> Hi Olof,
> 
> This is an attempt to match other ARM SoC families format.
> If you feel that the patch can be good, do not hesitate to take it yourself. I
> don't plan to integrate it in any of my pull-request so it can appear quickly in
> arm-soc and can be used by everyone.

Hi,

If you see what Peter did, he split up the rules per-SoC based on how
things were selectable in Kconfig. Since you seem to have the Kconfig
entries already, how about doing the same? That way the same information
w.r.t. SoC family that you have as comments isn't lost either.


-Olof

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
  2015-01-13 23:09   ` Olof Johansson
@ 2015-01-13 23:47     ` Alexandre Belloni
  2015-01-14  9:05       ` Arnd Bergmann
  0 siblings, 1 reply; 6+ messages in thread
From: Alexandre Belloni @ 2015-01-13 23:47 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Nicolas Ferre, Arnd Bergmann, ARM Maintainers, Boris BREZILLON,
	Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel

Hi Olof,

On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > options may be removed in the near future.
> > 
> > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> > Hi Olof,
> > 
> > This is an attempt to match other ARM SoC families format.
> > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > arm-soc and can be used by everyone.
> 
> Hi,
> 
> If you see what Peter did, he split up the rules per-SoC based on how
> things were selectable in Kconfig. Since you seem to have the Kconfig
> entries already, how about doing the same? That way the same information
> w.r.t. SoC family that you have as comments isn't lost either.
> 

You didn't see the patch set yet because it depends on a lot of other
series still being discussed but after the switch to multiplatform, the
only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.

That's our plan, unless you feel that we should keep one config option
per SoC.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
  2015-01-13 23:47     ` Alexandre Belloni
@ 2015-01-14  9:05       ` Arnd Bergmann
  2015-01-26 15:45         ` Nicolas Ferre
  0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2015-01-14  9:05 UTC (permalink / raw)
  To: Alexandre Belloni
  Cc: Olof Johansson, Nicolas Ferre, ARM Maintainers, Boris BREZILLON,
	Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel

On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
> 
> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> > On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> > > The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> > > options may be removed in the near future.
> > > 
> > > Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> > > ---
> > > Hi Olof,
> > > 
> > > This is an attempt to match other ARM SoC families format.
> > > If you feel that the patch can be good, do not hesitate to take it yourself. I
> > > don't plan to integrate it in any of my pull-request so it can appear quickly in
> > > arm-soc and can be used by everyone.
> > 
> > Hi,
> > 
> > If you see what Peter did, he split up the rules per-SoC based on how
> > things were selectable in Kconfig. Since you seem to have the Kconfig
> > entries already, how about doing the same? That way the same information
> > w.r.t. SoC family that you have as comments isn't lost either.
> > 
> 
> You didn't see the patch set yet because it depends on a lot of other
> series still being discussed but after the switch to multiplatform, the
> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
> 
> That's our plan, unless you feel that we should keep one config option
> per SoC.

With the patches that I prepared last year, all of AT91SAM9 becomes
one small file, so there really isn't any need to have separate Kconfig
options.

	Arnd

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
  2015-01-14  9:05       ` Arnd Bergmann
@ 2015-01-26 15:45         ` Nicolas Ferre
  2015-01-27  2:13           ` Olof Johansson
  0 siblings, 1 reply; 6+ messages in thread
From: Nicolas Ferre @ 2015-01-26 15:45 UTC (permalink / raw)
  To: Olof Johansson
  Cc: Arnd Bergmann, Alexandre Belloni, ARM Maintainers,
	Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
	linux-arm-kernel, linux-kernel

Le 14/01/2015 10:05, Arnd Bergmann a écrit :
> On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
>>
>> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
>>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
>>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
>>>> options may be removed in the near future.
>>>>
>>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>>>> ---
>>>> Hi Olof,
>>>>
>>>> This is an attempt to match other ARM SoC families format.
>>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
>>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
>>>> arm-soc and can be used by everyone.
>>>
>>> Hi,
>>>
>>> If you see what Peter did, he split up the rules per-SoC based on how
>>> things were selectable in Kconfig. Since you seem to have the Kconfig
>>> entries already, how about doing the same? That way the same information
>>> w.r.t. SoC family that you have as comments isn't lost either.
>>>
>>
>> You didn't see the patch set yet because it depends on a lot of other
>> series still being discussed but after the switch to multiplatform, the
>> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
>> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
>>
>> That's our plan, unless you feel that we should keep one config option
>> per SoC.
> 
> With the patches that I prepared last year, all of AT91SAM9 becomes
> one small file, so there really isn't any need to have separate Kconfig
> options.

Hi Olof,

After what noted Alexandre and Arnd, don't you think my initial attempt
was okay? Aka: ping ;-)

Bye,
-- 
Nicolas Ferre

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] ARM: dts: re-fromat AT91 part to match other entries
  2015-01-26 15:45         ` Nicolas Ferre
@ 2015-01-27  2:13           ` Olof Johansson
  0 siblings, 0 replies; 6+ messages in thread
From: Olof Johansson @ 2015-01-27  2:13 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: Arnd Bergmann, Alexandre Belloni, ARM Maintainers,
	Boris BREZILLON, Jean-Christophe PLAGNIOL-VILLARD,
	linux-arm-kernel, linux-kernel

On Mon, Jan 26, 2015 at 04:45:02PM +0100, Nicolas Ferre wrote:
> Le 14/01/2015 10:05, Arnd Bergmann a écrit :
> > On Wednesday 14 January 2015 00:47:59 Alexandre Belloni wrote:
> >>
> >> On 13/01/2015 at 15:09:56 -0800, Olof Johansson wrote :
> >>> On Tue, Jan 13, 2015 at 03:43:00PM +0100, Nicolas Ferre wrote:
> >>>> The entries are separated as ARM V4/V5 and ARM V7 as some other per-SoC config
> >>>> options may be removed in the near future.
> >>>>
> >>>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> >>>> ---
> >>>> Hi Olof,
> >>>>
> >>>> This is an attempt to match other ARM SoC families format.
> >>>> If you feel that the patch can be good, do not hesitate to take it yourself. I
> >>>> don't plan to integrate it in any of my pull-request so it can appear quickly in
> >>>> arm-soc and can be used by everyone.
> >>>
> >>> Hi,
> >>>
> >>> If you see what Peter did, he split up the rules per-SoC based on how
> >>> things were selectable in Kconfig. Since you seem to have the Kconfig
> >>> entries already, how about doing the same? That way the same information
> >>> w.r.t. SoC family that you have as comments isn't lost either.
> >>>
> >>
> >> You didn't see the patch set yet because it depends on a lot of other
> >> series still being discussed but after the switch to multiplatform, the
> >> only config option left will be SOC_AT91RM9200, SOC_AT91SAM9 (both
> >> under SOC_SAM_V4_V5) and SOC_SAMA5, under SOC_SAM_V7.
> >>
> >> That's our plan, unless you feel that we should keep one config option
> >> per SoC.
> > 
> > With the patches that I prepared last year, all of AT91SAM9 becomes
> > one small file, so there really isn't any need to have separate Kconfig
> > options.
> 
> Hi Olof,
> 
> After what noted Alexandre and Arnd, don't you think my initial attempt
> was okay? Aka: ping ;-)

Ah, yes. Applied now.


-Olof

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2015-01-27  2:13 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <20150112224203.GL22090@quad.lixom.net>
2015-01-13 14:43 ` [PATCH] ARM: dts: re-fromat AT91 part to match other entries Nicolas Ferre
2015-01-13 23:09   ` Olof Johansson
2015-01-13 23:47     ` Alexandre Belloni
2015-01-14  9:05       ` Arnd Bergmann
2015-01-26 15:45         ` Nicolas Ferre
2015-01-27  2:13           ` Olof Johansson

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).