* [GIT PULL] at91: cleanup for 3.20 #2
@ 2015-01-16 17:25 ` Nicolas Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2015-01-16 17:25 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 another cleanup pull-request for AT91. This one depends on the Device
Tree material that I posted yesterday, so I merged the at91-dt tag just before
stacking up Alexandre's patches. This dependency is needed to make sure that
SRAM gets initialized before using it.
More cleanup will come soon to reach multi-platform.
Thanks, best regards,
The following changes since commit eca6f17253f33313eeb3020d0634a60d10f650c4:
Merge tag 'at91-dt' into at91-3.20-cleanup (2015-01-16 17:18:34 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup2
for you to fetch changes up to 29ee506d0d56f6d39cc237de2512f9cb5629cbf7:
ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c (2015-01-16 18:08:42 +0100)
----------------------------------------------------------------
Second batch of cleanup for 3.20:
- By reworking the PM code, we can remove the AT91 more specific initialization
- We are using DT for SRAM initialization now, so we can remove its explicit
mapping
- The PMC clock driver now hosts IDLE function for at91rm9200 with other
SoCs ones.
----------------------------------------------------------------
Alexandre Belloni (8):
ARM: at91: pm: rework cpu detection
ARM: at91: pm: use the mmio-sram pool to access SRAM
ARM: at91: pm: add UDP and UHP checks to newer SoCs
ARM: at91: pm: prepare for multiplatform
ARM: at91: remove useless map_io
ARM: at91: sama5d4: remove useless call to at91_init_sram
ARM: at91: remove unused at91_init_sram
ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c
arch/arm/mach-at91/Kconfig | 1 +
arch/arm/mach-at91/at91rm9200.c | 15 -----
arch/arm/mach-at91/at91sam9260.c | 27 ---------
arch/arm/mach-at91/at91sam9261.c | 9 ---
arch/arm/mach-at91/at91sam9263.c | 7 ---
arch/arm/mach-at91/at91sam9g45.c | 7 ---
arch/arm/mach-at91/at91sam9n12.c | 6 --
arch/arm/mach-at91/at91sam9rl.c | 18 ------
arch/arm/mach-at91/at91sam9x5.c | 6 --
arch/arm/mach-at91/board-dt-rm9200.c | 11 ++++
arch/arm/mach-at91/board-dt-sam9.c | 27 +++++++++
arch/arm/mach-at91/board-dt-sama5.c | 1 +
arch/arm/mach-at91/generic.h | 15 ++++-
arch/arm/mach-at91/pm.c | 109 ++++++++++++++++++++++++++---------
arch/arm/mach-at91/sama5d3.c | 6 --
arch/arm/mach-at91/sama5d4.c | 1 -
arch/arm/mach-at91/setup.c | 20 -------
drivers/clk/at91/pmc.c | 9 +++
18 files changed, 145 insertions(+), 150 deletions(-)
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] at91: cleanup for 3.20 #2
@ 2015-01-16 17:25 ` Nicolas Ferre
0 siblings, 0 replies; 4+ messages in thread
From: Nicolas Ferre @ 2015-01-16 17:25 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof, Kevin,
This is another cleanup pull-request for AT91. This one depends on the Device
Tree material that I posted yesterday, so I merged the at91-dt tag just before
stacking up Alexandre's patches. This dependency is needed to make sure that
SRAM gets initialized before using it.
More cleanup will come soon to reach multi-platform.
Thanks, best regards,
The following changes since commit eca6f17253f33313eeb3020d0634a60d10f650c4:
Merge tag 'at91-dt' into at91-3.20-cleanup (2015-01-16 17:18:34 +0100)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup2
for you to fetch changes up to 29ee506d0d56f6d39cc237de2512f9cb5629cbf7:
ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c (2015-01-16 18:08:42 +0100)
----------------------------------------------------------------
Second batch of cleanup for 3.20:
- By reworking the PM code, we can remove the AT91 more specific initialization
- We are using DT for SRAM initialization now, so we can remove its explicit
mapping
- The PMC clock driver now hosts IDLE function for at91rm9200 with other
SoCs ones.
----------------------------------------------------------------
Alexandre Belloni (8):
ARM: at91: pm: rework cpu detection
ARM: at91: pm: use the mmio-sram pool to access SRAM
ARM: at91: pm: add UDP and UHP checks to newer SoCs
ARM: at91: pm: prepare for multiplatform
ARM: at91: remove useless map_io
ARM: at91: sama5d4: remove useless call to at91_init_sram
ARM: at91: remove unused at91_init_sram
ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c
arch/arm/mach-at91/Kconfig | 1 +
arch/arm/mach-at91/at91rm9200.c | 15 -----
arch/arm/mach-at91/at91sam9260.c | 27 ---------
arch/arm/mach-at91/at91sam9261.c | 9 ---
arch/arm/mach-at91/at91sam9263.c | 7 ---
arch/arm/mach-at91/at91sam9g45.c | 7 ---
arch/arm/mach-at91/at91sam9n12.c | 6 --
arch/arm/mach-at91/at91sam9rl.c | 18 ------
arch/arm/mach-at91/at91sam9x5.c | 6 --
arch/arm/mach-at91/board-dt-rm9200.c | 11 ++++
arch/arm/mach-at91/board-dt-sam9.c | 27 +++++++++
arch/arm/mach-at91/board-dt-sama5.c | 1 +
arch/arm/mach-at91/generic.h | 15 ++++-
arch/arm/mach-at91/pm.c | 109 ++++++++++++++++++++++++++---------
arch/arm/mach-at91/sama5d3.c | 6 --
arch/arm/mach-at91/sama5d4.c | 1 -
arch/arm/mach-at91/setup.c | 20 -------
drivers/clk/at91/pmc.c | 9 +++
18 files changed, 145 insertions(+), 150 deletions(-)
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [GIT PULL] at91: cleanup for 3.20 #2
2015-01-16 17:25 ` Nicolas Ferre
@ 2015-01-21 23:19 ` Olof Johansson
-1 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2015-01-21 23:19 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 Fri, Jan 16, 2015 at 06:25:41PM +0100, Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
>
> This is another cleanup pull-request for AT91. This one depends on the Device
> Tree material that I posted yesterday, so I merged the at91-dt tag just before
> stacking up Alexandre's patches. This dependency is needed to make sure that
> SRAM gets initialized before using it.
> More cleanup will come soon to reach multi-platform.
>
> Thanks, best regards,
>
> The following changes since commit eca6f17253f33313eeb3020d0634a60d10f650c4:
>
> Merge tag 'at91-dt' into at91-3.20-cleanup (2015-01-16 17:18:34 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup2
>
> for you to fetch changes up to 29ee506d0d56f6d39cc237de2512f9cb5629cbf7:
>
> ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c (2015-01-16 18:08:42 +0100)
>
> ----------------------------------------------------------------
> Second batch of cleanup for 3.20:
> - By reworking the PM code, we can remove the AT91 more specific initialization
> - We are using DT for SRAM initialization now, so we can remove its explicit
> mapping
> - The PMC clock driver now hosts IDLE function for at91rm9200 with other
> SoCs ones.
This adds a really annoying circular dependency for us. Cleanups are supposed
to be the base for other branches, not the other way around.
To break the cycle, I've merged this into next/soc instead of into cleanup. We
now have a dependency on soc coming after dt, which is also not what we usually
do, but it least it's better than putting the dt branch in front of cleanup.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] at91: cleanup for 3.20 #2
@ 2015-01-21 23:19 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2015-01-21 23:19 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 16, 2015 at 06:25:41PM +0100, Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
>
> This is another cleanup pull-request for AT91. This one depends on the Device
> Tree material that I posted yesterday, so I merged the at91-dt tag just before
> stacking up Alexandre's patches. This dependency is needed to make sure that
> SRAM gets initialized before using it.
> More cleanup will come soon to reach multi-platform.
>
> Thanks, best regards,
>
> The following changes since commit eca6f17253f33313eeb3020d0634a60d10f650c4:
>
> Merge tag 'at91-dt' into at91-3.20-cleanup (2015-01-16 17:18:34 +0100)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git tags/at91-cleanup2
>
> for you to fetch changes up to 29ee506d0d56f6d39cc237de2512f9cb5629cbf7:
>
> ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c (2015-01-16 18:08:42 +0100)
>
> ----------------------------------------------------------------
> Second batch of cleanup for 3.20:
> - By reworking the PM code, we can remove the AT91 more specific initialization
> - We are using DT for SRAM initialization now, so we can remove its explicit
> mapping
> - The PMC clock driver now hosts IDLE function for at91rm9200 with other
> SoCs ones.
This adds a really annoying circular dependency for us. Cleanups are supposed
to be the base for other branches, not the other way around.
To break the cycle, I've merged this into next/soc instead of into cleanup. We
now have a dependency on soc coming after dt, which is also not what we usually
do, but it least it's better than putting the dt branch in front of cleanup.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-21 23:19 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-16 17:25 [GIT PULL] at91: cleanup for 3.20 #2 Nicolas Ferre
2015-01-16 17:25 ` Nicolas Ferre
2015-01-21 23:19 ` Olof Johansson
2015-01-21 23:19 ` Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.