diff options
| author | Tony Lindgren <tony@atomide.com> | 2016-04-28 08:20:53 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2016-04-28 14:26:33 -0700 |
| commit | 10c1f7d32bf451d4309850c15ab1fdadccf92620 (patch) | |
| tree | 03f22db84c3299c431fed8ae647e94552b8eebc4 /arch/arm/mach-omap2 | |
| parent | 8453c5cafd32c4d6bd13ec4a62d4b639f4edb222 (diff) | |
ARM: OMAP2+: n900 needs MMC slot names for legacy user space
Let's pass the slot names in pdata like the legacy code does.
Once we have a generic DT binding for the slot names we can
switch to that.
Tested-by: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index f8d389d031ba..ea3a7d550ea9 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -21,6 +21,7 @@ #include <linux/regulator/fixed.h> #include <linux/platform_data/pinctrl-single.h> +#include <linux/platform_data/hsmmc-omap.h> #include <linux/platform_data/iommu-omap.h> #include <linux/platform_data/wkup_m3.h> #include <linux/platform_data/pwm_omap_dmtimer.h> @@ -37,6 +38,8 @@ #include "soc.h" #include "hsmmc.h" +static struct omap_hsmmc_platform_data __maybe_unused mmc_pdata[2]; + struct pdata_init { const char *compatible; void (*fn)(void); @@ -275,6 +278,8 @@ static struct platform_device rx51_lirc_device; static void __init nokia_n900_legacy_init(void) { hsmmc2_internal_input_clk(); + mmc_pdata[0].name = "external"; + mmc_pdata[1].name = "internal"; if (omap_type() == OMAP2_DEVICE_TYPE_SEC) { if (IS_ENABLED(CONFIG_ARM_ERRATA_430973)) { @@ -528,6 +533,8 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("ti,omap3-padconf", 0x48002a00, "48002a00.pinmux", &pcs_pdata), OF_DEV_AUXDATA("ti,omap2-iommu", 0x5d000000, "5d000000.mmu", &omap3_iommu_pdata), + OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x4809c000, "4809c000.mmc", &mmc_pdata[0]), + OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x480b4000, "480b4000.mmc", &mmc_pdata[1]), /* Only on am3517 */ OF_DEV_AUXDATA("ti,davinci_mdio", 0x5c030000, "davinci_mdio.0", NULL), OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0", |