Calxeda ECX-2000 support

GIT PULL Rob Herring 3 participants 5 messages Oct 31, 2012 – Nov 6, 2012

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm/calxeda highbank architecture

lore

Share & tools

lore

Rob Herring

author

2012-10-31 19:17 UTC #0 lore raw

Arnd, Olof,

Please pull support for Calxeda ECX-2000 SOC.

There will be a trivial conflict with the GIC move to drivers/irqchip once that goes in.

Rob

The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:

Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)

are available in the git repository at:

git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000

for you to fetch changes up to e095c0d122c09efabe7d4136ce77f72c636c4879:

ARM: highbank: Add initial ECX-2000 support (2012-10-31 13:47:01 -0500)

----------------------------------------------------------------
Support for Calxeda ECX-2000 SOC

----------------------------------------------------------------
Rob Herring (6):
ARM: highbank: disable unused sdhci and gpio in dts
ARM: highbank: enable coherent DMA for xgmac in dts
ARM: dts: Add Calxeda ECX-2000 support
ARM: smp_twd: don't warn on no DT node
ARM: highbank: abstract out SCU usage
ARM: highbank: Add initial ECX-2000 support

 Documentation/devicetree/bindings/arm/calxeda.txt |   13 +-
 arch/arm/boot/dts/Makefile                        |    3 +-
 arch/arm/boot/dts/ecx-2000.dts                    |  104 +++++++++
 arch/arm/boot/dts/ecx-common.dtsi                 |  237 +++++++++++++++++++++
 arch/arm/boot/dts/highbank.dts                    |  212 +-----------------
 arch/arm/kernel/smp_twd.c                         |    6 +-
 arch/arm/mach-highbank/Kconfig                    |    2 +-
 arch/arm/mach-highbank/highbank.c                 |   27 +--
 arch/arm/mach-highbank/hotplug.c                  |    6 +-
 arch/arm/mach-highbank/platsmp.c                  |    7 +-
 arch/arm/mach-highbank/pm.c                       |    3 -
 arch/arm/mach-highbank/sysregs.h                  |   19 ++
 arch/arm/mach-highbank/system.c                   |    2 -
 13 files changed, 394 insertions(+), 247 deletions(-)
 create mode 100644 arch/arm/boot/dts/ecx-2000.dts
 create mode 100644 arch/arm/boot/dts/ecx-common.dtsi

Olof Johansson

2012-11-06 14:51 UTC #1 lore raw

Quoted 9 lines · Rob Herring

Arnd, Olof,
Please pull support for Calxeda ECX-2000 SOC.
There will be a trivial conflict with the GIC move to drivers/irqchip once that goes in.
Rob

Quoted 7 lines

The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
are available in the git repository at:
git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000

Thanks, pulled into next/soc.

-Olof

Olof Johansson

2012-11-06 19:18 UTC #2 lore raw

In reply to Rob Herring

Quoted 13 lines · Rob Herring

Arnd, Olof,
Please pull support for Calxeda ECX-2000 SOC.
There will be a trivial conflict with the GIC move to drivers/irqchip once that goes in.
Rob
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)

Quoted 8 lines

are available in the git repository at:
git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000
for you to fetch changes up to e095c0d122c09efabe7d4136ce77f72c636c4879:
ARM: highbank: Add initial ECX-2000 support (2012-10-31 13:47:01 -0500)

The addition of include of core.h in sysregs.h gives me a build error on multi_v7_defconfig due to missing guard ifdefs. I've added the following patch on top of your branch.

commit 9186cea8283b0d235719e82607a1aec81db7ab8d

Author:     Olof Johansson <[email protected]>
AuthorDate: Tue Nov 6 11:09:10 2012 -0800
Commit:     Olof Johansson <[email protected]>
CommitDate: Tue Nov 6 11:09:10 2012 -0800

ARM: highbank: add ifdef guards to core.h

Fixes build error due to multiple includes:

In file included from arch/arm/mach-highbank/sysregs.h:23:0,
from arch/arm/mach-highbank/system.c:20:
arch/arm/mach-highbank/core.h:8:91: error: redefinition of 'highbank_lluart_map_io' In file included from arch/arm/mach-highbank/system.c:19:0:
arch/arm/mach-highbank/core.h:8:91: note: previous definition of 'highbank_lluart_map_io' was here

Signed-off-by Olof Johansson <[email protected]>

arch/arm/mach-highbank/core.h +5 -0

index 286ec82..068c687 100644
@@ -1,3 +1,6 @@
+#ifndef __HIGHBANK_CORE_H
+#define __HIGHBANK_CORE_H
+
 extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
 extern void highbank_clocks_init(void);
 extern void highbank_restart(char, const char *);

