* [PATCH 01/11] ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 02/11] ARM: shmobile: sh73a0: Add shmobile_init_late() Simon Horman
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Add the missing call to shmobile_init_late() to r8a7778_init_late().
This should make sure Suspend-to-RAM and CPUIdle are setup as expected
on bockw.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7778.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index f00a488..383e43b 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -520,6 +520,7 @@ void __init r8a7778_add_standard_devices(void)
void __init r8a7778_init_late(void)
{
+ shmobile_init_late();
platform_device_register_full(&ehci_info);
platform_device_register_full(&ohci_info);
}
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 02/11] ARM: shmobile: sh73a0: Add shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
2014-08-23 1:44 ` [PATCH 01/11] ARM: shmobile: r8a7778: Add missing call to shmobile_init_late() Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 03/11] ARM: shmobile: r8a7779: Fix shmobile_init_late() Simon Horman
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Extend sh73a0 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 2c802ae..0022918 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -799,6 +799,7 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.init_early = sh73a0_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_machine = sh73a0_add_standard_devices_dt,
+ .init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 03/11] ARM: shmobile: r8a7779: Fix shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
2014-08-23 1:44 ` [PATCH 01/11] ARM: shmobile: r8a7778: Add missing call to shmobile_init_late() Simon Horman
2014-08-23 1:44 ` [PATCH 02/11] ARM: shmobile: sh73a0: Add shmobile_init_late() Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 04/11] ARM: shmobile: r8a7778: " Simon Horman
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Fix r8a7779 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup and platform devices
are omitted as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7779.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 236c1be..6875a9f 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -774,7 +774,7 @@ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = r8a7779_add_standard_devices_dt,
- .init_late = r8a7779_init_late,
+ .init_late = shmobile_init_late,
.dt_compat = r8a7779_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 04/11] ARM: shmobile: r8a7778: Fix shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (2 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 03/11] ARM: shmobile: r8a7779: Fix shmobile_init_late() Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 05/11] ARM: shmobile: r8a73a4: Add shmobile_init_late() Simon Horman
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Fix r8a7778 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup and platform devices
are omitted as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7778.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 383e43b..e1a477b 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -610,8 +610,8 @@ static const char *r8a7778_compat_dt[] __initdata = {
DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
.init_early = r8a7778_init_delay,
.init_irq = r8a7778_init_irq_dt,
+ .init_late = shmobile_init_late,
.dt_compat = r8a7778_compat_dt,
- .init_late = r8a7778_init_late,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 05/11] ARM: shmobile: r8a73a4: Add shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (3 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 04/11] ARM: shmobile: r8a7778: " Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 06/11] ARM: shmobile: r7s72100: " Simon Horman
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Extend r8a73a4 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a73a4.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 6683072..6fbcdcc 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -311,6 +311,7 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
.init_early = r8a73a4_init_early,
+ .init_late = shmobile_init_late,
.dt_compat = r8a73a4_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 06/11] ARM: shmobile: r7s72100: Add shmobile_init_late()
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (4 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 05/11] ARM: shmobile: r8a73a4: Add shmobile_init_late() Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 07/11] ARM: shmobile: Rework multiplatform include workaround Simon Horman
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Extend r7s72100 SoC machine vector to include shmobile_init_late()
so Suspend-to-RAM and CPUIdle are setup as expected.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r7s72100.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/setup-r7s72100.c b/arch/arm/mach-shmobile/setup-r7s72100.c
index f3b3b14..8cdc25d 100644
--- a/arch/arm/mach-shmobile/setup-r7s72100.c
+++ b/arch/arm/mach-shmobile/setup-r7s72100.c
@@ -53,6 +53,7 @@ static const char *r7s72100_boards_compat_dt[] __initdata = {
DT_MACHINE_START(R7S72100_DT, "Generic R7S72100 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
+ .init_late = shmobile_init_late,
.dt_compat = r7s72100_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 07/11] ARM: shmobile: Rework multiplatform include workaround
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (5 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 06/11] ARM: shmobile: r7s72100: " Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 08/11] ARM: shmobile: dma: Use defines instead of hardcoded numbers Simon Horman
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Now when the majority of the include files have moved from
arch/arm/mach-shmobile/include/mach/ to arch/arm/mach-shmobile/
remove the header include file workaround in the Makefile...
... and add another workaround in irqs.h to cope with the fact
that <mach/irqs.h> needs to be where it is until the PFC code
has been updated to remove legacy non-DT interfaces.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/Makefile | 2 --
arch/arm/mach-shmobile/irqs.h | 2 +-
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index fe3878a..a6a1dc0 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -2,8 +2,6 @@
# Makefile for the linux kernel.
#
-ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
-
# Common objects
obj-y := timer.o console.o
diff --git a/arch/arm/mach-shmobile/irqs.h b/arch/arm/mach-shmobile/irqs.h
index 4ff2d2a..8e28223 100644
--- a/arch/arm/mach-shmobile/irqs.h
+++ b/arch/arm/mach-shmobile/irqs.h
@@ -2,7 +2,7 @@
#define __SHMOBILE_IRQS_H
#include <linux/sh_intc.h>
-#include <mach/irqs.h>
+#include "include/mach/irqs.h"
/* GIC */
#define gic_spi(nr) ((nr) + 32)
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 08/11] ARM: shmobile: dma: Use defines instead of hardcoded numbers
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (6 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 07/11] ARM: shmobile: Rework multiplatform include workaround Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 09/11] ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY Simon Horman
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/dma-register.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-shmobile/dma-register.h b/arch/arm/mach-shmobile/dma-register.h
index 97c40bd..52a2f66 100644
--- a/arch/arm/mach-shmobile/dma-register.h
+++ b/arch/arm/mach-shmobile/dma-register.h
@@ -52,8 +52,8 @@ static const unsigned int dma_ts_shift[] = {
((((i) & TS_LOW_BIT) << TS_LOW_SHIFT) |\
(((i) & TS_HI_BIT) << TS_HI_SHIFT))
-#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | 0x800 | TS_INDEX2VAL((xmit_sz)))
-#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | 0x800 | TS_INDEX2VAL((xmit_sz)))
+#define CHCR_TX(xmit_sz) (DM_FIX | SM_INC | RS_ERS | TS_INDEX2VAL((xmit_sz)))
+#define CHCR_RX(xmit_sz) (DM_INC | SM_FIX | RS_ERS | TS_INDEX2VAL((xmit_sz)))
/*
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 09/11] ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (7 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 08/11] ARM: shmobile: dma: Use defines instead of hardcoded numbers Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 10/11] ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization Simon Horman
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm+renesas@opensource.se>
Remove NR_IRQS_LEGACY from the r8a7779 generic machine
vector. The generic r8a7779 machine vector requires use
of Multiplatform, and in such case SPARSE_IRQ is enabled
by default. This in turns means that the default value
of .nr_irqs equals NR_IRQS and NR_IRQS_LEGACY. Because
of this we can simply remove NR_IRQS_LEGACY and move one
step closer to a cruft-free environment.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-r8a7779.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 6875a9f..6829cd1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -771,7 +771,6 @@ static const char *r8a7779_compat_dt[] __initdata = {
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.map_io = r8a7779_map_io,
.init_early = shmobile_init_delay,
- .nr_irqs = NR_IRQS_LEGACY,
.init_irq = r8a7779_init_irq_dt,
.init_machine = r8a7779_add_standard_devices_dt,
.init_late = shmobile_init_late,
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 10/11] ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (8 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 09/11] ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-23 1:44 ` [PATCH 11/11] ARM: shmobile: sh73a0: " Simon Horman
2014-08-25 0:41 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-sh7372.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 9cdfcdfd..3731ecc 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -1008,7 +1008,6 @@ static const char *sh7372_boards_compat_dt[] __initdata = {
DT_MACHINE_START(SH7372_DT, "Generic SH7372 (Flattened Device Tree)")
.map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices_dt,
- .nr_irqs = NR_IRQS_LEGACY,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = sh7372_add_standard_devices_dt,
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 11/11] ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (9 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 10/11] ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization Simon Horman
@ 2014-08-23 1:44 ` Simon Horman
2014-08-25 0:41 ` [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-23 1:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
As per arch_probe_nr_irqs(), the default value is NR_IRQS, which maps to
NR_IRQS_LEGACY if CONFIG_SPARSE_IRQ=y.
Since SPARSE_IRQ is selected by both ARCH_MULTIPLATFORM and
ARCH_SHMOBILE_LEGACY, it's always enabled on shmobile.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/setup-sh73a0.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 0022918..e7a0296 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -797,7 +797,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.smp = smp_ops(sh73a0_smp_ops),
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
- .nr_irqs = NR_IRQS_LEGACY,
.init_machine = sh73a0_add_standard_devices_dt,
.init_late = shmobile_init_late,
.dt_compat = sh73a0_boards_compat_dt,
--
2.0.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [GIT PULL] Renesas ARM Based SoC Updates for v3.18
2014-08-23 1:44 [GIT PULL] Renesas ARM Based SoC Updates for v3.18 Simon Horman
` (10 preceding siblings ...)
2014-08-23 1:44 ` [PATCH 11/11] ARM: shmobile: sh73a0: " Simon Horman
@ 2014-08-25 0:41 ` Simon Horman
11 siblings, 0 replies; 13+ messages in thread
From: Simon Horman @ 2014-08-25 0:41 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Aug 23, 2014 at 10:44:20AM +0900, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these Renesas ARM based SoC updates for v3.18.
>
>
> The following changes since commit 7d1311b93e58ed55f3a31cc8f94c4b8fe988a2b9:
>
> Linux 3.17-rc1 (2014-08-16 10:40:26 -0600)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.18
>
> for you to fetch changes up to 5ac9e7f35db00e630c9f95a1f73ac329371cdbbf:
>
> ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization (2014-08-20 09:09:24 +0900)
This pull request has a minor conflict in
arch/arm/mach-shmobile/setup-r8a7779.c with
"ARM: shmobile: marzen-reference: Enable TMU0 in device tree" which
is included in the pull request "Renesas ARM Based SoC DT Timers Updates
for v3.18" which is tagged as renesas-dt-timers-for-v3.18.
The resolution is to take the changes from both branches.
The DT_MACHINE_START stanza should end up as follows:
DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
.map_io = r8a7779_map_io,
.init_early = shmobile_init_delay,
.init_irq = r8a7779_init_irq_dt,
.init_late = shmobile_init_late,
.dt_compat = r8a7779_compat_dt,
MACHINE_END
This resolution is available in renesas-next-20140820-v3.17-rc1
tag of the next branch of the renesas tree.
> ----------------------------------------------------------------
> Renesas ARM Based SoC Updates for v3.18
>
> * Remove unnecessary nr_irqs initialisation on sh73a0, sh7372,
> and r8a7779 SoCs
> * Use defines hardcoded numbers for DMA
> * Rework multiplatform include workaround
> * Correctly use shmobile_init_late on a wider range of SoCs
>
> ----------------------------------------------------------------
> Geert Uytterhoeven (4):
> ARM: shmobile: r8a7778: Add missing call to shmobile_init_late()
> ARM: shmobile: dma: Use defines instead of hardcoded numbers
> ARM: shmobile: sh7372: Remove unneeded nr_irqs initialization
> ARM: shmobile: sh73a0: Remove unneeded nr_irqs initialization
>
> Magnus Damm (7):
> ARM: shmobile: sh73a0: Add shmobile_init_late()
> ARM: shmobile: r8a7779: Fix shmobile_init_late()
> ARM: shmobile: r8a7778: Fix shmobile_init_late()
> ARM: shmobile: r8a73a4: Add shmobile_init_late()
> ARM: shmobile: r7s72100: Add shmobile_init_late()
> ARM: shmobile: Rework multiplatform include workaround
> ARM: shmobile: r8a7779: Remove NR_IRQS_LEGACY
>
> arch/arm/mach-shmobile/Makefile | 2 --
> arch/arm/mach-shmobile/dma-register.h | 4 ++--
> arch/arm/mach-shmobile/irqs.h | 2 +-
> arch/arm/mach-shmobile/setup-r7s72100.c | 1 +
> arch/arm/mach-shmobile/setup-r8a73a4.c | 1 +
> arch/arm/mach-shmobile/setup-r8a7778.c | 3 ++-
> arch/arm/mach-shmobile/setup-r8a7779.c | 3 +--
> arch/arm/mach-shmobile/setup-sh7372.c | 1 -
> arch/arm/mach-shmobile/setup-sh73a0.c | 2 +-
> 9 files changed, 9 insertions(+), 10 deletions(-)
>
^ permalink raw reply [flat|nested] 13+ messages in thread