tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
arm: at91: move platfarm_data to include/linux/platform_data/atmel.h
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
+80
-76
-55
arch/arm/mach-at91/include/mach/board.h
-55
arch/arm/mach-at91/include/mach/board.h
···
31
31
#ifndef __ASM_ARCH_BOARD_H
32
32
#define __ASM_ARCH_BOARD_H
33
33
34
-
#include <linux/mtd/partitions.h>
35
-
#include <linux/device.h>
36
-
#include <linux/i2c.h>
37
-
#include <linux/leds.h>
38
-
#include <linux/spi/spi.h>
39
-
#include <linux/usb/atmel_usba_udc.h>
40
-
#include <linux/atmel-mci.h>
41
-
#include <sound/atmel-ac97c.h>
42
-
#include <linux/serial.h>
43
-
#include <linux/platform_data/macb.h>
44
34
#include <linux/platform_data/atmel.h>
45
35
46
36
/* USB Device */
47
-
struct at91_udc_data {
48
-
int vbus_pin; /* high == host powering us */
49
-
u8 vbus_active_low; /* vbus polarity */
50
-
u8 vbus_polled; /* Use polling, not interrupt */
51
-
int pullup_pin; /* active == D+ pulled up */
52
-
u8 pullup_active_low; /* true == pullup_pin is active low */
53
-
};
54
37
extern void __init at91_add_device_udc(struct at91_udc_data *data);
55
38
56
39
/* USB High Speed Device */
57
40
extern void __init at91_add_device_usba(struct usba_platform_data *data);
58
41
59
42
/* Compact Flash */
60
-
struct at91_cf_data {
61
-
int irq_pin; /* I/O IRQ */
62
-
int det_pin; /* Card detect */
63
-
int vcc_pin; /* power switching */
64
-
int rst_pin; /* card reset */
65
-
u8 chipselect; /* EBI Chip Select number */
66
-
u8 flags;
67
-
#define AT91_CF_TRUE_IDE 0x01
68
-
#define AT91_IDE_SWAP_A0_A2 0x02
69
-
};
70
43
extern void __init at91_add_device_cf(struct at91_cf_data *data);
71
44
72
45
/* MMC / SD */
···
59
86
extern void __init at91_add_device_eth(struct macb_platform_data *data);
60
87
61
88
/* USB Host */
62
-
#define AT91_MAX_USBH_PORTS 3
63
-
struct at91_usbh_data {
64
-
int vbus_pin[AT91_MAX_USBH_PORTS]; /* port power-control pin */
65
-
int overcurrent_pin[AT91_MAX_USBH_PORTS];
66
-
u8 ports; /* number of ports on root hub */
67
-
u8 overcurrent_supported;
68
-
u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS];
69
-
u8 overcurrent_status[AT91_MAX_USBH_PORTS];
70
-
u8 overcurrent_changed[AT91_MAX_USBH_PORTS];
71
-
};
72
89
extern void __init at91_add_device_usbh(struct at91_usbh_data *data);
73
90
extern void __init at91_add_device_usbh_ohci(struct at91_usbh_data *data);
74
91
extern void __init at91_add_device_usbh_ehci(struct at91_usbh_data *data);
···
87
124
88
125
extern struct platform_device *atmel_default_console_device;
89
126
90
-
struct atmel_uart_data {
91
-
int num; /* port num */
92
-
short use_dma_tx; /* use transmit DMA? */
93
-
short use_dma_rx; /* use receive DMA? */
94
-
void __iomem *regs; /* virt. base address, if any */
95
-
struct serial_rs485 rs485; /* rs485 settings */
96
-
};
97
127
extern void __init at91_add_device_serial(void);
98
128
99
129
/*
···
129
173
bool use_pck_as_mck);
130
174
131
175
/* Touchscreen Controller */
132
-
struct at91_tsadcc_data {
133
-
unsigned int adc_clock;
134
-
u8 pendet_debounce;
135
-
u8 ts_sample_hold_time;
136
-
};
137
176
extern void __init at91_add_device_tsadcc(struct at91_tsadcc_data *data);
138
177
139
178
/* CAN */
140
-
struct at91_can_data {
141
-
void (*transceiver_switch)(int on);
142
-
};
143
179
extern void __init at91_add_device_can(struct at91_can_data *data);
144
180
145
181
/* LEDs */
146
182
extern void __init at91_gpio_leds(struct gpio_led *leds, int nr);
147
183
extern void __init at91_pwm_leds(struct gpio_led *leds, int nr);
148
-
149
-
/* FIXME: this needs a better location, but gets stuff building again */
150
-
extern int at91_suspend_entering_slow_clock(void);
151
184
152
185
#endif
-7
arch/avr32/mach-at32ap/include/mach/board.h
-7
arch/avr32/mach-at32ap/include/mach/board.h
···
34
34
#define ATMEL_USART_CTS 0x02
35
35
#define ATMEL_USART_CLK 0x04
36
36
37
-
struct atmel_uart_data {
38
-
int num; /* port num */
39
-
short use_dma_tx; /* use transmit DMA? */
40
-
short use_dma_rx; /* use receive DMA? */
41
-
void __iomem *regs; /* virtual base address, if any */
42
-
struct serial_rs485 rs485; /* rs485 settings */
43
-
};
44
37
void at32_map_usart(unsigned int hw_id, unsigned int line, int flags);
45
38
struct platform_device *at32_add_device_usart(unsigned int id);
46
39
+1
-1
drivers/ata/pata_at91.c
+1
-1
drivers/ata/pata_at91.c
+1
-1
drivers/input/touchscreen/atmel_tsadcc.c
+1
-1
drivers/input/touchscreen/atmel_tsadcc.c
+1
-1
drivers/mmc/host/atmel-mci.c
+1
-1
drivers/mmc/host/atmel-mci.c
···
28
28
#include <linux/slab.h>
29
29
#include <linux/stat.h>
30
30
#include <linux/types.h>
31
+
#include <linux/platform_data/atmel.h>
31
32
32
33
#include <linux/mmc/host.h>
33
34
#include <linux/mmc/sdio.h>
···
41
40
#include <asm/unaligned.h>
42
41
43
42
#include <mach/cpu.h>
44
-
#include <mach/board.h>
45
43
46
44
#include "atmel-mci-regs.h"
47
45
+1
-2
drivers/net/can/at91_can.c
+1
-2
drivers/net/can/at91_can.c
···
33
33
#include <linux/spinlock.h>
34
34
#include <linux/string.h>
35
35
#include <linux/types.h>
36
+
#include <linux/platform_data/atmel.h>
36
37
37
38
#include <linux/can/dev.h>
38
39
#include <linux/can/error.h>
39
-
40
-
#include <mach/board.h>
41
40
42
41
#define AT91_MB_MASK(i) ((1 << (i)) - 1)
43
42
+1
-1
drivers/net/ethernet/cadence/at91_ether.c
+1
-1
drivers/net/ethernet/cadence/at91_ether.c
···
31
31
#include <linux/clk.h>
32
32
#include <linux/gfp.h>
33
33
#include <linux/phy.h>
34
+
#include <linux/platform_data/atmel.h>
34
35
35
36
#include <asm/io.h>
36
37
#include <asm/uaccess.h>
···
39
38
40
39
#include <mach/at91rm9200_emac.h>
41
40
#include <asm/gpio.h>
42
-
#include <mach/board.h>
43
41
44
42
#include "at91_ether.h"
45
43
+1
-1
drivers/pcmcia/at91_cf.c
+1
-1
drivers/pcmcia/at91_cf.c
···
17
17
#include <linux/interrupt.h>
18
18
#include <linux/slab.h>
19
19
#include <linux/gpio.h>
20
+
#include <linux/platform_data/atmel.h>
20
21
21
22
#include <pcmcia/ss.h>
22
23
···
25
24
#include <asm/io.h>
26
25
#include <asm/sizes.h>
27
26
28
-
#include <mach/board.h>
29
27
#include <mach/at91rm9200_mc.h>
30
28
#include <mach/at91_ramc.h>
31
29
+1
-1
drivers/rtc/rtc-at91sam9.c
+1
-1
drivers/rtc/rtc-at91sam9.c
+1
-1
drivers/spi/spi-atmel.c
+1
-1
drivers/spi/spi-atmel.c
+1
-1
drivers/tty/serial/atmel_serial.c
+1
-1
drivers/tty/serial/atmel_serial.c
···
39
39
#include <linux/atmel_pdc.h>
40
40
#include <linux/atmel_serial.h>
41
41
#include <linux/uaccess.h>
42
+
#include <linux/platform_data/atmel.h>
42
43
43
44
#include <asm/io.h>
44
45
#include <asm/ioctls.h>
45
46
46
47
#include <asm/mach/serial_at91.h>
47
-
#include <mach/board.h>
48
48
49
49
#ifdef CONFIG_ARM
50
50
#include <mach/cpu.h>
+1
-1
drivers/usb/gadget/at91_udc.c
+1
-1
drivers/usb/gadget/at91_udc.c
···
31
31
#include <linux/usb/gadget.h>
32
32
#include <linux/of.h>
33
33
#include <linux/of_gpio.h>
34
+
#include <linux/platform_data/atmel.h>
34
35
35
36
#include <asm/byteorder.h>
36
37
#include <mach/hardware.h>
···
39
38
#include <asm/irq.h>
40
39
#include <asm/gpio.h>
41
40
42
-
#include <mach/board.h>
43
41
#include <mach/cpu.h>
44
42
#include <mach/at91sam9261_matrix.h>
45
43
#include <mach/at91_matrix.h>
+1
-1
drivers/usb/gadget/atmel_usba_udc.c
+1
-1
drivers/usb/gadget/atmel_usba_udc.c
+1
-1
drivers/usb/host/ohci-at91.c
+1
-1
drivers/usb/host/ohci-at91.c
···
16
16
#include <linux/platform_device.h>
17
17
#include <linux/of_platform.h>
18
18
#include <linux/of_gpio.h>
19
+
#include <linux/platform_data/atmel.h>
19
20
20
21
#include <mach/hardware.h>
21
22
#include <asm/gpio.h>
22
23
23
-
#include <mach/board.h>
24
24
#include <mach/cpu.h>
25
25
26
26
#ifndef CONFIG_ARCH_AT91
+1
-1
drivers/video/atmel_lcdfb.c
+1
-1
drivers/video/atmel_lcdfb.c
+67
include/linux/platform_data/atmel.h
+67
include/linux/platform_data/atmel.h
···
8
8
#define __ATMEL_H__
9
9
10
10
#include <linux/mtd/nand.h>
11
+
#include <linux/mtd/partitions.h>
12
+
#include <linux/device.h>
13
+
#include <linux/i2c.h>
14
+
#include <linux/leds.h>
15
+
#include <linux/spi/spi.h>
16
+
#include <linux/usb/atmel_usba_udc.h>
17
+
#include <linux/atmel-mci.h>
18
+
#include <sound/atmel-ac97c.h>
19
+
#include <linux/serial.h>
20
+
#include <linux/platform_data/macb.h>
21
+
22
+
/* USB Device */
23
+
struct at91_udc_data {
24
+
int vbus_pin; /* high == host powering us */
25
+
u8 vbus_active_low; /* vbus polarity */
26
+
u8 vbus_polled; /* Use polling, not interrupt */
27
+
int pullup_pin; /* active == D+ pulled up */
28
+
u8 pullup_active_low; /* true == pullup_pin is active low */
29
+
};
30
+
31
+
/* Compact Flash */
32
+
struct at91_cf_data {
33
+
int irq_pin; /* I/O IRQ */
34
+
int det_pin; /* Card detect */
35
+
int vcc_pin; /* power switching */
36
+
int rst_pin; /* card reset */
37
+
u8 chipselect; /* EBI Chip Select number */
38
+
u8 flags;
39
+
#define AT91_CF_TRUE_IDE 0x01
40
+
#define AT91_IDE_SWAP_A0_A2 0x02
41
+
};
42
+
43
+
/* USB Host */
44
+
#define AT91_MAX_USBH_PORTS 3
45
+
struct at91_usbh_data {
46
+
int vbus_pin[AT91_MAX_USBH_PORTS]; /* port power-control pin */
47
+
int overcurrent_pin[AT91_MAX_USBH_PORTS];
48
+
u8 ports; /* number of ports on root hub */
49
+
u8 overcurrent_supported;
50
+
u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS];
51
+
u8 overcurrent_status[AT91_MAX_USBH_PORTS];
52
+
u8 overcurrent_changed[AT91_MAX_USBH_PORTS];
53
+
};
11
54
12
55
/* NAND / SmartMedia */
13
56
struct atmel_nand_data {
···
66
23
struct mtd_partition *parts;
67
24
unsigned int num_parts;
68
25
};
26
+
27
+
/* Serial */
28
+
struct atmel_uart_data {
29
+
int num; /* port num */
30
+
short use_dma_tx; /* use transmit DMA? */
31
+
short use_dma_rx; /* use receive DMA? */
32
+
void __iomem *regs; /* virt. base address, if any */
33
+
struct serial_rs485 rs485; /* rs485 settings */
34
+
};
35
+
36
+
/* Touchscreen Controller */
37
+
struct at91_tsadcc_data {
38
+
unsigned int adc_clock;
39
+
u8 pendet_debounce;
40
+
u8 ts_sample_hold_time;
41
+
};
42
+
43
+
/* CAN */
44
+
struct at91_can_data {
45
+
void (*transceiver_switch)(int on);
46
+
};
47
+
48
+
/* FIXME: this needs a better location, but gets stuff building again */
49
+
extern int at91_suspend_entering_slow_clock(void);
69
50
70
51
#endif /* __ATMEL_H__ */