ARM: at91: remove !DT support for at91rm9200

Remove irc.c and associated header file. The related code was idendified by the CONFIG_OLD_IRQ_AT91 option that was removed previously. It has been spotted by following coccinelle semantic match:

@rule1@
expression E;
statement S;
@@
(
- if (IS_ENABLED(CONFIG_OLD_IRQ_AT91)) S
|
- if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && E) S
)

Signed-off-by Nicolas Ferre <[email protected]>

Cc Julia Lawall <[email protected]>

---
Julia,

This is my very first try of coccinelle so forgive my naivety. But I would like to know how you would have done that.
Note as well that the 3 little chunks concerned by the use of coccinelle would have perfectly been removed by hand, but I wanted to have a try ;-)

Thanks, best regards.
Nicolas

 arch/arm/mach-at91/Makefile          |   1 -
 arch/arm/mach-at91/at91_aic.h        |  99 ------------
 arch/arm/mach-at91/board-dt-rm9200.c |   1 -
 arch/arm/mach-at91/board-dt-sam9.c   |   1 -
 arch/arm/mach-at91/board-dt-sama5.c  |   1 -
 arch/arm/mach-at91/generic.h         |   2 -
 arch/arm/mach-at91/irq.c             | 296 -----------------------------------
 arch/arm/mach-at91/pm.c              |  22 ---
 arch/arm/mach-at91/setup.c           |   4 -
 9 files changed, 427 deletions(-)
 delete mode 100644 arch/arm/mach-at91/at91_aic.h
 delete mode 100644 arch/arm/mach-at91/irq.c

arch/arm/mach-at91/Makefile +0 -1

index b486c7760ac4..2371b8845bf5 100644
@@ -4,7 +4,6 @@
 
 obj-y		:= gpio.o setup.o sysirq_mask.o
 
-obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o
 obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
 
 # CPU-specific support

arch/arm/mach-at91/at91_aic.h deleted +0 -99

deleted file mode 100644
index eaea66197fa1..000000000000
@@ -1,99 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91_aic.h
- *
- * Copyright (C) 2005 Ivan Kokshaysky
- * Copyright (C) SAN People
- *
- * Advanced Interrupt Controller (AIC) - System peripherals registers.
- * Based on AT91RM9200 datasheet revision E.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- */
-
-#ifndef AT91_AIC_H
-#define AT91_AIC_H
-
-#ifndef __ASSEMBLY__
-extern void __iomem *at91_aic_base;
-
-#define at91_aic_read(field) \
-	__raw_readl(at91_aic_base + field)
-
-#define at91_aic_write(field, value) \
-	__raw_writel(value, at91_aic_base + field)
-#else
-.extern at91_aic_base
-#endif
-
-/* Number of irq lines managed by AIC */
-#define NR_AIC_IRQS	32
-#define NR_AIC5_IRQS	128
-
-#define AT91_AIC5_SSR		0x0			/* Source Select Register [AIC5] */
-#define 	AT91_AIC5_INTSEL_MSK	(0x7f << 0)		/* Interrupt Line Selection Mask */
-
-#define AT91_AIC_IRQ_MIN_PRIORITY	0
-#define AT91_AIC_IRQ_MAX_PRIORITY	7
-
-#define AT91_AIC_SMR(n)		((n) * 4)		/* Source Mode Registers 0-31 */
-#define AT91_AIC5_SMR		0x4			/* Source Mode Register [AIC5] */
-#define		AT91_AIC_PRIOR		(7 << 0)		/* Priority Level */
-#define		AT91_AIC_SRCTYPE	(3 << 5)		/* Interrupt Source Type */
-#define			AT91_AIC_SRCTYPE_LOW		(0 << 5)
-#define			AT91_AIC_SRCTYPE_FALLING	(1 << 5)
-#define			AT91_AIC_SRCTYPE_HIGH		(2 << 5)
-#define			AT91_AIC_SRCTYPE_RISING		(3 << 5)
-
-#define AT91_AIC_SVR(n)		(0x80 + ((n) * 4))	/* Source Vector Registers 0-31 */
-#define AT91_AIC5_SVR		0x8			/* Source Vector Register [AIC5] */
-#define AT91_AIC_IVR		0x100			/* Interrupt Vector Register */
-#define AT91_AIC5_IVR		0x10			/* Interrupt Vector Register [AIC5] */
-#define AT91_AIC_FVR		0x104			/* Fast Interrupt Vector Register */
-#define AT91_AIC5_FVR		0x14			/* Fast Interrupt Vector Register [AIC5] */
-#define AT91_AIC_ISR		0x108			/* Interrupt Status Register */
-#define AT91_AIC5_ISR		0x18			/* Interrupt Status Register [AIC5] */
-#define		AT91_AIC_IRQID		(0x1f << 0)		/* Current Interrupt Identifier */
-
-#define AT91_AIC_IPR		0x10c			/* Interrupt Pending Register */
-#define AT91_AIC5_IPR0		0x20			/* Interrupt Pending Register 0 [AIC5] */
-#define AT91_AIC5_IPR1		0x24			/* Interrupt Pending Register 1 [AIC5] */
-#define AT91_AIC5_IPR2		0x28			/* Interrupt Pending Register 2 [AIC5] */
-#define AT91_AIC5_IPR3		0x2c			/* Interrupt Pending Register 3 [AIC5] */
-#define AT91_AIC_IMR		0x110			/* Interrupt Mask Register */
-#define AT91_AIC5_IMR		0x30			/* Interrupt Mask Register [AIC5] */
-#define AT91_AIC_CISR		0x114			/* Core Interrupt Status Register */
-#define AT91_AIC5_CISR		0x34			/* Core Interrupt Status Register [AIC5] */
-#define		AT91_AIC_NFIQ		(1 << 0)		/* nFIQ Status */
-#define		AT91_AIC_NIRQ		(1 << 1)		/* nIRQ Status */
-
-#define AT91_AIC_IECR		0x120			/* Interrupt Enable Command Register */
-#define AT91_AIC5_IECR		0x40			/* Interrupt Enable Command Register [AIC5] */
-#define AT91_AIC_IDCR		0x124			/* Interrupt Disable Command Register */
-#define AT91_AIC5_IDCR		0x44			/* Interrupt Disable Command Register [AIC5] */
-#define AT91_AIC_ICCR		0x128			/* Interrupt Clear Command Register */
-#define AT91_AIC5_ICCR		0x48			/* Interrupt Clear Command Register [AIC5] */
-#define AT91_AIC_ISCR		0x12c			/* Interrupt Set Command Register */
-#define AT91_AIC5_ISCR		0x4c			/* Interrupt Set Command Register [AIC5] */
-#define AT91_AIC_EOICR		0x130			/* End of Interrupt Command Register */
-#define AT91_AIC5_EOICR		0x38			/* End of Interrupt Command Register [AIC5] */
-#define AT91_AIC_SPU		0x134			/* Spurious Interrupt Vector Register */
-#define AT91_AIC5_SPU		0x3c			/* Spurious Interrupt Vector Register [AIC5] */
-#define AT91_AIC_DCR		0x138			/* Debug Control Register */
-#define AT91_AIC5_DCR		0x6c			/* Debug Control Register [AIC5] */
-#define		AT91_AIC_DCR_PROT	(1 << 0)		/* Protection Mode */
-#define		AT91_AIC_DCR_GMSK	(1 << 1)		/* General Mask */
-
-#define AT91_AIC_FFER		0x140			/* Fast Forcing Enable Register [SAM9 only] */
-#define AT91_AIC5_FFER		0x50			/* Fast Forcing Enable Register [AIC5] */
-#define AT91_AIC_FFDR		0x144			/* Fast Forcing Disable Register [SAM9 only] */
-#define AT91_AIC5_FFDR		0x54			/* Fast Forcing Disable Register [AIC5] */
-#define AT91_AIC_FFSR		0x148			/* Fast Forcing Status Register [SAM9 only] */
-#define AT91_AIC5_FFSR		0x58			/* Fast Forcing Status Register [AIC5] */
-
-void at91_aic_handle_irq(struct pt_regs *regs);
-void at91_aic5_handle_irq(struct pt_regs *regs);
-
-#endif

