at91: first batch of cleanup for 3.6

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Arnd, Olof,

The following changes since commit
6887a4131da3adaab011613776d865f4bcfb5678:

Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)

are available in the git repository at:

git://github.com/at91linux/linux-at91.git tags/at91-for-next-cleanup

for you to fetch changes up to c4b68520dc0ec96153bc0d87bca5ffba508edfcf:

ARM: at91: add AIC5 support (2012-07-02 14:31:00 +0200)

- ---------------------------------------------------------------- A series about interrupt controller cleanup. AT91 AIC is moving to fasteoi type of handler and sparse IRQ.
The Device Tree support is added to take into account priority and external IRQ.
In addition to that, the new AIC5 IP is introduced.

- ---------------------------------------------------------------- Jean-Christophe PLAGNIOL-VILLARD (1):
ARM: at91: aic add dt support for external irqs

Ludovic Desroches (8):
ARM: at91: fix at91_aic_write macro
ARM: at91: aic can use fast eoi handler type
ARM: at91: add of irq priorities support
ARM: at91: remove static irq priorities for sam9x5
ARM: at91: at91 based machines specify their own irq handler at
run time
ARM: at91: sparse irq support
ARM: at91: remove mach/irqs.h
ARM: at91: add AIC5 support

Paul Bolle (1):
ARM: at91: remove two unused headers

 .../devicetree/bindings/arm/atmel-aic.txt          |    9 +-
 arch/arm/boot/dts/at91sam9260.dtsi                 |   37 +-
 arch/arm/boot/dts/at91sam9263.dtsi                 |   31 +-
 arch/arm/boot/dts/at91sam9g45.dtsi                 |   39 +-
 arch/arm/boot/dts/at91sam9n12.dtsi                 |   30 +-
 arch/arm/boot/dts/at91sam9x5.dtsi                  |   39 +-
 arch/arm/kernel/irq.c                              |   10 -
 arch/arm/mach-at91/Kconfig                         |    2 +
 arch/arm/mach-at91/at91rm9200.c                    |    1 +
 arch/arm/mach-at91/at91rm9200_devices.c            |   84 ++--
 arch/arm/mach-at91/at91sam9260.c                   |    1 +
 arch/arm/mach-at91/at91sam9260_devices.c           |   92 ++---
 arch/arm/mach-at91/at91sam9261.c                   |    1 +
 arch/arm/mach-at91/at91sam9261_devices.c           |   68 ++--
 arch/arm/mach-at91/at91sam9263.c                   |    1 +
 arch/arm/mach-at91/at91sam9263_devices.c           |   80 ++--
 arch/arm/mach-at91/at91sam926x_time.c              |    2 +-
 arch/arm/mach-at91/at91sam9g45.c                   |    1 +
 arch/arm/mach-at91/at91sam9g45_devices.c           |  108 ++---
 arch/arm/mach-at91/at91sam9rl.c                    |    1 +
 arch/arm/mach-at91/at91sam9rl_devices.c            |   76 ++--
 arch/arm/mach-at91/at91sam9x5.c                    |   40 --
 arch/arm/mach-at91/at91x40.c                       |    1 +
 arch/arm/mach-at91/board-1arm.c                    |    2 +
 arch/arm/mach-at91/board-afeb-9260v1.c             |    2 +
 arch/arm/mach-at91/board-cam60.c                   |    2 +
 arch/arm/mach-at91/board-carmeva.c                 |    2 +
 arch/arm/mach-at91/board-cpu9krea.c                |    2 +
 arch/arm/mach-at91/board-cpuat91.c                 |    2 +
 arch/arm/mach-at91/board-csb337.c                  |    2 +
 arch/arm/mach-at91/board-csb637.c                  |    2 +
 arch/arm/mach-at91/board-dt.c                      |    2 +
 arch/arm/mach-at91/board-eb01.c                    |    2 +
 arch/arm/mach-at91/board-eb9200.c                  |    2 +
 arch/arm/mach-at91/board-ecbat91.c                 |    2 +
 arch/arm/mach-at91/board-eco920.c                  |    2 +
 arch/arm/mach-at91/board-flexibity.c               |    2 +
 arch/arm/mach-at91/board-foxg20.c                  |    2 +
 arch/arm/mach-at91/board-gsia18s.c                 |    2 +
 arch/arm/mach-at91/board-kafa.c                    |    2 +
 arch/arm/mach-at91/board-kb9202.c                  |    2 +
 arch/arm/mach-at91/board-neocore926.c              |    2 +
 arch/arm/mach-at91/board-pcontrol-g20.c            |    2 +
 arch/arm/mach-at91/board-picotux200.c              |    2 +
 arch/arm/mach-at91/board-qil-a9260.c               |    2 +
 arch/arm/mach-at91/board-rm9200dk.c                |    2 +
 arch/arm/mach-at91/board-rm9200ek.c                |    2 +
 arch/arm/mach-at91/board-rsi-ews.c                 |    2 +
 arch/arm/mach-at91/board-sam9-l9260.c              |    2 +
 arch/arm/mach-at91/board-sam9260ek.c               |    2 +
 arch/arm/mach-at91/board-sam9261ek.c               |    2 +
 arch/arm/mach-at91/board-sam9263ek.c               |    2 +
 arch/arm/mach-at91/board-sam9g20ek.c               |    3 +
 arch/arm/mach-at91/board-sam9m10g45ek.c            |    2 +
 arch/arm/mach-at91/board-sam9rlek.c                |    2 +
 arch/arm/mach-at91/board-snapper9260.c             |    2 +
 arch/arm/mach-at91/board-stamp9g20.c               |    3 +
 arch/arm/mach-at91/board-usb-a926x.c               |    4 +
 arch/arm/mach-at91/board-yl-9200.c                 |    2 +
 arch/arm/mach-at91/generic.h                       |    2 +
 arch/arm/mach-at91/gpio.c                          |    9 +-
 arch/arm/mach-at91/include/mach/at91_aic.h         |   36 +-
 arch/arm/mach-at91/include/mach/at91_spi.h         |   81 ----
 arch/arm/mach-at91/include/mach/at91_ssc.h         |  106 -----
 arch/arm/mach-at91/include/mach/entry-macro.S      |   27 --
 arch/arm/mach-at91/include/mach/irqs.h             |   48 ---
 arch/arm/mach-at91/irq.c                           |  413
