Merge branch 'heads/pinmux' into next

Conflicts:
	arch/arm/mach-shmobile/clock-r8a7740.c

diff --cc arch/arm/mach-shmobile/board-kzm9g-reference.c
Simple merge

diff --cc arch/arm/mach-shmobile/board-kzm9g.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7740.c
index b12c4764c9844a726e6bca2c689c62ae92a39cc1,e85c4e4a91ba1bd34fe36bf5c7d6dcb20cf5ddcf..6ad46403b1406425cc11438f5dc5bebd10f0ca26
--- 1/arch/arm/mach-shmobile/clock-r8a7740.c
--- 2/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@@ -595,7 -593,7 +596,8 @@@ static struct clk_lookup lookups[] = 
        CLKDEV_DEV_ID("sh_mmcif",               &mstp_clks[MSTP312]),
        CLKDEV_DEV_ID("e6bd0000.mmcif",         &mstp_clks[MSTP312]),
        CLKDEV_DEV_ID("sh-eth",                 &mstp_clks[MSTP309]),
 +      CLKDEV_DEV_ID("e9a00000.sh-eth",        &mstp_clks[MSTP309]),
+       CLKDEV_DEV_ID("renesas_tpu_pwm",        &mstp_clks[MSTP304]),
  
        CLKDEV_DEV_ID("sh_mobile_sdhi.2",       &mstp_clks[MSTP415]),
        CLKDEV_DEV_ID("e6870000.sdhi",          &mstp_clks[MSTP415]),

diff --cc arch/arm/mach-shmobile/include/mach/r8a7740.h
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7779.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
Simple merge

diff --cc drivers/pinctrl/sh-pfc/pfc-r8a7779.c
Simple merge

diff --cc include/linux/platform_data/gpio-rcar.h
Simple merge