diff options
author | Sahitya Tummala <stummala@codeaurora.org> | 2011-05-02 08:37:43 -0400 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2011-10-26 15:43:37 -0400 |
commit | 4a92fe80becbbee650cfad8457ad0e5cd97ed974 (patch) | |
tree | 1a08d4869b1119a85109825d7a8cf8525557bc8f /arch/arm/mach-msm | |
parent | 514d9eda92654430369060b91f7472bb198e7904 (diff) |
msm: mmc: Remove "pio_irq" resource
On some targets, MCI_IRQ_MASK1 is not routed to the MSM in which
case only "cmd_irq" must be used even for PIO. With this change,
all the targets will use only "cmd_irq" for both CMD and PIO.
Signed-off-by: Sahitya Tummala <stummala@codeaurora.org>
Signed-off-by: David Brown <davidb@codeaurora.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r-- | arch/arm/mach-msm/devices-msm7x00.c | 24 | ||||
-rw-r--r-- | arch/arm/mach-msm/devices-qsd8x50.c | 24 |
2 files changed, 0 insertions, 48 deletions
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c index c4f5e26feb4..993780f490a 100644 --- a/arch/arm/mach-msm/devices-msm7x00.c +++ b/arch/arm/mach-msm/devices-msm7x00.c | |||
@@ -176,12 +176,6 @@ static struct resource resources_sdc1[] = { | |||
176 | .name = "cmd_irq", | 176 | .name = "cmd_irq", |
177 | }, | 177 | }, |
178 | { | 178 | { |
179 | .start = INT_SDC1_1, | ||
180 | .end = INT_SDC1_1, | ||
181 | .flags = IORESOURCE_IRQ, | ||
182 | .name = "pio_irq", | ||
183 | }, | ||
184 | { | ||
185 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 179 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
186 | .name = "status_irq" | 180 | .name = "status_irq" |
187 | }, | 181 | }, |
@@ -204,12 +198,6 @@ static struct resource resources_sdc2[] = { | |||
204 | .flags = IORESOURCE_IRQ, | 198 | .flags = IORESOURCE_IRQ, |
205 | .name = "cmd_irq", | 199 | .name = "cmd_irq", |
206 | }, | 200 | }, |
207 | { | ||
208 | .start = INT_SDC2_1, | ||
209 | .end = INT_SDC2_1, | ||
210 | .flags = IORESOURCE_IRQ, | ||
211 | .name = "pio_irq", | ||
212 | }, | ||
213 | { | 201 | { |
214 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 202 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
215 | .name = "status_irq" | 203 | .name = "status_irq" |
@@ -233,12 +221,6 @@ static struct resource resources_sdc3[] = { | |||
233 | .flags = IORESOURCE_IRQ, | 221 | .flags = IORESOURCE_IRQ, |
234 | .name = "cmd_irq", | 222 | .name = "cmd_irq", |
235 | }, | 223 | }, |
236 | { | ||
237 | .start = INT_SDC3_1, | ||
238 | .end = INT_SDC3_1, | ||
239 | .flags = IORESOURCE_IRQ, | ||
240 | .name = "pio_irq", | ||
241 | }, | ||
242 | { | 224 | { |
243 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 225 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
244 | .name = "status_irq" | 226 | .name = "status_irq" |
@@ -262,12 +244,6 @@ static struct resource resources_sdc4[] = { | |||
262 | .flags = IORESOURCE_IRQ, | 244 | .flags = IORESOURCE_IRQ, |
263 | .name = "cmd_irq", | 245 | .name = "cmd_irq", |
264 | }, | 246 | }, |
265 | { | ||
266 | .start = INT_SDC4_1, | ||
267 | .end = INT_SDC4_1, | ||
268 | .flags = IORESOURCE_IRQ, | ||
269 | .name = "pio_irq", | ||
270 | }, | ||
271 | { | 247 | { |
272 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 248 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
273 | .name = "status_irq" | 249 | .name = "status_irq" |
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c index 12d8deb78d9..131633b12a3 100644 --- a/arch/arm/mach-msm/devices-qsd8x50.c +++ b/arch/arm/mach-msm/devices-qsd8x50.c | |||
@@ -140,12 +140,6 @@ static struct resource resources_sdc1[] = { | |||
140 | .name = "cmd_irq", | 140 | .name = "cmd_irq", |
141 | }, | 141 | }, |
142 | { | 142 | { |
143 | .start = INT_SDC1_1, | ||
144 | .end = INT_SDC1_1, | ||
145 | .flags = IORESOURCE_IRQ, | ||
146 | .name = "pio_irq", | ||
147 | }, | ||
148 | { | ||
149 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 143 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
150 | .name = "status_irq" | 144 | .name = "status_irq" |
151 | }, | 145 | }, |
@@ -168,12 +162,6 @@ static struct resource resources_sdc2[] = { | |||
168 | .flags = IORESOURCE_IRQ, | 162 | .flags = IORESOURCE_IRQ, |
169 | .name = "cmd_irq", | 163 | .name = "cmd_irq", |
170 | }, | 164 | }, |
171 | { | ||
172 | .start = INT_SDC2_1, | ||
173 | .end = INT_SDC2_1, | ||
174 | .flags = IORESOURCE_IRQ, | ||
175 | .name = "pio_irq", | ||
176 | }, | ||
177 | { | 165 | { |
178 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 166 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
179 | .name = "status_irq" | 167 | .name = "status_irq" |
@@ -197,12 +185,6 @@ static struct resource resources_sdc3[] = { | |||
197 | .flags = IORESOURCE_IRQ, | 185 | .flags = IORESOURCE_IRQ, |
198 | .name = "cmd_irq", | 186 | .name = "cmd_irq", |
199 | }, | 187 | }, |
200 | { | ||
201 | .start = INT_SDC3_1, | ||
202 | .end = INT_SDC3_1, | ||
203 | .flags = IORESOURCE_IRQ, | ||
204 | .name = "pio_irq", | ||
205 | }, | ||
206 | { | 188 | { |
207 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 189 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
208 | .name = "status_irq" | 190 | .name = "status_irq" |
@@ -226,12 +208,6 @@ static struct resource resources_sdc4[] = { | |||
226 | .flags = IORESOURCE_IRQ, | 208 | .flags = IORESOURCE_IRQ, |
227 | .name = "cmd_irq", | 209 | .name = "cmd_irq", |
228 | }, | 210 | }, |
229 | { | ||
230 | .start = INT_SDC4_1, | ||
231 | .end = INT_SDC4_1, | ||
232 | .flags = IORESOURCE_IRQ, | ||
233 | .name = "pio_irq", | ||
234 | }, | ||
235 | { | 211 | { |
236 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, | 212 | .flags = IORESOURCE_IRQ | IORESOURCE_DISABLED, |
237 | .name = "status_irq" | 213 | .name = "status_irq" |