From: Olof Johansson <olof@lixom.net>
Date: Sat, 4 Jan 2014 05:09:51 +0000 (-0800)
Subject: Merge tag 'renesas-dt3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~18516^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=11b35a352521b740944455b45dbee190e9c893a4;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'renesas-dt3-for-v3.14' of git://git./linux/kernel/git/horms/renesas into next/dt

From Simon Horman:
Third Round of Renesas ARM Based SoC DT Updates for v3.14

* r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCSs
  - Add SSI, QSPI and MSIOF  clocks in device tree

r8a7791 (R-Car M2) based Koelsch and r8a7790 (R-Car H2) based Lager boards
  - Remove reference DTS
  - Specify external clock frequency in DT
  - Sync non-reference DTS with referene DTS
  - Add clocks to DTS

* r8a7740 (R-Mobile A1) based Armadillo board
  - Add gpio-keys device
  - Add PWM backlight enable GPIO
  - Add PWM backlight power supply

* r8a73a0 (SH-Mobile AG5), r8a7740 (R-Mobile A1) and
  r8a73a4 (SH-Mobile APE6) SoCs
  - Specify PFC interrupts in DT

* tag 'renesas-dt3-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (72 commits)
  ARM: shmobile: r8a7791: Add SSI clocks in device tree
  ARM: shmobile: r8a7790: Add SSI clocks in device tree
  ARM: shmobile: r8a7791: Add QSPI module clock in device tree
  ARM: shmobile: r8a7790: Add QSPI module clock in device tree
  ARM: shmobile: r8a7791: Add MSIOF clocks in device tree
  ARM: shmobile: r8a7790: Add MSIOF clocks in device tree
  ARM: shmobile: Remove Koelsch reference DTS
  ARM: shmobile: Remove Lager reference DTS
  ARM: shmobile: koelsch: Specify external clock frequency in DT
  ARM: shmobile: lager: Specify external clock frequency in DT
  ARM: shmobile: Sync Koelsch DTS with Koelsch reference DTS
  ARM: shmobile: Sync Lager DTS with Lager reference DTS
  ARM: shmobile: r8a7791: Add clocks
  ARM: shmobile: r8a7790: Reference clocks
  ARM: shmobile: r8a7790: Add clocks
  ARM: shmobile: armadillo: dts: Add gpio-keys device
  ARM: shmobile: sh73a0: Specify PFC interrupts in DT
  ARM: shmobile: r8a7740: Specify PFC interrupts in DT
  ARM: shmobile: r8a73a4: Specify PFC interrupts in DT
  ARM: shmobile: armadillo: dts: Add PWM backlight enable GPIO
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
---

11b35a352521b740944455b45dbee190e9c893a4
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);
diff --cc drivers/clk/Makefile
index ace7309,8dd1339..a3b7c5d
--- a/drivers/clk/Makefile
+++ b/drivers/clk/Makefile
@@@ -35,7 -35,7 +35,8 @@@ obj-$(CONFIG_ARCH_TEGRA)	+= tegra
  obj-$(CONFIG_PLAT_SAMSUNG)	+= samsung/
  obj-$(CONFIG_COMMON_CLK_XGENE)  += clk-xgene.o
  obj-$(CONFIG_COMMON_CLK_KEYSTONE)	+= keystone/
 +obj-$(CONFIG_COMMON_CLK_AT91)	+= at91/
+ obj-$(CONFIG_ARCH_SHMOBILE_MULTI)	+= shmobile/
  
  obj-$(CONFIG_X86)		+= x86/