arch/arm/mach-at91/board-dt-rm9200.c +0 -1

index 226563f850b8..feeb1a0f258e 100644
@@ -22,7 +22,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include "at91_aic.h"
 #include "generic.h"
 
 static void __init at91rm9200_dt_timer_init(void)

arch/arm/mach-at91/board-dt-sam9.c +0 -1

index d3048ccdc41f..67c1bcbf0ed9 100644
@@ -21,7 +21,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"
 

arch/arm/mach-at91/board-dt-sama5.c +0 -1

index 129e2917506b..8fb9ef5333f1 100644
@@ -24,7 +24,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include "at91_aic.h"
 #include "generic.h"
 
 static void __init sama5_dt_device_init(void)

arch/arm/mach-at91/generic.h +0 -2

index 1ec9b011b6a9..713d1d9e50a1 100644
@@ -29,8 +29,6 @@ extern void __init at91_dt_initialize(void);
  /* Interrupts */
 extern void __init at91_init_irq_default(void);
 extern void __init at91_init_interrupts(unsigned int priority[]);
-extern void __init at91_aic_init(unsigned int priority[],
-				 unsigned int ext_irq_mask);
 extern int  __init at91_aic_of_init(struct device_node *node,
 				    struct device_node *parent);
 extern int  __init at91_aic5_of_init(struct device_node *node,

arch/arm/mach-at91/irq.c deleted +0 -296

deleted file mode 100644
index cdb3ec9efd2b..000000000000
@@ -1,296 +0,0 @@
-/*
- * linux/arch/arm/mach-at91/irq.c
- *
- *  Copyright (C) 2004 SAN People
- *  Copyright (C) 2004 ATMEL
- *  Copyright (C) Rick Bronson
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/mm.h>
-#include <linux/bitmap.h>
-#include <linux/types.h>
-#include <linux/irq.h>
-#include <linux/of.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-#include <linux/irqdomain.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-
-#include <mach/hardware.h>
-#include <asm/irq.h>
-#include <asm/setup.h>
-
-#include <asm/exception.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/irq.h>
-#include <asm/mach/map.h>
-
-#include "at91_aic.h"
-
-void __iomem *at91_aic_base;
-static struct irq_domain *at91_aic_domain;
-static struct device_node *at91_aic_np;
-static unsigned int n_irqs = NR_AIC_IRQS;
-
-#ifdef CONFIG_PM
-
-static unsigned long *wakeups;
-static unsigned long *backups;
-
-#define set_backup(bit) set_bit(bit, backups)
-#define clear_backup(bit) clear_bit(bit, backups)
-
-static int at91_aic_pm_init(void)
-{
-	backups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL);
-	if (!backups)
-		return -ENOMEM;
-
-	wakeups = kzalloc(BITS_TO_LONGS(n_irqs) * sizeof(*backups), GFP_KERNEL);
-	if (!wakeups) {
-		kfree(backups);
-		return -ENOMEM;
-	}
-
-	return 0;
-}
-
-static int at91_aic_set_wake(struct irq_data *d, unsigned value)
-{
-	if (unlikely(d->hwirq >= n_irqs))
-		return -EINVAL;
-
-	if (value)
-		set_bit(d->hwirq, wakeups);
-	else
-		clear_bit(d->hwirq, wakeups);
-
-	return 0;
-}
-
-void at91_irq_suspend(void)
-{
-	at91_aic_write(AT91_AIC_IDCR, *backups);
-	at91_aic_write(AT91_AIC_IECR, *wakeups);
-}
-
-void at91_irq_resume(void)
-{
-	at91_aic_write(AT91_AIC_IDCR, *wakeups);
-	at91_aic_write(AT91_AIC_IECR, *backups);
-}
-
-#else
-static inline int at91_aic_pm_init(void)
-{
-	return 0;
-}
-
-#define set_backup(bit)
-#define clear_backup(bit)
-#define at91_aic_set_wake	NULL
-
-#endif /* CONFIG_PM */
-
-asmlinkage void __exception_irq_entry
-at91_aic_handle_irq(struct pt_regs *regs)
-{
-	u32 irqnr;
-	u32 irqstat;
-
-	irqnr = at91_aic_read(AT91_AIC_IVR);
-	irqstat = at91_aic_read(AT91_AIC_ISR);
-
-	/*
-	 * ISR value is 0 when there is no current interrupt or when there is
-	 * a spurious interrupt
-	 */
-	if (!irqstat)
-		at91_aic_write(AT91_AIC_EOICR, 0);
-	else
-		handle_IRQ(irqnr, regs);
-}
-
-static void at91_aic_mask_irq(struct irq_data *d)
-{
-	/* Disable interrupt on AIC */
-	at91_aic_write(AT91_AIC_IDCR, 1 << d->hwirq);
-	/* Update ISR cache */
-	clear_backup(d->hwirq);
-}
-
-static void at91_aic_unmask_irq(struct irq_data *d)
-{
-	/* Enable interrupt on AIC */
-	at91_aic_write(AT91_AIC_IECR, 1 << d->hwirq);
-	/* Update ISR cache */
-	set_backup(d->hwirq);
-}
-
-static void at91_aic_eoi(struct irq_data *d)
-{
-	/*
-	 * Mark end-of-interrupt on AIC, the controller doesn't care about
-	 * the value written. Moreover it's a write-only register.
-	 */
-	at91_aic_write(AT91_AIC_EOICR, 0);
-}
-
-static unsigned long *at91_extern_irq;
-
-u32 at91_get_extern_irq(void)
-{
-	if (!at91_extern_irq)
-		return 0;
-	return *at91_extern_irq;
-}
-
-#define is_extern_irq(hwirq) test_bit(hwirq, at91_extern_irq)
-
-static int at91_aic_compute_srctype(struct irq_data *d, unsigned type)
-{
-	int srctype;
-
-	switch (type) {
-	case IRQ_TYPE_LEVEL_HIGH:
-		srctype = AT91_AIC_SRCTYPE_HIGH;
-		break;
-	case IRQ_TYPE_EDGE_RISING:
-		srctype = AT91_AIC_SRCTYPE_RISING;
-		break;
-	case IRQ_TYPE_LEVEL_LOW:
-		if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq))		/* only supported on external interrupts */
-			srctype = AT91_AIC_SRCTYPE_LOW;
-		else
-			srctype = -EINVAL;
-		break;
-	case IRQ_TYPE_EDGE_FALLING:
-		if ((d->hwirq == AT91_ID_FIQ) || is_extern_irq(d->hwirq))		/* only supported on external interrupts */
-			srctype = AT91_AIC_SRCTYPE_FALLING;
-		else
-			srctype = -EINVAL;
-		break;
-	default:
-		srctype = -EINVAL;
-	}
-
-	return srctype;
-}
-
-static int at91_aic_set_type(struct irq_data *d, unsigned type)
-{
-	unsigned int smr;
-	int srctype;
-
-	srctype = at91_aic_compute_srctype(d, type);
-	if (srctype < 0)
-		return srctype;
-
-	smr = at91_aic_read(AT91_AIC_SMR(d->hwirq)) & ~AT91_AIC_SRCTYPE;
-	at91_aic_write(AT91_AIC_SMR(d->hwirq), smr | srctype);
-
-	return 0;
-}
-
-static struct irq_chip at91_aic_chip = {
-	.name		= "AIC",
-	.irq_mask	= at91_aic_mask_irq,
-	.irq_unmask	= at91_aic_unmask_irq,
-	.irq_set_type	= at91_aic_set_type,
-	.irq_set_wake	= at91_aic_set_wake,
-	.irq_eoi	= at91_aic_eoi,
-};
-
-static void __init at91_aic_hw_init(unsigned int spu_vector)
-{
-	int i;
-
-	/*
-	 * Perform 8 End Of Interrupt Command to make sure AIC
-	 * will not Lock out nIRQ
-	 */
-	for (i = 0; i < 8; i++)
-		at91_aic_write(AT91_AIC_EOICR, 0);
-
-	/*
-	 * Spurious Interrupt ID in Spurious Vector Register.
-	 * When there is no current interrupt, the IRQ Vector Register
-	 * reads the value stored in AIC_SPU
-	 */
-	at91_aic_write(AT91_AIC_SPU, spu_vector);
-
-	/* No debugging in AIC: Debug (Protect) Control Register */
-	at91_aic_write(AT91_AIC_DCR, 0);
-
-	/* Disable and clear all interrupts initially */
-	at91_aic_write(AT91_AIC_IDCR, 0xFFFFFFFF);
-	at91_aic_write(AT91_AIC_ICCR, 0xFFFFFFFF);
-}
-
-/*
- * Initialize the AIC interrupt controller.
- */
-void __init at91_aic_init(unsigned int *priority, unsigned int ext_irq_mask)
-{
-	unsigned int i;
-	int irq_base;
-
-	at91_extern_irq = kzalloc(BITS_TO_LONGS(n_irqs)
-				  * sizeof(*at91_extern_irq), GFP_KERNEL);
-
-	if (at91_aic_pm_init() || at91_extern_irq == NULL)
-		panic("Unable to allocate bit maps\n");
-
-	*at91_extern_irq = ext_irq_mask;
-
-	at91_aic_base = ioremap(AT91_AIC, 512);
-	if (!at91_aic_base)
-		panic("Unable to ioremap AIC registers\n");
-
-	/* Add irq domain for AIC */
-	irq_base = irq_alloc_descs(-1, 0, n_irqs, 0);
-	if (irq_base < 0) {
-		WARN(1, "Cannot allocate irq_descs, assuming pre-allocated\n");
-		irq_base = 0;
-	}
-	at91_aic_domain = irq_domain_add_legacy(at91_aic_np, n_irqs,
-						irq_base, 0,
-						&irq_domain_simple_ops, NULL);
-
-	if (!at91_aic_domain)
-		panic("Unable to add AIC irq domain\n");
-
-	irq_set_default_host(at91_aic_domain);
-
-	/*
-	 * The IVR is used by macro get_irqnr_and_base to read and verify.
-	 * The irq number is NR_AIC_IRQS when a spurious interrupt has occurred.
-	 */
-	for (i = 0; i < n_irqs; i++) {
-		/* Put hardware irq number in Source Vector Register: */
-		at91_aic_write(AT91_AIC_SVR(i), NR_IRQS_LEGACY + i);
-		/* Active Low interrupt, with the specified priority */
-		at91_aic_write(AT91_AIC_SMR(i), AT91_AIC_SRCTYPE_LOW | priority[i]);
-		irq_set_chip_and_handler(NR_IRQS_LEGACY + i, &at91_aic_chip, handle_fasteoi_irq);
-		set_irq_flags(i, IRQF_VALID | IRQF_PROBE);
-	}
-
-	at91_aic_hw_init(n_irqs);
-}

