LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [GIT PULL] at91: multiplatform for 4.1 #1
@ 2015-03-19 17:14 Nicolas Ferre
  2015-04-02  0:59 ` Olof Johansson
  2015-04-02 14:17 ` Arnd Bergmann
  0 siblings, 2 replies; 5+ messages in thread
From: Nicolas Ferre @ 2015-03-19 17:14 UTC (permalink / raw)
  To: Arnd Bergmann, Olof Johansson, arm
  Cc: Nicolas Ferre, Linux Kernel list, linux-arm-kernel,
	Alexandre Belloni, Boris BREZILLON,
	Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches

Arnd, Olof, Kevin,

This is the real switch to multi-platform for AT91: after all the preparation
work that has been done, here we are! And there's also an additional cleanup on
top of that...
I stacked this material on top of my previous "at91-cleanup3" tag that I had sent
you earlier this week. As all my cleanup material is also on top of the fixes
tags (that you already have), these patches are also adapted to match this
state and avoid conflicts.
So, you can have this tag in your "multiplatform" branch separated, like I did,
or simply stacked on top or the AT91 cleanup material.

Thanks, best regards,

The following changes since commit 88c5544ab2240cf2a2dc87b5af9cd7990d06d028:

  Merge tag 'at91-cleanup3' into at91-4.1-multiplatform (2015-03-16 18:09:48 +0100)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-multiplatform

for you to fetch changes up to 1164f672d71ac103d85207b0453f3127c0efefb3:

  ARM: at91: drop AT91_TIMER_HZ (2015-03-19 16:37:45 +0100)

----------------------------------------------------------------
This is the multi-platform support for AT91:
- reworked arch/arm/mach-at91/Kconfig and arch/arm/Kconfig to switch to
  multi-platform
- updated at91_dt_defconfig
- continue the cleanup of unneeded files and code chunks

----------------------------------------------------------------
Alexandre Belloni (7):
      ARM: at91: switch to multiplatform
      ARM: at91: switch at91_dt_defconfig to multiplatform
      ARM: at91: remove unused headers
      ARM: at91: remove useless mach/cpu.h
      ARM: at91: remove SoC headers
      ARM: at91: remove hardware.h
      ARM: at91: drop AT91_TIMER_HZ

 arch/arm/Kconfig                               |  15 +-
 arch/arm/configs/at91_dt_defconfig             |   5 +-
 arch/arm/mach-at91/Kconfig                     | 117 +++++--------
 arch/arm/mach-at91/Makefile                    |   2 +
 arch/arm/mach-at91/include/mach/at91_dbgu.h    |  63 -------
 arch/arm/mach-at91/include/mach/at91rm9200.h   | 103 ------------
 arch/arm/mach-at91/include/mach/at91sam9260.h  | 129 ---------------
 arch/arm/mach-at91/include/mach/at91sam9261.h  |  99 -----------
 arch/arm/mach-at91/include/mach/at91sam9263.h  | 117 -------------
 arch/arm/mach-at91/include/mach/at91sam9_smc.h |   2 -
 arch/arm/mach-at91/include/mach/at91sam9g45.h  | 143 ----------------
 arch/arm/mach-at91/include/mach/at91sam9n12.h  |  65 --------
 arch/arm/mach-at91/include/mach/at91sam9rl.h   | 105 ------------
 arch/arm/mach-at91/include/mach/at91sam9x5.h   |  71 --------
 arch/arm/mach-at91/include/mach/cpu.h          | 216 ------------------------
 arch/arm/mach-at91/include/mach/hardware.h     | 134 ---------------
 arch/arm/mach-at91/include/mach/sama5d3.h      |  86 ----------
 arch/arm/mach-at91/include/mach/sama5d4.h      |  33 ----
 arch/arm/mach-at91/include/mach/uncompress.h   | 218 -------------------------
 arch/arm/mach-at91/pm.c                        |  12 +-
 arch/arm/mach-at91/pm_suspend.S                |   1 -
 arch/arm/mach-at91/sama5.c                     |   2 -
 22 files changed, 57 insertions(+), 1681 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_dbgu.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91rm9200.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9260.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9261.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9263.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9g45.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9n12.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9rl.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91sam9x5.h
 delete mode 100644 arch/arm/mach-at91/include/mach/cpu.h
 delete mode 100644 arch/arm/mach-at91/include/mach/hardware.h
 delete mode 100644 arch/arm/mach-at91/include/mach/sama5d3.h
 delete mode 100644 arch/arm/mach-at91/include/mach/sama5d4.h
 delete mode 100644 arch/arm/mach-at91/include/mach/uncompress.h

-- 
Nicolas Ferre

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

* Re: [GIT PULL] at91: multiplatform for 4.1 #1
  2015-03-19 17:14 [GIT PULL] at91: multiplatform for 4.1 #1 Nicolas Ferre
@ 2015-04-02  0:59 ` Olof Johansson
  2015-04-02 14:17 ` Arnd Bergmann
  1 sibling, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2015-04-02  0:59 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: Arnd Bergmann, arm, Linux Kernel list, linux-arm-kernel,
	Alexandre Belloni, Boris BREZILLON,
	Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches

