diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 10:56:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-04 10:56:25 -0500 |
| commit | eda58a85ec3fc05855a26654d97a2b53f0e715b9 (patch) | |
| tree | de995f6f0e38c3f35e866519c6de7e331ce6cc91 /arch/blackfin/include/asm/gpio.h | |
| parent | 024bb9617e01716c5ac7d235f54483cc6018978f (diff) | |
| parent | c8e674125e03c5f36ccfd61d83b933e6956074b0 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6: (40 commits)
Blackfin arch: Remove outdated code
Blackfin arch: Fix udelay implementation
Blackfin arch: Update Copyright information
Blackfin arch: Add BF561 PPI POLS, POLC Masks
Blackfin arch: Update CM-BF527 kernel config
Blackfin arch: define bfin_memmap as static since it is only used here
Blackfin arch: cplb mananger: use a do...while loop rather than a for loop
Blackfin arch: fix bug - traps test case 19 for exception 0x2d fails
Blackfin arch: add platform device bfin_mii-bus and KSZ8893M switch driver platform resources to board files
Blackfin arch: build jtag tty driver as a module by default
Blackfin arch: fix 2 bugs related to debug
Blackfin arch: Add ANOMALY_05000380 to BF54x to kill the compile warning
Blackfin arch: Fix bug - 561 SMP kernel can't boot from jffs2
Blackfin arch: base SIC_IWR# programming on whether the MMR exists
Blackfin arch: read SYSCR on newer parts that mirror the bits of SWRST in it
Blackfin arch: fixup board init function name
Blackfin arch: drop CONFIG_I2C_BOARDINFO ifdefs
Blackfin arch: bfin_reset->_bfin_reset redirection no longer needed
Blackfin arch: sync reboot handler with version in u-boot
Blackfin arch: Faster Implementation of csum_tcpudp_nofold()
...
Diffstat (limited to 'arch/blackfin/include/asm/gpio.h')
| -rw-r--r-- | arch/blackfin/include/asm/gpio.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 9477d82fcad2..d4a082ef75b4 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
| @@ -27,60 +27,6 @@ | |||
| 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | 27 | * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | /* | ||
| 31 | * Number BF537/6/4 BF561 BF533/2/1 | ||
| 32 | * BF527/5/2 | ||
| 33 | * | ||
| 34 | * GPIO_0 PF0 PF0 PF0 | ||
| 35 | * GPIO_1 PF1 PF1 PF1 | ||
| 36 | * GPIO_2 PF2 PF2 PF2 | ||
| 37 | * GPIO_3 PF3 PF3 PF3 | ||
| 38 | * GPIO_4 PF4 PF4 PF4 | ||
| 39 | * GPIO_5 PF5 PF5 PF5 | ||
| 40 | * GPIO_6 PF6 PF6 PF6 | ||
| 41 | * GPIO_7 PF7 PF7 PF7 | ||
| 42 | * GPIO_8 PF8 PF8 PF8 | ||
| 43 | * GPIO_9 PF9 PF9 PF9 | ||
| 44 | * GPIO_10 PF10 PF10 PF10 | ||
| 45 | * GPIO_11 PF11 PF11 PF11 | ||
| 46 | * GPIO_12 PF12 PF12 PF12 | ||
| 47 | * GPIO_13 PF13 PF13 PF13 | ||
| 48 | * GPIO_14 PF14 PF14 PF14 | ||
| 49 | * GPIO_15 PF15 PF15 PF15 | ||
| 50 | * GPIO_16 PG0 PF16 | ||
| 51 | * GPIO_17 PG1 PF17 | ||
| 52 | * GPIO_18 PG2 PF18 | ||
| 53 | * GPIO_19 PG3 PF19 | ||
| 54 | * GPIO_20 PG4 PF20 | ||
| 55 | * GPIO_21 PG5 PF21 | ||
| 56 | * GPIO_22 PG6 PF22 | ||
| 57 | * GPIO_23 PG7 PF23 | ||
| 58 | * GPIO_24 PG8 PF24 | ||
| 59 | * GPIO_25 PG9 PF25 | ||
| 60 | * GPIO_26 PG10 PF26 | ||
| 61 | * GPIO_27 PG11 PF27 | ||
| 62 | * GPIO_28 PG12 PF28 | ||
| 63 | * GPIO_29 PG13 PF29 | ||
| 64 | * GPIO_30 PG14 PF30 | ||
| 65 | * GPIO_31 PG15 PF31 | ||
| 66 | * GPIO_32 PH0 PF32 | ||
| 67 | * GPIO_33 PH1 PF33 | ||
| 68 | * GPIO_34 PH2 PF34 | ||
| 69 | * GPIO_35 PH3 PF35 | ||
| 70 | * GPIO_36 PH4 PF36 | ||
| 71 | * GPIO_37 PH5 PF37 | ||
| 72 | * GPIO_38 PH6 PF38 | ||
| 73 | * GPIO_39 PH7 PF39 | ||
| 74 | * GPIO_40 PH8 PF40 | ||
| 75 | * GPIO_41 PH9 PF41 | ||
| 76 | * GPIO_42 PH10 PF42 | ||
| 77 | * GPIO_43 PH11 PF43 | ||
| 78 | * GPIO_44 PH12 PF44 | ||
| 79 | * GPIO_45 PH13 PF45 | ||
| 80 | * GPIO_46 PH14 PF46 | ||
| 81 | * GPIO_47 PH15 PF47 | ||
| 82 | */ | ||
| 83 | |||
| 84 | #ifndef __ARCH_BLACKFIN_GPIO_H__ | 30 | #ifndef __ARCH_BLACKFIN_GPIO_H__ |
| 85 | #define __ARCH_BLACKFIN_GPIO_H__ | 31 | #define __ARCH_BLACKFIN_GPIO_H__ |
| 86 | 32 | ||
| @@ -295,10 +241,6 @@ int bfin_gpio_direction_output(unsigned gpio, int value); | |||
| 295 | int bfin_gpio_get_value(unsigned gpio); | 241 | int bfin_gpio_get_value(unsigned gpio); |
| 296 | void bfin_gpio_set_value(unsigned gpio, int value); | 242 | void bfin_gpio_set_value(unsigned gpio, int value); |
| 297 | 243 | ||
| 298 | #ifndef BF548_FAMILY | ||
| 299 | #define bfin_gpio_set_value(gpio, value) set_gpio_data(gpio, value) | ||
| 300 | #endif | ||
| 301 | |||
| 302 | #ifdef CONFIG_GPIOLIB | 244 | #ifdef CONFIG_GPIOLIB |
| 303 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | 245 | #include <asm-generic/gpio.h> /* cansleep wrappers */ |
| 304 | 246 | ||