arm: at91: mach header cleanup

PATCH In review Jean-Christophe PLAGNIOL-VILLARD 6 participants 21 messages Nov 7, 2012 – Nov 19, 2012 1 message not in the archive

Subsystems (21)

Networking Network drivers Arm (32-bit) USB +17 more subsystems

lore

Share & tools

lore

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:12 UTC #0 lore raw

Hi,

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://github.com/at91linux/linux-at91.git tags/for-3.8-at91_header_clean

for you to fetch changes up to 75984df05d86956541795f01e62d7dc67bc522fd:

arm: at91: move at91rm9200 rtc header in drivers/rtc (2012-11-06 20:30:52 +0800)

----------------------------------------------------------------
arm: at91: mach header cleanup

This first patch serie start the cleanup of the header in mach by moving all the platform data to include/linux/platform_data

and move the board header and drivers header next to them

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (10):
arm: at91: drop machine defconfig
arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
arm: at91 move board.h to arch/arm/mach-at91
arm: at91 move at91_aic.h to arch/arm/mach-at91
arn: at91: move at91_tc.h to arch/arm/mach-at91
arm: at91: move board header to arch/arm/mach-at91
arm: at91: move at91_shdwc.h to arch/arm/mach-at91
arm: at91: move pit define to the driver
arm: at91: move reset controller header to arm/arm/mach-at91
arm: at91: move at91rm9200 rtc header in drivers/rtc

 arch/arm/configs/afeb9260_defconfig                                        |  106 ------------------------------
 arch/arm/configs/cam60_defconfig                                           |  173 -------------------------------------------------
 arch/arm/configs/cpu9260_defconfig                                         |  116 ---------------------------------
 arch/arm/configs/cpu9g20_defconfig                                         |  116 ---------------------------------
 arch/arm/configs/qil-a9260_defconfig                                       |  114 --------------------------------
 arch/arm/configs/sam9_l9260_defconfig                                      |  148 ------------------------------------------
 arch/arm/configs/stamp9g20_defconfig                                       |  128 ------------------------------------
 arch/arm/configs/usb-a9260_defconfig                                       |  105 ------------------------------
 arch/arm/mach-at91/{include/mach => }/at91_aic.h                           |    0
 arch/arm/mach-at91/{include/mach => }/at91_rstc.h                          |    0
 arch/arm/mach-at91/{include/mach => }/at91_shdwc.h                         |    0
 arch/arm/mach-at91/{include/mach => }/at91_tc.h                            |    0
 arch/arm/mach-at91/at91rm9200.c                                            |    2 +-
 arch/arm/mach-at91/at91rm9200_devices.c                                    |    2 +-
 arch/arm/mach-at91/at91sam9260.c                                           |    4 +-
 arch/arm/mach-at91/at91sam9260_devices.c                                   |    2 +-
 arch/arm/mach-at91/at91sam9261.c                                           |    4 +-
 arch/arm/mach-at91/at91sam9261_devices.c                                   |    2 +-
 arch/arm/mach-at91/at91sam9263.c                                           |    4 +-
 arch/arm/mach-at91/at91sam9263_devices.c                                   |    2 +-
 arch/arm/mach-at91/at91sam926x_time.c                                      |   14 +++-
 arch/arm/mach-at91/at91sam9_alt_reset.S                                    |    2 +-
 arch/arm/mach-at91/at91sam9g45.c                                           |    2 +-
 arch/arm/mach-at91/at91sam9g45_devices.c                                   |    2 +-
 arch/arm/mach-at91/at91sam9g45_reset.S                                     |    3 +-
 arch/arm/mach-at91/at91sam9n12.c                                           |    2 +-
 arch/arm/mach-at91/at91sam9rl.c                                            |    4 +-
 arch/arm/mach-at91/at91sam9rl_devices.c                                    |    2 +-
 arch/arm/mach-at91/at91sam9x5.c                                            |    2 +-
 arch/arm/mach-at91/at91x40.c                                               |    3 +-
 arch/arm/mach-at91/at91x40_time.c                                          |    3 +-
 arch/arm/mach-at91/board-1arm.c                                            |    4 +-
 arch/arm/mach-at91/board-afeb-9260v1.c                                     |    5 +-
 arch/arm/mach-at91/board-cam60.c                                           |    4 +-
 arch/arm/mach-at91/board-carmeva.c                                         |    4 +-
 arch/arm/mach-at91/board-cpu9krea.c                                        |    4 +-
 arch/arm/mach-at91/board-cpuat91.c                                         |    4 +-
 arch/arm/mach-at91/board-csb337.c                                          |    4 +-
 arch/arm/mach-at91/board-csb637.c                                          |    4 +-
 arch/arm/mach-at91/board-dt.c                                              |    5 +-
 arch/arm/mach-at91/board-eb01.c                                            |    5 +-
 arch/arm/mach-at91/board-eb9200.c                                          |    5 +-
 arch/arm/mach-at91/board-ecbat91.c                                         |    4 +-
 arch/arm/mach-at91/board-eco920.c                                          |    4 +-
 arch/arm/mach-at91/board-flexibity.c                                       |    4 +-
 arch/arm/mach-at91/board-foxg20.c                                          |    4 +-
 arch/arm/mach-at91/board-gsia18s.c                                         |    8 +--
 arch/arm/mach-at91/board-kafa.c                                            |    4 +-
 arch/arm/mach-at91/board-kb9202.c                                          |    4 +-
 arch/arm/mach-at91/board-neocore926.c                                      |    4 +-
 arch/arm/mach-at91/board-pcontrol-g20.c                                    |    6 +-
 arch/arm/mach-at91/board-picotux200.c                                      |    4 +-
 arch/arm/mach-at91/board-qil-a9260.c                                       |    6 +-
 arch/arm/mach-at91/board-rm9200dk.c                                        |    4 +-
 arch/arm/mach-at91/board-rm9200ek.c                                        |    4 +-
 arch/arm/mach-at91/board-rsi-ews.c                                         |    4 +-
 arch/arm/mach-at91/board-sam9-l9260.c                                      |    4 +-
 arch/arm/mach-at91/board-sam9260ek.c                                       |    6 +-
 arch/arm/mach-at91/board-sam9261ek.c                                       |    6 +-
 arch/arm/mach-at91/board-sam9263ek.c                                       |    6 +-
 arch/arm/mach-at91/board-sam9g20ek.c                                       |    4 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c                                    |    6 +-
 arch/arm/mach-at91/board-sam9rlek.c                                        |    7 +-
 arch/arm/mach-at91/board-snapper9260.c                                     |    4 +-
 arch/arm/mach-at91/board-stamp9g20.c                                       |    4 +-
 arch/arm/mach-at91/board-usb-a926x.c                                       |    6 +-
 arch/arm/mach-at91/board-yl-9200.c                                         |    4 +-
 arch/arm/mach-at91/{include/mach => }/board.h                              |   55 ----------------
 arch/arm/mach-at91/{include/mach => }/gsia18s.h                            |    0
 arch/arm/mach-at91/include/mach/at91_pit.h                                 |   32 ---------
 arch/arm/mach-at91/irq.c                                                   |    2 +-
 arch/arm/mach-at91/leds.c                                                  |    2 +-
 arch/arm/mach-at91/pm.c                                                    |    6 +-
 arch/arm/mach-at91/setup.c                                                 |    2 +-
 arch/arm/mach-at91/{include/mach => }/stamp9g20.h                          |    0
 arch/avr32/mach-at32ap/include/mach/board.h                                |    7 --
 drivers/ata/pata_at91.c                                                    |    2 +-
 drivers/input/touchscreen/atmel_tsadcc.c                                   |    2 +-
 drivers/mmc/host/atmel-mci.c                                               |    2 +-
 drivers/net/can/at91_can.c                                                 |    3 +-
 drivers/net/ethernet/cadence/at91_ether.c                                  |    2 +-
 drivers/pcmcia/at91_cf.c                                                   |    2 +-
 drivers/rtc/rtc-at91rm9200.c                                               |    2 +-
 arch/arm/mach-at91/include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h |    0
 drivers/rtc/rtc-at91sam9.c                                                 |    2 +-
 drivers/spi/spi-atmel.c                                                    |    2 +-
 drivers/tty/serial/atmel_serial.c                                          |    2 +-
 drivers/usb/gadget/at91_udc.c                                              |    2 +-
 drivers/usb/gadget/atmel_usba_udc.c                                        |    2 +-
 drivers/usb/host/ohci-at91.c                                               |    2 +-
 drivers/video/atmel_lcdfb.c                                                |    2 +-
 include/linux/platform_data/atmel.h                                        |   67 +++++++++++++++++++
 92 files changed, 207 insertions(+), 1231 deletions(-)
 delete mode 100644 arch/arm/configs/afeb9260_defconfig
 delete mode 100644 arch/arm/configs/cam60_defconfig
 delete mode 100644 arch/arm/configs/cpu9260_defconfig
 delete mode 100644 arch/arm/configs/cpu9g20_defconfig
 delete mode 100644 arch/arm/configs/qil-a9260_defconfig
 delete mode 100644 arch/arm/configs/sam9_l9260_defconfig
 delete mode 100644 arch/arm/configs/stamp9g20_defconfig
 delete mode 100644 arch/arm/configs/usb-a9260_defconfig
 rename arch/arm/mach-at91/{include/mach => }/at91_aic.h (100%)
 rename arch/arm/mach-at91/{include/mach => }/at91_rstc.h (100%)
 rename arch/arm/mach-at91/{include/mach => }/at91_shdwc.h (100%)
 rename arch/arm/mach-at91/{include/mach => }/at91_tc.h (100%)
 rename arch/arm/mach-at91/{include/mach => }/board.h (71%)
 rename arch/arm/mach-at91/{include/mach => }/gsia18s.h (100%)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_pit.h
 rename arch/arm/mach-at91/{include/mach => }/stamp9g20.h (100%)
 rename arch/arm/mach-at91/include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h (100%)

