Merge branches 'rmobile/kota2' and 'rmobile/marzen' into rmobile-latest

Conflicts:
	arch/arm/mach-shmobile/Kconfig
	arch/arm/mach-shmobile/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --cc arch/arm/mach-shmobile/Kconfig
index ef0077e8771e8ba0b21eea59ff4d58c9e5fb9e22,0828fab2b65c7aa910dcfbcd73e712a1c56f0b61,ee4cb420726d7c23468c895f309ed7f51c1b38be..060e5644c49c4711668835d451885f552a63a210
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
--- 3/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@@ -28,12 -28,6 -28,19 +28,19 @@@@ config ARCH_SH73A
        select ARM_GIC
        select I2C
   
 + config ARCH_R8A7740
 +      bool "R-Mobile A1 (R8A77400)"
 +      select CPU_V7
 +      select SH_CLK_CPG
 +      select ARCH_WANT_OPTIONAL_GPIOLIB
 + 
++ config ARCH_R8A7779
++      bool "R-Car H1 (R8A77790)"
++      select CPU_V7
++      select SH_CLK_CPG
++      select ARM_GIC
++      select ARCH_WANT_OPTIONAL_GPIOLIB
++ 
   comment "SH-Mobile Board Type"
   
   config MACH_G3EVM
@@@@ -81,11 -75,6 -88,11 +88,16 @@@@ config MACH_KOTA
        select ARCH_REQUIRE_GPIOLIB
        depends on ARCH_SH73A0
   
 ++config MACH_BONITO
 ++     bool "bonito board"
 ++     select ARCH_REQUIRE_GPIOLIB
 ++     depends on ARCH_R8A7740
 ++
++ config MACH_MARZEN
++      bool "MARZEN board"
++      depends on ARCH_R8A7779
++      select ARCH_REQUIRE_GPIOLIB
++ 
   comment "SH-Mobile System Configuration"
   
   menu "Memory configuration"

diff --cc arch/arm/mach-shmobile/Makefile
index 957e5c7a38fe366c3ab486efea6098a8927d9535,5ca1f9d669953cec4f04b0b1ff806bed85fba150,b0d0d4b1ccbf896b3e1c80b953d1c5ccb6355ee3..997bd2bcd5f669459d84e0b33a461da95802edca
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
--- 3/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@@ -10,7 -10,6 -10,8 +10,8 @@@@ obj-$(CONFIG_ARCH_SH7367)     += setup-sh73
   obj-$(CONFIG_ARCH_SH7377)    += setup-sh7377.o clock-sh7377.o intc-sh7377.o
   obj-$(CONFIG_ARCH_SH7372)    += setup-sh7372.o clock-sh7372.o intc-sh7372.o
   obj-$(CONFIG_ARCH_SH73A0)    += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
 + obj-$(CONFIG_ARCH_R8A7740)   += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
++ obj-$(CONFIG_ARCH_R8A7779)   += setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o
   
   # SMP objects
   smp-y                                := platsmp.o headsmp.o
@@@@ -24,7 -23,6 -25,8 +25,8 @@@@ pfc-$(CONFIG_ARCH_SH7367)     += pfc-sh7367
   pfc-$(CONFIG_ARCH_SH7377)    += pfc-sh7377.o
   pfc-$(CONFIG_ARCH_SH7372)    += pfc-sh7372.o
   pfc-$(CONFIG_ARCH_SH73A0)    += pfc-sh73a0.o
 + pfc-$(CONFIG_ARCH_R8A7740)   += pfc-r8a7740.o
++ pfc-$(CONFIG_ARCH_R8A7779)   += pfc-r8a7779.o
   
   # IRQ objects
   obj-$(CONFIG_ARCH_SH7367)    += entry-intc.o
@@@@ -44,7 -41,6 -47,7 +47,8 @@@@ obj-$(CONFIG_MACH_AP4EVB)     += board-ap4e
   obj-$(CONFIG_MACH_AG5EVM)    += board-ag5evm.o
   obj-$(CONFIG_MACH_MACKEREL)  += board-mackerel.o
   obj-$(CONFIG_MACH_KOTA2)     += board-kota2.o
 ++obj-$(CONFIG_MACH_BONITO)    += board-bonito.o
++ obj-$(CONFIG_MACH_MARZEN)    += board-marzen.o
   
   # Framework support
   obj-$(CONFIG_SMP)            += $(smp-y)