diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 13:53:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-09 13:53:42 -0400 |
commit | 28efb9e1a758435bb9d49798400fb0373d018d5c (patch) | |
tree | bc7f376f5cc37776068d6e52a8daba8595692e27 /include | |
parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
parent | 33f197a603e61ddd099c29e94166d3172cdf57e4 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
avr32: Make atstk1006_nand_data definition static
avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100
avr32: Update defconfigs
avr32: Clean up HMATRIX code
avr32: Add MMIO address definitions for certain controllers
avr32: Introduce <mach/chip.h>
avr32: Remove include/asm-avr32/arch-at32ap
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-avr32/arch-at32ap/at32ap700x.h | 49 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/board.h | 121 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/cpu.h | 35 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/gpio.h | 45 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/init.h | 18 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/io.h | 39 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/irq.h | 14 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/pm.h | 51 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/portmux.h | 29 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/smc.h | 113 | ||||
-rw-r--r-- | include/asm-avr32/arch-at32ap/sram.h | 30 |
11 files changed, 0 insertions, 544 deletions
diff --git a/include/asm-avr32/arch-at32ap/at32ap700x.h b/include/asm-avr32/arch-at32ap/at32ap700x.h deleted file mode 100644 index d18a3053be0d..000000000000 --- a/include/asm-avr32/arch-at32ap/at32ap700x.h +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | /* | ||
2 | * Pin definitions for AT32AP7000. | ||
3 | * | ||
4 | * Copyright (C) 2006 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_ARCH_AT32AP700X_H__ | ||
11 | #define __ASM_ARCH_AT32AP700X_H__ | ||
12 | |||
13 | #define GPIO_PERIPH_A 0 | ||
14 | #define GPIO_PERIPH_B 1 | ||
15 | |||
16 | /* | ||
17 | * Pin numbers identifying specific GPIO pins on the chip. They can | ||
18 | * also be converted to IRQ numbers by passing them through | ||
19 | * gpio_to_irq(). | ||
20 | */ | ||
21 | #define GPIO_PIOA_BASE (0) | ||
22 | #define GPIO_PIOB_BASE (GPIO_PIOA_BASE + 32) | ||
23 | #define GPIO_PIOC_BASE (GPIO_PIOB_BASE + 32) | ||
24 | #define GPIO_PIOD_BASE (GPIO_PIOC_BASE + 32) | ||
25 | #define GPIO_PIOE_BASE (GPIO_PIOD_BASE + 32) | ||
26 | |||
27 | #define GPIO_PIN_PA(N) (GPIO_PIOA_BASE + (N)) | ||
28 | #define GPIO_PIN_PB(N) (GPIO_PIOB_BASE + (N)) | ||
29 | #define GPIO_PIN_PC(N) (GPIO_PIOC_BASE + (N)) | ||
30 | #define GPIO_PIN_PD(N) (GPIO_PIOD_BASE + (N)) | ||
31 | #define GPIO_PIN_PE(N) (GPIO_PIOE_BASE + (N)) | ||
32 | |||
33 | |||
34 | /* | ||
35 | * DMAC peripheral hardware handshaking interfaces, used with dw_dmac | ||
36 | */ | ||
37 | #define DMAC_MCI_RX 0 | ||
38 | #define DMAC_MCI_TX 1 | ||
39 | #define DMAC_DAC_TX 2 | ||
40 | #define DMAC_AC97_A_RX 3 | ||
41 | #define DMAC_AC97_A_TX 4 | ||
42 | #define DMAC_AC97_B_RX 5 | ||
43 | #define DMAC_AC97_B_TX 6 | ||
44 | #define DMAC_DMAREQ_0 7 | ||
45 | #define DMAC_DMAREQ_1 8 | ||
46 | #define DMAC_DMAREQ_2 9 | ||
47 | #define DMAC_DMAREQ_3 10 | ||
48 | |||
49 | #endif /* __ASM_ARCH_AT32AP700X_H__ */ | ||
diff --git a/include/asm-avr32/arch-at32ap/board.h b/include/asm-avr32/arch-at32ap/board.h deleted file mode 100644 index e60e9076544d..000000000000 --- a/include/asm-avr32/arch-at32ap/board.h +++ /dev/null | |||
@@ -1,121 +0,0 @@ | |||
1 | /* | ||
2 | * Platform data definitions. | ||
3 | */ | ||
4 | #ifndef __ASM_ARCH_BOARD_H | ||
5 | #define __ASM_ARCH_BOARD_H | ||
6 | |||
7 | #include <linux/types.h> | ||
8 | |||
9 | #define GPIO_PIN_NONE (-1) | ||
10 | |||
11 | /* | ||
12 | * Clock rates for various on-board oscillators. The number of entries | ||
13 | * in this array is chip-dependent. | ||
14 | */ | ||
15 | extern unsigned long at32_board_osc_rates[]; | ||
16 | |||
17 | /* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ | ||
18 | void at32_add_system_devices(void); | ||
19 | |||
20 | #define ATMEL_MAX_UART 4 | ||
21 | extern struct platform_device *atmel_default_console_device; | ||
22 | |||
23 | struct atmel_uart_data { | ||
24 | short use_dma_tx; /* use transmit DMA? */ | ||
25 | short use_dma_rx; /* use receive DMA? */ | ||
26 | void __iomem *regs; /* virtual base address, if any */ | ||
27 | }; | ||
28 | void at32_map_usart(unsigned int hw_id, unsigned int line); | ||
29 | struct platform_device *at32_add_device_usart(unsigned int id); | ||
30 | |||
31 | struct eth_platform_data { | ||
32 | u32 phy_mask; | ||
33 | u8 is_rmii; | ||
34 | }; | ||
35 | struct platform_device * | ||
36 | at32_add_device_eth(unsigned int id, struct eth_platform_data *data); | ||
37 | |||
38 | struct spi_board_info; | ||
39 | struct platform_device * | ||
40 | at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); | ||
41 | |||
42 | struct atmel_lcdfb_info; | ||
43 | struct platform_device * | ||
44 | at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | ||
45 | unsigned long fbmem_start, unsigned long fbmem_len, | ||
46 | unsigned int pin_config); | ||
47 | |||
48 | struct usba_platform_data; | ||
49 | struct platform_device * | ||
50 | at32_add_device_usba(unsigned int id, struct usba_platform_data *data); | ||
51 | |||
52 | struct ide_platform_data { | ||
53 | u8 cs; | ||
54 | }; | ||
55 | struct platform_device * | ||
56 | at32_add_device_ide(unsigned int id, unsigned int extint, | ||
57 | struct ide_platform_data *data); | ||
58 | |||
59 | /* mask says which PWM channels to mux */ | ||
60 | struct platform_device *at32_add_device_pwm(u32 mask); | ||
61 | |||
62 | /* depending on what's hooked up, not all SSC pins will be used */ | ||
63 | #define ATMEL_SSC_TK 0x01 | ||
64 | #define ATMEL_SSC_TF 0x02 | ||
65 | #define ATMEL_SSC_TD 0x04 | ||
66 | #define ATMEL_SSC_TX (ATMEL_SSC_TK | ATMEL_SSC_TF | ATMEL_SSC_TD) | ||
67 | |||
68 | #define ATMEL_SSC_RK 0x10 | ||
69 | #define ATMEL_SSC_RF 0x20 | ||
70 | #define ATMEL_SSC_RD 0x40 | ||
71 | #define ATMEL_SSC_RX (ATMEL_SSC_RK | ATMEL_SSC_RF | ATMEL_SSC_RD) | ||
72 | |||
73 | struct platform_device * | ||
74 | at32_add_device_ssc(unsigned int id, unsigned int flags); | ||
75 | |||
76 | struct i2c_board_info; | ||
77 | struct platform_device *at32_add_device_twi(unsigned int id, | ||
78 | struct i2c_board_info *b, | ||
79 | unsigned int n); | ||
80 | |||
81 | struct mci_platform_data; | ||
82 | struct platform_device * | ||
83 | at32_add_device_mci(unsigned int id, struct mci_platform_data *data); | ||
84 | |||
85 | struct ac97c_platform_data { | ||
86 | unsigned short dma_rx_periph_id; | ||
87 | unsigned short dma_tx_periph_id; | ||
88 | unsigned short dma_controller_id; | ||
89 | int reset_pin; | ||
90 | }; | ||
91 | struct platform_device * | ||
92 | at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data); | ||
93 | |||
94 | struct platform_device *at32_add_device_abdac(unsigned int id); | ||
95 | struct platform_device *at32_add_device_psif(unsigned int id); | ||
96 | |||
97 | struct cf_platform_data { | ||
98 | int detect_pin; | ||
99 | int reset_pin; | ||
100 | int vcc_pin; | ||
101 | int ready_pin; | ||
102 | u8 cs; | ||
103 | }; | ||
104 | struct platform_device * | ||
105 | at32_add_device_cf(unsigned int id, unsigned int extint, | ||
106 | struct cf_platform_data *data); | ||
107 | |||
108 | /* NAND / SmartMedia */ | ||
109 | struct atmel_nand_data { | ||
110 | int enable_pin; /* chip enable */ | ||
111 | int det_pin; /* card detect */ | ||
112 | int rdy_pin; /* ready/busy */ | ||
113 | u8 ale; /* address line number connected to ALE */ | ||
114 | u8 cle; /* address line number connected to CLE */ | ||
115 | u8 bus_width_16; /* buswidth is 16 bit */ | ||
116 | struct mtd_partition *(*partition_info)(int size, int *num_partitions); | ||
117 | }; | ||
118 | struct platform_device * | ||
119 | at32_add_device_nand(unsigned int id, struct atmel_nand_data *data); | ||
120 | |||
121 | #endif /* __ASM_ARCH_BOARD_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/cpu.h b/include/asm-avr32/arch-at32ap/cpu.h deleted file mode 100644 index 44d0bfa1f409..000000000000 --- a/include/asm-avr32/arch-at32ap/cpu.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | /* | ||
2 | * AVR32 and (fake) AT91 CPU identification | ||
3 | * | ||
4 | * Copyright (C) 2007 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_ARCH_CPU_H | ||
11 | #define __ASM_ARCH_CPU_H | ||
12 | |||
13 | /* | ||
14 | * Only AT32AP7000 is defined for now. We can identify the specific | ||
15 | * chip at runtime, but I'm not sure if it's really worth it. | ||
16 | */ | ||
17 | #ifdef CONFIG_CPU_AT32AP700X | ||
18 | # define cpu_is_at32ap7000() (1) | ||
19 | #else | ||
20 | # define cpu_is_at32ap7000() (0) | ||
21 | #endif | ||
22 | |||
23 | /* | ||
24 | * Since this is AVR32, we will never run on any AT91 CPU. But these | ||
25 | * definitions may reduce clutter in common drivers. | ||
26 | */ | ||
27 | #define cpu_is_at91rm9200() (0) | ||
28 | #define cpu_is_at91sam9xe() (0) | ||
29 | #define cpu_is_at91sam9260() (0) | ||
30 | #define cpu_is_at91sam9261() (0) | ||
31 | #define cpu_is_at91sam9263() (0) | ||
32 | #define cpu_is_at91sam9rl() (0) | ||
33 | #define cpu_is_at91cap9() (0) | ||
34 | |||
35 | #endif /* __ASM_ARCH_CPU_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/gpio.h b/include/asm-avr32/arch-at32ap/gpio.h deleted file mode 100644 index 0180f584ef03..000000000000 --- a/include/asm-avr32/arch-at32ap/gpio.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | #ifndef __ASM_AVR32_ARCH_GPIO_H | ||
2 | #define __ASM_AVR32_ARCH_GPIO_H | ||
3 | |||
4 | #include <linux/compiler.h> | ||
5 | #include <asm/irq.h> | ||
6 | |||
7 | |||
8 | /* Some GPIO chips can manage IRQs; some can't. The exact numbers can | ||
9 | * be changed if needed, but for the moment they're not configurable. | ||
10 | */ | ||
11 | #define ARCH_NR_GPIOS (NR_GPIO_IRQS + 2 * 32) | ||
12 | |||
13 | |||
14 | /* Arch-neutral GPIO API, supporting both "native" and external GPIOs. */ | ||
15 | #include <asm-generic/gpio.h> | ||
16 | |||
17 | static inline int gpio_get_value(unsigned int gpio) | ||
18 | { | ||
19 | return __gpio_get_value(gpio); | ||
20 | } | ||
21 | |||
22 | static inline void gpio_set_value(unsigned int gpio, int value) | ||
23 | { | ||
24 | __gpio_set_value(gpio, value); | ||
25 | } | ||
26 | |||
27 | static inline int gpio_cansleep(unsigned int gpio) | ||
28 | { | ||
29 | return __gpio_cansleep(gpio); | ||
30 | } | ||
31 | |||
32 | |||
33 | static inline int gpio_to_irq(unsigned int gpio) | ||
34 | { | ||
35 | if (gpio < NR_GPIO_IRQS) | ||
36 | return gpio + GPIO_IRQ_BASE; | ||
37 | return -EINVAL; | ||
38 | } | ||
39 | |||
40 | static inline int irq_to_gpio(unsigned int irq) | ||
41 | { | ||
42 | return irq - GPIO_IRQ_BASE; | ||
43 | } | ||
44 | |||
45 | #endif /* __ASM_AVR32_ARCH_GPIO_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/init.h b/include/asm-avr32/arch-at32ap/init.h deleted file mode 100644 index bc40e3d46150..000000000000 --- a/include/asm-avr32/arch-at32ap/init.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* | ||
2 | * AT32AP platform initialization calls. | ||
3 | * | ||
4 | * Copyright (C) 2006 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_AVR32_AT32AP_INIT_H__ | ||
11 | #define __ASM_AVR32_AT32AP_INIT_H__ | ||
12 | |||
13 | void setup_platform(void); | ||
14 | void setup_board(void); | ||
15 | |||
16 | void at32_setup_serial_console(unsigned int usart_id); | ||
17 | |||
18 | #endif /* __ASM_AVR32_AT32AP_INIT_H__ */ | ||
diff --git a/include/asm-avr32/arch-at32ap/io.h b/include/asm-avr32/arch-at32ap/io.h deleted file mode 100644 index 4ec6abc68ea3..000000000000 --- a/include/asm-avr32/arch-at32ap/io.h +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | #ifndef __ASM_AVR32_ARCH_AT32AP_IO_H | ||
2 | #define __ASM_AVR32_ARCH_AT32AP_IO_H | ||
3 | |||
4 | /* For "bizarre" halfword swapping */ | ||
5 | #include <linux/byteorder/swabb.h> | ||
6 | |||
7 | #if defined(CONFIG_AP700X_32_BIT_SMC) | ||
8 | # define __swizzle_addr_b(addr) (addr ^ 3UL) | ||
9 | # define __swizzle_addr_w(addr) (addr ^ 2UL) | ||
10 | # define __swizzle_addr_l(addr) (addr) | ||
11 | # define ioswabb(a, x) (x) | ||
12 | # define ioswabw(a, x) (x) | ||
13 | # define ioswabl(a, x) (x) | ||
14 | # define __mem_ioswabb(a, x) (x) | ||
15 | # define __mem_ioswabw(a, x) swab16(x) | ||
16 | # define __mem_ioswabl(a, x) swab32(x) | ||
17 | #elif defined(CONFIG_AP700X_16_BIT_SMC) | ||
18 | # define __swizzle_addr_b(addr) (addr ^ 1UL) | ||
19 | # define __swizzle_addr_w(addr) (addr) | ||
20 | # define __swizzle_addr_l(addr) (addr) | ||
21 | # define ioswabb(a, x) (x) | ||
22 | # define ioswabw(a, x) (x) | ||
23 | # define ioswabl(a, x) swahw32(x) | ||
24 | # define __mem_ioswabb(a, x) (x) | ||
25 | # define __mem_ioswabw(a, x) swab16(x) | ||
26 | # define __mem_ioswabl(a, x) swahb32(x) | ||
27 | #else | ||
28 | # define __swizzle_addr_b(addr) (addr) | ||
29 | # define __swizzle_addr_w(addr) (addr) | ||
30 | # define __swizzle_addr_l(addr) (addr) | ||
31 | # define ioswabb(a, x) (x) | ||
32 | # define ioswabw(a, x) swab16(x) | ||
33 | # define ioswabl(a, x) swab32(x) | ||
34 | # define __mem_ioswabb(a, x) (x) | ||
35 | # define __mem_ioswabw(a, x) (x) | ||
36 | # define __mem_ioswabl(a, x) (x) | ||
37 | #endif | ||
38 | |||
39 | #endif /* __ASM_AVR32_ARCH_AT32AP_IO_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/irq.h b/include/asm-avr32/arch-at32ap/irq.h deleted file mode 100644 index 608e350368c7..000000000000 --- a/include/asm-avr32/arch-at32ap/irq.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #ifndef __ASM_AVR32_ARCH_IRQ_H | ||
2 | #define __ASM_AVR32_ARCH_IRQ_H | ||
3 | |||
4 | #define EIM_IRQ_BASE NR_INTERNAL_IRQS | ||
5 | #define NR_EIM_IRQS 32 | ||
6 | #define AT32_EXTINT(n) (EIM_IRQ_BASE + (n)) | ||
7 | |||
8 | #define GPIO_IRQ_BASE (EIM_IRQ_BASE + NR_EIM_IRQS) | ||
9 | #define NR_GPIO_CTLR (5 /*internal*/ + 1 /*external*/) | ||
10 | #define NR_GPIO_IRQS (NR_GPIO_CTLR * 32) | ||
11 | |||
12 | #define NR_IRQS (GPIO_IRQ_BASE + NR_GPIO_IRQS) | ||
13 | |||
14 | #endif /* __ASM_AVR32_ARCH_IRQ_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/pm.h b/include/asm-avr32/arch-at32ap/pm.h deleted file mode 100644 index 979b355b77b6..000000000000 --- a/include/asm-avr32/arch-at32ap/pm.h +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | /* | ||
2 | * AVR32 AP Power Management. | ||
3 | * | ||
4 | * Copyright (C) 2008 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_AVR32_ARCH_PM_H | ||
11 | #define __ASM_AVR32_ARCH_PM_H | ||
12 | |||
13 | /* Possible arguments to the "sleep" instruction */ | ||
14 | #define CPU_SLEEP_IDLE 0 | ||
15 | #define CPU_SLEEP_FROZEN 1 | ||
16 | #define CPU_SLEEP_STANDBY 2 | ||
17 | #define CPU_SLEEP_STOP 3 | ||
18 | #define CPU_SLEEP_STATIC 5 | ||
19 | |||
20 | #ifndef __ASSEMBLY__ | ||
21 | extern void cpu_enter_idle(void); | ||
22 | extern void cpu_enter_standby(unsigned long sdramc_base); | ||
23 | |||
24 | extern bool disable_idle_sleep; | ||
25 | |||
26 | static inline void cpu_disable_idle_sleep(void) | ||
27 | { | ||
28 | disable_idle_sleep = true; | ||
29 | } | ||
30 | |||
31 | static inline void cpu_enable_idle_sleep(void) | ||
32 | { | ||
33 | disable_idle_sleep = false; | ||
34 | } | ||
35 | |||
36 | static inline void cpu_idle_sleep(void) | ||
37 | { | ||
38 | /* | ||
39 | * If we're using the COUNT and COMPARE registers for | ||
40 | * timekeeping, we can't use the IDLE state. | ||
41 | */ | ||
42 | if (disable_idle_sleep) | ||
43 | cpu_relax(); | ||
44 | else | ||
45 | cpu_enter_idle(); | ||
46 | } | ||
47 | |||
48 | void intc_set_suspend_handler(unsigned long offset); | ||
49 | #endif | ||
50 | |||
51 | #endif /* __ASM_AVR32_ARCH_PM_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/portmux.h b/include/asm-avr32/arch-at32ap/portmux.h deleted file mode 100644 index b1abe6b4e4ef..000000000000 --- a/include/asm-avr32/arch-at32ap/portmux.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | /* | ||
2 | * AT32 portmux interface. | ||
3 | * | ||
4 | * Copyright (C) 2006 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_ARCH_PORTMUX_H__ | ||
11 | #define __ASM_ARCH_PORTMUX_H__ | ||
12 | |||
13 | /* | ||
14 | * Set up pin multiplexing, called from board init only. | ||
15 | * | ||
16 | * The following flags determine the initial state of the pin. | ||
17 | */ | ||
18 | #define AT32_GPIOF_PULLUP 0x00000001 /* (not-OUT) Enable pull-up */ | ||
19 | #define AT32_GPIOF_OUTPUT 0x00000002 /* (OUT) Enable output driver */ | ||
20 | #define AT32_GPIOF_HIGH 0x00000004 /* (OUT) Set output high */ | ||
21 | #define AT32_GPIOF_DEGLITCH 0x00000008 /* (IN) Filter glitches */ | ||
22 | #define AT32_GPIOF_MULTIDRV 0x00000010 /* Enable multidriver option */ | ||
23 | |||
24 | void at32_select_periph(unsigned int pin, unsigned int periph, | ||
25 | unsigned long flags); | ||
26 | void at32_select_gpio(unsigned int pin, unsigned long flags); | ||
27 | void at32_reserve_pin(unsigned int pin); | ||
28 | |||
29 | #endif /* __ASM_ARCH_PORTMUX_H__ */ | ||
diff --git a/include/asm-avr32/arch-at32ap/smc.h b/include/asm-avr32/arch-at32ap/smc.h deleted file mode 100644 index c98eea44a70a..000000000000 --- a/include/asm-avr32/arch-at32ap/smc.h +++ /dev/null | |||
@@ -1,113 +0,0 @@ | |||
1 | /* | ||
2 | * Static Memory Controller for AT32 chips | ||
3 | * | ||
4 | * Copyright (C) 2006 Atmel Corporation | ||
5 | * | ||
6 | * Inspired by the OMAP2 General-Purpose Memory Controller interface | ||
7 | * | ||
8 | * This program is free software; you can redistribute it and/or modify | ||
9 | * it under the terms of the GNU General Public License version 2 as | ||
10 | * published by the Free Software Foundation. | ||
11 | */ | ||
12 | #ifndef __ARCH_AT32AP_SMC_H | ||
13 | #define __ARCH_AT32AP_SMC_H | ||
14 | |||
15 | /* | ||
16 | * All timing parameters are in nanoseconds. | ||
17 | */ | ||
18 | struct smc_timing { | ||
19 | /* Delay from address valid to assertion of given strobe */ | ||
20 | int ncs_read_setup; | ||
21 | int nrd_setup; | ||
22 | int ncs_write_setup; | ||
23 | int nwe_setup; | ||
24 | |||
25 | /* Pulse length of given strobe */ | ||
26 | int ncs_read_pulse; | ||
27 | int nrd_pulse; | ||
28 | int ncs_write_pulse; | ||
29 | int nwe_pulse; | ||
30 | |||
31 | /* Total cycle length of given operation */ | ||
32 | int read_cycle; | ||
33 | int write_cycle; | ||
34 | |||
35 | /* Minimal recovery times, will extend cycle if needed */ | ||
36 | int ncs_read_recover; | ||
37 | int nrd_recover; | ||
38 | int ncs_write_recover; | ||
39 | int nwe_recover; | ||
40 | }; | ||
41 | |||
42 | /* | ||
43 | * All timing parameters are in clock cycles. | ||
44 | */ | ||
45 | struct smc_config { | ||
46 | |||
47 | /* Delay from address valid to assertion of given strobe */ | ||
48 | u8 ncs_read_setup; | ||
49 | u8 nrd_setup; | ||
50 | u8 ncs_write_setup; | ||
51 | u8 nwe_setup; | ||
52 | |||
53 | /* Pulse length of given strobe */ | ||
54 | u8 ncs_read_pulse; | ||
55 | u8 nrd_pulse; | ||
56 | u8 ncs_write_pulse; | ||
57 | u8 nwe_pulse; | ||
58 | |||
59 | /* Total cycle length of given operation */ | ||
60 | u8 read_cycle; | ||
61 | u8 write_cycle; | ||
62 | |||
63 | /* Bus width in bytes */ | ||
64 | u8 bus_width; | ||
65 | |||
66 | /* | ||
67 | * 0: Data is sampled on rising edge of NCS | ||
68 | * 1: Data is sampled on rising edge of NRD | ||
69 | */ | ||
70 | unsigned int nrd_controlled:1; | ||
71 | |||
72 | /* | ||
73 | * 0: Data is driven on falling edge of NCS | ||
74 | * 1: Data is driven on falling edge of NWR | ||
75 | */ | ||
76 | unsigned int nwe_controlled:1; | ||
77 | |||
78 | /* | ||
79 | * 0: NWAIT is disabled | ||
80 | * 1: Reserved | ||
81 | * 2: NWAIT is frozen mode | ||
82 | * 3: NWAIT in ready mode | ||
83 | */ | ||
84 | unsigned int nwait_mode:2; | ||
85 | |||
86 | /* | ||
87 | * 0: Byte select access type | ||
88 | * 1: Byte write access type | ||
89 | */ | ||
90 | unsigned int byte_write:1; | ||
91 | |||
92 | /* | ||
93 | * Number of clock cycles before data is released after | ||
94 | * the rising edge of the read controlling signal | ||
95 | * | ||
96 | * Total cycles from SMC is tdf_cycles + 1 | ||
97 | */ | ||
98 | unsigned int tdf_cycles:4; | ||
99 | |||
100 | /* | ||
101 | * 0: TDF optimization disabled | ||
102 | * 1: TDF optimization enabled | ||
103 | */ | ||
104 | unsigned int tdf_mode:1; | ||
105 | }; | ||
106 | |||
107 | extern void smc_set_timing(struct smc_config *config, | ||
108 | const struct smc_timing *timing); | ||
109 | |||
110 | extern int smc_set_configuration(int cs, const struct smc_config *config); | ||
111 | extern struct smc_config *smc_get_configuration(int cs); | ||
112 | |||
113 | #endif /* __ARCH_AT32AP_SMC_H */ | ||
diff --git a/include/asm-avr32/arch-at32ap/sram.h b/include/asm-avr32/arch-at32ap/sram.h deleted file mode 100644 index 4838dae7601a..000000000000 --- a/include/asm-avr32/arch-at32ap/sram.h +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* | ||
2 | * Simple SRAM allocator | ||
3 | * | ||
4 | * Copyright (C) 2008 Atmel Corporation | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | #ifndef __ASM_AVR32_ARCH_SRAM_H | ||
11 | #define __ASM_AVR32_ARCH_SRAM_H | ||
12 | |||
13 | #include <linux/genalloc.h> | ||
14 | |||
15 | extern struct gen_pool *sram_pool; | ||
16 | |||
17 | static inline unsigned long sram_alloc(size_t len) | ||
18 | { | ||
19 | if (!sram_pool) | ||
20 | return 0UL; | ||
21 | |||
22 | return gen_pool_alloc(sram_pool, len); | ||
23 | } | ||
24 | |||
25 | static inline void sram_free(unsigned long addr, size_t len) | ||
26 | { | ||
27 | return gen_pool_free(sram_pool, addr, len); | ||
28 | } | ||
29 | |||
30 | #endif /* __ASM_AVR32_ARCH_SRAM_H */ | ||