Best Regards,
J.

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #1 lore raw

PATCH 1/10 arm: at91: drop machine defconfig

No one care about them for releases and the machine are present in soc defconfigs so drop them.

For qil-a9260 and usb-a9260 I maintain them and now switch to the at91sam9260_defconfig.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/configs/afeb9260_defconfig   |  106 --------------------
 arch/arm/configs/cam60_defconfig      |  173 ---------------------------------
 arch/arm/configs/cpu9260_defconfig    |  116 ----------------------
 arch/arm/configs/cpu9g20_defconfig    |  116 ----------------------
 arch/arm/configs/qil-a9260_defconfig  |  114 ----------------------
 arch/arm/configs/sam9_l9260_defconfig |  148 ----------------------------
 arch/arm/configs/stamp9g20_defconfig  |  128 ------------------------
 arch/arm/configs/usb-a9260_defconfig  |  105 --------------------
 8 files changed, 1006 deletions(-)
 delete mode 100644 arch/arm/configs/afeb9260_defconfig
 delete mode 100644 arch/arm/configs/cam60_defconfig
 delete mode 100644 arch/arm/configs/cpu9260_defconfig
 delete mode 100644 arch/arm/configs/cpu9g20_defconfig
 delete mode 100644 arch/arm/configs/qil-a9260_defconfig
 delete mode 100644 arch/arm/configs/sam9_l9260_defconfig
 delete mode 100644 arch/arm/configs/stamp9g20_defconfig
 delete mode 100644 arch/arm/configs/usb-a9260_defconfig

arch/arm/configs/afeb9260_defconfig deleted +0 ~~-106~~

deleted file mode 100644
index c285a9d..0000000
@@ -1,106 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
-CONFIG_SYSVIPC=y
-CONFIG_LOG_BUF_SHIFT=14
-CONFIG_SYSFS_DEPRECATED_V2=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_SLAB=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_AT91=y
-CONFIG_ARCH_AT91SAM9260=y
-CONFIG_MACH_AFEB9260=y
-CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="mem=64M console=ttyS0,115200 initrd=0x21100000,3145728 root=/dev/ram0 rw"
-CONFIG_FPE_NWFPE=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_IPV6 is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_DATAFLASH=y
-CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_ATMEL=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_ATMEL_SSC=y
-CONFIG_EEPROM_AT24=y
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_SCSI_MULTI_LUN=y
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=y
-CONFIG_MACB=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-# CONFIG_SERIO is not set
-CONFIG_SERIAL_ATMEL=y
-CONFIG_SERIAL_ATMEL_CONSOLE=y
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_GPIO=y
-CONFIG_SPI=y
-CONFIG_SPI_DEBUG=y
-CONFIG_SPI_ATMEL=y
-CONFIG_SPI_SPIDEV=y
-# CONFIG_HWMON is not set
-CONFIG_WATCHDOG=y
-CONFIG_WATCHDOG_NOWAYOUT=y
-# CONFIG_VGA_CONSOLE is not set
-# CONFIG_USB_HID is not set
-CONFIG_USB=y
-CONFIG_USB_DEVICEFS=y
-CONFIG_USB_MON=y
-CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_STORAGE=y
-CONFIG_USB_GADGET=y
-CONFIG_USB_ZERO=m
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_DEBUG=y
-CONFIG_RTC_DRV_FM3130=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-CONFIG_INOTIFY=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_JFFS2_FS=y
-CONFIG_CRAMFS=y
-CONFIG_NFS_FS=y
-CONFIG_NFS_V3=y
-CONFIG_ROOT_NFS=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_CODEPAGE_850=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DEBUG_INFO=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_CRC_T10DIF=y

arch/arm/configs/cam60_defconfig deleted +0 ~~-173~~

173 lines not on this page · raw message

arch/arm/configs/cpu9260_defconfig deleted +0 ~~-116~~

116 lines not on this page · raw message

arch/arm/configs/cpu9g20_defconfig deleted +0 ~~-116~~

116 lines not on this page · raw message

arch/arm/configs/qil-a9260_defconfig deleted +0 ~~-114~~

114 lines not on this page · raw message

arch/arm/configs/sam9_l9260_defconfig deleted +0 ~~-148~~

148 lines not on this page · raw message

arch/arm/configs/stamp9g20_defconfig deleted +0 ~~-128~~

128 lines not on this page · raw message

arch/arm/configs/usb-a9260_defconfig deleted +0 ~~-105~~

105 lines not on this page · raw message

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #2 lore raw

PATCH 2/10 arm: at91: move platfarm_data to include/linux/platform_data/atmel.h

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc linux-ide at vger.kernel.org

Cc linux-input at vger.kernel.org

Cc linux-mmc at vger.kernel.org

Cc linux-can at vger.kernel.org

Cc netdev at vger.kernel.org

Cc linux-pcmcia at lists.infradead.org

Cc rtc-linux at googlegroups.com

Cc spi-devel-general at lists.sourceforge.net

Cc linux-serial at vger.kernel.org

Cc linux-usb at vger.kernel.org

Cc linux-fbdev at vger.kernel.org

---
HI all,

If it's ok with everyone this will go via at91 with the patch serie than clean up the include/mach

For preparation to switch to arm multiarch kernel

Best Regards,
J.

 arch/arm/mach-at91/include/mach/board.h     |   55 ----------------------
 arch/avr32/mach-at32ap/include/mach/board.h |    7 ---
 drivers/ata/pata_at91.c                     |    2 +-
 drivers/input/touchscreen/atmel_tsadcc.c    |    2 +-
 drivers/mmc/host/atmel-mci.c                |    2 +-
 drivers/net/can/at91_can.c                  |    3 +-
 drivers/net/ethernet/cadence/at91_ether.c   |    2 +-
 drivers/pcmcia/at91_cf.c                    |    2 +-
 drivers/rtc/rtc-at91sam9.c                  |    2 +-
 drivers/spi/spi-atmel.c                     |    2 +-
 drivers/tty/serial/atmel_serial.c           |    2 +-
 drivers/usb/gadget/at91_udc.c               |    2 +-
 drivers/usb/gadget/atmel_usba_udc.c         |    2 +-
 drivers/usb/host/ohci-at91.c                |    2 +-
 drivers/video/atmel_lcdfb.c                 |    2 +-
 include/linux/platform_data/atmel.h         |   67 +++++++++++++++++++++++++++
 16 files changed, 80 insertions(+), 76 deletions(-)

arch/arm/mach-at91/include/mach/board.h +0 ~~-55~~

index c55a436..662451d 100644
@@ -31,42 +31,15 @@
 #ifndef __ASM_ARCH_BOARD_H
 #define __ASM_ARCH_BOARD_H
 
-#include <linux/mtd/partitions.h>
-#include <linux/device.h>
-#include <linux/i2c.h>
-#include <linux/leds.h>
-#include <linux/spi/spi.h>
-#include <linux/usb/atmel_usba_udc.h>
-#include <linux/atmel-mci.h>
-#include <sound/atmel-ac97c.h>
-#include <linux/serial.h>
-#include <linux/platform_data/macb.h>
 #include <linux/platform_data/atmel.h>
 
  /* USB Device */
-struct at91_udc_data {
-	int	vbus_pin;		/* high == host powering us */
-	u8	vbus_active_low;	/* vbus polarity */
-	u8	vbus_polled;		/* Use polling, not interrupt */
-	int	pullup_pin;		/* active == D+ pulled up */
-	u8	pullup_active_low;	/* true == pullup_pin is active low */
-};
 extern void __init at91_add_device_udc(struct at91_udc_data *data);
 
  /* USB High Speed Device */
 extern void __init at91_add_device_usba(struct usba_platform_data *data);
 
  /* Compact Flash */
-struct at91_cf_data {
-	int	irq_pin;		/* I/O IRQ */
-	int	det_pin;		/* Card detect */
-	int	vcc_pin;		/* power switching */
-	int	rst_pin;		/* card reset */
-	u8	chipselect;		/* EBI Chip Select number */
-	u8	flags;
-#define AT91_CF_TRUE_IDE	0x01
-#define AT91_IDE_SWAP_A0_A2	0x02
-};
 extern void __init at91_add_device_cf(struct at91_cf_data *data);
 
  /* MMC / SD */

@@ -86,16 +59,6 @@ extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *d
 extern void __init at91_add_device_eth(struct macb_platform_data *data);
 
  /* USB Host */
-#define AT91_MAX_USBH_PORTS	3
-struct at91_usbh_data {
-	int		vbus_pin[AT91_MAX_USBH_PORTS];	/* port power-control pin */
-	int             overcurrent_pin[AT91_MAX_USBH_PORTS];
-	u8		ports;				/* number of ports on root hub */
-	u8              overcurrent_supported;
-	u8              vbus_pin_active_low[AT91_MAX_USBH_PORTS];
-	u8              overcurrent_status[AT91_MAX_USBH_PORTS];
-	u8              overcurrent_changed[AT91_MAX_USBH_PORTS];
-};
 extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
 extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
 extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);

