From: Olof Johansson <olof@lixom.net>
Date: Wed, 1 Apr 2015 23:37:30 +0000 (-0700)
Subject: Merge tag 'renesas-sh73a0-multiplatform-for-v4.1' of git://git.kernel.org/pub/scm... 
X-Git-Tag: v4.1-rc1~48^2~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c0b0bb6e1490f48f2675c3557653fb554a9c8817;p=linux.git

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

c0b0bb6e1490f48f2675c3557653fb554a9c8817
diff --cc Documentation/devicetree/bindings/arm/shmobile.txt
index 2f8043ee438d,c69f127d27c3..c4f19b2e7dd9
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@@ -53,10 -57,10 +53,8 @@@ Boards
      compatible = "renesas,kzm9d", "renesas,emev2"
    - Kyoto Microcomputer Co. KZM-A9-GT
      compatible = "renesas,kzm9g", "renesas,sh73a0"
-   - Kyoto Microcomputer Co. KZM-A9-GT - Reference Device Tree Implementation
-     compatible = "renesas,kzm9g-reference", "renesas,sh73a0"
    - Lager (RTP0RC7790SEB00010S)
      compatible = "renesas,lager", "renesas,r8a7790"
 -  - Mackerel (R0P7372LC0016RL, AP4 EVM 2nd)
 -    compatible = "renesas,mackerel"
    - Marzen
      compatible = "renesas,marzen", "renesas,r8a7779"
  
diff --cc arch/arm/boot/dts/Makefile
index 5d258e00c5e7,aa26d13b7401..7f098c992198
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -468,8 -470,8 +468,7 @@@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += 
  	r8a7778-bockw.dtb \
  	r8a7778-bockw-reference.dtb \
  	r8a7779-marzen.dtb \
- 	sh73a0-kzm9g.dtb \
- 	sh73a0-kzm9g-reference.dtb
 -	sh7372-mackerel.dtb \
+ 	sh73a0-kzm9g.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
  	emev2-kzm9d.dtb \
  	r7s72100-genmai.dtb \
diff --cc arch/arm/mach-shmobile/Makefile
index ba7bb7847ae3,7b9ed9e25e9b..d3aca07b51a8
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -6,7 -6,8 +6,7 @@@
  obj-y				:= timer.o console.o
  
  # CPU objects
- obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o
 -obj-$(CONFIG_ARCH_SH7372)	+= setup-sh7372.o intc-sh7372.o pm-sh7372.o
+ obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o pm-sh73a0.o
  obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
  obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o pm-r8a7740.o
  obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o
diff --cc arch/arm/mach-shmobile/Makefile.boot
index da9fc6d4a1da,6ef0e2b29a02..e1ef19cef89c
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@@ -4,7 -6,7 +4,6 @@@ loadaddr-$(CONFIG_MACH_ARMADILLO800EVA
  loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
  loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
  loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
- loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 -loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
  loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
  
  __ZRELADDR	:= $(sort $(loadaddr-y))
diff --cc arch/arm/mach-shmobile/include/mach/zboot.h
index 9d9cb09c9336,219bbcf029cc..175ee05465da
--- a/arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/arch/arm/mach-shmobile/include/mach/zboot.h
@@@ -9,7 -9,10 +9,7 @@@
   *
   **************************************************/
  
- #if defined(CONFIG_MACH_KZM9G) || defined(CONFIG_MACH_KZM9G_REFERENCE)
 -#ifdef CONFIG_MACH_MACKEREL
 -#define MEMORY_START	0x40000000
 -#include "mach/head-mackerel.txt"
 -#elif defined(CONFIG_MACH_KZM9G)
++#ifdef CONFIG_MACH_KZM9G
  #define MEMORY_START	0x43000000
  #include "mach/head-kzm9g.txt"
  #else