* [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann
@ 2012-03-10 18:44 Alan Ott
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Alan Ott @ 2012-03-10 18:44 UTC (permalink / raw)
To: linux-arm-kernel
Hello,
I'm helping Arnd Bergmann get some of his cleanup patches upstream. This
set covers the AT91 and is based off of torvalds/linux.git.
Thanks,
Alan.
Arnd Bergmann (2):
ARM: at91: only RM9200 has ISA-style PIO
ARM: at91: Use proper __iomem annotations
arch/arm/Kconfig | 1 +
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 ++++
arch/arm/mach-at91/setup.c | 4 ++--
4 files changed, 8 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO
2012-03-10 18:44 [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
@ 2012-03-10 18:44 ` Alan Ott
2012-03-10 19:24 ` Arnd Bergmann
2012-03-10 18:44 ` [PATCH 2/2] ARM: at91: Use proper __iomem annotations Alan Ott
2012-03-10 23:14 ` [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2 siblings, 1 reply; 8+ messages in thread
From: Alan Ott @ 2012-03-10 18:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
Most at91 systems have no support for PCMCIA or other
PC-style buses, so we can select NO_IOPORT in order to
disable compilationf or all drivers that need these.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
arch/arm/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dfb0312..1306f0d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -322,6 +322,7 @@ config ARCH_AT91
select ARCH_REQUIRE_GPIOLIB
select HAVE_CLK
select CLKDEV_LOOKUP
+ select NO_IOPORT if !ARCH_AT91RM9200
help
This enables support for systems based on the Atmel AT91RM9200,
AT91SAM9 and AT91CAP9 processors.
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: at91: Use proper __iomem annotations
2012-03-10 18:44 [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
@ 2012-03-10 18:44 ` Alan Ott
2012-03-12 2:02 ` Olof Johansson
2012-03-10 23:14 ` [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2 siblings, 1 reply; 8+ messages in thread
From: Alan Ott @ 2012-03-10 18:44 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
MMIO addresses should be of type 'void __iomem *', not integer,
in order to make the build-time type system of the kernel work.
This changes some of the locations in the at91 platform that
I noticed, but there may be more, since I have not yet built
every configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 ++++
arch/arm/mach-at91/setup.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 99c3174..239b657 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -27,7 +27,7 @@
static struct map_desc at91rm9200_io_desc[] __initdata = {
{
- .virtual = AT91_VA_BASE_EMAC,
+ .virtual = (unsigned long)AT91_VA_BASE_EMAC,
.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
.length = SZ_16K,
.type = MT_DEVICE,
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 2d0e4e9..91375e2 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -75,8 +75,12 @@
* to 0xFEF78000 .. 0xFF000000. (544Kb)
*/
#define AT91_IO_PHYS_BASE 0xFFF78000
+#ifdef __ASSEMBLER__
#define AT91_IO_VIRT_BASE (0xFF000000 - AT91_IO_SIZE)
#else
+#define AT91_IO_VIRT_BASE (void __iomem *)(0xFF000000 - AT91_IO_SIZE)
+#endif
+#else
/*
* Identity mapping for the non MMU case.
*/
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 69d3fc4..809da35 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -57,7 +57,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
{
struct map_desc *desc = &sram_desc[bank];
- desc->virtual = AT91_IO_VIRT_BASE - length;
+ desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;
if (bank > 0)
desc->virtual -= sram_desc[bank - 1].length;
@@ -72,7 +72,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
}
static struct map_desc at91_io_desc __initdata = {
- .virtual = AT91_VA_BASE_SYS,
+ .virtual = (unsigned long)AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
@ 2012-03-10 19:24 ` Arnd Bergmann
2012-03-10 20:06 ` Alan Ott
0 siblings, 1 reply; 8+ messages in thread
From: Arnd Bergmann @ 2012-03-10 19:24 UTC (permalink / raw)
To: linux-arm-kernel
On Saturday 10 March 2012, Alan Ott wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> Most at91 systems have no support for PCMCIA or other
> PC-style buses, so we can select NO_IOPORT in order to
> disable compilationf or all drivers that need these.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Alan Ott <alan@signal11.us>
Hi Alan,
You forgot to Cc the at91 maintainers on this patch (and on patch 0).
Also, this patch relies on the another series I did to redefine
the meaning of CONFIG_NO_IOPORT while renaming the existing one to
CONFIG_NO_IOPORT_MAP. This patch will have to wait for the other
series.
Arnd
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO
2012-03-10 19:24 ` Arnd Bergmann
@ 2012-03-10 20:06 ` Alan Ott
0 siblings, 0 replies; 8+ messages in thread
From: Alan Ott @ 2012-03-10 20:06 UTC (permalink / raw)
To: linux-arm-kernel
On 03/10/2012 02:24 PM, Arnd Bergmann wrote:
> On Saturday 10 March 2012, Alan Ott wrote:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> Most at91 systems have no support for PCMCIA or other
>> PC-style buses, so we can select NO_IOPORT in order to
>> disable compilationf or all drivers that need these.
>>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> Signed-off-by: Alan Ott <alan@signal11.us>
> You forgot to Cc the at91 maintainers on this patch (and on patch 0).
> Also, this patch relies on the another series I did to redefine
> the meaning of CONFIG_NO_IOPORT while renaming the existing one to
> CONFIG_NO_IOPORT_MAP. This patch will have to wait for the other
> series.
Hi Arnd,
I'm going to assume you mean randconfig/ioport in
git://git.linaro.org/people/arnd/linux.git .
I'll take this patch out for v2 and make a note that it needs to go with
the patches in randconfig/ioport.
I used scripts/get_maintainers.pl for the recipient list, but I now see
how that failed, since this patch modifies the AT91 section of a file
not in arc/arm/mach-at91.
Alan.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann
2012-03-10 18:44 [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
2012-03-10 18:44 ` [PATCH 2/2] ARM: at91: Use proper __iomem annotations Alan Ott
@ 2012-03-10 23:14 ` Alan Ott
2012-03-10 23:15 ` [PATCH v2 1/1] ARM: at91: Use proper __iomem annotations Alan Ott
2 siblings, 1 reply; 8+ messages in thread
From: Alan Ott @ 2012-03-10 23:14 UTC (permalink / raw)
To: linux-arm-kernel
Version 2 of the patchset.
* NO_IOPORT for RM9200 patch has been removed.
* Hopefully all the right people are on this one.
Arnd Bergmann (1):
ARM: at91: Use proper __iomem annotations
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 ++++
arch/arm/mach-at91/setup.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 1/1] ARM: at91: Use proper __iomem annotations
2012-03-10 23:14 ` [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
@ 2012-03-10 23:15 ` Alan Ott
0 siblings, 0 replies; 8+ messages in thread
From: Alan Ott @ 2012-03-10 23:15 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
MMIO addresses should be of type 'void __iomem *', not integer,
in order to make the build-time type system of the kernel work.
This changes some of the locations in the at91 platform that
I noticed, but there may be more, since I have not yet built
every configuration.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Alan Ott <alan@signal11.us>
---
arch/arm/mach-at91/at91rm9200.c | 2 +-
arch/arm/mach-at91/include/mach/hardware.h | 4 ++++
arch/arm/mach-at91/setup.c | 4 ++--
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 99c3174..239b657 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -27,7 +27,7 @@
static struct map_desc at91rm9200_io_desc[] __initdata = {
{
- .virtual = AT91_VA_BASE_EMAC,
+ .virtual = (unsigned long)AT91_VA_BASE_EMAC,
.pfn = __phys_to_pfn(AT91RM9200_BASE_EMAC),
.length = SZ_16K,
.type = MT_DEVICE,
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index 2d0e4e9..91375e2 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -75,8 +75,12 @@
* to 0xFEF78000 .. 0xFF000000. (544Kb)
*/
#define AT91_IO_PHYS_BASE 0xFFF78000
+#ifdef __ASSEMBLER__
#define AT91_IO_VIRT_BASE (0xFF000000 - AT91_IO_SIZE)
#else
+#define AT91_IO_VIRT_BASE (void __iomem *)(0xFF000000 - AT91_IO_SIZE)
+#endif
+#else
/*
* Identity mapping for the non MMU case.
*/
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c
index 69d3fc4..809da35 100644
--- a/arch/arm/mach-at91/setup.c
+++ b/arch/arm/mach-at91/setup.c
@@ -57,7 +57,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
{
struct map_desc *desc = &sram_desc[bank];
- desc->virtual = AT91_IO_VIRT_BASE - length;
+ desc->virtual = (unsigned long)AT91_IO_VIRT_BASE - length;
if (bank > 0)
desc->virtual -= sram_desc[bank - 1].length;
@@ -72,7 +72,7 @@ void __init at91_init_sram(int bank, unsigned long base, unsigned int length)
}
static struct map_desc at91_io_desc __initdata = {
- .virtual = AT91_VA_BASE_SYS,
+ .virtual = (unsigned long)AT91_VA_BASE_SYS,
.pfn = __phys_to_pfn(AT91_BASE_SYS),
.length = SZ_16K,
.type = MT_DEVICE,
--
1.7.0.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/2] ARM: at91: Use proper __iomem annotations
2012-03-10 18:44 ` [PATCH 2/2] ARM: at91: Use proper __iomem annotations Alan Ott
@ 2012-03-12 2:02 ` Olof Johansson
0 siblings, 0 replies; 8+ messages in thread
From: Olof Johansson @ 2012-03-12 2:02 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Sat, Mar 10, 2012 at 10:44 AM, Alan Ott <alan@signal11.us> wrote:
> diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
> index 2d0e4e9..91375e2 100644
> --- a/arch/arm/mach-at91/include/mach/hardware.h
> +++ b/arch/arm/mach-at91/include/mach/hardware.h
> @@ -75,8 +75,12 @@
> ?* to 0xFEF78000 .. 0xFF000000. ?(544Kb)
> ?*/
> ?#define AT91_IO_PHYS_BASE ? ? ?0xFFF78000
> +#ifdef __ASSEMBLER__
> ?#define AT91_IO_VIRT_BASE ? ? ?(0xFF000000 - AT91_IO_SIZE)
> ?#else
> +#define AT91_IO_VIRT_BASE ? ? ?(void __iomem *)(0xFF000000 - AT91_IO_SIZE)
> +#endif
> +#else
This can use the IOMEM()-style macro instead, Rob Herring just moved
those to a common header file (not yet in any tree though).
-Olof
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-03-12 2:02 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-10 18:44 [PATCH 0/2] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 18:44 ` [PATCH 1/2] ARM: at91: only RM9200 has ISA-style PIO Alan Ott
2012-03-10 19:24 ` Arnd Bergmann
2012-03-10 20:06 ` Alan Ott
2012-03-10 18:44 ` [PATCH 2/2] ARM: at91: Use proper __iomem annotations Alan Ott
2012-03-12 2:02 ` Olof Johansson
2012-03-10 23:14 ` [PATCH v2 0/1] ARM: AT91: cleanup patches from Arnd Bergmann Alan Ott
2012-03-10 23:15 ` [PATCH v2 1/1] ARM: at91: Use proper __iomem annotations Alan Ott
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).