diff options
author | Ahmad Fatoum <a.fatoum@pengutronix.de> | 2020-06-02 10:00:47 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-06-03 09:18:07 +0200 |
commit | d576796c40aeb7c41691a94d38ef1884d5303f5b (patch) | |
tree | bc5839fd033bf53f0e94c19b5cd1638983f30969 /drivers | |
parent | c10b20dc83ac25b1d81c39eaad4529d9911813b1 (diff) | |
download | barebox-d576796c40aeb7c41691a94d38ef1884d5303f5b.tar.gz barebox-d576796c40aeb7c41691a94d38ef1884d5303f5b.tar.xz |
mci: define fall-back hw_dev->detect for all MCIs
A barebox environment oftree node may reference its storage by a phandle
to a partition node under a MCI node. barebox will then call the
device's detect method to detect the card if this hasn't happened
before. Out of 17 MCI drivers, 8 host drivers already implement
a detect method, which just calls mci_detect_card.
Provide a generic implementation that does the same.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mci/mci-core.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c index e8844a3c00..a58dedc1cd 100644 --- a/drivers/mci/mci-core.c +++ b/drivers/mci/mci-core.c @@ -1811,6 +1811,18 @@ static int mci_detect(struct device_d *dev) return mci_detect_card(mci->host); } +static int mci_hw_detect(struct device_d *dev) +{ + struct mci *mci; + + list_for_each_entry(mci, &mci_list, list) { + if (dev == mci->host->hw_dev) + return mci_detect_card(mci->host); + } + + return -ENODEV; +} + /** * Create a new mci device (for convenience) * @param host mci_host for this MCI device @@ -1819,6 +1831,7 @@ static int mci_detect(struct device_d *dev) int mci_register(struct mci_host *host) { struct mci *mci; + struct device_d *hw_dev; struct param_d *param_probe; int ret; @@ -1833,13 +1846,16 @@ int mci_register(struct mci_host *host) mci->dev.id = DEVICE_ID_DYNAMIC; } + hw_dev = host->hw_dev; mci->dev.platform_data = host; - mci->dev.parent = host->hw_dev; + mci->dev.parent = hw_dev; mci->host = host; host->mci = mci; mci->dev.detect = mci_detect; + if (!hw_dev->detect) + hw_dev->detect = mci_hw_detect; - host->supply = regulator_get(host->hw_dev, "vmmc"); + host->supply = regulator_get(hw_dev, "vmmc"); if (IS_ERR(host->supply)) { dev_err(&mci->dev, "Failed to get 'vmmc' regulator.\n"); host->supply = NULL; @@ -1849,7 +1865,7 @@ int mci_register(struct mci_host *host) if (ret) goto err_free; - dev_info(mci->host->hw_dev, "registered as %s\n", dev_name(&mci->dev)); + dev_info(hw_dev, "registered as %s\n", dev_name(&mci->dev)); param_probe = dev_add_param_bool(&mci->dev, "probe", mci_set_probe, NULL, &mci->probe, mci); |