From: Simon Horman <horms+renesas@verge.net.au>
Date: Thu, 19 Dec 2013 10:08:11 +0000 (+0900)
Subject: Merge branch 'heads/soc2' into boards2-base
X-Git-Tag: v5.15~18591^2~2^2~12
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=70d4f2e5576a16120e6bc85b10011032306c1179;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'heads/soc2' into boards2-base
---

70d4f2e5576a16120e6bc85b10011032306c1179
diff --cc arch/arm/mach-shmobile/Kconfig
index 3e57d45,8c88892..cd89d63
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -265,18 -243,8 +269,19 @@@ config MACH_KOELSC
  	bool "Koelsch board"
  	depends on ARCH_R8A7791
  	select USE_OF
+ 	select MICREL_PHY if SH_ETH
  
 +config MACH_KOELSCH_REFERENCE
 +	bool "Koelsch board - Reference Device Tree Implementation"
 +	depends on ARCH_R8A7791
 +	select USE_OF
 +	---help---
 +	   Use reference implementation of Koelsch board support
 +	   which makes use of device tree at the expense
 +	   of not supporting a number of devices.
 +
 +	   This is intended to aid developers
 +
  config MACH_KZM9G
  	bool "KZM-A9-GT board"
  	depends on ARCH_SH73A0
diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index 3543c3b,1a11e26..8474818
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -67,9 -63,31 +67,30 @@@ R8A7790_GPIO(5)
  		&r8a7790_gpio##idx##_platform_data,			\
  		sizeof(r8a7790_gpio##idx##_platform_data))
  
+ static struct resource i2c_resources[] __initdata = {
+ 	/* I2C0 */
+ 	DEFINE_RES_MEM(0xE6508000, 0x40),
+ 	DEFINE_RES_IRQ(gic_spi(287)),
+ 	/* I2C1 */
+ 	DEFINE_RES_MEM(0xE6518000, 0x40),
+ 	DEFINE_RES_IRQ(gic_spi(288)),
+ 	/* I2C2 */
+ 	DEFINE_RES_MEM(0xE6530000, 0x40),
+ 	DEFINE_RES_IRQ(gic_spi(286)),
+ 	/* I2C3 */
+ 	DEFINE_RES_MEM(0xE6540000, 0x40),
+ 	DEFINE_RES_IRQ(gic_spi(290)),
+ 
+ };
+ 
+ #define r8a7790_register_i2c(idx)		\
+ 	platform_device_register_simple(	\
+ 		"i2c-rcar", idx,		\
+ 		i2c_resources + (2 * idx), 2);	\
+ 
  void __init r8a7790_pinmux_init(void)
  {
 -	platform_device_register_simple("pfc-r8a7790", -1, pfc_resources,
 -					ARRAY_SIZE(pfc_resources));
 +	r8a7790_register_pfc();
  	r8a7790_register_gpio(0);
  	r8a7790_register_gpio(1);
  	r8a7790_register_gpio(2);