• 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
Kconfig 4.76 KB