-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kern…
…el/git/hskinnemoen/avr32-2.6
- Loading branch information
Showing
125 changed files
with
591 additions
and
42 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| #ifndef __ASM_AVR32_GPIO_H | ||
| #define __ASM_AVR32_GPIO_H | ||
|
|
||
| #include <asm/arch/gpio.h> | ||
| #include <mach/gpio.h> | ||
|
|
||
| #endif /* __ASM_AVR32_GPIO_H */ |
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| /* | ||
| * Pin definitions for AT32AP7000. | ||
| * | ||
| * Copyright (C) 2006 Atmel Corporation | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
| #ifndef __ASM_ARCH_AT32AP700X_H__ | ||
| #define __ASM_ARCH_AT32AP700X_H__ | ||
|
|
||
| #define GPIO_PERIPH_A 0 | ||
| #define GPIO_PERIPH_B 1 | ||
|
|
||
| /* | ||
| * Pin numbers identifying specific GPIO pins on the chip. They can | ||
| * also be converted to IRQ numbers by passing them through | ||
| * gpio_to_irq(). | ||
| */ | ||
| #define GPIO_PIOA_BASE (0) | ||
| #define GPIO_PIOB_BASE (GPIO_PIOA_BASE + 32) | ||
| #define GPIO_PIOC_BASE (GPIO_PIOB_BASE + 32) | ||
| #define GPIO_PIOD_BASE (GPIO_PIOC_BASE + 32) | ||
| #define GPIO_PIOE_BASE (GPIO_PIOD_BASE + 32) | ||
|
|
||
| #define GPIO_PIN_PA(N) (GPIO_PIOA_BASE + (N)) | ||
| #define GPIO_PIN_PB(N) (GPIO_PIOB_BASE + (N)) | ||
| #define GPIO_PIN_PC(N) (GPIO_PIOC_BASE + (N)) | ||
| #define GPIO_PIN_PD(N) (GPIO_PIOD_BASE + (N)) | ||
| #define GPIO_PIN_PE(N) (GPIO_PIOE_BASE + (N)) | ||
|
|
||
|
|
||
| /* | ||
| * DMAC peripheral hardware handshaking interfaces, used with dw_dmac | ||
| */ | ||
| #define DMAC_MCI_RX 0 | ||
| #define DMAC_MCI_TX 1 | ||
| #define DMAC_DAC_TX 2 | ||
| #define DMAC_AC97_A_RX 3 | ||
| #define DMAC_AC97_A_TX 4 | ||
| #define DMAC_AC97_B_RX 5 | ||
| #define DMAC_AC97_B_TX 6 | ||
| #define DMAC_DMAREQ_0 7 | ||
| #define DMAC_DMAREQ_1 8 | ||
| #define DMAC_DMAREQ_2 9 | ||
| #define DMAC_DMAREQ_3 10 | ||
|
|
||
| #endif /* __ASM_ARCH_AT32AP700X_H__ */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| /* | ||
| * Platform data definitions. | ||
| */ | ||
| #ifndef __ASM_ARCH_BOARD_H | ||
| #define __ASM_ARCH_BOARD_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| #define GPIO_PIN_NONE (-1) | ||
|
|
||
| /* | ||
| * Clock rates for various on-board oscillators. The number of entries | ||
| * in this array is chip-dependent. | ||
| */ | ||
| extern unsigned long at32_board_osc_rates[]; | ||
|
|
||
| /* Add basic devices: system manager, interrupt controller, portmuxes, etc. */ | ||
| void at32_add_system_devices(void); | ||
|
|
||
| #define ATMEL_MAX_UART 4 | ||
| extern struct platform_device *atmel_default_console_device; | ||
|
|
||
| struct atmel_uart_data { | ||
| short use_dma_tx; /* use transmit DMA? */ | ||
| short use_dma_rx; /* use receive DMA? */ | ||
| void __iomem *regs; /* virtual base address, if any */ | ||
| }; | ||
| void at32_map_usart(unsigned int hw_id, unsigned int line); | ||
| struct platform_device *at32_add_device_usart(unsigned int id); | ||
|
|
||
| struct eth_platform_data { | ||
| u32 phy_mask; | ||
| u8 is_rmii; | ||
| }; | ||
| struct platform_device * | ||
| at32_add_device_eth(unsigned int id, struct eth_platform_data *data); | ||
|
|
||
| struct spi_board_info; | ||
| struct platform_device * | ||
| at32_add_device_spi(unsigned int id, struct spi_board_info *b, unsigned int n); | ||
|
|
||
| struct atmel_lcdfb_info; | ||
| struct platform_device * | ||
| at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data, | ||
| unsigned long fbmem_start, unsigned long fbmem_len, | ||
| unsigned int pin_config); | ||
|
|
||
| struct usba_platform_data; | ||
| struct platform_device * | ||
| at32_add_device_usba(unsigned int id, struct usba_platform_data *data); | ||
|
|
||
| struct ide_platform_data { | ||
| u8 cs; | ||
| }; | ||
| struct platform_device * | ||
| at32_add_device_ide(unsigned int id, unsigned int extint, | ||
| struct ide_platform_data *data); | ||
|
|
||
| /* mask says which PWM channels to mux */ | ||
| struct platform_device *at32_add_device_pwm(u32 mask); | ||
|
|
||
| /* depending on what's hooked up, not all SSC pins will be used */ | ||
| #define ATMEL_SSC_TK 0x01 | ||
| #define ATMEL_SSC_TF 0x02 | ||
| #define ATMEL_SSC_TD 0x04 | ||
| #define ATMEL_SSC_TX (ATMEL_SSC_TK | ATMEL_SSC_TF | ATMEL_SSC_TD) | ||
|
|
||
| #define ATMEL_SSC_RK 0x10 | ||
| #define ATMEL_SSC_RF 0x20 | ||
| #define ATMEL_SSC_RD 0x40 | ||
| #define ATMEL_SSC_RX (ATMEL_SSC_RK | ATMEL_SSC_RF | ATMEL_SSC_RD) | ||
|
|
||
| struct platform_device * | ||
| at32_add_device_ssc(unsigned int id, unsigned int flags); | ||
|
|
||
| struct i2c_board_info; | ||
| struct platform_device *at32_add_device_twi(unsigned int id, | ||
| struct i2c_board_info *b, | ||
| unsigned int n); | ||
|
|
||
| struct mci_platform_data; | ||
| struct platform_device * | ||
| at32_add_device_mci(unsigned int id, struct mci_platform_data *data); | ||
|
|
||
| struct ac97c_platform_data { | ||
| unsigned short dma_rx_periph_id; | ||
| unsigned short dma_tx_periph_id; | ||
| unsigned short dma_controller_id; | ||
| int reset_pin; | ||
| }; | ||
| struct platform_device * | ||
| at32_add_device_ac97c(unsigned int id, struct ac97c_platform_data *data); | ||
|
|
||
| struct platform_device *at32_add_device_abdac(unsigned int id); | ||
| struct platform_device *at32_add_device_psif(unsigned int id); | ||
|
|
||
| struct cf_platform_data { | ||
| int detect_pin; | ||
| int reset_pin; | ||
| int vcc_pin; | ||
| int ready_pin; | ||
| u8 cs; | ||
| }; | ||
| struct platform_device * | ||
| at32_add_device_cf(unsigned int id, unsigned int extint, | ||
| struct cf_platform_data *data); | ||
|
|
||
| /* NAND / SmartMedia */ | ||
| struct atmel_nand_data { | ||
| int enable_pin; /* chip enable */ | ||
| int det_pin; /* card detect */ | ||
| int rdy_pin; /* ready/busy */ | ||
| u8 ale; /* address line number connected to ALE */ | ||
| u8 cle; /* address line number connected to CLE */ | ||
| u8 bus_width_16; /* buswidth is 16 bit */ | ||
| struct mtd_partition *(*partition_info)(int size, int *num_partitions); | ||
| }; | ||
| struct platform_device * | ||
| at32_add_device_nand(unsigned int id, struct atmel_nand_data *data); | ||
|
|
||
| #endif /* __ASM_ARCH_BOARD_H */ |
Oops, something went wrong.