arch/arm/mach-at91/pm.c +0 -22

index 4073ab7f38f3..a42360f69127 100644
@@ -29,7 +29,6 @@
 #include <mach/cpu.h>
 #include <mach/hardware.h>
 
-#include "at91_aic.h"
 #include "generic.h"
 #include "pm.h"
 #include "gpio.h"

@@ -136,19 +135,6 @@ static int at91_pm_enter(suspend_state_t state)
 	else
 		at91_gpio_suspend();
 
-	if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base) {
-		at91_irq_suspend();
-
-		pr_debug("AT91: PM - wake mask %08x, pm state %d\n",
-				/* remember all the always-wake irqs */
-				(at91_pmc_read(AT91_PMC_PCSR)
-						| (1 << AT91_ID_FIQ)
-						| (1 << AT91_ID_SYS)
-						| (at91_get_extern_irq()))
-					& at91_aic_read(AT91_AIC_IMR),
-				state);
-	}
-
 	switch (state) {
 		/*
 		 * Suspend-to-RAM is like STANDBY plus slow clock mode, so

@@ -212,17 +198,9 @@ static int at91_pm_enter(suspend_state_t state)
 			goto error;
 	}
 
-	if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base)
-		pr_debug("AT91: PM - wakeup %08x\n",
-			 at91_aic_read(AT91_AIC_IPR) &
-			 at91_aic_read(AT91_AIC_IMR));
-
 error:
 	target_state = PM_SUSPEND_ON;
 
-	if (IS_ENABLED(CONFIG_OLD_IRQ_AT91) && at91_aic_base)
-		at91_irq_resume();
-
 	if (of_have_populated_dt())
 		at91_pinctrl_gpio_resume();
 	else

arch/arm/mach-at91/setup.c +0 -5

index 98b0c1a62899..6c3013e3309b 100644
@@ -49,10 +49,6 @@ void __init at91_init_irq_default(void)
 
 void __init at91_init_interrupts(unsigned int *priority)
 {
-	/* Initialize the AIC interrupt controller */
-	if (IS_ENABLED(CONFIG_OLD_IRQ_AT91))
-		at91_aic_init(priority, at91_boot_soc.extern_irq);
-
 	/* Enable GPIO interrupts */
 	at91_gpio_irq_setup();
 }