+++++++++++++++++---
 arch/arm/mach-at91/pm.c                            |    1 +
 68 files changed, 835 insertions(+), 718 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_spi.h
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_ssc.h
 delete mode 100644 arch/arm/mach-at91/include/mach/entry-macro.S
 delete mode 100644 arch/arm/mach-at91/include/mach/irqs.h

Thanks, best regards,
- --
Nicolas Ferre

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJP8ZtmAAoJEAf03oE53VmQkZoIAKiDMeHdLJXuvZDc0Mt3JvOg dDB+k8dfyW3IpEjxcn1pfhki9mnOC/EWHYYGrzxwzHZNMgArI7JjgHZq2wfuZJfZ Hv0raEBnQxXwPxQYt9ZOagdVw0sWVQ3Pj98uxSFQPS43U7M9tW5bjdLOAJZwpvQW MQcY5+cfAfeP8AOdwNVrlE/KkmvIl4FlikweSzJBA2IYE+djr7YJ5mVUp1Uuj+NQ AzYc2qnMMPd1fjGXQzR6hpljjhDiMQlC7RXHEGJCIkFNg5noEHGRE0vxesdrLI8N d4MkXhIQKVbuZhmAIrV7v2EtvJp7Wv+htTfjh+nnZsEYCxbR0AJnOXrj9yroMYM= =FPgl
-----END PGP SIGNATURE-----

Pulled into next/cleanup

Thanks,

Arnd

Unfortunately, I got a bunch of new builf errors and warnings:

8<----
ARM: at91: fix new build errors

MULTI_IRQ_HANDLER and SPARSE_IRQ are now required everywhere because mach/irqs.h and mach/entry-macros.S are gone but the symbols are only selected for AT91SAM9, not for the NOMMU parts.

A few files now need to include linux/io.h directly, which used to be included through other headers that have changed.

The new at91_aic_irq_priorities variable is only used with CONFIG_OF enabled and should not be visible otherwise.

---

Please check these patches for correctness, and try to be more careful to avoid such problems in the future. I found these just building the defconfig files, not even invoking my randconfig scripts.

Arnd

index 7d0c40a..c8050b1 100644
@@ -37,6 +37,8 @@ config SOC_AT91SAM9
 config SOC_AT91RM9200
 	bool "AT91RM9200"
 	select CPU_ARM920T
+	select MULTI_IRQ_HANDLER
+	select SPARSE_IRQ
 	select GENERIC_CLOCKEVENTS
 	select HAVE_AT91_DBGU0
 

@@ -142,6 +144,8 @@ config ARCH_AT91SAM9G45
 config ARCH_AT91X40
 	bool "AT91x40"
 	depends on !MMU
+	select MULTI_IRQ_HANDLER
+	select SPARSE_IRQ
 	select ARCH_USES_GETTIMEOFFSET
 
 endchoice

index 4c0f5fd..46090e6 100644
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/irq.h>
+#include <linux/io.h>
 #include <asm/proc-fns.h>
 #include <asm/system_misc.h>
 #include <asm/mach/arch.h>

index c5eaaa0..1e02c0e 100644
@@ -49,7 +49,6 @@ static struct irq_domain *at91_aic_domain;
 static struct device_node *at91_aic_np;
 static unsigned int n_irqs = NR_AIC_IRQS;
 static unsigned long at91_aic_caps = 0;
-static unsigned int *at91_aic_irq_priorities;
 
 /* AIC5 introduces a Source Select Register */
 #define AT91_AIC_CAP_AIC5	(1 << 0)

@@ -359,6 +358,8 @@ static void __init __maybe_unused at91_aic5_hw_init(unsigned int spu_vector)
 }
 
 #if defined(CONFIG_OF)
+static unsigned int *at91_aic_irq_priorities;
+
 static int at91_aic_irq_map(struct irq_domain *h, unsigned int virq,
 							irq_hw_number_t hw)
 {

index dc474bc..fca9790 100644
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioctl.h>
 #include <linux/completion.h>
+#include <linux/io.h>
 
 #include <asm/uaccess.h>
 

Le 07/04/2012 09:42 AM, Arnd Bergmann a ?crit :

Hi,

Patches are ok for me. Sorry for this issue, I've tested it on several boards but not these two ones and I didn't notice they don't select AT91SAM9.

Regards

Ludovic

On 07/04/2012 09:42 AM, Arnd Bergmann :

Sorry for this Arnd, I should have triggered my building scripts earlier for this request...

Tell me if you can queue your fixing patch or if you prefer that I rework it and send it back a series to you...

Anyway, here is my:

Thanks a lot.

Nicolas Ferre

Your choice. I'll apply the fix now, but I can replace the series if you prefer to send a more bisectible version.

Thanks for the quick reply.

Arnd