From: "H. Nikolaus Schaller" <hns@goldelico.com>
To: "Ulf Hansson" <ulf.hansson@linaro.org>,
"Jérôme Pouiller" <jerome.pouiller@silabs.com>,
"Avri Altman" <avri.altman@wdc.com>,
"Shawn Lin" <shawn.lin@rock-chips.com>,
"Linus Walleij" <linus.walleij@linaro.org>,
"Tony Lindgren" <tony@atomide.com>,
"Bean Huo" <beanhuo@micron.com>,
"H. Nikolaus Schaller" <hns@goldelico.com>,
"Kiwoong Kim" <kwmad.kim@samsung.com>,
"Tian Tao" <tiantao6@hisilicon.com>,
"Andreas Kemnade" <andreas@kemnade.info>,
"Yang Li" <abaci-bugfix@linux.alibaba.com>
Cc: notasas@gmail.com, linux-mmc@vger.kernel.org,
linux-kernel@vger.kernel.org, letux-kernel@openphoenux.org,
kernel@pyra-handheld.com, linux-omap@vger.kernel.org
Subject: [PATCH 5/5] mmc: host: omap_hsmmc: revert special init for wl1251
Date: Tue, 9 Nov 2021 11:59:08 +0100 [thread overview]
Message-ID: <6f3cd3fca958b7dbdd9957ed369cd3733e85c95a.1636455548.git.hns@goldelico.com> (raw)
In-Reply-To: <cover.1636455548.git.hns@goldelico.com>
Replaces: commit f6498b922e57 ("mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card")
Requires: commit ("mmc: core: transplant ti,wl1251 quirks from to be retired omap_hsmmc")
After moving the wl1251 quirks from omap_hsmmc_init_card() to wl1251_quirk()
and sdio_card_init_methods[] we can remove omap_hsmmc_init_card() completely.
This also removes the specialization on the combination of omap_hsmmc and wl1251.
Related-to: commit f6498b922e57 ("mmc: host: omap_hsmmc: add code for special init of wl1251 to get rid of pandora_wl1251_init_card")
Related-to: commit 2398c41d6432 ("omap: pdata-quirks: remove openpandora quirks for mmc3 and wl1251")
Related-to: commit f9d50fef4b64 ("ARM: OMAP2+: omap3-pandora: add wifi support")
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
---
drivers/mmc/host/omap_hsmmc.c | 36 -----------------------------------
1 file changed, 36 deletions(-)
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6960e305e0a39..9749639ea8977 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1504,41 +1504,6 @@ static void omap_hsmmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
omap_hsmmc_set_bus_mode(host);
}
-static void omap_hsmmc_init_card(struct mmc_host *mmc, struct mmc_card *card)
-{
- struct omap_hsmmc_host *host = mmc_priv(mmc);
-
- if (card->type == MMC_TYPE_SDIO || card->type == MMC_TYPE_SD_COMBO) {
- struct device_node *np = mmc_dev(mmc)->of_node;
-
- /*
- * REVISIT: should be moved to sdio core and made more
- * general e.g. by expanding the DT bindings of child nodes
- * to provide a mechanism to provide this information:
- * Documentation/devicetree/bindings/mmc/mmc-card.txt
- */
-
- np = of_get_compatible_child(np, "ti,wl1251");
- if (np) {
- /*
- * We have TI wl1251 attached to MMC3. Pass this
- * information to the SDIO core because it can't be
- * probed by normal methods.
- */
-
- dev_info(host->dev, "found wl1251\n");
- card->quirks |= MMC_QUIRK_NONSTD_SDIO;
- card->cccr.wide_bus = 1;
- card->cis.vendor = 0x104c;
- card->cis.device = 0x9066;
- card->cis.blksize = 512;
- card->cis.max_dtr = 24000000;
- card->ocr = 0x80;
- of_node_put(np);
- }
- }
-}
-
static void omap_hsmmc_enable_sdio_irq(struct mmc_host *mmc, int enable)
{
struct omap_hsmmc_host *host = mmc_priv(mmc);
@@ -1667,7 +1632,6 @@ static struct mmc_host_ops omap_hsmmc_ops = {
.set_ios = omap_hsmmc_set_ios,
.get_cd = mmc_gpio_get_cd,
.get_ro = mmc_gpio_get_ro,
- .init_card = omap_hsmmc_init_card,
.enable_sdio_irq = omap_hsmmc_enable_sdio_irq,
};
--
2.33.0
prev parent reply other threads:[~2021-11-09 10:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-09 10:59 [PATCH 0/5] mmc: core: extend mmc_fixup_device and transplant ti,wl1251 quirks from to be retired omap_hsmmc H. Nikolaus Schaller
2021-11-09 10:59 ` [PATCH 1/5] mmc: core: rewrite mmc_fixup_device() H. Nikolaus Schaller
2021-11-09 10:59 ` [PATCH 2/5] mmc: core: allow to match the device tree to apply quirks H. Nikolaus Schaller
2021-11-09 11:20 ` Jérôme Pouiller
2021-11-09 10:59 ` [PATCH 3/5] mmc: core: provide macro and table " H. Nikolaus Schaller
2021-11-09 11:21 ` Jérôme Pouiller
2021-11-09 10:59 ` [PATCH 4/5] mmc: core: transplant ti,wl1251 quirks from to be retired omap_hsmmc H. Nikolaus Schaller
2021-11-09 10:59 ` H. Nikolaus Schaller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6f3cd3fca958b7dbdd9957ed369cd3733e85c95a.1636455548.git.hns@goldelico.com \
--to=hns@goldelico.com \
--cc=abaci-bugfix@linux.alibaba.com \
--cc=andreas@kemnade.info \
--cc=avri.altman@wdc.com \
--cc=beanhuo@micron.com \
--cc=jerome.pouiller@silabs.com \
--cc=kernel@pyra-handheld.com \
--cc=kwmad.kim@samsung.com \
--cc=letux-kernel@openphoenux.org \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=notasas@gmail.com \
--cc=shawn.lin@rock-chips.com \
--cc=tiantao6@hisilicon.com \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®