* [GIT PULL 2/4] at91: DT for 3.18 #1
2014-09-01 17:38 [GIT PULL 1/4] at91: cleanup for 3.18 #1 Nicolas Ferre
@ 2014-09-01 17:38 ` Nicolas Ferre
2014-09-01 17:38 ` [GIT PULL 3/4] at91: drivers " Nicolas Ferre
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2014-09-01 17:38 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson, arm
Cc: Nicolas Ferre, Linux Kernel list, linux-arm-kernel,
Alexandre Belloni, Boris BREZILLON, Maxime Ripard,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
Arnd, Olof, Kevin,
This is basically the material that Maxime and Alexandre gave to me (thus
the merge of their pull-request). I resolved a conflict so it should not appear
when you merge with current 3.17-rc tree.
Thanks, best regards,
The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git tags/at91-dt
for you to fetch changes up to 464d6e18639c4347dafd8dbcee270674dd3d8fba:
Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux (2014-08-19 16:04:10 -0500)
----------------------------------------------------------------
First batch of AT91 DT material for 3.18:
- RAM controller rework for multiple controller SoCs
- shutdown controller addtion
----------------------------------------------------------------
Alexandre Belloni (2):
ARM: at91/dt: sama5d3: define mpddr clock and ramc clocks
ARM: at91/dt: at91sam9: use ddrck in ramc
Maxime Ripard (2):
ARM: at91/dt: Declare a second ram controller when relevant
ARM: at91/dt: sama5d3: Add shutdown controller
Nicolas Ferre (1):
Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/.../mripard/linux
arch/arm/boot/dts/at91sam9263.dtsi | 10 +++++++---
arch/arm/boot/dts/at91sam9g45.dtsi | 10 ++++++++--
arch/arm/boot/dts/at91sam9n12.dtsi | 2 ++
arch/arm/boot/dts/at91sam9x5.dtsi | 2 ++
arch/arm/boot/dts/sama5d3.dtsi | 14 +++++++++++++-
5 files changed, 32 insertions(+), 6 deletions(-)
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 3/4] at91: drivers for 3.18 #1
2014-09-01 17:38 [GIT PULL 1/4] at91: cleanup for 3.18 #1 Nicolas Ferre
2014-09-01 17:38 ` [GIT PULL 2/4] at91: DT " Nicolas Ferre
@ 2014-09-01 17:38 ` Nicolas Ferre
2014-09-01 17:38 ` [GIT PULL 4/4] at91: dt for 3.18 #2 Nicolas Ferre
2014-09-05 21:12 ` [GIT PULL 1/4] at91: cleanup for 3.18 #1 Arnd Bergmann
3 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2014-09-01 17:38 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson, arm
Cc: Nicolas Ferre, Linux Kernel list, linux-arm-kernel,
Alexandre Belloni, Boris BREZILLON, Maxime Ripard,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
Arnd, Olof, Kevin,
This is the big clenup of the poweroff, reset and ram code that was lying in
setup.c previously. The drivers are now moved to their proper locations and used
in AT91 setup code.
As discussed with Arnd and later on a little bit with Olof in Chicago, I
included in this pull-request the "drivers" code and the "cleanup" code that
should go on top of it. The use of these core drivers result in a modification
of the AT91 core code that depends on the "drivers" branch: it seemed easier to
stack these "cleanup" modifications on top of the drivers themselves instead of
having a "cleanup" branch that depends on a "dt" and "drivers" branch...
To summarize, I merged both the at91-3.18-cleanup and at91-3.18-dt branches in
this one before adding the "drivers" and then code that enables these drivers.
Tell me what you feel while reading this pull-request, I'll be happy to
re-arrange it so it can suit your flow.
Thanks, best regards,
The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git tags/at91-drivers
for you to fetch changes up to 405a72c5e78b5c560c8b2711d4000fa5eb063e1b:
power: reset: at91-poweroff: fix wakeup status register index (2014-09-01 18:40:44 +0200)
----------------------------------------------------------------
First batch of AT91 drivers for 3.18:
- reset, poweroff and ram drivers are moved to their proper
location instead of being in mach-at91 directory. They now use
the appropriate frameworks.
- big amount of removal of these machine specific drivers and use
of the newly created drivers. This lead to an overhaul of the setup.c AT91
startup code.
----------------------------------------------------------------
Alexandre Belloni (7):
ARM: at91: Add new binding for sama5d3-ddramc
memory: add a driver for atmel ram controllers
ARM: at91: select ATMEL_SDRAMC when using OF
clk: at91: remove the useless CLK_IGNORE_UNUSED flag
ARM: at91/dt: sama5d3: define mpddr clock and ramc clocks
ARM: at91/dt: at91sam9: use ddrck in ramc
ARM: at91: fix ramc standby function registration
Boris BREZILLON (4):
ARM: at91: introduce OLD_IRQ_AT91 Kconfig option
ARM: at91: enclose at91_aic_xx calls in IS_ENABLED(CONFIG_OLD_IRQ_AT91) blocks
ARM: at91: make use of the new AIC driver for dt enabled boards
ARM: at91: remove old irq material
Maxime Ripard (18):
power: reset: Add if statement instead of multiple depends on
power: reset: Add AT91 reset driver
power: reset: Add AT91 poweroff driver
ARM: at91/dt: Declare a second ram controller when relevant
ARM: at91/dt: sama5d3: Add shutdown controller
ARM: at91: setup: Switch to pr_fmt
ARM: at91: Rework ramc mapping code
ARM: at91: Remove the old-style reset probing
ARM: at91/soc: Introduce register_devices callback
ARM: at91: Probe the reset driver
ARM: at91: Call at91_register_devices in the board files
ARM: at91: Remove reset code from the machine code
ARM: at91: Remove poweroff DT probing
ARM: at91: Register the poweroff driver
ARM: at91: Remove poweroff code
ARM: at91/pm: Remove show_reset_status function
ARM: at91: Remove rstc and shdwnc global base addresses
ARM: at91: Remove rstc and shdwc headers
Nicolas Ferre (5):
Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/.../mripard/linux
Merge branches 'at91-3.18-cleanup' and 'at91-3.18-dt' into at91-3.18-drivers
Merge tag 'at91-drivers-for-3.17' of git://git.kernel.org/.../mripard/linux
ARM: at91/power/reset: fix Kconfig "depends on" directive
power: reset: at91-poweroff: fix wakeup status register index
.../devicetree/bindings/arm/atmel-at91.txt | 8 +-
arch/arm/boot/dts/at91sam9263.dtsi | 10 +-
arch/arm/boot/dts/at91sam9g45.dtsi | 10 +-
arch/arm/boot/dts/at91sam9n12.dtsi | 2 +
arch/arm/boot/dts/at91sam9x5.dtsi | 2 +
arch/arm/boot/dts/sama5d3.dtsi | 14 +-
arch/arm/mach-at91/Kconfig | 25 +-
arch/arm/mach-at91/Kconfig.non_dt | 6 +
arch/arm/mach-at91/Makefile | 5 +-
arch/arm/mach-at91/at91_rstc.h | 53 ----
arch/arm/mach-at91/at91_shdwc.h | 50 ----
arch/arm/mach-at91/at91sam9260.c | 45 +++-
arch/arm/mach-at91/at91sam9261.c | 45 +++-
arch/arm/mach-at91/at91sam9263.c | 45 +++-
arch/arm/mach-at91/at91sam9_alt_reset.S | 40 ---
arch/arm/mach-at91/at91sam9g45.c | 49 +++-
arch/arm/mach-at91/at91sam9g45_reset.S | 45 ----
arch/arm/mach-at91/at91sam9rl.c | 45 +++-
arch/arm/mach-at91/board-afeb-9260v1.c | 2 +
arch/arm/mach-at91/board-cam60.c | 2 +
arch/arm/mach-at91/board-cpu9krea.c | 2 +
arch/arm/mach-at91/board-dt-rm9200.c | 13 -
arch/arm/mach-at91/board-dt-sam9.c | 13 -
arch/arm/mach-at91/board-dt-sama5.c | 13 -
arch/arm/mach-at91/board-flexibity.c | 2 +
arch/arm/mach-at91/board-sam9-l9260.c | 2 +
arch/arm/mach-at91/board-sam9260ek.c | 3 +-
arch/arm/mach-at91/board-sam9261ek.c | 3 +-
arch/arm/mach-at91/board-sam9263ek.c | 3 +-
arch/arm/mach-at91/board-sam9m10g45ek.c | 3 +-
arch/arm/mach-at91/board-sam9rlek.c | 3 +-
arch/arm/mach-at91/board-snapper9260.c | 2 +
arch/arm/mach-at91/generic.h | 10 +-
arch/arm/mach-at91/irq.c | 270 +--------------------
arch/arm/mach-at91/pm.c | 104 ++------
arch/arm/mach-at91/setup.c | 183 +++-----------
arch/arm/mach-at91/soc.h | 1 +
drivers/clk/at91/clk-system.c | 8 +-
drivers/memory/Kconfig | 10 +
drivers/memory/Makefile | 1 +
drivers/memory/atmel-sdramc.c | 98 ++++++++
drivers/power/reset/Kconfig | 33 ++-
drivers/power/reset/Makefile | 2 +
drivers/power/reset/at91-poweroff.c | 156 ++++++++++++
drivers/power/reset/at91-reset.c | 252 +++++++++++++++++++
45 files changed, 891 insertions(+), 802 deletions(-)
delete mode 100644 arch/arm/mach-at91/at91_rstc.h
delete mode 100644 arch/arm/mach-at91/at91_shdwc.h
delete mode 100644 arch/arm/mach-at91/at91sam9_alt_reset.S
delete mode 100644 arch/arm/mach-at91/at91sam9g45_reset.S
create mode 100644 drivers/memory/atmel-sdramc.c
create mode 100644 drivers/power/reset/at91-poweroff.c
create mode 100644 drivers/power/reset/at91-reset.c
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread* [GIT PULL 4/4] at91: dt for 3.18 #2
2014-09-01 17:38 [GIT PULL 1/4] at91: cleanup for 3.18 #1 Nicolas Ferre
2014-09-01 17:38 ` [GIT PULL 2/4] at91: DT " Nicolas Ferre
2014-09-01 17:38 ` [GIT PULL 3/4] at91: drivers " Nicolas Ferre
@ 2014-09-01 17:38 ` Nicolas Ferre
2014-09-02 13:49 ` Nicolas Ferre
2014-09-05 21:12 ` [GIT PULL 1/4] at91: cleanup for 3.18 #1 Arnd Bergmann
3 siblings, 1 reply; 6+ messages in thread
From: Nicolas Ferre @ 2014-09-01 17:38 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson, arm
Cc: Nicolas Ferre, Linux Kernel list, linux-arm-kernel,
Alexandre Belloni, Boris BREZILLON, Florian Fainelli,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
Arnd, Olof, Kevin,
A little bit more material for the DT branch. I didn't want to the one I've
just sent you because this material is not related to the big cleanup addressed
by previous 3 pull-requests.
It is very basic and simple DT updates and a use of phy fixup infrastructure
that is now present in phy subsystem.
Thanks, best regards,
The following changes since commit 464d6e18639c4347dafd8dbcee270674dd3d8fba:
Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux (2014-08-19 16:04:10 -0500)
are available in the git repository at:
git://github.com/at91linux/linux-at91.git tags/at91-dt2
for you to fetch changes up to 5f8157309624929e05ece846d3ca8a3a64988378:
ARM: at91: remove phy fixup for sama5d3xek boards (2014-09-01 19:30:44 +0200)
----------------------------------------------------------------
Second batch of AT91 DT patches for 3.18:
- 2 little fixes for at91sam9x5 and at91sam9n12ek
- removal of a board specific hook for sama5d3xek about phy fixup
replaced with proper DT property definition.
----------------------------------------------------------------
Alexandre Belloni (1):
ARM: at91/dt: sam9x5: fix ADC compatible string
Bo Shen (1):
ARM: at91/dt: sam9n12ek: ohci: add port and vbus property
Boris BREZILLON (2):
ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards
ARM: at91: remove phy fixup for sama5d3xek boards
arch/arm/boot/dts/at91sam9n12ek.dts | 2 ++
arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
arch/arm/boot/dts/sama5d3xcm.dtsi | 30 ++++++++++++++++++++++++++++++
arch/arm/mach-at91/board-dt-sama5.c | 22 ----------------------
4 files changed, 33 insertions(+), 23 deletions(-)
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [GIT PULL 4/4] at91: dt for 3.18 #2
2014-09-01 17:38 ` [GIT PULL 4/4] at91: dt for 3.18 #2 Nicolas Ferre
@ 2014-09-02 13:49 ` Nicolas Ferre
0 siblings, 0 replies; 6+ messages in thread
From: Nicolas Ferre @ 2014-09-02 13:49 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson, arm
Cc: Linux Kernel list, linux-arm-kernel, Alexandre Belloni,
Boris BREZILLON, Florian Fainelli,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches,
Maxime Ripard
On 01/09/2014 19:38, Nicolas Ferre :
> Arnd, Olof, Kevin,
>
> A little bit more material for the DT branch. I didn't want to the one I've
> just sent you because this material is not related to the big cleanup addressed
> by previous 3 pull-requests.
> It is very basic and simple DT updates and a use of phy fixup infrastructure
> that is now present in phy subsystem.
>
> Thanks, best regards,
>
> The following changes since commit 464d6e18639c4347dafd8dbcee270674dd3d8fba:
>
> Merge tag 'at91-dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux (2014-08-19 16:04:10 -0500)
>
> are available in the git repository at:
>
>
> git://github.com/at91linux/linux-at91.git tags/at91-dt2
FYI, I've just pushed a branch to show the conflict resolution while
merging this tag with the tree previous pull-requests:
https://github.com/at91linux/linux-at91/commits/at91-3.18-resolved
or:
git://github.com/at91linux/linux-at91.git at91-3.18-resolved
Best regards,
> for you to fetch changes up to 5f8157309624929e05ece846d3ca8a3a64988378:
>
> ARM: at91: remove phy fixup for sama5d3xek boards (2014-09-01 19:30:44 +0200)
>
> ----------------------------------------------------------------
> Second batch of AT91 DT patches for 3.18:
> - 2 little fixes for at91sam9x5 and at91sam9n12ek
> - removal of a board specific hook for sama5d3xek about phy fixup
> replaced with proper DT property definition.
>
> ----------------------------------------------------------------
> Alexandre Belloni (1):
> ARM: at91/dt: sam9x5: fix ADC compatible string
>
> Bo Shen (1):
> ARM: at91/dt: sam9n12ek: ohci: add port and vbus property
>
> Boris BREZILLON (2):
> ARM: at91/dt: describe rgmii ethernet phy connected to sama5d3xek boards
> ARM: at91: remove phy fixup for sama5d3xek boards
>
> arch/arm/boot/dts/at91sam9n12ek.dts | 2 ++
> arch/arm/boot/dts/at91sam9x5.dtsi | 2 +-
> arch/arm/boot/dts/sama5d3xcm.dtsi | 30 ++++++++++++++++++++++++++++++
> arch/arm/mach-at91/board-dt-sama5.c | 22 ----------------------
> 4 files changed, 33 insertions(+), 23 deletions(-)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL 1/4] at91: cleanup for 3.18 #1
2014-09-01 17:38 [GIT PULL 1/4] at91: cleanup for 3.18 #1 Nicolas Ferre
` (2 preceding siblings ...)
2014-09-01 17:38 ` [GIT PULL 4/4] at91: dt for 3.18 #2 Nicolas Ferre
@ 2014-09-05 21:12 ` Arnd Bergmann
3 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2014-09-05 21:12 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Olof Johansson, arm, Linux Kernel list, linux-arm-kernel,
Alexandre Belloni, Boris BREZILLON, Maxime Ripard,
Jean-Christophe PLAGNIOL-VILLARD, Ludovic Desroches
On Monday 01 September 2014, Nicolas Ferre wrote:
> Arnd, Olof, Kevin,
>
> Boris moved both of our AIC drivers to their new home: the drivers/irqchip
> directory taking advantage of the genirc framework. For DT-enabled SoCs, we can
> use these drivers (aic and aic5) as Jason merged them and they are
> available in 3.17 kernel.
>
Pulled all four branches, thanks!
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread