Commit 231bf80f authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board changes from Olof Johansson:
 "This is the smallest board branch we have ever had.  Most of this is a
  few cleanups for board code for Renesas shmobile, with a bit of legacy
  driver support added.  This is strongly trending in the right
  direction now"

* tag 'boards-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: Enable R-Car Gen2 CMA code in board files
  ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
  ARM: shmobile: armadillo800eva legacy: Add LED support
  ARM: shmobile: lager-reference: Remove workarounds for core clock issues
  ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
parents b3345d7c bdd18e8f
...@@ -55,11 +55,11 @@ ...@@ -55,11 +55,11 @@
* CON22 Serial * CON22 Serial
* CON23 LAN * CON23 LAN
* CON24 USB3 * CON24 USB3
* LED1 Camera LED(Yellow) * LED1 Camera LED (Yellow)
* LED2 Power LED (Green) * LED2 Power LED (Green)
* ED3-LED6 User LED(Yellow) * LED3-LED6 User LED (Yellow)
* LED7 LAN link LED(Green) * LED7 LAN link LED (Green)
* LED8 LAN activity LED(Yellow) * LED8 LAN activity LED (Yellow)
*/ */
/* /*
......
...@@ -580,6 +580,40 @@ static struct platform_device hdmi_lcdc_device = { ...@@ -580,6 +580,40 @@ static struct platform_device hdmi_lcdc_device = {
}, },
}; };
/* LEDS */
static struct gpio_led gpio_leds[] = {
{
.name = "LED3",
.gpio = 102,
.default_state = LEDS_GPIO_DEFSTATE_ON,
}, {
.name = "LED4",
.gpio = 111,
.default_state = LEDS_GPIO_DEFSTATE_ON,
}, {
.name = "LED5",
.gpio = 110,
.default_state = LEDS_GPIO_DEFSTATE_ON,
}, {
.name = "LED6",
.gpio = 177,
.default_state = LEDS_GPIO_DEFSTATE_ON,
},
};
static struct gpio_led_platform_data leds_gpio_info = {
.leds = gpio_leds,
.num_leds = ARRAY_SIZE(gpio_leds),
};
static struct platform_device leds_gpio_device = {
.name = "leds-gpio",
.id = -1,
.dev = {
.platform_data = &leds_gpio_info,
},
};
/* GPIO KEY */ /* GPIO KEY */
#define GPIO_KEY(c, g, d, ...) \ #define GPIO_KEY(c, g, d, ...) \
{ .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ } { .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }
...@@ -1075,6 +1109,7 @@ static struct platform_device *eva_devices[] __initdata = { ...@@ -1075,6 +1109,7 @@ static struct platform_device *eva_devices[] __initdata = {
&lcdc0_device, &lcdc0_device,
&pwm_device, &pwm_device,
&pwm_backlight_device, &pwm_backlight_device,
&leds_gpio_device,
&gpio_keys_device, &gpio_keys_device,
&sh_eth_device, &sh_eth_device,
&vcc_sdhi0, &vcc_sdhi0,
......
...@@ -94,24 +94,9 @@ static const struct clk_name clk_names[] __initconst = { ...@@ -94,24 +94,9 @@ static const struct clk_name clk_names[] __initconst = {
{ "lvds0", "lvds.0", "rcar-du-r8a7791" }, { "lvds0", "lvds.0", "rcar-du-r8a7791" },
}; };
/*
* This is a really crude hack to work around core platform clock issues
*/
static const struct clk_name clk_enables[] __initconst = {
{ "ether", NULL, "ee700000.ethernet" },
{ "i2c2", NULL, "e6530000.i2c" },
{ "msiof0", NULL, "e6e20000.spi" },
{ "qspi_mod", NULL, "e6b10000.spi" },
{ "sdhi0", NULL, "ee100000.sd" },
{ "sdhi1", NULL, "ee140000.sd" },
{ "sdhi2", NULL, "ee160000.sd" },
{ "thermal", NULL, "e61f0000.thermal" },
};
static void __init koelsch_add_standard_devices(void) static void __init koelsch_add_standard_devices(void)
{ {
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
r8a7791_add_dt_devices(); r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
...@@ -130,5 +115,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch") ...@@ -130,5 +115,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
.init_time = rcar_gen2_timer_init, .init_time = rcar_gen2_timer_init,
.init_machine = koelsch_add_standard_devices, .init_machine = koelsch_add_standard_devices,
.init_late = shmobile_init_late, .init_late = shmobile_init_late,
.reserve = rcar_gen2_reserve,
.dt_compat = koelsch_boards_compat_dt, .dt_compat = koelsch_boards_compat_dt,
MACHINE_END MACHINE_END
...@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch") ...@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
.init_time = rcar_gen2_timer_init, .init_time = rcar_gen2_timer_init,
.init_machine = koelsch_init, .init_machine = koelsch_init,
.init_late = shmobile_init_late, .init_late = shmobile_init_late,
.reserve = rcar_gen2_reserve,
.dt_compat = koelsch_boards_compat_dt, .dt_compat = koelsch_boards_compat_dt,
MACHINE_END MACHINE_END
...@@ -100,23 +100,9 @@ static const struct clk_name clk_names[] __initconst = { ...@@ -100,23 +100,9 @@ static const struct clk_name clk_names[] __initconst = {
{ "lvds1", "lvds.1", "rcar-du-r8a7790" }, { "lvds1", "lvds.1", "rcar-du-r8a7790" },
}; };
/*
* This is a really crude hack to work around core platform clock issues
*/
static const struct clk_name clk_enables[] __initconst = {
{ "ether", NULL, "ee700000.ethernet" },
{ "msiof1", NULL, "e6e10000.spi" },
{ "mmcif1", NULL, "ee220000.mmc" },
{ "qspi_mod", NULL, "e6b10000.spi" },
{ "sdhi0", NULL, "ee100000.sd" },
{ "sdhi2", NULL, "ee140000.sd" },
{ "thermal", NULL, "e61f0000.thermal" },
};
static void __init lager_add_standard_devices(void) static void __init lager_add_standard_devices(void)
{ {
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false); shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
r8a7790_add_dt_devices(); r8a7790_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
...@@ -135,5 +121,6 @@ DT_MACHINE_START(LAGER_DT, "lager") ...@@ -135,5 +121,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
.init_time = rcar_gen2_timer_init, .init_time = rcar_gen2_timer_init,
.init_machine = lager_add_standard_devices, .init_machine = lager_add_standard_devices,
.init_late = shmobile_init_late, .init_late = shmobile_init_late,
.reserve = rcar_gen2_reserve,
.dt_compat = lager_boards_compat_dt, .dt_compat = lager_boards_compat_dt,
MACHINE_END MACHINE_END
...@@ -887,5 +887,6 @@ DT_MACHINE_START(LAGER_DT, "lager") ...@@ -887,5 +887,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
.init_time = rcar_gen2_timer_init, .init_time = rcar_gen2_timer_init,
.init_machine = lager_init, .init_machine = lager_init,
.init_late = shmobile_init_late, .init_late = shmobile_init_late,
.reserve = rcar_gen2_reserve,
.dt_compat = lager_boards_compat_dt, .dt_compat = lager_boards_compat_dt,
MACHINE_END MACHINE_END
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment