diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-12 09:09:06 -0400 |
| commit | 239060b93bb30a4ad55f1ecaa512464a035cc5ba (patch) | |
| tree | 77f79810e57d4fc24356eca0cd6db463e8994128 /arch/blackfin/mach-bf533/include/mach/portmux.h | |
| parent | 1408b15b98635a13bad2e2a50b3c2ae2ccdf625b (diff) | |
| parent | e9203c988234aa512bd45ca32b52e21c7bbfc414 (diff) | |
Merge branch 'kbuild/rc-fixes' into kbuild/kconfig
We need to revert the temporary hack in 71ebc01, hence the merge.
Diffstat (limited to 'arch/blackfin/mach-bf533/include/mach/portmux.h')
| -rw-r--r-- | arch/blackfin/mach-bf533/include/mach/portmux.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf533/include/mach/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 075dae1af164..96f5d9129f20 100644 --- a/arch/blackfin/mach-bf533/include/mach/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
| 8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
| 9 | 9 | ||
| 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
| 11 | 11 | ||
| 12 | #define P_PPI0_CLK (P_DONTCARE) | 12 | #define P_PPI0_CLK (P_DONTCARE) |
| 13 | #define P_PPI0_FS1 (P_DONTCARE) | 13 | #define P_PPI0_FS1 (P_DONTCARE) |
| @@ -60,6 +60,7 @@ | |||
| 60 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) | 60 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) |
| 61 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) | 61 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) |
| 62 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) | 62 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) |
| 63 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PF2 | ||
| 63 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | 64 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 |
| 64 | 65 | ||
| 65 | #define P_TMR2 (P_DONTCARE) | 66 | #define P_TMR2 (P_DONTCARE) |