--

2.1.3

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Quoted 9 lines · On Thursday 27 November 2014 17:06:28 Nicolas Ferre wrote:

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

Quoted 2 lines

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Awesome stuff!

Two questions:

- is anything holding this up from getting merged in 3.19?

- Are there any remaining issues that keep us from using multiplatform? I know you all have been working on those a lot, but I haven't checked what is still missing.

Quoted 13 lines · Arnd Bergmann

Quoted 11 lines · On Thursday 27 November 2014 17:06:28 Nicolas Ferre wrote:

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Quoted 6 lines

Awesome stuff!

Two questions:

- is anything holding this up from getting merged in 3.19?

If you think this is not too late in the cycle, I would say go ahead

Quoted 4 lines

- Are there any remaining issues that keep us from using multiplatform? I know you all have been working on those a lot, but I haven't checked what is still missing.

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

The currently affected drivers are:
- drivers/ata/pata_at91.c (SMC)
- drivers/pcmcia/at91_cf.c (SMC)
- drivers/usb/gadget/udc/at91_udc.c (Matrix, this is the only one for sam9)
- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)
- drivers/watchdog/at91rm9200_wdt.c (WIP, will be converted properly to an MFD)

I'll resume working on that in December.

Do you want me to submit the sama5d[3-4] switch for 3.19? I'll have to rebase on that series. The main remaining issue is that I couldn't work out a way not breaking the defconfigs, even after talking with the Kconfig maintainer so doing first sama5 then sam9/rm9200 will break the defconfigs for sam9/rm9200 twice.

