* linux-next: manual merge of the at91 tree with the arm tree
@ 2011-09-09 1:20 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-09-09 1:20 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 513 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/board-usb-a9260.c between commit 2f8163baada3 ("ARM:
gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h")
from the arm tree and commit 6939fd49787e ("at91: merge board USB-A9260
and USB-A9263 together") from the at91 tree.
The latter removes the file modified by the former, so I did thet.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the at91 tree with the arm tree
@ 2011-11-22 1:22 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-11-22 1:22 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
Cc: linux-next, linux-kernel, Nicolas Pitre, Russell King
[-- Attachment #1: Type: text/plain, Size: 1387 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got a conflict in
arch/arm/mach-at91/setup.c between commit cf48c02e3bf0 ("ARM: mach-at91:
remove arch specific special handling for ioremap") from the arm tree and
commit 6a5f01336ed8 ("ARM: at91: make DBGU soc independent") from the
at91 tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-at91/setup.c
index cf98a8f,3c309dc..0000000
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@@ -73,9 -75,24 +75,6 @@@ static struct map_desc at91_io_desc __i
.type = MT_DEVICE,
};
- #define AT91_DBGU0 0xfffff200
- #define AT91_DBGU1 0xffffee00
-
-void __iomem *at91_ioremap(unsigned long p, size_t size, unsigned int type)
-{
- if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))
- return (void __iomem *)AT91_IO_P2V(p);
-
- return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));
-}
-EXPORT_SYMBOL(at91_ioremap);
-
-void at91_iounmap(volatile void __iomem *addr)
-{
- unsigned long virt = (unsigned long)addr;
-
- if (virt >= VMALLOC_START && virt < VMALLOC_END)
- __iounmap(addr);
-}
-EXPORT_SYMBOL(at91_iounmap);
-
static void __init soc_detect(u32 dbgu_base)
{
u32 cidr, socid;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the at91 tree with the arm tree
@ 2011-11-22 1:19 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2011-11-22 1:19 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD, Nicolas Ferre
Cc: linux-next, linux-kernel, Russell King
[-- Attachment #1: Type: text/plain, Size: 5435 bytes --]
Hi all,
Today's linux-next merge of the at91 tree got conflicts in
arch/arm/mach-at91/at91cap9.c, arch/arm/mach-at91/at91sam9260.c,
arch/arm/mach-at91/at91sam9261.c, arch/arm/mach-at91/at91sam9263.c,
arch/arm/mach-at91/at91sam9g45.c and arch/arm/mach-at91/at91sam9rl.c
between commit b91dfe91bb61 ("ARM: restart: at91: use new restart hook")
from the arm tree and commit 92996c285e17 ("ARM: at91: make shutdown
controler soc independent") from the at91 tree.
Just context changes. I fixed it up (see below) and can carry the fixes
as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-at91/at91cap9.c
index 2937339,81a9f38..0000000
--- a/arch/arm/mach-at91/at91cap9.c
+++ b/arch/arm/mach-at91/at91cap9.c
@@@ -333,10 -326,16 +326,16 @@@ static void __init at91cap9_map_io(void
at91_init_sram(0, AT91CAP9_SRAM_BASE, AT91CAP9_SRAM_SIZE);
}
+ static void __init at91cap9_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91CAP9_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91CAP9_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91CAP9_BASE_SMC);
+ }
+
static void __init at91cap9_initialize(void)
{
- at91_arch_reset = at91cap9_reset;
+ arm_pm_restart = at91cap9_restart;
- pm_power_off = at91cap9_poweroff;
at91_extern_irq = (1 << AT91CAP9_ID_IRQ0) | (1 << AT91CAP9_ID_IRQ1);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9260.c
index ec9e23d,5e25cef..0000000
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@@ -325,10 -318,16 +318,16 @@@ static void __init at91sam9260_map_io(v
}
}
+ static void __init at91sam9260_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9260_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9260_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9260_BASE_SMC);
+ }
+
static void __init at91sam9260_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9260_poweroff;
at91_extern_irq = (1 << AT91SAM9260_ID_IRQ0) | (1 << AT91SAM9260_ID_IRQ1)
| (1 << AT91SAM9260_ID_IRQ2);
diff --cc arch/arm/mach-at91/at91sam9261.c
index 19ac7c0,a0538c5..0000000
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@@ -285,10 -278,16 +278,16 @@@ static void __init at91sam9261_map_io(v
at91_init_sram(0, AT91SAM9261_SRAM_BASE, AT91SAM9261_SRAM_SIZE);
}
+ static void __init at91sam9261_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9261_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9261_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9261_BASE_SMC);
+ }
+
static void __init at91sam9261_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9261_poweroff;
at91_extern_irq = (1 << AT91SAM9261_ID_IRQ0) | (1 << AT91SAM9261_ID_IRQ1)
| (1 << AT91SAM9261_ID_IRQ2);
diff --cc arch/arm/mach-at91/at91sam9263.c
index 50d0163,0d90b6a..0000000
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@@ -303,10 -296,17 +296,17 @@@ static void __init at91sam9263_map_io(v
at91_init_sram(1, AT91SAM9263_SRAM1_BASE, AT91SAM9263_SRAM1_SIZE);
}
+ static void __init at91sam9263_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9263_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9263_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9263_BASE_SMC0);
+ at91sam9_ioremap_smc(1, AT91SAM9263_BASE_SMC1);
+ }
+
static void __init at91sam9263_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9263_poweroff;
at91_extern_irq = (1 << AT91SAM9263_ID_IRQ0) | (1 << AT91SAM9263_ID_IRQ1);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9g45.c
index ff21f7a,72c3cce..0000000
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@@ -338,10 -331,16 +331,16 @@@ static void __init at91sam9g45_map_io(v
init_consistent_dma_size(SZ_4M);
}
+ static void __init at91sam9g45_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9G45_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9G45_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9G45_BASE_SMC);
+ }
+
static void __init at91sam9g45_initialize(void)
{
- at91_arch_reset = at91sam9g45_reset;
+ arm_pm_restart = at91sam9g45_restart;
- pm_power_off = at91sam9g45_poweroff;
at91_extern_irq = (1 << AT91SAM9G45_ID_IRQ0);
/* Register GPIO subsystem */
diff --cc arch/arm/mach-at91/at91sam9rl.c
index 61cbb46,96247f6..0000000
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@@ -290,10 -283,16 +283,16 @@@ static void __init at91sam9rl_map_io(vo
at91_init_sram(0, AT91SAM9RL_SRAM_BASE, sram_size);
}
+ static void __init at91sam9rl_ioremap_registers(void)
+ {
+ at91_ioremap_shdwc(AT91SAM9RL_BASE_SHDWC);
+ at91sam926x_ioremap_pit(AT91SAM9RL_BASE_PIT);
+ at91sam9_ioremap_smc(0, AT91SAM9RL_BASE_SMC);
+ }
+
static void __init at91sam9rl_initialize(void)
{
- at91_arch_reset = at91sam9_alt_reset;
+ arm_pm_restart = at91sam9_alt_restart;
- pm_power_off = at91sam9rl_poweroff;
at91_extern_irq = (1 << AT91SAM9RL_ID_IRQ0);
/* Register GPIO subsystem */
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-11-22 1:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-09 1:20 linux-next: manual merge of the at91 tree with the arm tree Stephen Rothwell
2011-11-22 1:19 Stephen Rothwell
2011-11-22 1:22 Stephen Rothwell
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).