@@ -124,13 +87,6 @@ extern void __init at91_register_uart(unsigned id, unsigned portnr, unsigned pin
 
 extern struct platform_device *atmel_default_console_device;
 
-struct atmel_uart_data {
-	int			num;		/* port num */
-	short			use_dma_tx;	/* use transmit DMA? */
-	short			use_dma_rx;	/* use receive DMA? */
-	void __iomem		*regs;		/* virt. base address, if any */
-	struct serial_rs485	rs485;		/* rs485 settings */
-};
 extern void __init at91_add_device_serial(void);
 
 /*

@@ -173,24 +129,13 @@ extern void __init at91_add_device_isi(struct isi_platform_data *data,
 		bool use_pck_as_mck);
 
  /* Touchscreen Controller */
-struct at91_tsadcc_data {
-	unsigned int    adc_clock;
-	u8		pendet_debounce;
-	u8		ts_sample_hold_time;
-};
 extern void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data);
 
 /* CAN */
-struct at91_can_data {
-	void (*transceiver_switch)(int on);
-};
 extern void __init at91_add_device_can(struct at91_can_data *data);
 
  /* LEDs */
 extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
 extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
 
-/* FIXME: this needs a better location, but gets stuff building again */
-extern int at91_suspend_entering_slow_clock(void);
-
 #endif

arch/avr32/mach-at32ap/include/mach/board.h +0 -7

index 70742ec..dca9345 100644
@@ -34,13 +34,6 @@ extern struct platform_device *atmel_default_console_device;
 #define	ATMEL_USART_CTS		0x02
 #define	ATMEL_USART_CLK		0x04
 
-struct atmel_uart_data {
-	int		num;		/* port num */
-	short		use_dma_tx;	/* use transmit DMA? */
-	short		use_dma_rx;	/* use receive DMA? */
-	void __iomem	*regs;		/* virtual base address, if any */
-	struct serial_rs485	rs485;		/* rs485 settings */
-};
 void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
 struct platform_device *at32_add_device_usart(unsigned int id);

drivers/ata/pata_at91.c +1 -1

index 53d3770..2a96bb2 100644
@@ -27,9 +27,9 @@
 #include <linux/libata.h>
 #include <linux/platform_device.h>
 #include <linux/ata_platform.h>
+#include <linux/platform_data/atmel.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/board.h>
 #include <asm/gpio.h>
 
 #define DRV_NAME		"pata_at91"

drivers/input/touchscreen/atmel_tsadcc.c +1 -1

index 201b2d2..ea392ee 100644
@@ -22,7 +22,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
-#include <mach/board.h>
+#include <linux/platform_data/atmel.h>
 #include <mach/cpu.h>
 
 /* Register definitions based on AT91SAM9RL64 preliminary draft datasheet */

drivers/mmc/host/atmel-mci.c +1 -1

index ddf096e..8689989 100644
@@ -28,6 +28,7 @@
 #include <linux/slab.h>
 #include <linux/stat.h>
 #include <linux/types.h>
+#include <linux/platform_data/atmel.h>
 
 #include <linux/mmc/host.h>
 #include <linux/mmc/sdio.h>

@@ -40,7 +41,6 @@
 #include <asm/unaligned.h>
 
 #include <mach/cpu.h>
-#include <mach/board.h>
 
 #include "atmel-mci-regs.h"

drivers/net/can/at91_can.c +1 -2

index fcff73a..994b6ac 100644
@@ -33,12 +33,11 @@
 #include <linux/spinlock.h>
 #include <linux/string.h>
 #include <linux/types.h>
+#include <linux/platform_data/atmel.h>
 
 #include <linux/can/dev.h>
 #include <linux/can/error.h>
 
-#include <mach/board.h>
-
 #define AT91_MB_MASK(i)		((1 << (i)) - 1)
 
 /* Common registers */

drivers/net/ethernet/cadence/at91_ether.c +1 -1

index 4e980a7..35fc6edb 100644
@@ -31,6 +31,7 @@
 #include <linux/clk.h>
 #include <linux/gfp.h>
 #include <linux/phy.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

@@ -38,7 +39,6 @@
 
 #include <mach/at91rm9200_emac.h>
 #include <asm/gpio.h>
-#include <mach/board.h>
 
 #include "at91_ether.h"

drivers/pcmcia/at91_cf.c +1 -1

index 9694c1e..01463c7 100644
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/slab.h>
 #include <linux/gpio.h>
+#include <linux/platform_data/atmel.h>
 
 #include <pcmcia/ss.h>

@@ -24,7 +25,6 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 
-#include <mach/board.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>

drivers/rtc/rtc-at91sam9.c +1 -1

index 2dfe7a2..e981798 100644
@@ -19,8 +19,8 @@
 #include <linux/interrupt.h>
 #include <linux/ioctl.h>
 #include <linux/slab.h>
+#include <linux/platform_data/atmel.h>
 
-#include <mach/board.h>
 #include <mach/at91_rtt.h>
 #include <mach/cpu.h>

drivers/spi/spi-atmel.c +1 -1

index 16d6a83..61fb0ec 100644
@@ -19,9 +19,9 @@
 #include <linux/interrupt.h>
 #include <linux/spi/spi.h>
 #include <linux/slab.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
-#include <mach/board.h>
 #include <asm/gpio.h>
 #include <mach/cpu.h>

drivers/tty/serial/atmel_serial.c +1 -1

index 3d7e1ee..5660ec2 100644
@@ -39,12 +39,12 @@
 #include <linux/atmel_pdc.h>
 #include <linux/atmel_serial.h>
 #include <linux/uaccess.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
 #include <asm/ioctls.h>
 
 #include <asm/mach/serial_at91.h>
-#include <mach/board.h>
 
 #ifdef CONFIG_ARM
 #include <mach/cpu.h>

drivers/usb/gadget/at91_udc.c +1 -1

index 89d90b5..a7b042b 100644
@@ -31,6 +31,7 @@
 #include <linux/usb/gadget.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/byteorder.h>
 #include <mach/hardware.h>

@@ -38,7 +39,6 @@
 #include <asm/irq.h>
 #include <asm/gpio.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91sam9261_matrix.h>
 #include <mach/at91_matrix.h>

drivers/usb/gadget/atmel_usba_udc.c +1 -1

index 9a9bced..a7aed84 100644
@@ -21,9 +21,9 @@
 #include <linux/usb/gadget.h>
 #include <linux/usb/atmel_usba_udc.h>
 #include <linux/delay.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/gpio.h>
-#include <mach/board.h>
 
 #include "atmel_usba_udc.h"

drivers/usb/host/ohci-at91.c +1 -1

index 0bf72f9..8e62f81 100644
@@ -16,11 +16,11 @@
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/of_gpio.h>
+#include <linux/platform_data/atmel.h>
 
 #include <mach/hardware.h>
 #include <asm/gpio.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 
 #ifndef CONFIG_ARCH_AT91

drivers/video/atmel_lcdfb.c +1 -1

index 94cac9f..12cf5f3 100644
@@ -19,8 +19,8 @@
 #include <linux/backlight.h>
 #include <linux/gfp.h>
 #include <linux/module.h>
+#include <linux/platform_data/atmel.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <asm/gpio.h>

include/linux/platform_data/atmel.h +67 -0

77 lines not on this page · raw message

Signature · 1 line

1.7.10.4

Marc Kleine-Budde

maintainer Acked-by on v1 2/10

2012-11-07 12:20 UTC #3 lore raw

Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h

Quoted 13 lines · Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc linux-ide at vger.kernel.org
Cc linux-input at vger.kernel.org
Cc linux-mmc at vger.kernel.org
Cc linux-can at vger.kernel.org
Cc netdev at vger.kernel.org
Cc linux-pcmcia at lists.infradead.org
Cc rtc-linux at googlegroups.com
Cc spi-devel-general at lists.sourceforge.net
Cc linux-serial at vger.kernel.org
Cc linux-usb at vger.kernel.org
Cc linux-fbdev at vger.kernel.org

Quoted 5 lines

---
HI all,
If it's ok with everyone this will go via at91 with the patch serie than clean up the include/mach

Fine with me.

Quoted 1 line

For preparation to switch to arm multiarch kernel

Acked-by Marc Kleine-Budde <[email protected]> (for the CAN related changes)

Marc

Signature · 12 lines

Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 259 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121107/46c5f879/attachment.sig>

A message that is not in the archive (sent off-list or not yet received): [email protected]

Dmitry Torokhov

Acked-by

2012-11-10 08:42 UTC #5 lore raw

Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h

Quoted 17 lines · Marc Kleine-Budde

Quoted 16 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc linux-ide at vger.kernel.org
Cc linux-input at vger.kernel.org
Cc linux-mmc at vger.kernel.org
Cc linux-can at vger.kernel.org
Cc netdev at vger.kernel.org
Cc linux-pcmcia at lists.infradead.org
Cc rtc-linux at googlegroups.com
Cc spi-devel-general at lists.sourceforge.net
Cc linux-serial at vger.kernel.org
Cc linux-usb at vger.kernel.org
Cc linux-fbdev at vger.kernel.org
---
HI all,

