History

ARM: OMAP2: HSMMC: explicit fields to declare cover/card detect pin

board-rx51 has no card detect pin in the mmc slot, but can detect that the (cell-phone) cover has been removed and the card is accessible. The semantics between cover/card detect differ, the gpio on the slot informs you after the card has been removed, cover removal does not necessarily mean that the card has been removed. This means different code paths are necessary. To complete this we also want different fields in the platform data for cover and card detect. This separation is not pushed all the way down into struct omap2_hsmmc_info which is used to initialize the platform data. If we did that we had to go over all board files and set the new gpio_cod pin to -EINVAL. If we forget one board or some out-of-tree archicture forgets that the default '0' is used which is a valid pin number.

Andreas Fenkart committed 11 years ago

Commit b7a56461 parent 40433263 files · +33 −17Browse files

Unified · Split

3 files
  1. arch/arm/mach-omap2/hsmmc.c +25 −8
  2. drivers/mmc/host/omap_hsmmc.c +6 −5
  3. include/linux/platform_data/hsmmc-omap.h +2 −4
arch/arm/mach-omap2/hsmmc.c+25−8
@@ -150,9 +150,13 @@ static int nop_mmc_set_power(struct device *dev, int power_on, int vdd) · 149 unmodified lines
150static inline void omap_hsmmc_mux(struct omap_hsmmc_platform_data150static inline void omap_hsmmc_mux(struct omap_hsmmc_platform_data
151 *mmc_controller, int controller_nr)151 *mmc_controller, int controller_nr)
152{152{
153 if (gpio_is_valid(mmc_controller->switch_pin) &&153 if (gpio_is_valid(mmc_controller->gpio_cd) &&
154 (mmc_controller->switch_pin < OMAP_MAX_GPIO_LINES))154 (mmc_controller->gpio_cd < OMAP_MAX_GPIO_LINES))
155 omap_mux_init_gpio(mmc_controller->switch_pin,155 omap_mux_init_gpio(mmc_controller->gpio_cd,
156 OMAP_PIN_INPUT_PULLUP);
157 if (gpio_is_valid(mmc_controller->gpio_cod) &&
158 (mmc_controller->gpio_cod < OMAP_MAX_GPIO_LINES))
159 omap_mux_init_gpio(mmc_controller->gpio_cod,
156 OMAP_PIN_INPUT_PULLUP);160 OMAP_PIN_INPUT_PULLUP);
157 if (gpio_is_valid(mmc_controller->gpio_wp) &&161 if (gpio_is_valid(mmc_controller->gpio_wp) &&
158 (mmc_controller->gpio_wp < OMAP_MAX_GPIO_LINES))162 (mmc_controller->gpio_wp < OMAP_MAX_GPIO_LINES))
@@ -250,15 +254,20 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, · 91 unmodified lines
250 mmc->internal_clock = !c->ext_clock;254 mmc->internal_clock = !c->ext_clock;
251 mmc->reg_offset = 0;255 mmc->reg_offset = 0;
252 256
253 mmc->switch_pin = c->gpio_cd;257 if (c->cover_only) {
258 /* detect if mobile phone cover removed */
259 mmc->gpio_cd = -EINVAL;
260 mmc->gpio_cod = c->gpio_cd;
261 } else {
262 /* card detect pin on the mmc socket itself */
263 mmc->gpio_cd = c->gpio_cd;
264 mmc->gpio_cod = -EINVAL;
265 }
254 mmc->gpio_wp = c->gpio_wp;266 mmc->gpio_wp = c->gpio_wp;
255 267
256 mmc->remux = c->remux;268 mmc->remux = c->remux;
257 mmc->init_card = c->init_card;269 mmc->init_card = c->init_card;
258 270
259 if (c->cover_only)
260 mmc->cover = 1;
261
262 if (c->nonremovable)271 if (c->nonremovable)
263 mmc->nonremovable = 1;272 mmc->nonremovable = 1;
264 273
@@ -358,7 +367,15 @@ void omap_hsmmc_late_init(struct omap2_hsmmc_info *c) · 93 unmodified lines
358 if (!mmc_pdata)367 if (!mmc_pdata)
359 continue;368 continue;
360 369
361 mmc_pdata->switch_pin = c->gpio_cd;370 if (c->cover_only) {
371 /* detect if mobile phone cover removed */
372 mmc_pdata->gpio_cd = -EINVAL;
373 mmc_pdata->gpio_cod = c->gpio_cd;
374 } else {
375 /* card detect pin on the mmc socket itself */
376 mmc_pdata->gpio_cd = c->gpio_cd;
377 mmc_pdata->gpio_cod = -EINVAL;
378 }
362 mmc_pdata->gpio_wp = c->gpio_wp;379 mmc_pdata->gpio_wp = c->gpio_wp;
363 380
364 res = omap_device_register(pdev);381 res = omap_device_register(pdev);
drivers/mmc/host/omap_hsmmc.c+6−5
@@ -427,15 +427,15 @@ static int omap_hsmmc_gpio_init(struct mmc_host *mmc, · 426 unmodified lines
427{427{
428 int ret;428 int ret;
429 429
430 if (pdata->cover && gpio_is_valid(pdata->switch_pin)) {430 if (gpio_is_valid(pdata->gpio_cod)) {
431 ret = mmc_gpio_request_cd(mmc, pdata->switch_pin, 0);431 ret = mmc_gpio_request_cd(mmc, pdata->gpio_cod, 0);
432 if (ret)432 if (ret)
433 return ret;433 return ret;
434 434
435 host->get_cover_state = omap_hsmmc_get_cover_state;435 host->get_cover_state = omap_hsmmc_get_cover_state;
436 mmc_gpio_set_cd_isr(mmc, omap_hsmmc_cover_irq);436 mmc_gpio_set_cd_isr(mmc, omap_hsmmc_cover_irq);
437 } else if (!pdata->cover && gpio_is_valid(pdata->switch_pin)) {437 } else if (gpio_is_valid(pdata->gpio_cd)) {
438 ret = mmc_gpio_request_cd(mmc, pdata->switch_pin, 0);438 ret = mmc_gpio_request_cd(mmc, pdata->gpio_cd, 0);
439 if (ret)439 if (ret)
440 return ret;440 return ret;
441 441
@@ -1920,7 +1920,8 @@ static struct omap_hsmmc_platform_data *of_get_hsmmc_pdata(struct device *dev) · 1478 unmodified lines
1920 if (of_find_property(np, "ti,dual-volt", NULL))1920 if (of_find_property(np, "ti,dual-volt", NULL))
1921 pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;1921 pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT;
1922 1922
1923 pdata->switch_pin = -EINVAL;1923 pdata->gpio_cd = -EINVAL;
1924 pdata->gpio_cod = -EINVAL;
1924 pdata->gpio_wp = -EINVAL;1925 pdata->gpio_wp = -EINVAL;
1925 1926
1926 if (of_find_property(np, "ti,non-removable", NULL)) {1927 if (of_find_property(np, "ti,non-removable", NULL)) {
include/linux/platform_data/hsmmc-omap.h+2−4
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data { · 54 unmodified lines
55 u32 caps; /* Used for the MMC driver on 2430 and later */55 u32 caps; /* Used for the MMC driver on 2430 and later */
56 u32 pm_caps; /* PM capabilities of the mmc */56 u32 pm_caps; /* PM capabilities of the mmc */
57 57
58 /* switch pin can be for card detect (default) or card cover */
59 unsigned cover:1;
60
61 /* use the internal clock */58 /* use the internal clock */
62 unsigned internal_clock:1;59 unsigned internal_clock:1;
63 60
@@ -73,7 +70,8 @@ struct omap_hsmmc_platform_data { · 9 unmodified lines
73#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)70#define HSMMC_HAS_HSPE_SUPPORT (1 << 2)
74 unsigned features;71 unsigned features;
75 72
76 int switch_pin; /* gpio (card detect) */73 int gpio_cd; /* gpio (card detect) */
74 int gpio_cod; /* gpio (cover detect) */
77 int gpio_wp; /* gpio (write protect) */75 int gpio_wp; /* gpio (write protect) */
78 76
79 int (*set_power)(struct device *dev, int power_on, int vdd);77 int (*set_power)(struct device *dev, int power_on, int vdd);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t