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: 1514821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 6CFE0DF266 for ; Thu, 27 Sep 2012 15:15:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1THFlm-0001rP-PS; Thu, 27 Sep 2012 15:12:55 +0000 Received: from mail-wi0-f171.google.com ([209.85.212.171]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1THFlH-0001hw-6x for linux-arm-kernel@lists.infradead.org; Thu, 27 Sep 2012 15:12:23 +0000 Received: by wibhj13 with SMTP id hj13so2634872wib.0 for ; Thu, 27 Sep 2012 08:12:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=z5StgIjgmquWouGpUe/GhFXyaHMP60XgneOxNtSVci4=; b=kNqvmaobGq/muIkmTwCUb2SKzHv34MfiGcuROO60WAdYeO9bDl1qIgMi/cIYMKVDNk 7JGj6lKikAC55I++7WWz5JnlyrpmPj/5XYDsT7cr7bWaZxzqviIpDbm4nbm1bitM5ZLa t1Hhy4NYPHAB7QYaBJrhjvMz934j4c5XNIhdHSSOoMV/0N4IoANvrGIoWbgXUthkX7Da GydnwNesLRys5BzGzspQSg3JluyvIgRR+ww0Ual568XcDzc32ZctJ5efT8ZRZhEDNtXL uJpO95JhuJvTGhaM2yWsXuvZjFhGbdj4y+vRKIJpoQtoIa+BxKfc8y2IUzHN/WtrhdXY 5bJQ== 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 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: ALoCoQmClUtmUENpWlWhsWPpbWuAnM2CkuFOgeru15FlWeVvcwOkn5ZFw0QNZAIu82vjV43a1zAw X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.171 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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);