From patchwork Thu Sep 27 15:12:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11766 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7FB6623E54 for ; Thu, 27 Sep 2012 15:12:25 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 21F8CA1887C for ; Thu, 27 Sep 2012 15:12:25 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so4450868iej.11 for ; Thu, 27 Sep 2012 08:12:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=z5StgIjgmquWouGpUe/GhFXyaHMP60XgneOxNtSVci4=; b=fa1QzlEzi6dhYxCAcOVAMLKctLxMRYYWK4C9njOQo7uFyC3VjG0biBoMdbcOsiF3Nn ItmJ0KFIVfrqS4k1llymHGlKEFGkMoI/Ewcun4Tr6jrKNBiO3gzhKGy+G7LMPjvMLTOL h6H2q7iSqBl9yKpqjCRUSn8OD2xfVoIuC5Ya/kuMJnbWVehsnLbuJqur0hjIMUvZbDr2 z3hd29pqqfbeZMh+OUbgWznrt5VXswcssvhM6T36ipZEHrYHS3qjyTatYvC4W7HatkBL P/N+lCE5HdX9fI7kKV6jsyCfP/c6t73uY1W+WSAPaz0eLAMBxkodPR59HdGRodFq5L6i xP/w== Received: by 10.50.184.129 with SMTP id eu1mr3947669igc.0.1348758744923; Thu, 27 Sep 2012 08:12:24 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp420830igc; Thu, 27 Sep 2012 08:12:23 -0700 (PDT) Received: by 10.180.78.40 with SMTP id y8mr9128328wiw.7.1348758742631; Thu, 27 Sep 2012 08:12:22 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id m1si41087331wic.40.2012.09.27.08.12.22 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:22 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wgi16 with SMTP id 16so1362335wgi.31 for ; Thu, 27 Sep 2012 08:12:22 -0700 (PDT) Received: by 10.216.206.152 with SMTP id l24mr1569412weo.66.1348758742135; Thu, 27 Sep 2012 08:12:22 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id t7sm13643780wix.6.2012.09.27.08.12.20 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 27 Sep 2012 08:12:21 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, Lee Jones Subject: [PATCH 2/7] ARM: ux500: Add SDI (MMC) support to the HREF Device Tree Date: Thu, 27 Sep 2012 16:12:01 +0100 Message-Id: <1348758726-25336-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> References: <1348758726-25336-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmFl2AI2vJBbwYg42CDU1xzyFCCTT1NTfaeINPVQCRKvzixJTkjY071LAuryL3CPOHMUwvS Here we add the Device Tree nodes which are required to successfully probe the MMCI driver which will enable the four cards available on ST-Ericsson's HREF hardware development platform. Acked-by: Linus Walleij Signed-off-by: Lee Jones --- arch/arm/boot/dts/hrefv60plus.dts | 44 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-ux500/board-mop500.c | 1 - 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts index e2213204..3fd83c6 100644 --- a/arch/arm/boot/dts/hrefv60plus.dts +++ b/arch/arm/boot/dts/hrefv60plus.dts @@ -77,6 +77,50 @@ }; }; + // External Micro SD slot + sdi0_per1@80126000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <50000000>; + bus-width = <4>; + mmc-cap-sd-highspeed; + mmc-cap-mmc-highspeed; + vmmc-supply = <&ab8500_ldo_aux3_reg>; + + cd-gpios = <&tc3589x_gpio 3 0x4>; + + status = "okay"; + }; + + // WLAN SDIO channel + sdi1_per2@80118000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <50000000>; + bus-width = <4>; + + status = "okay"; + }; + + // PoP:ed eMMC + sdi2_per3@80005000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <50000000>; + bus-width = <8>; + mmc-cap-mmc-highspeed; + + status = "okay"; + }; + + // On-board eMMC + sdi4_per2@80114000 { + arm,primecell-periphid = <0x10480180>; + max-frequency = <50000000>; + bus-width = <8>; + mmc-cap-mmc-highspeed; + vmmc-supply = <&ab8500_ldo_aux2_reg>; + + status = "okay"; + }; + sound { compatible = "stericsson,snd-soc-mop500"; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 4eedf1c..38e53b2 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -818,7 +818,6 @@ static void __init u8500_init_machine(void) platform_add_devices(mop500_platform_devs, ARRAY_SIZE(mop500_platform_devs)); - mop500_sdi_init(parent); mop500_audio_init(parent); i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);