* [PATCH 1/5] ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
@ 2014-06-25 7:35 ` Simon Horman
2014-06-25 7:35 ` [PATCH 2/5] ARM: shmobile: lager-reference: " Simon Horman
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-06-25 7:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Now the core clock issues have been fixed by commit
3c90c55dcde745bed81f6447f24ba96bda43d984 ("drivers: sh: compile
drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI"), revert the following
3 commits:
- 4dcb4c80380dfa482874b931e308fd382597feab ("ARM: shmobile: Add Koelsch
clock workarounds for SDHI"),
- 8e4f394b20a0fe474dd88204d76978191566decf ("ARM: shmobile:
koelsch-reference: Annotate clk_enables as __initconst"),
- 3d75d9ea74fee6f5a4bdcbbdf2d577661d047eef ("ARM: shmobile:
koelsch-reference: Work around core clock issues").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 1d3f67d..28e3c45 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -92,24 +92,9 @@ static const struct clk_name clk_names[] __initconst = {
{ "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)
{
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
r8a7791_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 2/5] ARM: shmobile: lager-reference: Remove workarounds for core clock issues
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
2014-06-25 7:35 ` [PATCH 1/5] ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues Simon Horman
@ 2014-06-25 7:35 ` Simon Horman
2014-06-25 7:35 ` [PATCH 3/5] ARM: shmobile: armadillo800eva legacy: Add LED support Simon Horman
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-06-25 7:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Now the core clock issues have been fixed by commit
3c90c55dcde745bed81f6447f24ba96bda43d984 ("drivers: sh: compile
drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI"), revert the following
2 commits:
- f98b55d730492e664fb2649bd7054fec0fe81acd ("ARM: shmobile: Add Lager
clock workarounds for SDHI and MMCIF"),
- aa5de826afe747c353162bbc116c63ab5335f91c ("ARM: shmobile:
lager-reference: Work around core clock issues").
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager-reference.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 4f0af91..9e0624e 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -98,23 +98,9 @@ static const struct clk_name clk_names[] __initconst = {
{ "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)
{
shmobile_clk_workaround(clk_names, ARRAY_SIZE(clk_names), false);
- shmobile_clk_workaround(clk_enables, ARRAY_SIZE(clk_enables), true);
r8a7790_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/5] ARM: shmobile: armadillo800eva legacy: Add LED support
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
2014-06-25 7:35 ` [PATCH 1/5] ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues Simon Horman
2014-06-25 7:35 ` [PATCH 2/5] ARM: shmobile: lager-reference: " Simon Horman
@ 2014-06-25 7:35 ` Simon Horman
2014-06-25 7:35 ` [PATCH 4/5] ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/ Simon Horman
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-06-25 7:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Cfr. r8a7740-armadillo800eva-reference.dts
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 35 ++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 53d03e8..395638d 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -578,6 +578,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 */
#define GPIO_KEY(c, g, d, ...) \
{ .code = c, .gpio = g, .desc = d, .active_low = 1, __VA_ARGS__ }
@@ -1069,6 +1103,7 @@ static struct platform_device *eva_devices[] __initdata = {
&lcdc0_device,
&pwm_device,
&pwm_backlight_device,
+ &leds_gpio_device,
&gpio_keys_device,
&sh_eth_device,
&vcc_sdhi0,
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 4/5] ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
` (2 preceding siblings ...)
2014-06-25 7:35 ` [PATCH 3/5] ARM: shmobile: armadillo800eva legacy: Add LED support Simon Horman
@ 2014-06-25 7:35 ` Simon Horman
2014-06-25 7:35 ` [PATCH 5/5] ARM: shmobile: Enable R-Car Gen2 CMA code in board files Simon Horman
2014-07-08 5:09 ` [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Olof Johansson
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-06-25 7:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
And add missing spaces before opening parentheses
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 368518b..0ae4982 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -53,11 +53,11 @@
* CON22 Serial
* CON23 LAN
* CON24 USB3
- * LED1 Camera LED(Yellow)
+ * LED1 Camera LED (Yellow)
* LED2 Power LED (Green)
- * ED3-LED6 User LED(Yellow)
- * LED7 LAN link LED(Green)
- * LED8 LAN activity LED(Yellow)
+ * LED3-LED6 User LED (Yellow)
+ * LED7 LAN link LED (Green)
+ * LED8 LAN activity LED (Yellow)
*/
/*
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 5/5] ARM: shmobile: Enable R-Car Gen2 CMA code in board files
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
` (3 preceding siblings ...)
2014-06-25 7:35 ` [PATCH 4/5] ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/ Simon Horman
@ 2014-06-25 7:35 ` Simon Horman
2014-07-08 5:09 ` [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Olof Johansson
5 siblings, 0 replies; 7+ messages in thread
From: Simon Horman @ 2014-06-25 7:35 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Hook in the R-Car Gen2 CMA reservation code in the board
files for Lager and Koelsch. Both the DT-reference code
and the legacy code is modified.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-koelsch-reference.c | 1 +
arch/arm/mach-shmobile/board-koelsch.c | 1 +
arch/arm/mach-shmobile/board-lager-reference.c | 1 +
arch/arm/mach-shmobile/board-lager.c | 1 +
4 files changed, 4 insertions(+)
diff --git a/arch/arm/mach-shmobile/board-koelsch-reference.c b/arch/arm/mach-shmobile/board-koelsch-reference.c
index 28e3c45..5e0375f 100644
--- a/arch/arm/mach-shmobile/board-koelsch-reference.c
+++ b/arch/arm/mach-shmobile/board-koelsch-reference.c
@@ -113,5 +113,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
.init_time = rcar_gen2_timer_init,
.init_machine = koelsch_add_standard_devices,
.init_late = shmobile_init_late,
+ .reserve = rcar_gen2_reserve,
.dt_compat = koelsch_boards_compat_dt,
MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-koelsch.c b/arch/arm/mach-shmobile/board-koelsch.c
index 0d44e7eb..db4b8a3 100644
--- a/arch/arm/mach-shmobile/board-koelsch.c
+++ b/arch/arm/mach-shmobile/board-koelsch.c
@@ -526,5 +526,6 @@ DT_MACHINE_START(KOELSCH_DT, "koelsch")
.init_time = rcar_gen2_timer_init,
.init_machine = koelsch_init,
.init_late = shmobile_init_late,
+ .reserve = rcar_gen2_reserve,
.dt_compat = koelsch_boards_compat_dt,
MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
index 9e0624e..c5e656e 100644
--- a/arch/arm/mach-shmobile/board-lager-reference.c
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -119,5 +119,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
.init_time = rcar_gen2_timer_init,
.init_machine = lager_add_standard_devices,
.init_late = shmobile_init_late,
+ .reserve = rcar_gen2_reserve,
.dt_compat = lager_boards_compat_dt,
MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 83bbb5c..a51d202 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -891,5 +891,6 @@ DT_MACHINE_START(LAGER_DT, "lager")
.init_time = rcar_gen2_timer_init,
.init_machine = lager_init,
.init_late = shmobile_init_late,
+ .reserve = rcar_gen2_reserve,
.dt_compat = lager_boards_compat_dt,
MACHINE_END
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17
2014-06-25 7:35 [GIT PULL] Renesas ARM Based SoC Boards Updates for v3.17 Simon Horman
` (4 preceding siblings ...)
2014-06-25 7:35 ` [PATCH 5/5] ARM: shmobile: Enable R-Car Gen2 CMA code in board files Simon Horman
@ 2014-07-08 5:09 ` Olof Johansson
5 siblings, 0 replies; 7+ messages in thread
From: Olof Johansson @ 2014-07-08 5:09 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jun 25, 2014 at 04:35:34PM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC boards updates for v3.17.
>
> This pull request is based on commits included in 'Renesas ARM Based SoC
> Updates for v3.17", which is tagged as renesas-soc-for-v3.17 and I have
> sent a pull-request for. That pull requests includes a few extra commits
> which were added after the board code was added on top.
>
>
> The following changes since commit ecdaca48629bd99609fdc612685363330967dce2:
>
> ARM: shmobile: rcar-gen2: correct return value of shmobile_smp_apmu_suspend_init (2014-06-17 19:33:22 +0900)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards-for-v3.17
>
> for you to fetch changes up to 5f65c5bd58bf027eb2bacc2294a98e7aea81c630:
>
> ARM: shmobile: Enable R-Car Gen2 CMA code in board files (2014-06-17 19:35:59 +0900)
Merged, thanks.
-Olof
^ permalink raw reply [flat|nested] 7+ messages in thread