* [GIT PULL] Calxeda ECX-2000 support
@ 2012-10-31 19:17 Rob Herring
2012-11-06 14:51 ` Olof Johansson
2012-11-06 19:18 ` Olof Johansson
0 siblings, 2 replies; 5+ messages in thread
From: Rob Herring @ 2012-10-31 19:17 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 5+ messages in thread* [GIT PULL] Calxeda ECX-2000 support
2012-10-31 19:17 [GIT PULL] Calxeda ECX-2000 support Rob Herring
@ 2012-11-06 14:51 ` Olof Johansson
2012-11-06 19:18 ` Olof Johansson
1 sibling, 0 replies; 5+ messages in thread
From: Olof Johansson @ 2012-11-06 14:51 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 31, 2012 at 02:17:10PM -0500, Rob Herring wrote:
> 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
Thanks, pulled into next/soc.
-Olof
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] Calxeda ECX-2000 support
2012-10-31 19:17 [GIT PULL] Calxeda ECX-2000 support Rob Herring
2012-11-06 14:51 ` Olof Johansson
@ 2012-11-06 19:18 ` Olof Johansson
2012-11-06 19:38 ` Rob Herring
1 sibling, 1 reply; 5+ messages in thread
From: Olof Johansson @ 2012-11-06 19:18 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Oct 31, 2012 at 02:17:10PM -0500, Rob Herring wrote:
> 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)
>
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 <olof@lixom.net>
AuthorDate: Tue Nov 6 11:09:10 2012 -0800
Commit: Olof Johansson <olof@lixom.net>
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 <olof@lixom.net>
diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
index 286ec82..068c687 100644
--- a/arch/arm/mach-highbank/core.h
+++ b/arch/arm/mach-highbank/core.h
@@ -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
^ permalink raw reply related [flat|nested] 5+ messages in thread* [GIT PULL] Calxeda ECX-2000 support
2012-11-06 19:18 ` Olof Johansson
@ 2012-11-06 19:38 ` Rob Herring
2012-11-06 22:08 ` Arnd Bergmann
0 siblings, 1 reply; 5+ messages in thread
From: Rob Herring @ 2012-11-06 19:38 UTC (permalink / raw)
To: linux-arm-kernel
On 11/06/2012 01:18 PM, Olof Johansson wrote:
> On Wed, Oct 31, 2012 at 02:17:10PM -0500, Rob Herring wrote:
>> 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)
>>
>
> 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 <olof@lixom.net>
> AuthorDate: Tue Nov 6 11:09:10 2012 -0800
> Commit: Olof Johansson <olof@lixom.net>
> 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
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
>
> Signed-off-by: Olof Johansson <olof@lixom.net>
>
> diff --git a/arch/arm/mach-highbank/core.h b/arch/arm/mach-highbank/core.h
> index 286ec82..068c687 100644
> --- a/arch/arm/mach-highbank/core.h
> +++ b/arch/arm/mach-highbank/core.h
> @@ -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
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [GIT PULL] Calxeda ECX-2000 support
2012-11-06 19:38 ` Rob Herring
@ 2012-11-06 22:08 ` Arnd Bergmann
0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2012-11-06 22:08 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 06 November 2012, Rob Herring wrote:
> On 11/06/2012 01:18 PM, Olof Johansson wrote:
> > 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:
>From 5bd09fb0336aa4020b85f13e16a4d21e3f5f70c3 Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
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 <arnd@arndb.de>
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 6ec73f9..999aa48 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -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) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-06 22:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-31 19:17 [GIT PULL] Calxeda ECX-2000 support Rob Herring
2012-11-06 14:51 ` Olof Johansson
2012-11-06 19:18 ` Olof Johansson
2012-11-06 19:38 ` Rob Herring
2012-11-06 22:08 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).