Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb902177 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'renesas-soc-fixes-for-v3.14' of... 

Merge tag 'renesas-soc-fixes-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc

From Simon Horman:
Renesas ARM Based SoC Fixes for v3.14

* r8a7790 (R-Car H2) SoC

  - Correct I2C controller names

    This fixes the issue introduced by
    b448c904 "ARM: shmobile: r8a7790: add I2C support"
    which is queued-up for v3.14.

* tag 'renesas-soc-fixes-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: r8a7790: Fix I2C controller names
parents f53f4159 db455c78

arch/arm/mach-shmobile/clock-r8a7790.c

+4 −4
Original line number Diff line number Diff line
@@ -292,13 +292,13 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),

	CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),

	CLKDEV_DEV_ID("e6508000.i2c", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.0", &mstp_clks[MSTP931]),

	CLKDEV_DEV_ID("e6518000.i2c", &mstp_clks[MSTP930]),

	CLKDEV_DEV_ID("i2c-rcar.1", &mstp_clks[MSTP930]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.1", &mstp_clks[MSTP930]),

	CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP929]),

	CLKDEV_DEV_ID("i2c-rcar.2", &mstp_clks[MSTP929]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.2", &mstp_clks[MSTP929]),

	CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP928]),

	CLKDEV_DEV_ID("i2c-rcar.3", &mstp_clks[MSTP928]),

	CLKDEV_DEV_ID("i2c-rcar_gen2.3", &mstp_clks[MSTP928]),

	CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),

	CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),

	CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),

arch/arm/mach-shmobile/setup-r8a7790.c

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static struct resource i2c_resources[] __initdata = { 


#define r8a7790_register_i2c(idx)		\

	platform_device_register_simple(	\

		"i2c-rcar", idx,		\

		"i2c-rcar_gen2", idx,		\

		i2c_resources + (2 * idx), 2);	\



void __init r8a7790_pinmux_init(void)