diff options
-rw-r--r-- | arch/arm/mach-pxa/pxa930.c | 19 | ||||
-rw-r--r-- | arch/arm/plat-pxa/include/plat/mfp.h | 68 |
2 files changed, 86 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa930.c b/arch/arm/mach-pxa/pxa930.c index 71131742fffd..064292008288 100644 --- a/arch/arm/mach-pxa/pxa930.c +++ b/arch/arm/mach-pxa/pxa930.c | |||
@@ -176,13 +176,30 @@ static struct mfp_addr_map pxa930_mfp_addr_map[] __initdata = { | |||
176 | MFP_ADDR_END, | 176 | MFP_ADDR_END, |
177 | }; | 177 | }; |
178 | 178 | ||
179 | static struct mfp_addr_map pxa935_mfp_addr_map[] __initdata = { | ||
180 | MFP_ADDR(GPIO159, 0x0524), | ||
181 | MFP_ADDR(GPIO163, 0x0534), | ||
182 | MFP_ADDR(GPIO167, 0x0544), | ||
183 | MFP_ADDR(GPIO168, 0x0548), | ||
184 | MFP_ADDR(GPIO169, 0x054c), | ||
185 | MFP_ADDR(GPIO170, 0x0550), | ||
186 | MFP_ADDR(GPIO171, 0x0554), | ||
187 | MFP_ADDR(GPIO172, 0x0558), | ||
188 | MFP_ADDR(GPIO173, 0x055c), | ||
189 | |||
190 | MFP_ADDR_END, | ||
191 | }; | ||
192 | |||
179 | static int __init pxa930_init(void) | 193 | static int __init pxa930_init(void) |
180 | { | 194 | { |
181 | if (cpu_is_pxa930()) { | 195 | if (cpu_is_pxa930() || cpu_is_pxa935()) { |
182 | mfp_init_base(io_p2v(MFPR_BASE)); | 196 | mfp_init_base(io_p2v(MFPR_BASE)); |
183 | mfp_init_addr(pxa930_mfp_addr_map); | 197 | mfp_init_addr(pxa930_mfp_addr_map); |
184 | } | 198 | } |
185 | 199 | ||
200 | if (cpu_is_pxa935()) | ||
201 | mfp_init_addr(pxa935_mfp_addr_map); | ||
202 | |||
186 | return 0; | 203 | return 0; |
187 | } | 204 | } |
188 | 205 | ||
diff --git a/arch/arm/plat-pxa/include/plat/mfp.h b/arch/arm/plat-pxa/include/plat/mfp.h index 08ad665460ba..22086e696e8e 100644 --- a/arch/arm/plat-pxa/include/plat/mfp.h +++ b/arch/arm/plat-pxa/include/plat/mfp.h | |||
@@ -150,6 +150,74 @@ enum { | |||
150 | MFP_PIN_GPIO125, | 150 | MFP_PIN_GPIO125, |
151 | MFP_PIN_GPIO126, | 151 | MFP_PIN_GPIO126, |
152 | MFP_PIN_GPIO127, | 152 | MFP_PIN_GPIO127, |
153 | |||
154 | MFP_PIN_GPIO128, | ||
155 | MFP_PIN_GPIO129, | ||
156 | MFP_PIN_GPIO130, | ||
157 | MFP_PIN_GPIO131, | ||
158 | MFP_PIN_GPIO132, | ||
159 | MFP_PIN_GPIO133, | ||
160 | MFP_PIN_GPIO134, | ||
161 | MFP_PIN_GPIO135, | ||
162 | MFP_PIN_GPIO136, | ||
163 | MFP_PIN_GPIO137, | ||
164 | MFP_PIN_GPIO138, | ||
165 | MFP_PIN_GPIO139, | ||
166 | MFP_PIN_GPIO140, | ||
167 | MFP_PIN_GPIO141, | ||
168 | MFP_PIN_GPIO142, | ||
169 | MFP_PIN_GPIO143, | ||
170 | MFP_PIN_GPIO144, | ||
171 | MFP_PIN_GPIO145, | ||
172 | MFP_PIN_GPIO146, | ||
173 | MFP_PIN_GPIO147, | ||
174 | MFP_PIN_GPIO148, | ||
175 | MFP_PIN_GPIO149, | ||
176 | MFP_PIN_GPIO150, | ||
177 | MFP_PIN_GPIO151, | ||
178 | MFP_PIN_GPIO152, | ||
179 | MFP_PIN_GPIO153, | ||
180 | MFP_PIN_GPIO154, | ||
181 | MFP_PIN_GPIO155, | ||
182 | MFP_PIN_GPIO156, | ||
183 | MFP_PIN_GPIO157, | ||
184 | MFP_PIN_GPIO158, | ||
185 | MFP_PIN_GPIO159, | ||
186 | MFP_PIN_GPIO160, | ||
187 | MFP_PIN_GPIO161, | ||
188 | MFP_PIN_GPIO162, | ||
189 | MFP_PIN_GPIO163, | ||
190 | MFP_PIN_GPIO164, | ||
191 | MFP_PIN_GPIO165, | ||
192 | MFP_PIN_GPIO166, | ||
193 | MFP_PIN_GPIO167, | ||
194 | MFP_PIN_GPIO168, | ||
195 | MFP_PIN_GPIO169, | ||
196 | MFP_PIN_GPIO170, | ||
197 | MFP_PIN_GPIO171, | ||
198 | MFP_PIN_GPIO172, | ||
199 | MFP_PIN_GPIO173, | ||
200 | MFP_PIN_GPIO174, | ||
201 | MFP_PIN_GPIO175, | ||
202 | MFP_PIN_GPIO176, | ||
203 | MFP_PIN_GPIO177, | ||
204 | MFP_PIN_GPIO178, | ||
205 | MFP_PIN_GPIO179, | ||
206 | MFP_PIN_GPIO180, | ||
207 | MFP_PIN_GPIO181, | ||
208 | MFP_PIN_GPIO182, | ||
209 | MFP_PIN_GPIO183, | ||
210 | MFP_PIN_GPIO184, | ||
211 | MFP_PIN_GPIO185, | ||
212 | MFP_PIN_GPIO186, | ||
213 | MFP_PIN_GPIO187, | ||
214 | MFP_PIN_GPIO188, | ||
215 | MFP_PIN_GPIO189, | ||
216 | MFP_PIN_GPIO190, | ||
217 | MFP_PIN_GPIO191, | ||
218 | |||
219 | MFP_PIN_GPIO255 = 255, | ||
220 | |||
153 | MFP_PIN_GPIO0_2, | 221 | MFP_PIN_GPIO0_2, |
154 | MFP_PIN_GPIO1_2, | 222 | MFP_PIN_GPIO1_2, |
155 | MFP_PIN_GPIO2_2, | 223 | MFP_PIN_GPIO2_2, |