Quoted 8 lines

Quoted 2 lines
If it's ok with everyone this will go via at91 with the patch serie than clean up the include/mach
Fine with me.
Quoted 1 line
For preparation to switch to arm multiarch kernel
Acked-by Marc Kleine-Budde <[email protected]> (for the CAN related changes)

Acked-by Dmitry Torokhov <[email protected]>

for input piece.

Signature · 1 line

Dmitry

Joachim Eastwood

2012-11-10 10:54 UTC #6 lore raw

Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h

In reply to Jean-Christophe PLAGNIOL-VILLARD

Hi Jean-Christophe,

Quoted 40 lines · Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc linux-ide at vger.kernel.org
Cc linux-input at vger.kernel.org
Cc linux-mmc at vger.kernel.org
Cc linux-can at vger.kernel.org
Cc netdev at vger.kernel.org
Cc linux-pcmcia at lists.infradead.org
Cc rtc-linux at googlegroups.com
Cc spi-devel-general at lists.sourceforge.net
Cc linux-serial at vger.kernel.org
Cc linux-usb at vger.kernel.org
Cc linux-fbdev at vger.kernel.org
---
HI all,
If it's ok with everyone this will go via at91 with the patch serie than clean up the include/mach
For preparation to switch to arm multiarch kernel
Best Regards,
J.
 arch/arm/mach-at91/include/mach/board.h     |   55 ----------------------
 arch/avr32/mach-at32ap/include/mach/board.h |    7 ---
 drivers/ata/pata_at91.c                     |    2 +-
 drivers/input/touchscreen/atmel_tsadcc.c    |    2 +-
 drivers/mmc/host/atmel-mci.c                |    2 +-
 drivers/net/can/at91_can.c                  |    3 +-
 drivers/net/ethernet/cadence/at91_ether.c   |    2 +-
 drivers/pcmcia/at91_cf.c                    |    2 +-
 drivers/rtc/rtc-at91sam9.c                  |    2 +-
 drivers/spi/spi-atmel.c                     |    2 +-
 drivers/tty/serial/atmel_serial.c           |    2 +-
 drivers/usb/gadget/at91_udc.c               |    2 +-
 drivers/usb/gadget/atmel_usba_udc.c         |    2 +-
 drivers/usb/host/ohci-at91.c                |    2 +-
 drivers/video/atmel_lcdfb.c                 |    2 +-
 include/linux/platform_data/atmel.h         |   67 +++++++++++++++++++++++++++
 16 files changed, 80 insertions(+), 76 deletions(-)

<snip>

Quoted 13 lines

drivers/net/ethernet/cadence/at91_ether.c +1 -0

index 4e980a7..35fc6edb 100644
@@ -31,6 +31,7 @@
 #include <linux/clk.h>
 #include <linux/gfp.h>
 #include <linux/phy.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>

drivers/net/ethernet/cadence/at91_ether.c line 43

Quoted 6 lines

drivers/net/ethernet/cadence/at91_ether.c +0 -1

@@ -38,7 +39,6 @@
 
 #include <mach/at91rm9200_emac.h>
 #include <asm/gpio.h>
-#include <mach/board.h>
 
 #include "at91_ether.h"

The at91_ether driver in net-next does not need to be change since it all mach includes has already been removed by other patches and it includes linux/platform_data/macb.h directly.

What tree was these patches based on?
The at91_ether driver changes has been in linux-next for a long while now.

regards
Joachim Eastwood

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-12 14:06 UTC #7 lore raw

Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h

Quoted 65 lines · Joachim Eastwood

Hi Jean-Christophe,
Quoted 40 lines · Jean-Christophe PLAGNIOL-VILLARD
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Cc linux-ide at vger.kernel.org
Cc linux-input at vger.kernel.org
Cc linux-mmc at vger.kernel.org
Cc linux-can at vger.kernel.org
Cc netdev at vger.kernel.org
Cc linux-pcmcia at lists.infradead.org
Cc rtc-linux at googlegroups.com
Cc spi-devel-general at lists.sourceforge.net
Cc linux-serial at vger.kernel.org
Cc linux-usb at vger.kernel.org
Cc linux-fbdev at vger.kernel.org
---
HI all,
If it's ok with everyone this will go via at91 with the patch serie than clean up the include/mach
For preparation to switch to arm multiarch kernel
Best Regards,
J.
 arch/arm/mach-at91/include/mach/board.h     |   55 ----------------------
 arch/avr32/mach-at32ap/include/mach/board.h |    7 ---
 drivers/ata/pata_at91.c                     |    2 +-
 drivers/input/touchscreen/atmel_tsadcc.c    |    2 +-
 drivers/mmc/host/atmel-mci.c                |    2 +-
 drivers/net/can/at91_can.c                  |    3 +-
 drivers/net/ethernet/cadence/at91_ether.c   |    2 +-
 drivers/pcmcia/at91_cf.c                    |    2 +-
 drivers/rtc/rtc-at91sam9.c                  |    2 +-
 drivers/spi/spi-atmel.c                     |    2 +-
 drivers/tty/serial/atmel_serial.c           |    2 +-
 drivers/usb/gadget/at91_udc.c               |    2 +-
 drivers/usb/gadget/atmel_usba_udc.c         |    2 +-
 drivers/usb/host/ohci-at91.c                |    2 +-
 drivers/video/atmel_lcdfb.c                 |    2 +-
 include/linux/platform_data/atmel.h         |   67 +++++++++++++++++++++++++++
 16 files changed, 80 insertions(+), 76 deletions(-)
<snip>
Quoted 18 lines
drivers/net/ethernet/cadence/at91_ether.c +1 -1
index 4e980a7..35fc6edb 100644
@@ -31,6 +31,7 @@
 #include <linux/clk.h>
 #include <linux/gfp.h>
 #include <linux/phy.h>
+#include <linux/platform_data/atmel.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -38,7 +39,6 @@
 
 #include <mach/at91rm9200_emac.h>
 #include <asm/gpio.h>
-#include <mach/board.h>
 

Quoted 8 lines

drivers/net/ethernet/cadence/at91_ether.c line 43
Quoted 1 line
drivers/net/ethernet/cadence/at91_ether.c +0 -0
 #include "at91_ether.h"
The at91_ether driver in net-next does not need to be change since it all mach includes has already been removed by other patches and it includes linux/platform_data/macb.h directly.
What tree was these patches based on?
The at91_ether driver changes has been in linux-next for a long while now.

the conflict is minor easy to handle and the cleanup need to go first on arm soc so this is based on rc3

Best Regards,
J.

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #8 lore raw

PATCH 3/10 arm: at91 move board.h to arch/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

as this is only used board old style board

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/at91rm9200_devices.c       |    2 +-
 arch/arm/mach-at91/at91sam9260_devices.c      |    2 +-
 arch/arm/mach-at91/at91sam9261_devices.c      |    2 +-
 arch/arm/mach-at91/at91sam9263_devices.c      |    2 +-
 arch/arm/mach-at91/at91sam9g45_devices.c      |    2 +-
 arch/arm/mach-at91/at91sam9n12.c              |    2 +-
 arch/arm/mach-at91/at91sam9rl_devices.c       |    2 +-
 arch/arm/mach-at91/at91sam9x5.c               |    2 +-
 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               |    3 ++-
 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          |    2 +-
 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          |    2 +-
 arch/arm/mach-at91/board-usb-a926x.c          |    2 +-
 arch/arm/mach-at91/board-yl-9200.c            |    2 +-
 arch/arm/mach-at91/{include/mach => }/board.h |    0
 arch/arm/mach-at91/leds.c                     |    2 +-
 46 files changed, 46 insertions(+), 45 deletions(-)
 rename arch/arm/mach-at91/{include/mach => }/board.h (100%)

arch/arm/mach-at91/at91rm9200_devices.c +1 -1

index 1e122bc..94bbf7d 100644
@@ -18,11 +18,11 @@
 #include <linux/platform_device.h>
 #include <linux/i2c-gpio.h>
 
-#include <mach/board.h>
 #include <mach/at91rm9200.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/at91sam9260_devices.c +1 -1

index aa1e587..2670bac 100644
@@ -19,7 +19,6 @@
 
 #include <linux/platform_data/at91_adc.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91sam9260.h>
 #include <mach/at91sam9260_matrix.h>

@@ -27,6 +26,7 @@
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_adc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/at91sam9261_devices.c +1 -1

index b948769..a3c0d97 100644
@@ -21,12 +21,12 @@
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <mach/board.h>
 #include <mach/at91sam9261.h>
 #include <mach/at91sam9261_matrix.h>
 #include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/at91sam9263_devices.c +1 -1

index cb85da2..2ad7fea 100644
@@ -20,12 +20,12 @@
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <mach/board.h>
 #include <mach/at91sam9263.h>
 #include <mach/at91sam9263_matrix.h>
 #include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/at91sam9g45_devices.c +1 -1

index b159607..ddc3285 100644
@@ -26,7 +26,6 @@
 #include <video/atmel_lcdc.h>
 
 #include <mach/at91_adc.h>
-#include <mach/board.h>
 #include <mach/at91sam9g45.h>
 #include <mach/at91sam9g45_matrix.h>
 #include <mach/at91_matrix.h>

@@ -36,6 +35,7 @@
 
 #include <media/atmel-isi.h>
 
