Merge remote-tracking branch 'renesas/next'

Conflicts:
	arch/arm/mach-shmobile/board-armadillo800eva.c
	arch/arm/mach-shmobile/board-bockw.c
	arch/arm/mach-shmobile/board-lager.c
	arch/arm/mach-shmobile/setup-r8a7740.c
	drivers/leds/Kconfig
	drivers/leds/leds-renesas-tpu.c
	drivers/pinctrl/sh-pfc/Kconfig

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/mach-shmobile/board-armadillo800eva.c
index b85b2882dbd05cc57d644d15f9349abe75cc7293,fca18176d385f1c690f692f706732020c24a0a13..9ca9c79a85dd96c60902df656af324117aaa38c4
--- 1/arch/arm/mach-shmobile/board-armadillo800eva.c
--- 2/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@@ -1119,40 -1195,13 +1205,10 @@@ static void __init eva_init(void
        r8a7740_pinmux_init();
        r8a7740_meram_workaround();
  
-       /* SCIFA1 */
-       gpio_request(GPIO_FN_SCIFA1_RXD, NULL);
-       gpio_request(GPIO_FN_SCIFA1_TXD, NULL);
- 
        /* LCDC0 */
-       gpio_request(GPIO_FN_LCDC0_SELECT,      NULL);
- 
        gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
-       gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */
- 
-       /* Touchscreen */
-       gpio_request(GPIO_FN_IRQ10,     NULL); /* TP_INT */
  
 -      /* Touchscreen */
 -      gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
 -
        /* GETHER */
-       gpio_request(GPIO_FN_ET_CRS,            NULL);
-       gpio_request(GPIO_FN_ET_MDC,            NULL);
-       gpio_request(GPIO_FN_ET_MDIO,           NULL);
-       gpio_request(GPIO_FN_ET_TX_ER,          NULL);
-       gpio_request(GPIO_FN_ET_RX_ER,          NULL);
-       gpio_request(GPIO_FN_ET_ERXD0,          NULL);
-       gpio_request(GPIO_FN_ET_ERXD1,          NULL);
-       gpio_request(GPIO_FN_ET_ERXD2,          NULL);
-       gpio_request(GPIO_FN_ET_ERXD3,          NULL);
-       gpio_request(GPIO_FN_ET_TX_CLK,         NULL);
-       gpio_request(GPIO_FN_ET_TX_EN,          NULL);
-       gpio_request(GPIO_FN_ET_ETXD0,          NULL);
-       gpio_request(GPIO_FN_ET_ETXD1,          NULL);
-       gpio_request(GPIO_FN_ET_ETXD2,          NULL);
-       gpio_request(GPIO_FN_ET_ETXD3,          NULL);
-       gpio_request(GPIO_FN_ET_PHY_INT,        NULL);
-       gpio_request(GPIO_FN_ET_COL,            NULL);
-       gpio_request(GPIO_FN_ET_RX_DV,          NULL);
-       gpio_request(GPIO_FN_ET_RX_CLK,         NULL);
- 
        gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */
  
        /* USB */

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

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

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

diff --cc arch/arm/mach-shmobile/setup-emev2.c
index 899a86c31ec92213520793c4c757628a5d4b0504,858aa8b9d7d91f3e9226d0ddb11fa241f6cc3ed9..66694e0e7bc5d4b4ce52335a63b9c3cf5956ab95
--- 1/arch/arm/mach-shmobile/setup-emev2.c
--- 2/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@@ -454,8 -453,8 +453,7 @@@ DT_MACHINE_START(EMEV2_DT, "Generic Emm
        .smp            = smp_ops(emev2_smp_ops),
        .init_early     = emev2_init_delay,
        .nr_irqs        = NR_IRQS_LEGACY,
-       .init_irq       = irqchip_init,
        .init_machine   = emev2_add_standard_devices_dt,
 -      .init_time      = shmobile_timer_init,
        .dt_compat      = emev2_boards_compat_dt,
  MACHINE_END
  

diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
index 326a4ab0bd5f8ea0f6ba64f6a202ce60d9a66b40,00c5a707238bf740eda55e2e91c75b8ca1a381d5..4656987939da7a3c9117cc4962eca306e82b805d
--- 1/arch/arm/mach-shmobile/setup-r8a7740.c
--- 2/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@@ -1027,9 -1016,10 +1016,9 @@@ static const char *r8a7740_boards_compa
  
  DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
        .map_io         = r8a7740_map_io,
-       .init_early     = r8a7740_add_early_devices_dt,
-       .init_irq       = r8a7740_init_irq,
-       .init_machine   = r8a7740_add_standard_devices_dt,
+       .init_early     = r8a7740_init_delay,
+       .init_irq       = r8a7740_init_irq_of,
+       .init_machine   = r8a7740_generic_init,
 -      .init_time      = shmobile_timer_init,
        .dt_compat      = r8a7740_boards_compat_dt,
  MACHINE_END
  

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

diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index fdf3894b1cc31e0291d2fc00e35bfbe61185f735,2098cce6e45485747892b739be47e0d2f24cb78f..01966d59c9f215efbbf340316935a7979882d134
--- 1/arch/arm/mach-shmobile/setup-sh73a0.c
--- 2/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -1035,8 -941,8 +941,7 @@@ DT_MACHINE_START(SH73A0_DT, "Generic SH
        .map_io         = sh73a0_map_io,
        .init_early     = sh73a0_init_delay,
        .nr_irqs        = NR_IRQS_LEGACY,
-       .init_irq       = irqchip_init,
        .init_machine   = sh73a0_add_standard_devices_dt,
 -      .init_time      = shmobile_timer_init,
        .dt_compat      = sh73a0_boards_compat_dt,
  MACHINE_END
  #endif /* CONFIG_USE_OF */

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/pinctrl/sh-pfc/Kconfig
Simple merge

diff --cc drivers/pwm/Kconfig
Simple merge