Quoted 16 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

Quoted 15 lines · Arnd Bergmann

Quoted 11 lines · On Thursday 27 November 2014 17:06:28 Nicolas Ferre wrote:

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Awesome stuff!

Quoted 6 lines

Quoted 4 lines

Two questions:

- is anything holding this up from getting merged in 3.19?

If you think this is not too late in the cycle, I would say go ahead

I'd say we should do it, unless there are last-minute regressions.

Quoted 18 lines

Quoted 4 lines

- Are there any remaining issues that keep us from using multiplatform? I know you all have been working on those a lot, but I haven't checked what is still missing.

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

The currently affected drivers are:
- drivers/ata/pata_at91.c (SMC)
- drivers/pcmcia/at91_cf.c (SMC)
- drivers/usb/gadget/udc/at91_udc.c (Matrix, this is the only one for sam9)
- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)
- drivers/watchdog/at91rm9200_wdt.c (WIP, will be converted properly to an MFD)

Quoted 1 line

I'll resume working on that in December.

Ok, sounds great.

Quoted 5 lines

Do you want me to submit the sama5d[3-4] switch for 3.19? I'll have to rebase on that series. The main remaining issue is that I couldn't work out a way not breaking the defconfigs, even after talking with the Kconfig maintainer so doing first sama5 then sam9/rm9200 will break the defconfigs for sam9/rm9200 twice.

Probably better to do all of mach-at91 at once for 3.20 so we don't break anything trying to make both aproaches work together.

Quoted 17 lines · Arnd Bergmann

Quoted 16 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

Quoted 15 lines · Arnd Bergmann

Quoted 11 lines · On Thursday 27 November 2014 17:06:28 Nicolas Ferre wrote:

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Awesome stuff!

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

Two questions:

- is anything holding this up from getting merged in 3.19?

If you think this is not too late in the cycle, I would say go ahead

I'd say we should do it, unless there are last-minute regressions.

Arnd,

I am totally in favor for a merge into 3.19.
I wanted to wait one day or two but given that the official announce had been made several months ago, I don't think it makes a big difference.

So, what do you prefer:

1/ I wait today and send you the pull-request this evening (our time) 2/ I send you the pull-request at the beginning of next week but still can make it for 3.19?

(BTW, in the meantime, there is a pending pull-request (at91-cleanup3) but it is true that you needn't pulling it in if you plan to take this one which will be named at91-cleanup4 and that will obviously contain the 3rd one).

Quoted 33 lines · On Friday 28 November 2014 10:36:09 Nicolas Ferre wrote:

Quoted 17 lines · Arnd Bergmann

Quoted 16 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

Quoted 15 lines · Arnd Bergmann

Quoted 11 lines · On Thursday 27 November 2014 17:06:28 Nicolas Ferre wrote:

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Awesome stuff!

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

Two questions:

- is anything holding this up from getting merged in 3.19?

If you think this is not too late in the cycle, I would say go ahead

I'd say we should do it, unless there are last-minute regressions.

Arnd,

I am totally in favor for a merge into 3.19.
I wanted to wait one day or two but given that the official announce had been made several months ago, I don't think it makes a big difference.

Quoted 5 lines

So, what do you prefer:

1/ I wait today and send you the pull-request this evening (our time) 2/ I send you the pull-request at the beginning of next week but still can make it for 3.19?

Just send the pull request whenever you have it ready. If some bug shows up, reply to that mail with an updated pull request.

Quoted 4 lines

(BTW, in the meantime, there is a pending pull-request (at91-cleanup3) but it is true that you needn't pulling it in if you plan to take this one which will be named at91-cleanup4 and that will obviously contain the 3rd one).

Yes, I have a backlog of pull requests to look at, should get to that soon today.

Arnd

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

The currently affected drivers are:
- drivers/ata/pata_at91.c (SMC)
- drivers/pcmcia/at91_cf.c (SMC)

- drivers/usb/gadget/udc/at91_udc.c (Matrix, this is the only one for sam9)

- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)

- drivers/watchdog/at91rm9200_wdt.c (WIP, will be converted properly to an MFD)

Quoted 4 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

I just looked at the drivers because I got curious, and to see if there are still any low-hanging fruit, but I guess you already picked them all ;-)

Quoted 3 lines

The currently affected drivers are:
- drivers/ata/pata_at91.c (SMC)
- drivers/pcmcia/at91_cf.c (SMC)

I guess the SMC should live in drivers/memory with an interface similar to mvebu-devbus.c?

Seems doable but nontrivial.

Quoted 2 lines

- drivers/usb/gadget/udc/at91_udc.c (Matrix, this is the only one for sam9)

Is at91_matrix a pin controller? With the board files removed, the udc driver has the only two remaining calls to at91_matrix_{read,write} for setting the pullup, so that could be modeled as a trivial pinctrl driver