@@ -18,3 +21,5 @@ extern void highbank_smc1(int fn, int arg);
 extern void highbank_cpu_die(unsigned int cpu);
 
 extern struct smp_operations highbank_smp_ops;
+
+#endif

Rob Herring

author

2012-11-06 19:38 UTC #3 lore raw

Quoted 36 lines · Olof Johansson

Quoted 13 lines · Rob Herring
Arnd, Olof,
Please pull support for Calxeda ECX-2000 SOC.
There will be a trivial conflict with the GIC move to drivers/irqchip once that goes in.
Rob
The following changes since commit 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64:
Linux 3.7-rc3 (2012-10-28 12:24:48 -0700)
Quoted 8 lines
are available in the git repository at:
git://sources.calxeda.com/kernel/linux.git tags/calxeda-ecx-2000
for you to fetch changes up to e095c0d122c09efabe7d4136ce77f72c636c4879:
ARM: highbank: Add initial ECX-2000 support (2012-10-31 13:47:01 -0500)
The addition of include of core.h in sysregs.h gives me a build error on multi_v7_defconfig due to missing guard ifdefs. I've added the following patch on top of your branch.
commit 9186cea8283b0d235719e82607a1aec81db7ab8d
Author:     Olof Johansson <[email protected]>
AuthorDate: Tue Nov 6 11:09:10 2012 -0800
Commit:     Olof Johansson <[email protected]>
CommitDate: Tue Nov 6 11:09:10 2012 -0800
ARM: highbank: add ifdef guards to core.h

Quoted 7 lines

Fixes build error due to multiple includes:
In file included from arch/arm/mach-highbank/sysregs.h:23:0,
from arch/arm/mach-highbank/system.c:20:
arch/arm/mach-highbank/core.h:8:91: error: redefinition of 'highbank_lluart_map_io' In file included from arch/arm/mach-highbank/system.c:19:0:
arch/arm/mach-highbank/core.h:8:91: note: previous definition of 'highbank_lluart_map_io' was here

Thanks, I didn't see that in my tree because I have follow-on patches removing this based on the DEBUG_LL clean-up. Now that the dependency from Stephen is in your tree, I need to send that to you as well.

Rob

Quoted 21 lines

Signed-off-by Olof Johansson <[email protected]>

arch/arm/mach-highbank/core.h +5 -0

index 286ec82..068c687 100644
@@ -1,3 +1,6 @@
+#ifndef __HIGHBANK_CORE_H
+#define __HIGHBANK_CORE_H
+
 extern void highbank_set_cpu_jump(int cpu, void *jump_addr);
 extern void highbank_clocks_init(void);
 extern void highbank_restart(char, const char *);

@@ -18,3 +21,5 @@ extern void highbank_smc1(int fn, int arg);
 extern void highbank_cpu_die(unsigned int cpu);
 
 extern struct smp_operations highbank_smp_ops;
+
+#endif

Arnd Bergmann

2012-11-06 22:08 UTC #4 lore raw

Quoted 9 lines · Rob Herring

Quoted 4 lines · Olof Johansson
The addition of include of core.h in sysregs.h gives me a build error on multi_v7_defconfig due to missing guard ifdefs. I've added the following patch on top of your branch.
Thanks, I didn't see that in my tree because I have follow-on patches removing this based on the DEBUG_LL clean-up. Now that the dependency from Stephen is in your tree, I need to send that to you as well.

I've just added another patch on top to get around a build warning:

Quoted 1 line

From 5bd09fb0336aa4020b85f13e16a4d21e3f5f70c3 Mon Sep 17 00:00:00 2001

From: Arnd Bergmann <[email protected]>
Date: Tue, 6 Nov 2012 23:02:27 +0100
Subject: [PATCH] ARM: smp_twd: fix build warning

0336517b38c "ARM: smp_twd: don't warn on no DT node" introduced a silly build warning by returning an error from a void function. This keeps the intention of that patch but fixes the warning by removing the error code

Signed-off-by Arnd Bergmann <[email protected]>

arch/arm/kernel/smp_twd.c +1 -1

index 6ec73f9..999aa48 100644
@@ -367,7 +367,7 @@ void __init twd_local_timer_of_register(void)
 
 	np = of_find_matching_node(NULL, twd_of_match);
 	if (!np)
-		return -ENODEV;
+		return;
 
 	twd_ppi = irq_of_parse_and_map(np, 0);
 	if (!twd_ppi) {