1. 02 Apr, 2015 1 commit
    • Olof Johansson's avatar
      Merge tag 'at91-multiplatform' of... · 58bc2d9b
      Olof Johansson authored
      Merge tag 'at91-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/multiplatform
      
      Merge "at91: multiplatform for 4.1 #1" from Nicolas Ferre:
      
      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
      
      * tag 'at91-multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (61 commits)
        ARM: at91: drop AT91_TIMER_HZ
        ARM: at91: remove hardware.h
        ARM: at91: remove SoC headers
        ARM: at91: remove useless mach/cpu.h
        ARM: at91: remove unused headers
        ARM: at91: switch at91_dt_defconfig to multiplatform
        ARM: at91: switch to multiplatform
        ARM: at91: remove useless include
        clocksource: atmel-st: remove mach/hardware dependency
        clocksource: atmel-st: use syscon/regmap
        ARM: at91: time: move the system timer driver to drivers/clocksource
        ARM: at91: properly initialize timer
        ARM: at91: at91rm9200: remove deprecated arm_pm_restart
        watchdog: at91rm9200: implement restart handler
        watchdog: at91rm9200: use the system timer syscon
        mfd: syscon: Add atmel system timer registers definition
        ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
        ARM: at91: remove old setup
        ARM: at91: sama5d4: remove useless map_io
        ARM: at91: sama5 use SoC detection infrastructure
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      58bc2d9b
  2. 01 Apr, 2015 2 commits
    • Olof Johansson's avatar
      Merge tag 'renesas-sh73a0-multiplatform-for-v4.1' of... · c0b0bb6e
      Olof Johansson authored
      Merge tag 'renesas-sh73a0-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform
      
      Merge "Renesas ARM Based SoC sh73a0 Multiplatform Updates for v4.1" from Simon
      Horman:
      
      * Add multiplatform support to sh73a0 and its kzm9g board
      * Use Bus State Controller to enable ethernet for multiplatform sh73a0/kzm9g
      * Add PM domain support to multiplatform sh73a0
      
      * tag 'renesas-sh73a0-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (43 commits)
        ARM: shmobile: sh73a0: Remove restart callback
        ARM: shmobile: sh73a0 dtsi: Add PM domain support
        ARM: shmobile: sh73a0: Remove unused sh73a0_add_standard_devices_dt()
        ARM: shmobile: sh73a0 dtsi: Add Cortex-A9 TWD node
        ARM: shmobile: kzm9g-reference: Remove board C code and DT file
        ARM: shmobile: kzm9g dts: Move Ethernet node to BSC
        ARM: shmobile: sh73a0 dtsi: Add Bus State Controller node
        ARM: shmobile: kzm9g: Build DTS for Multiplatform
        ARM: shmobile: kzm9g dts: Sync with kzm9g-reference dts
        ARM: shmobile: sh73a0: Add Multiplatform support
        ARM: shmobile: sh73a0: Introduce generic setup callback
        ARM: shmobile: r8a7794: add SDHI DT support
        ARM: shmobile: r8a7790: add ADSP clocks
        ARM: shmobile: r8a7791: add ADSP clocks
        ARM: shmobile: henninger: add CAN0 DT support
        ARM: shmobile: r8a7791: add CAN DT support
        ARM: shmobile: r8a7791: add CAN clocks
        ARM: shmobile: r8a7790: add CAN DT support
        ARM: shmobile: r8a7790: add CAN clocks
        ARM: shmobile: emev2-kzm9d dts: Add PFC information for uart1
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c0b0bb6e
    • Olof Johansson's avatar
      Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of... · d36d520a
      Olof Johansson authored
      Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/multiplatform
      
      Merge "Renesas ARM Based SoC r8a73a4 CCF and Multiplatform Updates for
      v4.1" from Simon Horman:
      
      * Add CCF and them multiplatform support to r8a73a4 SoC and its
        ape6evm board.
      * Then remove legacy r8a73a4 SoC and ape6evm board code.
      
      ----------------------------------------------------------------
      Geert Uytterhoeven (6):
            ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
            ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
            ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug
            ARM: shmobile: ape6evm dts: Drop console= bootargs parameter
            PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding
            ARM: shmobile: r8a73a4 dtsi: Add PM domain support
      
      Laurent Pinchart (1):
            ARM: shmobile: r8a73a4: Remove legacy code
      
      Simon Horman (1):
            ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
      
      Ulrich Hecht (5):
            ARM: shmobile: r8a73a4: Add CPG register bits header
            ARM: shmobile: r8a73a4: Common clock framework DT description
            ARM: shmobile: ape6evm: Disable legacy clock initialization
            ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
            ARM: shmobile: ape6evm-reference: Remove board C code and DT file
      
       Documentation/devicetree/bindings/arm/shmobile.txt |   2 -
       .../bindings/power/renesas,sysc-rmobile.txt        |   1 +
       MAINTAINERS                                        |   1 -
       arch/arm/boot/dts/Makefile                         |   2 -
       arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts    | 156 -----
       arch/arm/boot/dts/r8a73a4-ape6evm.dts              |  37 +-
       arch/arm/boot/dts/r8a73a4.dtsi                     | 557 ++++++++++++++++-
       arch/arm/configs/ape6evm_defconfig                 | 109 ----
       arch/arm/mach-shmobile/Kconfig                     |  25 -
       arch/arm/mach-shmobile/Makefile                    |   3 -
       arch/arm/mach-shmobile/Makefile.boot               |   2 -
       arch/arm/mach-shmobile/board-ape6evm-reference.c   |  60 --
       arch/arm/mach-shmobile/board-ape6evm.c             | 306 ----------
       arch/arm/mach-shmobile/clock-r8a73a4.c             | 659 ---------------------
       arch/arm/mach-shmobile/r8a73a4.h                   |  17 -
       arch/arm/mach-shmobile/setup-r8a73a4.c             | 273 +--------
       include/dt-bindings/clock/r8a73a4-clock.h          |  62 ++
       17 files changed, 615 insertions(+), 1657 deletions(-)
       delete mode 100644 arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
       delete mode 100644 arch/arm/configs/ape6evm_defconfig
       delete mode 100644 arch/arm/mach-shmobile/board-ape6evm-reference.c
       delete mode 100644 arch/arm/mach-shmobile/board-ape6evm.c
       delete mode 100644 arch/arm/mach-shmobile/clock-r8a73a4.c
       delete mode 100644 arch/arm/mach-shmobile/r8a73a4.h
       create mode 100644 include/dt-bindings/clock/r8a73a4-clock.h
      
      * tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a73a4: Remove legacy code
        ARM: shmobile: r8a73a4 dtsi: Add PM domain support
        PM / Domains: R-Mobile SYSC: Document R-Mobile APE6 (r8a73a4) binding
        ARM: shmobile: ape6evm dts: Drop console= bootargs parameter
        ARM: shmobile: r8a73a4: ape6evm: Remove legacy platform
        ARM: shmobile: ape6evm-reference: Remove board C code and DT file
        ARM: shmobile: r8a73a4: Move pfc node to work around probe ordering bug
        ARM: shmobile: ape6evm dts: Move Ethernet node to BSC
        ARM: shmobile: r8a73a4 dtsi: Add Bus State Controller node
        ARM: shmobile: r8a73a4: Add MSTP clock assignments to DT
        ARM: shmobile: ape6evm: Disable legacy clock initialization
        ARM: shmobile: r8a73a4: Common clock framework DT description
        ARM: shmobile: r8a73a4: Add CPG register bits header
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      d36d520a
  3. 19 Mar, 2015 7 commits
  4. 16 Mar, 2015 16 commits
  5. 13 Mar, 2015 14 commits