Hi Arnd,

Quoted 10 lines · On Fri, 28 Nov 2014 00:12:25 +0100 Arnd Bergmann <[email protected]> wrote:

Quoted 4 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

I just looked at the drivers because I got curious, and to see if there are still any low-hanging fruit, but I guess you already picked them all

Quoted 6 lines

Quoted 3 lines

The currently affected drivers are:
- drivers/ata/pata_at91.c (SMC)
- drivers/pcmcia/at91_cf.c (SMC)

I guess the SMC should live in drivers/memory with an interface similar to mvebu-devbus.c?

Actually, there's some work in progress to support the EBI/SMC blocks as a memory controller driver ;-):

http://thread.gmane.org/gmane.linux.kernel/1822096

I'll post a new version soon.

Quoted 10 lines

Seems doable but nontrivial.

Quoted 2 lines

- drivers/usb/gadget/udc/at91_udc.c (Matrix, this is the only one for sam9)

Is at91_matrix a pin controller? With the board files removed, the udc driver has the only two remaining calls to at91_matrix_{read,write} for setting the pullup, so that could be modeled as a trivial pinctrl driver

The matrix block is containing several system configuration registers. Most of them are related to AHB/APB bus config (master <-> slave priority, burst and some other configs I don't remember). Another register is here to define which HW logic is attached to an external device connected through the EBI (External Bus Interface):
NAND, SDRAM, CompactFlash, ...
And, as you pointed out, there's a register to configure the pullup of the UDC device.

As you can see, the matrix registers might be accessed by different drivers (include the EBI/SMC driver), hence I proposed to expose them as a syscon device (see the EBI/SMC series).

Quoted 4 lines · On Thursday 27 November 2014 18:12:43 Alexandre Belloni wrote:

As discussed some weeks ago, I prepared patches to switch sama5d[3-4] to multiplatform. We are still missing the SMC and matrix drivers to switch sam9 and rm9200.

I just looked at the drivers because I got curious, and to see if there are still any low-hanging fruit, but I guess you already picked them all ;-)

Quoted 2 lines

- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)

This one seems fairly straightforward to do, including a DT binding, but the result is still ugly as it supports the at32 chips that do things very differently.

The patch below gets it to compile and should be enough as a replacement once a compatible string gets added.

Quoted 2 lines

- drivers/watchdog/at91rm9200_wdt.c (WIP, will be converted properly to an MFD)

I think we discussed this one before. Remind me why we can't just convert it to use watchdog_register() for simplification and then move whatever remains into the arch/arm/mach-at91/at91rm9200_time.c file, or both into drivers/clocksource.

Arnd

8<----
ASoC: atmel/ac97c: remove platform_data dependency

As at91 gets changed to multiplatform, we can't use the mach/cpu.h header any more, but this is ok as it only gets used to check for cpu_is_at32ap7000(), which arch/avr32.

In order to make the driver work without platform_data, this also changes the reset gpio line handling so it can look up the gpio descriptor from DT. It is still missing a compatible string and a binding that describes the valid DT properties.

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

sound/atmel/ac97c.c +15 -19

index b59427d5a697..4eec216b7f92 100644
@@ -34,10 +34,10 @@
 #include <linux/platform_data/dma-dw.h>
 #include <linux/dma/dw.h>
 
+#ifdef CONFIG_AVR32
 #include <mach/cpu.h>
-
-#ifdef CONFIG_ARCH_AT91
-#include <mach/hardware.h>
+#else
+#define cpu_is_at32ap7000() (0)
 #endif
 
 #include "ac97c.h"

@@ -78,7 +78,7 @@ struct atmel_ac97c {
 	void __iomem			*regs;
 	int				irq;
 	int				opened;
-	int				reset_pin;
+	struct gpio_desc		*reset_pin;
 };
 
 #define get_chip(card) ((struct atmel_ac97c *)(card)->private_data)

@@ -890,11 +890,11 @@ static void atmel_ac97c_reset(struct atmel_ac97c *chip)
 	ac97c_writel(chip, CAMR, 0);
 	ac97c_writel(chip, COMR, 0);
 