+#include "board.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9n12.c +1 -1

index 732d3d3..896d09e 100644
@@ -15,8 +15,8 @@
 #include <mach/at91sam9n12.h>
 #include <mach/at91_pmc.h>
 #include <mach/cpu.h>
-#include <mach/board.h>
 
+#include "board.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9rl_devices.c +1 -1

index 5047bdc..160384d 100644
@@ -17,13 +17,13 @@
 #include <linux/fb.h>
 #include <video/atmel_lcdc.h>
 
-#include <mach/board.h>
 #include <mach/at91sam9rl.h>
 #include <mach/at91sam9rl_matrix.h>
 #include <mach/at91_matrix.h>
 #include <mach/at91sam9_smc.h>
 #include <linux/platform_data/dma-atmel.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/at91sam9x5.c +1 -1

index e503538..1d66551 100644
@@ -15,8 +15,8 @@
 #include <mach/at91sam9x5.h>
 #include <mach/at91_pmc.h>
 #include <mach/cpu.h>
-#include <mach/board.h>
 
+#include "board.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/board-1arm.c +1 -1

index 22d8856..0f22d25 100644
@@ -34,10 +34,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-afeb-9260v1.c +1 -1

index 93a832f..7935673 100644
@@ -43,9 +43,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-cam60.c +1 -1

index 477e708..51dec43 100644
@@ -38,10 +38,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-carmeva.c +1 -1

index 71d8f36..2811763 100644
@@ -35,9 +35,9 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-cpu9krea.c +1 -1

index e71c473..9e6316d 100644
@@ -40,12 +40,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91sam9260_matrix.h>
 #include <mach/at91_matrix.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-cpuat91.c +1 -1

