From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: [PATCH 2/2] mmc: omap_hsmmc: Check if MMC slot name is passed in pdata Date: Tue, 26 Apr 2016 16:46:23 -0700 Message-ID: <1461714383-9956-3-git-send-email-tony@atomide.com> References: <1461714383-9956-1-git-send-email-tony@atomide.com> Return-path: Received: from muru.com ([72.249.23.125]:52325 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754844AbcDZXqi (ORCPT ); Tue, 26 Apr 2016 19:46:38 -0400 In-Reply-To: <1461714383-9956-1-git-send-email-tony@atomide.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Aaro Koskinen , Ivaylo Dimitrov , Sebastian Reichel , Pavel Machel , Timo Kokkonen , Ulf Hansson , Kishon Vijay Abraham I , linux-mmc@vger.kernel.org The legacy user space for n900 relies on the MMC slot names. Let's check if those are passed in pdata and use them. Then when we have a generic MMC slot name binding we can switch to use that assuming it works for the n900 legacy user space too. As this makes the DT booting compatible with legacy booting, we should be able to start dropping omap3 legacy booting support in v4.8. Cc: Ulf Hansson Cc: Kishon Vijay Abraham I Cc: linux-mmc@vger.kernel.org Signed-off-by: Tony Lindgren --- Ulf, this is safe to pick separately to the MMC tree if it looks acceptable to you. drivers/mmc/host/omap_hsmmc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index e9d75c6..3563321 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -1946,13 +1946,17 @@ MODULE_DEVICE_TABLE(of, omap_mmc_of_match); static struct omap_hsmmc_platform_data *of_get_hsmmc_pdata(struct device *dev) { - struct omap_hsmmc_platform_data *pdata; + struct omap_hsmmc_platform_data *pdata, *legacy; struct device_node *np = dev->of_node; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) return ERR_PTR(-ENOMEM); /* out of memory */ + legacy = dev_get_platdata(dev); + if (legacy && legacy->name) + pdata->name = legacy->name; + if (of_find_property(np, "ti,dual-volt", NULL)) pdata->controller_flags |= OMAP_HSMMC_SUPPORTS_DUAL_VOLT; -- 2.8.1