diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-06-08 15:53:45 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-06 12:55:49 -0400 |
commit | 306208f40cde5f835e891976031571b81815b9df (patch) | |
tree | 084867d5c1c7c8e45d8d770267f6125966afd27f /arch/blackfin | |
parent | a13265af99c8c10c61b7713d62d8d163fbf30a94 (diff) |
Blackfin: add a GPIO_DEFAULT_BOOT_SPI_CS
This is parallel to the existing P_DEFAULT_BOOT_SPI_CS, but in terms of
the GPIO value so it can be used with the normal gpio API.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r-- | arch/blackfin/mach-bf518/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf538/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/portmux.h | 1 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/portmux.h | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/arch/blackfin/mach-bf518/include/mach/portmux.h b/arch/blackfin/mach-bf518/include/mach/portmux.h index 3af790828d9f..d39eb4b66de7 100644 --- a/arch/blackfin/mach-bf518/include/mach/portmux.h +++ b/arch/blackfin/mach-bf518/include/mach/portmux.h | |||
@@ -109,6 +109,7 @@ | |||
109 | #define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PF8) | P_FUNCT(2)) | 109 | #define P_SPI1_SSEL4 (P_DEFINED | P_IDENT(GPIO_PF8) | P_FUNCT(2)) |
110 | #define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(2)) | 110 | #define P_SPI1_SSEL5 (P_DEFINED | P_IDENT(GPIO_PG11) | P_FUNCT(2)) |
111 | 111 | ||
112 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PG15 | ||
112 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | 113 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 |
113 | 114 | ||
114 | /* SPORT Port Mux */ | 115 | /* SPORT Port Mux */ |
diff --git a/arch/blackfin/mach-bf527/include/mach/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index d4518b6f4adf..8e821db8e489 100644 --- a/arch/blackfin/mach-bf527/include/mach/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h | |||
@@ -79,6 +79,7 @@ | |||
79 | 79 | ||
80 | #define P_HWAIT (P_DONTCARE) | 80 | #define P_HWAIT (P_DONTCARE) |
81 | 81 | ||
82 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PG1 | ||
82 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | 83 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 |
83 | 84 | ||
84 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) | 85 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PG1) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf533/include/mach/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 075dae1af164..4af9195469bf 100644 --- a/arch/blackfin/mach-bf533/include/mach/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
@@ -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) |
diff --git a/arch/blackfin/mach-bf537/include/mach/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index da9760329e49..355e127bb8fa 100644 --- a/arch/blackfin/mach-bf537/include/mach/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) | 37 | #define P_PPI0_FS1 (P_DEFINED | P_IDENT(GPIO_PF9) | P_FUNCT(1)) |
38 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) | 38 | #define P_TACLK0 (P_DEFINED | P_IDENT(GPIO_PF14) | P_FUNCT(1)) |
39 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) | 39 | #define P_TMRCLK (P_DEFINED | P_IDENT(GPIO_PF15) | P_FUNCT(1)) |
40 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PF10 | ||
40 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | 41 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 |
41 | 42 | ||
42 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) | 43 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PG0) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf538/include/mach/portmux.h b/arch/blackfin/mach-bf538/include/mach/portmux.h index 0083ba13ee9e..b773c5fdbc72 100644 --- a/arch/blackfin/mach-bf538/include/mach/portmux.h +++ b/arch/blackfin/mach-bf538/include/mach/portmux.h | |||
@@ -108,6 +108,7 @@ | |||
108 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) | 108 | #define P_SPI0_SSEL2 (P_DEFINED | P_IDENT(GPIO_PF2)) |
109 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) | 109 | #define P_SPI0_SSEL1 (P_DEFINED | P_IDENT(GPIO_PF1)) |
110 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) | 110 | #define P_SPI0_SS (P_DEFINED | P_IDENT(GPIO_PF0)) |
111 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PF2 | ||
111 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | 112 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 |
112 | 113 | ||
113 | #endif /* _MACH_PORTMUX_H_ */ | 114 | #endif /* _MACH_PORTMUX_H_ */ |
diff --git a/arch/blackfin/mach-bf548/include/mach/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 89ad6a886362..89f282d52690 100644 --- a/arch/blackfin/mach-bf548/include/mach/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h | |||
@@ -131,6 +131,7 @@ | |||
131 | #define P_KEY_COL2 (P_DEFINED | P_IDENT(GPIO_PD14) | P_FUNCT(3)) | 131 | #define P_KEY_COL2 (P_DEFINED | P_IDENT(GPIO_PD14) | P_FUNCT(3)) |
132 | #define P_KEY_COL3 (P_DEFINED | P_IDENT(GPIO_PD15) | P_FUNCT(3)) | 132 | #define P_KEY_COL3 (P_DEFINED | P_IDENT(GPIO_PD15) | P_FUNCT(3)) |
133 | 133 | ||
134 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PE4 | ||
134 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 | 135 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL1 |
135 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PE0) | P_FUNCT(0)) | 136 | #define P_SPI0_SCK (P_DEFINED | P_IDENT(GPIO_PE0) | P_FUNCT(0)) |
136 | #define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(0)) | 137 | #define P_SPI0_MISO (P_DEFINED | P_IDENT(GPIO_PE1) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf561/include/mach/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index 3a7b46bbe849..56be4e8d1966 100644 --- a/arch/blackfin/mach-bf561/include/mach/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
@@ -91,6 +91,7 @@ | |||
91 | #define P_SPI0_MOSI (P_DONTCARE) | 91 | #define P_SPI0_MOSI (P_DONTCARE) |
92 | #define P_SPI0_MISO (P_DONTCARE) | 92 | #define P_SPI0_MISO (P_DONTCARE) |
93 | #define P_SPI0_SCK (P_DONTCARE) | 93 | #define P_SPI0_SCK (P_DONTCARE) |
94 | #define GPIO_DEFAULT_BOOT_SPI_CS GPIO_PF2 | ||
94 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 | 95 | #define P_DEFAULT_BOOT_SPI_CS P_SPI0_SSEL2 |
95 | 96 | ||
96 | #endif /* _MACH_PORTMUX_H_ */ | 97 | #endif /* _MACH_PORTMUX_H_ */ |