From patchwork Tue Apr 26 23:46:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 8949341 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AED16BF440 for ; Tue, 26 Apr 2016 23:46:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C7F5320121 for ; Tue, 26 Apr 2016 23:46:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BEE47201FE for ; Tue, 26 Apr 2016 23:46:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754730AbcDZXqk (ORCPT ); Tue, 26 Apr 2016 19:46:40 -0400 Received: from muru.com ([72.249.23.125]:52315 "EHLO muru.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754798AbcDZXqh (ORCPT ); Tue, 26 Apr 2016 19:46:37 -0400 Received: from sampyla.monkeybrains.net (localhost [127.0.0.1]) by muru.com (Postfix) with ESMTP id 5869B82C7; Tue, 26 Apr 2016 23:48:00 +0000 (UTC) From: Tony Lindgren To: linux-omap@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Aaro Koskinen , Ivaylo Dimitrov , Sebastian Reichel , Pavel Machel , Timo Kokkonen , Kishon Vijay Abraham I , linux-mmc@vger.kernel.org, Ulf Hansson Subject: [PATCH 1/2] ARM: OMAP2+: n900 needs MMC slot names for legacy user space Date: Tue, 26 Apr 2016 16:46:22 -0700 Message-Id: <1461714383-9956-2-git-send-email-tony@atomide.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1461714383-9956-1-git-send-email-tony@atomide.com> References: <1461714383-9956-1-git-send-email-tony@atomide.com> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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. Signed-off-by: Tony Lindgren Acked-by: Pavel Machek --- arch/arm/mach-omap2/pdata-quirks.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index a935d28..cfaf45f 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -35,6 +36,8 @@ #include "soc.h" #include "hsmmc.h" +static struct __maybe_unused omap_hsmmc_platform_data mmc_pdata[2]; + struct pdata_init { const char *compatible; void (*fn)(void); @@ -271,6 +274,8 @@ static struct platform_device omap3_rom_rng_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)) { @@ -497,6 +502,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",