Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
On Wed, Nov 07, 2012 at 01:20:41PM +0100, Marc Kleine-Budde wrote: On 11/07/2012 12:22 PM, Jean-Christophe PLAGNIOL-VILLARD wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Nicolas Ferre nicolas.fe...@atmel.com Cc: linux-...@vger.kernel.org Cc: linux-in...@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: net...@vger.kernel.org Cc: linux-pcm...@lists.infradead.org Cc: rtc-li...@googlegroups.com Cc: spi-devel-gene...@lists.sourceforge.net Cc: linux-ser...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: linux-fb...@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 Fine with me. For preparation to switch to arm multiarch kernel Acked-by: Marc Kleine-Budde m...@pengutronix.de (for the CAN related changes) Acked-by: Dmitry Torokhov dmitry.torok...@gmail.com for input piece. -- Dmitry -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
Hi Jean-Christophe, On 7 November 2012 12:22, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Nicolas Ferre nicolas.fe...@atmel.com Cc: linux-...@vger.kernel.org Cc: linux-in...@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: net...@vger.kernel.org Cc: linux-pcm...@lists.infradead.org Cc: rtc-li...@googlegroups.com Cc: spi-devel-gene...@lists.sourceforge.net Cc: linux-ser...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: linux-fb...@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 diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c index 4e980a7..35fc6edb 100644 --- a/drivers/net/ethernet/cadence/at91_ether.c +++ b/drivers/net/ethernet/cadence/at91_ether.c @@ -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 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 -- To unsubscribe from this list: send the line unsubscribe linux-mmc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
On 11/07/2012 12:22 PM, Jean-Christophe PLAGNIOL-VILLARD wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com Cc: Nicolas Ferre nicolas.fe...@atmel.com Cc: linux-...@vger.kernel.org Cc: linux-in...@vger.kernel.org Cc: linux-mmc@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: net...@vger.kernel.org Cc: linux-pcm...@lists.infradead.org Cc: rtc-li...@googlegroups.com Cc: spi-devel-gene...@lists.sourceforge.net Cc: linux-ser...@vger.kernel.org Cc: linux-...@vger.kernel.org Cc: linux-fb...@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 Fine with me. For preparation to switch to arm multiarch kernel Acked-by: Marc Kleine-Budde m...@pengutronix.de (for the CAN related changes) Marc -- Pengutronix e.K. | Marc Kleine-Budde | Industrial Linux Solutions| Phone: +49-231-2826-924 | Vertretung West/Dortmund | Fax: +49-5121-206917- | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de | signature.asc Description: OpenPGP digital signature
[PATCH 02/10] arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com
Cc: Nicolas Ferre nicolas.fe...@atmel.com
Cc: linux-...@vger.kernel.org
Cc: linux-in...@vger.kernel.org
Cc: linux-mmc@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: net...@vger.kernel.org
Cc: linux-pcm...@lists.infradead.org
Cc: rtc-li...@googlegroups.com
Cc: spi-devel-gene...@lists.sourceforge.net
Cc: linux-ser...@vger.kernel.org
Cc: linux-...@vger.kernel.org
Cc: linux-fb...@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(-)
diff --git a/arch/arm/mach-at91/include/mach/board.h
b/arch/arm/mach-at91/include/mach/board.h
index c55a436..662451d 100644
--- a/arch/arm/mach-at91/include/mach/board.h
+++ b/arch/arm/mach-at91/include/mach/board.h
@@ -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_A20x02
-};
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_PORTS3
-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
