From patchwork Mon Oct 1 10:43:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11883 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 B288023E57 for ; Mon, 1 Oct 2012 10:44:09 +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 6A3FAA18ADA for ; Mon, 1 Oct 2012 10:44:09 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so11252231iej.11 for ; Mon, 01 Oct 2012 03:44:09 -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=BuC78lYzse7oq/Pwk068JTUYPDQ30/G53JlLjbrvK1zyUXowTD4bTuV+e3fgI1oP5E 67uPILayadg1VI9deyzZoH6vB2UpTT7DBblqWKUw6wVT5p0pW2Uu9S4RdBDvPbU/pZuA SEu2HV7sGQdqIAAjMCilFEwalG+3JK1zTZ1sl4UgqzKsGxEUnE+nD/8kZ0aQtCIXYkDf M47CSVoA/JhYxmFHf9IHgCyXVgOCG5B4tpRvqRnH2ZElTSvCUmvzFHYwIW6VMOMpIHAp fgqqz8C5G3LG65/3sWI96GSVm2GQ+bg8lLpwPDaI0X2fydU/GnC9453YQqoI5FwXiYh2 i57Q== Received: by 10.50.184.129 with SMTP id eu1mr5330274igc.0.1349088249181; Mon, 01 Oct 2012 03:44:09 -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 ex8csp17888igc; Mon, 1 Oct 2012 03:44:08 -0700 (PDT) Received: by 10.216.241.200 with SMTP id g50mr7383946wer.79.1349088246949; Mon, 01 Oct 2012 03:44:06 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id k54si20202023wec.81.2012.10.01.03.44.06 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:06 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wibhr7 with SMTP id hr7so1832521wib.13 for ; Mon, 01 Oct 2012 03:44:06 -0700 (PDT) Received: by 10.216.134.218 with SMTP id s68mr8071872wei.72.1349088246236; Mon, 01 Oct 2012 03:44:06 -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 v3sm15856944wiw.7.2012.10.01.03.44.04 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 03:44:05 -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: Mon, 1 Oct 2012 11:43:43 +0100 Message-Id: <1349088228-8582-3-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> References: <1349088228-8582-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlFpBX2+rGIz6p1ZLNq514pTxNO5QM1KueVr2rPJW4hEO4MgtGxW4ueI8I55e/NQZLIugiv 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);