On Thu, Mar 19, 2015 at 06:14:29PM +0100, Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
> 
> This is the real switch to multi-platform for AT91: after all the preparation
> work that has been done, here we are! And there's also an additional cleanup on
> top of that...
> I stacked this material on top of my previous "at91-cleanup3" tag that I had sent
> you earlier this week. As all my cleanup material is also on top of the fixes
> tags (that you already have), these patches are also adapted to match this
> state and avoid conflicts.
> So, you can have this tag in your "multiplatform" branch separated, like I did,
> or simply stacked on top or the AT91 cleanup material.
> 
> Thanks, best regards,
> 
> The following changes since commit 88c5544ab2240cf2a2dc87b5af9cd7990d06d028:
> 
>   Merge tag 'at91-cleanup3' into at91-4.1-multiplatform (2015-03-16 18:09:48 +0100)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-multiplatform
> 
> for you to fetch changes up to 1164f672d71ac103d85207b0453f3127c0efefb3:
> 
>   ARM: at91: drop AT91_TIMER_HZ (2015-03-19 16:37:45 +0100)
> 
> ----------------------------------------------------------------
> This is the multi-platform support for AT91:
> - reworked arch/arm/mach-at91/Kconfig and arch/arm/Kconfig to switch to
>   multi-platform
> - updated at91_dt_defconfig
> - continue the cleanup of unneeded files and code chunks

Nice! Merged.


-Olof

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

* Re: [GIT PULL] at91: multiplatform for 4.1 #1
  2015-03-19 17:14 [GIT PULL] at91: multiplatform for 4.1 #1 Nicolas Ferre
  2015-04-02  0:59 ` Olof Johansson
@ 2015-04-02 14:17 ` Arnd Bergmann
  2015-04-02 15:07   ` [PATCH] ARM: at91: add a Kconfig dependency on multi-platform Nicolas Ferre
  1 sibling, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2015-04-02 14:17 UTC (permalink / raw)
  To: linux-arm-kernel
  Cc: Nicolas Ferre, Olof Johansson, arm, Boris BREZILLON,
	Linux Kernel list, Ludovic Desroches, Alexandre Belloni,
	Jean-Christophe PLAGNIOL-VILLARD

On Thursday 19 March 2015 18:14:29 Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
> 
> This is the real switch to multi-platform for AT91: after all the preparation
> work that has been done, here we are! And there's also an additional cleanup on
> top of that...
> I stacked this material on top of my previous "at91-cleanup3" tag that I had sent
> you earlier this week. As all my cleanup material is also on top of the fixes
> tags (that you already have), these patches are also adapted to match this
> state and avoid conflicts.
> So, you can have this tag in your "multiplatform" branch separated, like I did,
> or simply stacked on top or the AT91 cleanup material.

I got a build error with legacy (non-multi) platforms when ARCH_AT91 is enabled
and needed this change on top:

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e2cd30f6c23d..fd95f34945f4 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ARCH_AT91
 	bool "Atmel SoCs"
+	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
 	select ARCH_REQUIRE_GPIOLIB
 	select COMMON_CLK_AT91
 	select PINCTRL

Can you check if that is the right approach and submit it as a proper
patch?

	Arnd

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

* [PATCH] ARM: at91: add a Kconfig dependency on multi-platform
  2015-04-02 14:17 ` Arnd Bergmann
@ 2015-04-02 15:07   ` Nicolas Ferre
  2015-04-03 17:47     ` Olof Johansson
  0 siblings, 1 reply; 5+ messages in thread
From: Nicolas Ferre @ 2015-04-02 15:07 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Olof Johansson, ARM Maintainers, Boris BREZILLON,
	Alexandre Belloni, Ludovic Desroches,
	Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel,
	Nicolas Ferre

When building a legacy (non-multi) platforms and if the ARCH_AT91 config option
is enabled there is a build error. We need AT91 to depend on multi-platform
core type options.

Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 arch/arm/mach-at91/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index e2cd30f6c23d..fd95f34945f4 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ARCH_AT91
 	bool "Atmel SoCs"
+	depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V7
 	select ARCH_REQUIRE_GPIOLIB
 	select COMMON_CLK_AT91
 	select PINCTRL
-- 
2.1.3


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

* Re: [PATCH] ARM: at91: add a Kconfig dependency on multi-platform
  2015-04-02 15:07   ` [PATCH] ARM: at91: add a Kconfig dependency on multi-platform Nicolas Ferre
@ 2015-04-03 17:47     ` Olof Johansson
  0 siblings, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2015-04-03 17:47 UTC (permalink / raw)
  To: Nicolas Ferre
  Cc: Arnd Bergmann, ARM Maintainers, Boris BREZILLON,
	Alexandre Belloni, Ludovic Desroches,
	Jean-Christophe PLAGNIOL-VILLARD, linux-arm-kernel, linux-kernel

On Thu, Apr 02, 2015 at 05:07:57PM +0200, Nicolas Ferre wrote:
> When building a legacy (non-multi) platforms and if the ARCH_AT91 config option
> is enabled there is a build error. We need AT91 to depend on multi-platform
> core type options.
> 
> Reported-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Applied, thanks.


-Olof

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

end of thread, other threads:[~2015-04-03 17:48 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-19 17:14 [GIT PULL] at91: multiplatform for 4.1 #1 Nicolas Ferre
2015-04-02  0:59 ` Olof Johansson
2015-04-02 14:17 ` Arnd Bergmann
2015-04-02 15:07   ` [PATCH] ARM: at91: add a Kconfig dependency on multi-platform Nicolas Ferre
2015-04-03 17:47     ` 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).