-	if (gpio_is_valid(chip->reset_pin)) {
-		gpio_set_value(chip->reset_pin, 0);
+	if (chip->reset_pin) {
+		gpiod_set_value(chip->reset_pin, 0);
 		/* AC97 v2.2 specifications says minimum 1 us. */
 		udelay(2);
-		gpio_set_value(chip->reset_pin, 1);
+		gpiod_set_value(chip->reset_pin, 1);
 	} else {
 		ac97c_writel(chip, MR, AC97C_MR_WRST | AC97C_MR_ENA);
 		udelay(2);

@@ -923,7 +923,7 @@ static int atmel_ac97c_probe(struct platform_device *pdev)
 	}
 
 	pdata = pdev->dev.platform_data;
-	if (!pdata) {
+	if (cpu_is_at32ap7000() && !pdata) {
 		dev_dbg(&pdev->dev, "no platform data\n");
 		return -ENXIO;
 	}

@@ -980,16 +980,18 @@ static int atmel_ac97c_probe(struct platform_device *pdev)
 		goto err_ioremap;
 	}
 
-	if (gpio_is_valid(pdata->reset_pin)) {
-		if (gpio_request(pdata->reset_pin, "reset_pin")) {
+	if (pdata && gpio_is_valid(pdata->reset_pin)) {
+		if (devm_gpio_request(&pdev->dev, pdata->reset_pin, "reset")) {
 			dev_dbg(&pdev->dev, "reset pin not available\n");
-			chip->reset_pin = -ENODEV;
+			chip->reset_pin = NULL;
 		} else {
 			gpio_direction_output(pdata->reset_pin, 1);
-			chip->reset_pin = pdata->reset_pin;
+			chip->reset_pin = gpio_to_desc(pdata->reset_pin);
 		}
 	} else {
-		chip->reset_pin = -EINVAL;
+		chip->reset_pin = devm_gpiod_get(&pdev->dev, "reset", 0);
+		if (IS_ERR(chip->reset_pin))
+			chip->reset_pin = NULL;
 	}
 
 	atmel_ac97c_reset(chip);

@@ -1113,9 +1115,6 @@ err_dma:
 		chip->dma.tx_chan = NULL;
 	}
 err_ac97_bus:
-	if (gpio_is_valid(chip->reset_pin))
-		gpio_free(chip->reset_pin);
-
 	iounmap(chip->regs);
 err_ioremap:
 	free_irq(irq, chip);

@@ -1170,9 +1169,6 @@ static int atmel_ac97c_remove(struct platform_device *pdev)
 	struct snd_card *card = platform_get_drvdata(pdev);
 	struct atmel_ac97c *chip = get_chip(card);
 
-	if (gpio_is_valid(chip->reset_pin))
-		gpio_free(chip->reset_pin);
-
 	ac97c_writel(chip, CAMR, 0);
 	ac97c_writel(chip, COMR, 0);
 	ac97c_writel(chip, MR,   0);

Quoted 9 lines

Quoted 1 line

- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)

This one seems fairly straightforward to do, including a DT binding, but the result is still ugly as it supports the at32 chips that do things very differently.

The patch below gets it to compile and should be enough as a replacement once a compatible string gets added.

Actually, some work was done but we never saw an other version of the series. Alexander, are you still interested? Else we can take the patch below.

http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/246679.html

Hi Alexandre,

On Friday 28 November 2014, 01:28:22 wrote Alexandre Belloni:

Quoted 15 lines

Quoted 9 lines

Quoted 1 line

- sound/atmel/ac97c.c (that one is still not converted to DT anyway...)

This one seems fairly straightforward to do, including a DT binding, but the result is still ugly as it supports the at32 chips that do things very differently.

The patch below gets it to compile and should be enough as a replacement once a compatible string gets added.

Actually, some work was done but we never saw an other version of the series. Alexander, are you still interested? Else we can take the patch below.

http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/246679.html

Well, I tried to get a ac97c driver based on alsa soc framework as suggested by Takashi. But I failed so far, I could not get my head around those architecture.

When keeping my DT support on the current driver, the only thing which is open that the bindings should be modifed that they are like soc-ac97link bindings.

Quoted 4 lines

Quoted 4 lines

Actually, some work was done but we never saw an other version of the series. Alexander, are you still interested? Else we can take the patch below.

Quoted 1 line

Quoted 1 line

http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/246679.html

I see. Yes, the approach is similar, and there are actually multiple independent problems:

- getting the current driver to build with multiplatform (trivial, 5 lines)
- changing the gpio handling to work with DT (simple, both of us did that)
- writing the binding (simple)

- changing the driver to ASoC (not that simple)

Quoted 3 lines

Well, I tried to get a ac97c driver based on alsa soc framework as suggested by Takashi. But I failed so far, I could not get my head around those architecture.

Let's just start with the trivial first patch, that can probably just be merged into 3.19, and then we can build on top of that later if anybody wants to get ac97 working again on at91.

Quoted 2 lines

When keeping my DT support on the current driver, the only thing which is open that the bindings should be modifed that they are like soc-ac97link bindings.

Makes sense, if that binding works on the at91 hardware. I'm not sure whether the pinctrl stuff or the first two gpio lines apply though.

Arnd

8<---
ALSA: atmel: fix building the ac97 driver for at91-multiplatform

at91 will no longer export the mach/cpu.h and mach/hardware.h header files in the future, which would break building the atmel ac97c driver.

Since the cpu_is_* check is only used to find out whether we are running on avr32 or arm/at91, we can hardcode that check in the ARM case.

Unfortunately the driver is missing other work to be useful again on ARM, if anyone wants to actually use it, they need to add a DT binding, and the driver should really be converted to use the ASoC framework.

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

Link http://www.spinics.net/lists/arm-kernel/msg382068.html

sound/atmel/ac97c.c +3 -3

index b59427d5a697..4eec216b7f92 100644
@@ -34,10 +34,10 @@
 #include <linux/platform_data/dma-dw.h>
 #include <linux/dma/dw.h>
 
+#ifdef CONFIG_AVR32
 #include <mach/cpu.h>
-
-#ifdef CONFIG_ARCH_AT91
-#include <mach/hardware.h>
+#else
+#define cpu_is_at32ap7000() (0)
 #endif
 
 #include "ac97c.h"

Quoted 4 lines · Arnd Bergmann

Quoted 4 lines

Quoted 4 lines

Actually, some work was done but we never saw an other version of the series. Alexander, are you still interested? Else we can take the patch below.

Quoted 8 lines

Quoted 1 line

Quoted 1 line

http://lists.infradead.org/pipermail/linux-arm-kernel/2014-April/246679.html

I see. Yes, the approach is similar, and there are actually multiple independent problems:

- getting the current driver to build with multiplatform (trivial, 5 lines)
- changing the gpio handling to work with DT (simple, both of us did that)
- writing the binding (simple)

Yeah, let's focus on those first steps. Takashi was willing to take patches, even if we were not converting the driver to ASoC.

Quoted 6 lines

- changing the driver to ASoC (not that simple)

Quoted 3 lines

Well, I tried to get a ac97c driver based on alsa soc framework as suggested by Takashi. But I failed so far, I could not get my head around those architecture.

Quoted 4 lines

Let's just start with the trivial first patch, that can probably just be merged into 3.19, and then we can build on top of that later if anybody wants to get ac97 working again on at91.

Do you want one of us to send that patch to Takashi and the Alsa ML or will you do it?
You can add my ack.

This is the last series of patches that removes the non-Device-Tree board support for older Atmel SoCs.
Again, for the record, it was announced here
https://lkml.org/lkml/2014/9/10/293 ([ANNOUNCE] ARM: at91: removal of board files) two months ago.
Several files beyond at91rm9200 are touched this time as I tried to remove the biggest parts that were related to !DT SoC initializations. More cleanup is certainly needed to remove dead code.

The diffstat is also pretty big as a lot of at91rm9200 boards were remaining.

Bye,

Nicolas Ferre (11):
ARM: at91: remove at91rm9200 legacy boards files
ARM: at91: remove at91rm9200 legacy board support
ARM: at91: switch configuration option to SOC_AT91RM9200
ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers
ARM: at91: always USE_OF from now on
ARM: at91/trivial: update Kconfig comment to mention SAMA5
ARM: at91: remove all !DT related configuration options
ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files
ARM: at91: remove old at91-specific clock driver
ARM: at91: remove legacy IRQ driver and related code
ARM: at91: remove unused IRQ function declarations

 arch/arm/Kconfig                        |    5 +-
 arch/arm/configs/at91rm9200_defconfig   |  161 ----
 arch/arm/mach-at91/Kconfig              |   34 +-
 arch/arm/mach-at91/Kconfig.non_dt       |  114 ---
 arch/arm/mach-at91/Makefile             |   19 -
 arch/arm/mach-at91/at91_aic.h           |   99 ---
 arch/arm/mach-at91/at91rm9200.c         |  341 ---------
 arch/arm/mach-at91/at91rm9200_devices.c | 1212 -------------------------------
 arch/arm/mach-at91/at91sam9n12.c        |  213 +-----
 arch/arm/mach-at91/at91sam9x5.c         |  311 +-------
 arch/arm/mach-at91/board-1arm.c         |   99 ---
 arch/arm/mach-at91/board-carmeva.c      |  167 -----
 arch/arm/mach-at91/board-cpuat91.c      |  189 -----
 arch/arm/mach-at91/board-csb337.c       |  260 -------
 arch/arm/mach-at91/board-csb637.c       |  142 ----
 arch/arm/mach-at91/board-dt-rm9200.c    |    1 -
 arch/arm/mach-at91/board-dt-sam9.c      |    1 -
 arch/arm/mach-at91/board-dt-sama5.c     |    1 -
 arch/arm/mach-at91/board-eb9200.c       |  126 ----
 arch/arm/mach-at91/board-ecbat91.c      |  191 -----
 arch/arm/mach-at91/board-eco920.c       |  160 ----
 arch/arm/mach-at91/board-kafa.c         |  113 ---
 arch/arm/mach-at91/board-kb9202.c       |  159 ----
 arch/arm/mach-at91/board-picotux200.c   |  129 ----
 arch/arm/mach-at91/board-rm9200ek.c     |  196 -----
 arch/arm/mach-at91/board-yl-9200.c      |  597 ---------------
 arch/arm/mach-at91/clock.c              |  977 -------------------------
 arch/arm/mach-at91/clock.h              |   49 --
 arch/arm/mach-at91/generic.h            |   17 -
 arch/arm/mach-at91/irq.c                |  296 --------
 arch/arm/mach-at91/pm.c                 |   22 -
 arch/arm/mach-at91/setup.c              |   13 -
 drivers/net/ethernet/cadence/Kconfig    |    2 +-
 drivers/rtc/Kconfig                     |    2 +-
 drivers/watchdog/Kconfig                |    4 +-
 35 files changed, 19 insertions(+), 6403 deletions(-)
 delete mode 100644 arch/arm/configs/at91rm9200_defconfig
 delete mode 100644 arch/arm/mach-at91/Kconfig.non_dt
 delete mode 100644 arch/arm/mach-at91/at91_aic.h
 delete mode 100644 arch/arm/mach-at91/at91rm9200_devices.c
 delete mode 100644 arch/arm/mach-at91/board-1arm.c
 delete mode 100644 arch/arm/mach-at91/board-carmeva.c
 delete mode 100644 arch/arm/mach-at91/board-cpuat91.c
 delete mode 100644 arch/arm/mach-at91/board-csb337.c
 delete mode 100644 arch/arm/mach-at91/board-csb637.c
 delete mode 100644 arch/arm/mach-at91/board-eb9200.c
 delete mode 100644 arch/arm/mach-at91/board-ecbat91.c
 delete mode 100644 arch/arm/mach-at91/board-eco920.c
 delete mode 100644 arch/arm/mach-at91/board-kafa.c
 delete mode 100644 arch/arm/mach-at91/board-kb9202.c
 delete mode 100644 arch/arm/mach-at91/board-picotux200.c
 delete mode 100644 arch/arm/mach-at91/board-rm9200ek.c
 delete mode 100644 arch/arm/mach-at91/board-yl-9200.c
 delete mode 100644 arch/arm/mach-at91/clock.c
 delete mode 100644 arch/arm/mach-at91/clock.h
 delete mode 100644 arch/arm/mach-at91/irq.c