* [PATCH 1/3] ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits
2014-08-25 1:10 [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Simon Horman
@ 2014-08-25 1:10 ` Simon Horman
2014-08-25 1:10 ` [PATCH 2/3] ARM: shmobile: ape6evm: " Simon Horman
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-08-25 1:10 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of sh73a0 specific bits.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index e7a0296..8ff9679 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -775,17 +775,12 @@ void __init sh73a0_add_early_devices(void)
void __init sh73a0_add_standard_devices_dt(void)
{
- struct platform_device_info devinfo = { .name = "cpufreq-cpu0", .id = -1, };
-
/* clocks are setup late during boot in the case of DT */
sh73a0_clock_init();
platform_add_devices(sh73a0_devices_dt,
ARRAY_SIZE(sh73a0_devices_dt));
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-
- /* Instantiate cpufreq-cpu0 */
- platform_device_register_full(&devinfo);
}
static const char *sh73a0_boards_compat_dt[] __initdata = {
--
2.0.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/3] ARM: shmobile: ape6evm: Remove duplicate CPUFreq bits
2014-08-25 1:10 [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Simon Horman
2014-08-25 1:10 ` [PATCH 1/3] ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits Simon Horman
@ 2014-08-25 1:10 ` Simon Horman
2014-08-25 1:10 ` [PATCH 3/3] ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h Simon Horman
2014-09-05 16:04 ` [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-08-25 1:10 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
The CPUFreq platform device is already registered by
shmobile_init_late(), so get rid of ape6evm specific bits.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-ape6evm-reference.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
index 2f7723e..ac371b7 100644
--- a/arch/arm/mach-shmobile/board-ape6evm-reference.c
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -50,7 +50,6 @@ static void __init ape6evm_add_standard_devices(void)
r8a73a4_add_dt_devices();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
- platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);
}
static const char *ape6evm_boards_compat_dt[] __initdata = {
--
2.0.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h
2014-08-25 1:10 [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Simon Horman
2014-08-25 1:10 ` [PATCH 1/3] ARM: shmobile: sh73a0: Remove duplicate CPUFreq bits Simon Horman
2014-08-25 1:10 ` [PATCH 2/3] ARM: shmobile: ape6evm: " Simon Horman
@ 2014-08-25 1:10 ` Simon Horman
2014-09-05 16:04 ` [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-08-25 1:10 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Move all definitions for legacy INTC from the common "irqs.h" to the
INTC-specific "intc.h".
Include "intc.h" in sh7372/sh73a0 CPU and board files where needed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Magnus Damm <damm+renesas@opensource.se>
[horms+renesas at verge.net.au: omitted whitespace change]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-kzm9g.c | 1 +
arch/arm/mach-shmobile/board-mackerel.c | 1 +
arch/arm/mach-shmobile/intc.h | 5 +++++
arch/arm/mach-shmobile/irqs.h | 6 ------
arch/arm/mach-shmobile/setup-sh7372.c | 1 +
arch/arm/mach-shmobile/setup-sh73a0.c | 1 +
6 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index f8bc7f8..1bcd7eb 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -50,6 +50,7 @@
#include <video/sh_mobile_lcdc.h>
#include "common.h"
+#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 79f448e..b7c4261 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -63,6 +63,7 @@
#include <asm/mach-types.h>
#include "common.h"
+#include "intc.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh-gpio.h"
diff --git a/arch/arm/mach-shmobile/intc.h b/arch/arm/mach-shmobile/intc.h
index a5603c7..40b2ad4 100644
--- a/arch/arm/mach-shmobile/intc.h
+++ b/arch/arm/mach-shmobile/intc.h
@@ -287,4 +287,9 @@ static struct intc_desc p ## _desc __initdata = { \
p ## _sense_registers, NULL), \
}
+/* INTCS */
+#define INTCS_VECT_BASE 0x3400
+#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
+#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt))
+
#endif /* __ASM_MACH_INTC_H */
diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
index 8e28223..3070f6d 100644
--- a/arch/arm/mach-shmobile/irqs.h
+++ b/arch/arm/mach-shmobile/irqs.h
@@ -1,18 +1,12 @@
#ifndef __SHMOBILE_IRQS_H
#define __SHMOBILE_IRQS_H
-#include <linux/sh_intc.h>
#include "include/mach/irqs.h"
/* GIC */
#define gic_spi(nr) ((nr) + 32)
#define gic_iid(nr) (nr) /* ICCIAR / interrupt ID */
-/* INTCS */
-#define INTCS_VECT_BASE 0x3400
-#define INTCS_VECT(n, vect) INTC_VECT((n), INTCS_VECT_BASE + (vect))
-#define intcs_evt2irq(evt) evt2irq(INTCS_VECT_BASE + (evt))
-
/* GPIO IRQ */
#define _GPIO_IRQ_BASE 2500
#define GPIO_IRQ_BASE(x) (_GPIO_IRQ_BASE + (32 * x))
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 3731ecc..eaf5d13 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -41,6 +41,7 @@
#include "common.h"
#include "dma-register.h"
+#include "intc.h"
#include "irqs.h"
#include "pm-rmobile.h"
#include "sh7372.h"
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 8ff9679..173c678 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -40,6 +40,7 @@
#include "common.h"
#include "dma-register.h"
+#include "intc.h"
#include "irqs.h"
#include "sh73a0.h"
--
2.0.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18
2014-08-25 1:10 [GIT PULL] Second Round Of Renesas ARM Based SoC Updates For v3.18 Simon Horman
` (2 preceding siblings ...)
2014-08-25 1:10 ` [PATCH 3/3] ARM: shmobile: Move legacy INTC definitions from irqs.h to intc.h Simon Horman
@ 2014-09-05 16:04 ` Arnd Bergmann
3 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2014-09-05 16:04 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 25 August 2014, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these second round of Renesas ARM based SoC updates for v3.18.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-soc-for-v3.18,
> which I have already sent a pull-request for.
>
Pulled into next/soc, thanks!
Arnd
^ permalink raw reply [flat|nested] 5+ messages in thread