index 2cbd1a2..e74d395 100644
@@ -36,12 +36,12 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "board.h"
 #include "generic.h"
 
 static struct gpio_led cpuat91_leds[] = {

arch/arm/mach-at91/board-csb337.c +1 -1

index 3e37437..e4063bd 100644
@@ -38,9 +38,9 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-csb637.c +1 -1

index 872871a..306e7b6 100644
@@ -35,9 +35,9 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

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

index e8f45c4..7ba737d 100644
@@ -15,7 +15,6 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
 #include <asm/setup.h>

@@ -24,6 +23,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-eb01.c +2 -1

index 01f66e9..f6b85f0 100644
@@ -27,8 +27,9 @@
 #include <mach/hardware.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
+
+#include "board.h"
 #include "generic.h"
 
 static void __init at91eb01_init_irq(void)

arch/arm/mach-at91/board-eb9200.c +1 -1

index 0cfac16..6e53817 100644
@@ -35,9 +35,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-ecbat91.c +1 -1

index 3d931ff..df23145 100644
@@ -37,10 +37,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-eco920.c +1 -1

index d93658a..771e58b 100644
@@ -24,12 +24,12 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "board.h"
 #include "generic.h"
 
 static void __init eco920_init_early(void)

arch/arm/mach-at91/board-flexibity.c +1 -1

index fa98aba..2df0fe4 100644
@@ -33,9 +33,9 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
+#include "board.h"
 #include "generic.h"
 
 static void __init flexibity_init_early(void)

arch/arm/mach-at91/board-foxg20.c +1 -1

index 6e47071..18e1777 100644
@@ -41,10 +41,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-gsia18s.c +1 -1

index a9d5e78..0fefddc 100644
@@ -30,12 +30,12 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/gsia18s.h>
 #include <mach/stamp9g20.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-kafa.c +1 -1

index 86050da..920cf4c 100644
@@ -34,10 +34,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/cpu.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-kb9202.c +1 -1

index abe9fed..2d37837 100644
@@ -35,12 +35,12 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/cpu.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-neocore926.c +1 -1

index 6960778..935d11c 100644
@@ -44,10 +44,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-pcontrol-g20.c +1 -1

index 9ca3e32..e1e0766 100644
@@ -29,11 +29,11 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/stamp9g20.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-picotux200.c +1 -1

index f83e1de..a4a1d0f 100644
@@ -37,11 +37,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-qil-a9260.c +1 -1

index 799f214..a816fb3 100644
@@ -40,11 +40,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-rm9200dk.c +1 -1

index 66338e7..a91b03c 100644
@@ -39,11 +39,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-rm9200ek.c +1 -1

index 5d1b572..7b0be62 100644
@@ -39,11 +39,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-rsi-ews.c +1 -1

index a0ecf04..bc5d88a 100644
@@ -25,11 +25,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 
 #include <linux/gpio.h>
 
+#include "board.h"
 #include "generic.h"
 
 static void __init rsi_ews_init_early(void)

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

index c5f01ac..caea7e2 100644
@@ -37,10 +37,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9260ek.c +1 -1

index 8cd6e67..ac2c949 100644
@@ -41,12 +41,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9261ek.c +1 -1

index a9167dd..06251bb 100644
@@ -45,12 +45,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9263ek.c +1 -1

index b87dbe2..533c23a 100644
@@ -44,12 +44,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9g20ek.c +1 -1

index 3ab2b86..4c6f6e9 100644
@@ -43,11 +43,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/system_rev.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1

index 3d48ec1..364a4bf 100644
@@ -42,12 +42,12 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9rlek.c +1 -1

index fb89ea9..5693caf 100644
@@ -30,11 +30,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-snapper9260.c +1 -1

index a4e031a..b79b56e 100644
@@ -32,10 +32,10 @@
 #include <asm/mach/arch.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-stamp9g20.c +1 -1

index c3fb31d..5756462 100644
@@ -25,10 +25,10 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-usb-a926x.c +1 -1

index 6ea069b..013dfb6 100644
@@ -41,11 +41,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+#include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-yl-9200.c +1 -1

index f162fdf..5d3a40f 100644
@@ -43,12 +43,12 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/board.h>
 #include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board.h renamed from arch/arm/mach-at91/include/mach/board.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/board.h
rename to arch/arm/mach-at91/board.h

arch/arm/mach-at91/leds.c +1 -1

index 1b1e62b..3e22978 100644
@@ -15,7 +15,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 
-#include <mach/board.h>
+#include "board.h"
 
 
 /* ------------------------------------------------------------------------- */

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #9 lore raw

PATCH 4/10 arm: at91 move at91_aic.h to arch/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

as this is only used board old style board old mach code

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/{include/mach => }/at91_aic.h |    0
 arch/arm/mach-at91/at91rm9200.c                  |    2 +-
 arch/arm/mach-at91/at91sam9260.c                 |    2 +-
 arch/arm/mach-at91/at91sam9261.c                 |    2 +-
 arch/arm/mach-at91/at91sam9263.c                 |    2 +-
 arch/arm/mach-at91/at91sam9g45.c                 |    2 +-
 arch/arm/mach-at91/at91sam9rl.c                  |    2 +-
 arch/arm/mach-at91/at91x40.c                     |    3 ++-
 arch/arm/mach-at91/board-1arm.c                  |    2 +-
 arch/arm/mach-at91/board-afeb-9260v1.c           |    3 +--
 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                    |    3 +--
 arch/arm/mach-at91/board-eb01.c                  |    2 +-
 arch/arm/mach-at91/board-eb9200.c                |    3 +--
 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             |    2 +-
 arch/arm/mach-at91/board-sam9m10g45ek.c          |    2 +-
 arch/arm/mach-at91/board-sam9rlek.c              |    3 ++-
 arch/arm/mach-at91/board-snapper9260.c           |    2 +-
 arch/arm/mach-at91/board-stamp9g20.c             |    2 +-
 arch/arm/mach-at91/board-usb-a926x.c             |    2 +-
 arch/arm/mach-at91/board-yl-9200.c               |    2 +-
 arch/arm/mach-at91/irq.c                         |    2 +-
 arch/arm/mach-at91/pm.c                          |    2 +-
 46 files changed, 47 insertions(+), 48 deletions(-)
 rename arch/arm/mach-at91/{include/mach => }/at91_aic.h (100%)

arch/arm/mach-at91/at91_aic.h renamed from arch/arm/mach-at91/include/mach/at91_aic.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_aic.h
rename to arch/arm/mach-at91/at91_aic.h

arch/arm/mach-at91/at91rm9200.c +1 -1

index 5269825..aeac7cf 100644
@@ -17,11 +17,11 @@
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
 #include <mach/at91rm9200.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_st.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9260.c +1 -1

index f820261..bb2e17c 100644
@@ -20,10 +20,10 @@
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/at91sam9260.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9261.c +1 -1

index 04295c0..09009d8 100644
@@ -19,10 +19,10 @@
 #include <asm/system_misc.h>
 #include <mach/cpu.h>
 #include <mach/at91sam9261.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9263.c +1 -1

index d6f9c23..0c86aa8 100644
@@ -18,10 +18,10 @@
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
 #include <mach/at91sam9263.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9g45.c +1 -1

index 84af1b5..098fe16 100644
@@ -18,10 +18,10 @@
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
 #include <mach/at91sam9g45.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9rl.c +1 -1

index 72e9084..5cd076b 100644
@@ -19,10 +19,10 @@
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/at91sam9rl.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/at91_rstc.h>
 
+#include "at91_aic.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91x40.c +2 -1

index bb7f544..19ca793 100644
@@ -18,9 +18,10 @@
 #include <asm/system_misc.h>
 #include <asm/mach/arch.h>
 #include <mach/at91x40.h>
-#include <mach/at91_aic.h>
 #include <mach/at91_st.h>
 #include <mach/timex.h>
+
+#include "at91_aic.h"
 #include "generic.h"
 
 /*

arch/arm/mach-at91/board-1arm.c +1 -1

index 0f22d25..b99b575 100644
@@ -35,8 +35,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/cpu.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-afeb-9260v1.c +1 -2

index 7935673..854b979 100644
@@ -43,8 +43,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
-
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-cam60.c +1 -1

index 51dec43..28a18ce 100644
@@ -38,9 +38,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-carmeva.c +1 -1

index 2811763..c17bb53 100644
@@ -35,8 +35,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-cpu9krea.c +1 -1

index 9e6316d..8474324 100644
@@ -40,11 +40,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91sam9260_matrix.h>
 #include <mach/at91_matrix.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-cpuat91.c +1 -1

index e74d395..2a7af78 100644
@@ -36,11 +36,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-csb337.c +1 -1

index e4063bd..78e0250 100644
@@ -38,8 +38,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-csb637.c +1 -1

index 306e7b6..ec0f3ab 100644
@@ -35,8 +35,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

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

index 7ba737d..03f028e 100644
@@ -15,14 +15,13 @@
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
-#include <mach/at91_aic.h>
-
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 #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-eb01.c +1 -1

index f6b85f0..b489388 100644
@@ -27,8 +27,8 @@
 #include <mach/hardware.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-eb9200.c +1 -2

index 6e53817..9f5e71c 100644
@@ -35,8 +35,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
-
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-ecbat91.c +1 -1

index df23145..ef69e0e 100644
@@ -38,8 +38,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/cpu.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-eco920.c +1 -1

index 771e58b..50f3d37 100644
@@ -24,11 +24,11 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-flexibity.c +1 -1

index 2df0fe4..5d44eba 100644
@@ -33,8 +33,8 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-foxg20.c +1 -1

index 18e1777..191d37c 100644
@@ -41,9 +41,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-gsia18s.c +1 -1

index 0fefddc..842add7 100644
@@ -30,11 +30,11 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/gsia18s.h>
 #include <mach/stamp9g20.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-kafa.c +1 -1

index 920cf4c..9a43d1e 100644
@@ -34,9 +34,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-kb9202.c +1 -1

index 2d37837..f168bec 100644
@@ -36,10 +36,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/cpu.h>
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-neocore926.c +1 -1

index 935d11c..bc7a1c4 100644
@@ -44,9 +44,9 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-pcontrol-g20.c +1 -1

index e1e0766..977fa78 100644
@@ -29,10 +29,10 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/stamp9g20.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-picotux200.c +1 -1

index a4a1d0f..4938f1c 100644
@@ -37,10 +37,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-qil-a9260.c +1 -1

index a816fb3..c4bdea7 100644
@@ -40,10 +40,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-rm9200dk.c +1 -1

index a91b03c..9e5061b 100644
@@ -39,10 +39,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-rm9200ek.c +1 -1

index 7b0be62..58277db 100644
@@ -39,10 +39,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/board-rsi-ews.c +1 -1

index bc5d88a..2e8b833 100644
@@ -25,10 +25,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 
 #include <linux/gpio.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

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

index caea7e2..b75fbf6 100644
@@ -37,9 +37,9 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9260ek.c +1 -1

index ac2c949..d0d5fe6 100644
@@ -41,11 +41,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9261ek.c +1 -1

index 06251bb..5850eb4 100644
@@ -45,11 +45,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9263ek.c +1 -1

index 533c23a..b8443ae 100644
@@ -44,11 +44,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9g20ek.c +1 -1

index 4c6f6e9..7b51238 100644
@@ -43,10 +43,10 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/system_rev.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1

index 364a4bf..6b2a983 100644
@@ -42,11 +42,11 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9rlek.c +2 -1

index 5693caf..6bd8853 100644
@@ -30,10 +30,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-snapper9260.c +1 -1

index b79b56e..9877150 100644
@@ -32,9 +32,9 @@
 #include <asm/mach/arch.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-stamp9g20.c +1 -1

index 5756462..48a962b 100644
@@ -25,9 +25,9 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-usb-a926x.c +1 -1

index 013dfb6..c93f906 100644
@@ -41,10 +41,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91sam9_smc.h>
 #include <mach/at91_shdwc.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-yl-9200.c +1 -1

index 5d3a40f..8673aeb 100644
@@ -43,11 +43,11 @@
 #include <asm/mach/irq.h>
 
 #include <mach/hardware.h>
-#include <mach/at91_aic.h>
 #include <mach/at91rm9200_mc.h>
 #include <mach/at91_ramc.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "board.h"
 #include "generic.h"

arch/arm/mach-at91/irq.c +1 -1

index febc2ee..8e21026 100644
@@ -42,7 +42,7 @@
 #include <asm/mach/irq.h>
 #include <asm/mach/map.h>
 
-#include <mach/at91_aic.h>
+#include "at91_aic.h"
 
 void __iomem *at91_aic_base;
 static struct irq_domain *at91_aic_domain;

arch/arm/mach-at91/pm.c +1 -1

index 5315f05..e8cb6b8 100644
@@ -25,10 +25,10 @@
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
 
-#include <mach/at91_aic.h>
 #include <mach/at91_pmc.h>
 #include <mach/cpu.h>
 
+#include "at91_aic.h"
 #include "generic.h"
 #include "pm.h"

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #10 lore raw

PATCH 5/10 arn: at91: move at91_tc.h to arch/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/{include/mach => }/at91_tc.h |    0
 arch/arm/mach-at91/at91x40_time.c               |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename arch/arm/mach-at91/{include/mach => }/at91_tc.h (100%)

arch/arm/mach-at91/at91_tc.h renamed from arch/arm/mach-at91/include/mach/at91_tc.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_tc.h
rename to arch/arm/mach-at91/at91_tc.h

arch/arm/mach-at91/at91x40_time.c +2 -1

index ee06d7b..0e57e44 100644
@@ -26,7 +26,8 @@
 #include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach/time.h>
-#include <mach/at91_tc.h>
+
+#include "at91_tc.h"
 
 #define at91_tc_read(field) \
 	__raw_readl(AT91_IO_P2V(AT91_TC) + field)

Signature · 1 line

1.7.10.4

Nicolas Ferre

2012-11-12 10:57 UTC #11 lore raw

PATCH 5/10 arn: at91: move at91_tc.h to arch/arm/mach-at91

Hi,

Beware: subject has typo: s/arn/ARM/
Also, care about capital letters for "ARM" => to all patches of the series.

Bye,

On 11/07/2012 12:22 PM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 27 lines

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/{include/mach => }/at91_tc.h |    0
 arch/arm/mach-at91/at91x40_time.c               |    3 ++-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename arch/arm/mach-at91/{include/mach => }/at91_tc.h (100%)

arch/arm/mach-at91/at91_tc.h renamed from arch/arm/mach-at91/include/mach/at91_tc.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_tc.h
rename to arch/arm/mach-at91/at91_tc.h

arch/arm/mach-at91/at91x40_time.c +2 -1

index ee06d7b..0e57e44 100644
@@ -26,7 +26,8 @@
 #include <linux/io.h>
 #include <mach/hardware.h>
 #include <asm/mach/time.h>
-#include <mach/at91_tc.h>
+
+#include "at91_tc.h"
 
 #define at91_tc_read(field) \
 	__raw_readl(AT91_IO_P2V(AT91_TC) + field)

Signature · 1 line

Nicolas Ferre

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #12 lore raw

PATCH 6/10 arm: at91: move board header to arch/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/board-gsia18s.c                |    4 ++--
 arch/arm/mach-at91/board-pcontrol-g20.c           |    2 +-
 arch/arm/mach-at91/{include/mach => }/gsia18s.h   |    0
 arch/arm/mach-at91/{include/mach => }/stamp9g20.h |    0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename arch/arm/mach-at91/{include/mach => }/gsia18s.h (100%)
 rename arch/arm/mach-at91/{include/mach => }/stamp9g20.h (100%)

arch/arm/mach-at91/board-gsia18s.c +2 -2

index 842add7..23a2fa1 100644
@@ -31,13 +31,13 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/gsia18s.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "gsia18s.h"
+#include "stamp9g20.h"
 
 static void __init gsia18s_init_early(void)
 {

arch/arm/mach-at91/board-pcontrol-g20.c +1 -1

index 977fa78..0299554 100644
@@ -30,12 +30,12 @@
 #include <asm/mach/arch.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/stamp9g20.h>
 
 #include "at91_aic.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"
+#include "stamp9g20.h"
 
 
 static void __init pcontrol_g20_init_early(void)

arch/arm/mach-at91/gsia18s.h renamed from arch/arm/mach-at91/include/mach/gsia18s.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/gsia18s.h
rename to arch/arm/mach-at91/gsia18s.h

arch/arm/mach-at91/stamp9g20.h renamed from arch/arm/mach-at91/include/mach/stamp9g20.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/stamp9g20.h
rename to arch/arm/mach-at91/stamp9g20.h

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #13 lore raw

PATCH 7/10 arm: at91: move at91_shdwc.h to arch/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

This is only used by old boards style or via core code.

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/{include/mach => }/at91_shdwc.h |    0
 arch/arm/mach-at91/board-qil-a9260.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-sam9m10g45ek.c            |    2 +-
 arch/arm/mach-at91/board-sam9rlek.c                |    2 +-
 arch/arm/mach-at91/board-usb-a926x.c               |    2 +-
 arch/arm/mach-at91/pm.c                            |    2 +-
 arch/arm/mach-at91/setup.c                         |    2 +-
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename arch/arm/mach-at91/{include/mach => }/at91_shdwc.h (100%)

arch/arm/mach-at91/at91_shdwc.h renamed from arch/arm/mach-at91/include/mach/at91_shdwc.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_shdwc.h
rename to arch/arm/mach-at91/at91_shdwc.h

arch/arm/mach-at91/board-qil-a9260.c +1 -1

index c4bdea7..33b1628 100644
@@ -41,9 +41,9 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9260ek.c +1 -1

index d0d5fe6..f0135cd 100644
@@ -42,10 +42,10 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9261ek.c +1 -1

index 5850eb4..13ebaa8 100644
@@ -46,10 +46,10 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9263ek.c +1 -1

index b8443ae..89b9608 100644
@@ -45,10 +45,10 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9m10g45ek.c +1 -1

index 6b2a983..e4cc375 100644
@@ -43,10 +43,10 @@
 #include <asm/mach/irq.h>
 
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 #include <mach/system_rev.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-sam9rlek.c +1 -1

index 6bd8853..377a109 100644
@@ -31,10 +31,10 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/board-usb-a926x.c +1 -1

index c93f906..c1060f9 100644
@@ -42,9 +42,9 @@
 
 #include <mach/hardware.h>
 #include <mach/at91sam9_smc.h>
-#include <mach/at91_shdwc.h>
 
 #include "at91_aic.h"
+#include "at91_shdwc.h"
 #include "board.h"
 #include "sam9_smc.h"
 #include "generic.h"

arch/arm/mach-at91/pm.c +1 -1

index e8cb6b8..3455740 100644
@@ -37,7 +37,7 @@
  */
 
 #include <mach/at91_rstc.h>
-#include <mach/at91_shdwc.h>
+#include "at91_shdwc.h"
 
 static void __init show_reset_status(void)
 {

arch/arm/mach-at91/setup.c +1 -1

index 0b32c81..8a66979 100644
@@ -18,8 +18,8 @@
 #include <mach/cpu.h>
 #include <mach/at91_dbgu.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_shdwc.h>
 
+#include "at91_shdwc.h"
 #include "soc.h"
 #include "generic.h"

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #14 lore raw

PATCH 8/10 arm: at91: move pit define to the driver

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/at91sam926x_time.c      |   14 ++++++++++--
 arch/arm/mach-at91/include/mach/at91_pit.h |   32 ----------------------------
 2 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 arch/arm/mach-at91/include/mach/at91_pit.h

arch/arm/mach-at91/at91sam926x_time.c +12 -2

index ffc0957..358412f 100644
@@ -20,8 +20,18 @@
 
 #include <asm/mach/time.h>
 
-#include <mach/at91_pit.h>
-
+#define AT91_PIT_MR		0x00			/* Mode Register */
+#define		AT91_PIT_PITIEN		(1 << 25)		/* Timer Interrupt Enable */
+#define		AT91_PIT_PITEN		(1 << 24)		/* Timer Enabled */
+#define		AT91_PIT_PIV		(0xfffff)		/* Periodic Interval Value */
+
+#define AT91_PIT_SR		0x04			/* Status Register */
+#define		AT91_PIT_PITS		(1 << 0)		/* Timer Status */
+
+#define AT91_PIT_PIVR		0x08			/* Periodic Interval Value Register */
+#define AT91_PIT_PIIR		0x0c			/* Periodic Interval Image Register */
+#define		AT91_PIT_PICNT		(0xfff << 20)		/* Interval Counter */
+#define		AT91_PIT_CPIV		(0xfffff)		/* Inverval Value */
 
 #define PIT_CPIV(x)	((x) & AT91_PIT_CPIV)
 #define PIT_PICNT(x)	(((x) & AT91_PIT_PICNT) >> 20)

arch/arm/mach-at91/include/mach/at91_pit.h deleted +0 ~~-32~~

deleted file mode 100644
index d1f80ad..0000000
@@ -1,32 +0,0 @@
-/*
- * arch/arm/mach-at91/include/mach/at91_pit.h
- *
- * Copyright (C) 2007 Andrew Victor
- * Copyright (C) 2007 Atmel Corporation.
- *
- * Periodic Interval Timer (PIT) - System peripherals regsters.
- * Based on AT91SAM9261 datasheet revision D.
- *
- * 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_PIT_H
-#define AT91_PIT_H
-
-#define AT91_PIT_MR		0x00			/* Mode Register */
-#define		AT91_PIT_PITIEN		(1 << 25)		/* Timer Interrupt Enable */
-#define		AT91_PIT_PITEN		(1 << 24)		/* Timer Enabled */
-#define		AT91_PIT_PIV		(0xfffff)		/* Periodic Interval Value */
-
-#define AT91_PIT_SR		0x04			/* Status Register */
-#define		AT91_PIT_PITS		(1 << 0)		/* Timer Status */
-
-#define AT91_PIT_PIVR		0x08			/* Periodic Interval Value Register */
-#define AT91_PIT_PIIR		0x0c			/* Periodic Interval Image Register */
-#define		AT91_PIT_PICNT		(0xfff << 20)		/* Interval Counter */
-#define		AT91_PIT_CPIV		(0xfffff)		/* Inverval Value */
-
-#endif

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #15 lore raw

PATCH 9/10 arm: at91: move reset controller header to arm/arm/mach-at91

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/{include/mach => }/at91_rstc.h |    0
 arch/arm/mach-at91/at91sam9260.c                  |    2 +-
 arch/arm/mach-at91/at91sam9261.c                  |    2 +-
 arch/arm/mach-at91/at91sam9263.c                  |    2 +-
 arch/arm/mach-at91/at91sam9_alt_reset.S           |    2 +-
 arch/arm/mach-at91/at91sam9g45_reset.S            |    3 +--
 arch/arm/mach-at91/at91sam9rl.c                   |    2 +-
 arch/arm/mach-at91/pm.c                           |    2 +-
 8 files changed, 7 insertions(+), 8 deletions(-)
 rename arch/arm/mach-at91/{include/mach => }/at91_rstc.h (100%)

arch/arm/mach-at91/at91_rstc.h renamed from arch/arm/mach-at91/include/mach/at91_rstc.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_rstc.h
rename to arch/arm/mach-at91/at91_rstc.h

arch/arm/mach-at91/at91sam9260.c +1 -1

index bb2e17c..9942984 100644
@@ -21,9 +21,9 @@
 #include <mach/at91_dbgu.h>
 #include <mach/at91sam9260.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 
 #include "at91_aic.h"
+#include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9261.c +1 -1

index 09009d8..c583ba2 100644
@@ -20,9 +20,9 @@
 #include <mach/cpu.h>
 #include <mach/at91sam9261.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 
 #include "at91_aic.h"
+#include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9263.c +1 -1

index 0c86aa8..500ee19 100644
@@ -19,9 +19,9 @@
 #include <asm/system_misc.h>
 #include <mach/at91sam9263.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 
 #include "at91_aic.h"
+#include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/at91sam9_alt_reset.S +1 -1

index 7af2e10..f039538 100644
@@ -16,7 +16,7 @@
 #include <linux/linkage.h>
 #include <mach/hardware.h>
 #include <mach/at91_ramc.h>
-#include <mach/at91_rstc.h>
+#include "at91_rstc.h"
 
 			.arm

arch/arm/mach-at91/at91sam9g45_reset.S +1 -2

index 9d45718..721a1a3 100644
@@ -13,8 +13,7 @@
 #include <linux/linkage.h>
 #include <mach/hardware.h>
 #include <mach/at91_ramc.h>
-#include <mach/at91_rstc.h>
-
+#include "at91_rstc.h"
 			.arm
 
 			.globl	at91sam9g45_restart

arch/arm/mach-at91/at91sam9rl.c +1 -1

index 5cd076b..97dd8f1 100644
@@ -20,9 +20,9 @@
 #include <mach/at91_dbgu.h>
 #include <mach/at91sam9rl.h>
 #include <mach/at91_pmc.h>
-#include <mach/at91_rstc.h>
 
 #include "at91_aic.h"
+#include "at91_rstc.h"
 #include "soc.h"
 #include "generic.h"
 #include "clock.h"

arch/arm/mach-at91/pm.c +1 -1

index 3455740..adb6db8 100644
@@ -36,7 +36,7 @@
  * Show the reason for the previous system reset.
  */
 
-#include <mach/at91_rstc.h>
+#include "at91_rstc.h"
 #include "at91_shdwc.h"
 
 static void __init show_reset_status(void)

Signature · 1 line

1.7.10.4

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-07 11:22 UTC #16 lore raw

PATCH 10/10 arm: at91: move at91rm9200 rtc header in drivers/rtc

In reply to Jean-Christophe PLAGNIOL-VILLARD

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

Cc rtc-linux at googlegroups.com

---
 drivers/rtc/rtc-at91rm9200.c                                         |    2 +-
 .../include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h          |    0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename arch/arm/mach-at91/include/mach/at91_rtc.h => drivers/rtc/rtc-at91rm9200.h (100%)

drivers/rtc/rtc-at91rm9200.c +1 -1

index fca9790..b6469e2 100644
@@ -31,7 +31,7 @@
 
 #include <asm/uaccess.h>
 
-#include <mach/at91_rtc.h>
+#include "rtc-at91rm9200.h"
 
 #define at91_rtc_read(field) \
 	__raw_readl(at91_rtc_regs + field)

drivers/rtc/rtc-at91rm9200.h renamed from arch/arm/mach-at91/include/mach/at91_rtc.h +0 -0

similarity index 100%
rename from arch/arm/mach-at91/include/mach/at91_rtc.h
rename to drivers/rtc/rtc-at91rm9200.h

Signature · 1 line

1.7.10.4

Arnd Bergmann

2012-11-12 21:47 UTC #17 lore raw

In reply to Jean-Christophe PLAGNIOL-VILLARD

Quoted 15 lines · Jean-Christophe PLAGNIOL-VILLARD

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://github.com/at91linux/linux-at91.git tags/for-3.8-at91_header_clean
for you to fetch changes up to 75984df05d86956541795f01e62d7dc67bc522fd:
arm: at91: move at91rm9200 rtc header in drivers/rtc (2012-11-06 20:30:52 +0800)
----------------------------------------------------------------
arm: at91: mach header cleanup

Quoted 8 lines

This first patch serie start the cleanup of the header in mach by moving all the platform data to include/linux/platform_data
and move the board header and drivers header next to them
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>

Hi Jean-Christophe,

Sorry for the delay, I've pulled it now into the next/cleanup branch.

Nice work!

Arnd

Joachim Eastwood

2012-11-17 15:32 UTC #18 lore raw

Quoted 21 lines · Arnd Bergmann

Quoted 20 lines · Jean-Christophe PLAGNIOL-VILLARD
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://github.com/at91linux/linux-at91.git tags/for-3.8-at91_header_clean
for you to fetch changes up to 75984df05d86956541795f01e62d7dc67bc522fd:
arm: at91: move at91rm9200 rtc header in drivers/rtc (2012-11-06 20:30:52 +0800)
----------------------------------------------------------------
arm: at91: mach header cleanup
This first patch serie start the cleanup of the header in mach by moving all the platform data to include/linux/platform_data
and move the board header and drivers header next to them

Quoted 8 lines

Quoted 3 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Hi Jean-Christophe,
Sorry for the delay, I've pulled it now into the next/cleanup branch.

Hi,

The changes to atmel_serial break compile on AVR32 with:
drivers/tty/serial/atmel_serial.c:162: error: 'ATMEL_MAX_UART'
undeclared here (not in a function)
make[3]: *** [drivers/tty/serial/atmel_serial.o] Error 1

This is because AVR32 defined ATMEL_MAX_UART in mach/board.h. I wonder why this didn't break on AT91, though. On AT91 it's defined in mach/hardware.h but I can't see that file being included anywhere here.

Unsure what the best fix is. Maybe we could move ATMEL_MAX_UART into linux/platform_data/atmel.h.

regards
Joachim Eastwood

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-17 22:02 UTC #19 lore raw

Quoted 38 lines · Joachim Eastwood

Quoted 21 lines · Arnd Bergmann
Quoted 20 lines · Jean-Christophe PLAGNIOL-VILLARD
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://github.com/at91linux/linux-at91.git tags/for-3.8-at91_header_clean
for you to fetch changes up to 75984df05d86956541795f01e62d7dc67bc522fd:
arm: at91: move at91rm9200 rtc header in drivers/rtc (2012-11-06 20:30:52 +0800)
----------------------------------------------------------------
arm: at91: mach header cleanup
This first patch serie start the cleanup of the header in mach by moving all the platform data to include/linux/platform_data
and move the board header and drivers header next to them
Quoted 8 lines
Quoted 3 lines
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
Cc Nicolas Ferre <[email protected]>
Hi Jean-Christophe,
Sorry for the delay, I've pulled it now into the next/cleanup branch.
Hi,
The changes to atmel_serial break compile on AVR32 with:
drivers/tty/serial/atmel_serial.c:162: error: 'ATMEL_MAX_UART'
undeclared here (not in a function)
make[3]: *** [drivers/tty/serial/atmel_serial.o] Error 1

Quoted 6 lines

This is because AVR32 defined ATMEL_MAX_UART in mach/board.h. I wonder why this didn't break on AT91, though. On AT91 it's defined in mach/hardware.h but I can't see that file being included anywhere here.
Unsure what the best fix is. Maybe we could move ATMEL_MAX_UART into linux/platform_data/atmel.h.

I already spot it too and fix it

yes I move it to platform_data/atmel.h

I does not break on at91 as hardware.h is inlcluded when you include/linux/io.h

Best Regards,
J.

Jean-Christophe PLAGNIOL-VILLARD

author

2012-11-17 22:05 UTC #20 lore raw

PATCH 1/1 atmel: move ATMEL_MAX_UART to platform_data/atmel.h

In reply to Jean-Christophe PLAGNIOL-VILLARD

use 7 for it as the sam9260 or the sam9g25 have 7 of them DBGU included

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/include/mach/hardware.h  |    3 ---
 arch/avr32/mach-at32ap/include/mach/board.h |    1 -
 include/linux/platform_data/atmel.h         |    6 ++++++
 3 files changed, 6 insertions(+), 4 deletions(-)

arch/arm/mach-at91/include/mach/hardware.h +0 -3

index 711a789..a832e07 100644
@@ -90,9 +90,6 @@
 #define AT91_SRAM_MAX		SZ_1M
 #define AT91_VIRT_BASE		(AT91_IO_VIRT_BASE - AT91_SRAM_MAX)
 
-/* Serial ports */
-#define ATMEL_MAX_UART		7		/* 6 USART3's and one DBGU port (SAM9260) */
-
 /* External Memory Map */
 #define AT91_CHIPSELECT_0	0x10000000
 #define AT91_CHIPSELECT_1	0x20000000

arch/avr32/mach-at32ap/include/mach/board.h +0 -1

index dca9345..d485b03 100644
@@ -26,7 +26,6 @@ static inline void __deprecated at32_add_system_devices(void)
 
 }
 
-#define ATMEL_MAX_UART	4
 extern struct platform_device *atmel_default_console_device;
 
 /* Flags for selecting USART extra pins */

include/linux/platform_data/atmel.h +6 -0

index dbd6d53..59fffa4 100644
@@ -19,6 +19,12 @@
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
 
+/*
+ * at91: 6 USART3's and one DBGU port (SAM9260)
+ * avr32: 4
+ */
+#define ATMEL_MAX_UART	7
+
  /* USB Device */
 struct at91_udc_data {
 	int	vbus_pin;		/* high == host powering us */

Signature · 1 line

1.7.10.4

Nicolas Ferre

2012-11-19 09:09 UTC #21 lore raw

PATCH 1/1 atmel: move ATMEL_MAX_UART to platform_data/atmel.h

On 11/17/2012 11:05 PM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 41 lines

use 7 for it as the sam9260 or the sam9g25 have 7 of them DBGU included

Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>

Cc Nicolas Ferre <[email protected]>

---
 arch/arm/mach-at91/include/mach/hardware.h  |    3 ---
 arch/avr32/mach-at32ap/include/mach/board.h |    1 -
 include/linux/platform_data/atmel.h         |    6 ++++++
 3 files changed, 6 insertions(+), 4 deletions(-)

arch/arm/mach-at91/include/mach/hardware.h +0 -3

index 711a789..a832e07 100644
@@ -90,9 +90,6 @@
 #define AT91_SRAM_MAX		SZ_1M
 #define AT91_VIRT_BASE		(AT91_IO_VIRT_BASE - AT91_SRAM_MAX)
 
-/* Serial ports */
-#define ATMEL_MAX_UART		7		/* 6 USART3's and one DBGU port (SAM9260) */
-
 /* External Memory Map */
 #define AT91_CHIPSELECT_0	0x10000000
 #define AT91_CHIPSELECT_1	0x20000000

arch/avr32/mach-at32ap/include/mach/board.h +0 -1

index dca9345..d485b03 100644
@@ -26,7 +26,6 @@ static inline void __deprecated at32_add_system_devices(void)
 
 }
 
-#define ATMEL_MAX_UART	4
 extern struct platform_device *atmel_default_console_device;
 
 /* Flags for selecting USART extra pins */

include/linux/platform_data/atmel.h +0 -0

index dbd6d53..59fffa4 100644

include/linux/platform_data/atmel.h line 23

Quoted 5 lines

include/linux/platform_data/atmel.h +2 -0

@@ -19,6 +19,12 @@
 #include <linux/serial.h>
 #include <linux/platform_data/macb.h>
 
+/*
+ * at91: 6 USART3's and one DBGU port (SAM9260)

Why the "3"?

include/linux/platform_data/atmel.h line 30

Quoted 8 lines

include/linux/platform_data/atmel.h +4 -0

+ * avr32: 4
+ */
+#define ATMEL_MAX_UART	7
+
  /* USB Device */
 struct at91_udc_data {
 	int	vbus_pin;		/* high == host powering us */

Ok otherwise. Do not bother, I may change the typo while including it in at91-fixes pull request...

Acked-by Nicolas Ferre <[email protected]>

Best regards,

Signature · 1 line

Nicolas Ferre