Merge tag 'renesas-r8a73a4-ccf-and-multiplatform-for-v4.1' of git://git.kernel.org...

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: Olof Johansson <olof@lixom.net>

diff --cc Documentation/devicetree/bindings/arm/shmobile.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/Kconfig
index 15a7dba2a683f53be3ade1cbbfb0acede38fe7ce,5fc47569051e236d65e3c42870b4f7203810f6bd..485961a4de1dac570e34e609b8eebc4f1637a42b
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -133,24 -129,15 +126,6 @@@ config ARCH_R8A777
  
  comment "Renesas ARM SoCs Board Type"
  
- config MACH_APE6EVM
-       bool "APE6EVM board"
-       depends on ARCH_R8A73A4
-       select SMSC_PHY if SMSC911X
-       select USE_OF
- 
- config MACH_APE6EVM_REFERENCE
-       bool "APE6EVM board - Reference Device Tree Implementation"
-       depends on ARCH_R8A73A4
 -config MACH_MACKEREL
 -      bool "mackerel board"
 -      depends on ARCH_SH7372
 -      select ARCH_REQUIRE_GPIOLIB
 -      select REGULATOR_FIXED_VOLTAGE if REGULATOR
--      select SMSC_PHY if SMSC911X
 -      select SND_SOC_AK4642 if SND_SIMPLE_CARD
--      select USE_OF
-       ---help---
-          Use reference implementation of APE6EVM board support
-          which makes a greater use of device tree at the expense
-          of not supporting a number of devices.
- 
-          This is intended to aid developers
--
  config MACH_ARMADILLO800EVA
        bool "Armadillo-800 EVA board"
        depends on ARCH_R8A7740

diff --cc arch/arm/mach-shmobile/Makefile
index beb3f1491e68bb3580d79875bd9d98aaba4e44df,cf8b348f943d2e9a6410dab792118f4c97c9900c..ba7bb7847ae3ec42e01a55e5dbd843a02c57d9a3
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -20,8 -21,8 +20,7 @@@ obj-$(CONFIG_ARCH_R7S72100)   += setup-r7
  # Clock objects
  ifndef CONFIG_COMMON_CLK
  obj-y                         += clock.o
 -obj-$(CONFIG_ARCH_SH7372)     += clock-sh7372.o
  obj-$(CONFIG_ARCH_SH73A0)     += clock-sh73a0.o
- obj-$(CONFIG_ARCH_R8A73A4)    += clock-r8a73a4.o
  obj-$(CONFIG_ARCH_R8A7740)    += clock-r8a7740.o
  obj-$(CONFIG_ARCH_R8A7778)    += clock-r8a7778.o
  obj-$(CONFIG_ARCH_R8A7779)    += clock-r8a7779.o
@@@ -53,8 -57,7 +52,6 @@@ obj-$(CONFIG_PM_RMOBILE)      += pm-rmobile.
  ifdef CONFIG_ARCH_SHMOBILE_MULTI
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen-reference.o
  else
- obj-$(CONFIG_MACH_APE6EVM)    += board-ape6evm.o
- obj-$(CONFIG_MACH_APE6EVM_REFERENCE)  += board-ape6evm-reference.o
 -obj-$(CONFIG_MACH_MACKEREL)   += board-mackerel.o
  obj-$(CONFIG_MACH_BOCKW)      += board-bockw.o
  obj-$(CONFIG_MACH_BOCKW_REFERENCE)    += board-bockw-reference.o
  obj-$(CONFIG_MACH_MARZEN)     += board-marzen.o

diff --cc arch/arm/mach-shmobile/Makefile.boot
Simple merge