diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2023-05-08 23:20:07 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-07-19 16:35:47 +0200 |
| commit | feb0ac7960911808a630dd702a39515442c8a9eb (patch) | |
| tree | b973037060909cbe54666d25f0a7e2ece5969ae3 /include/linux | |
| parent | 1a6d8fab9d4aa3de978c426b844978a8eafa63b8 (diff) | |
| download | linux-stable-feb0ac7960911808a630dd702a39515442c8a9eb.tar.gz linux-stable-feb0ac7960911808a630dd702a39515442c8a9eb.tar.bz2 linux-stable-feb0ac7960911808a630dd702a39515442c8a9eb.zip | |
ARM/mmc: Convert old mmci-omap to GPIO descriptors
[ Upstream commit e519f0bb64efc2c9c8b67bb2d114dda458bdc34d ]
A recent change to the OMAP driver making it use a dynamic GPIO
base created problems with some old OMAP1 board files, among
them Nokia 770, SX1 and also the OMAP2 Nokia n8x0.
Fix up all instances of GPIOs being used for the MMC driver
by pushing the handling of power, slot selection and MMC
"cover" into the driver as optional GPIOs.
This is maybe not the most perfect solution as the MMC
framework have some central handlers for some of the
stuff, but it at least makes the situtation better and
solves the immediate issue.
Fixes: 92bf78b33b0b ("gpio: omap: use dynamic allocation of base")
Acked-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/platform_data/mmc-omap.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h index 91051e9907f3..054d0c3c5ec5 100644 --- a/include/linux/platform_data/mmc-omap.h +++ b/include/linux/platform_data/mmc-omap.h @@ -20,8 +20,6 @@ struct omap_mmc_platform_data { * maximum frequency on the MMC bus */ unsigned int max_freq; - /* switch the bus to a new slot */ - int (*switch_slot)(struct device *dev, int slot); /* initialize board-specific MMC functionality, can be NULL if * not supported */ int (*init)(struct device *dev); |