From patchwork Sat Mar 23 12:58:09 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2324641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 27CC83FC8A for ; Sat, 23 Mar 2013 13:01:55 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJO2V-0007DS-IK; Sat, 23 Mar 2013 12:59:15 +0000 Received: from mail-ee0-f52.google.com ([74.125.83.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UJO1a-0006u4-CU for linux-arm-kernel@lists.infradead.org; Sat, 23 Mar 2013 12:58:19 +0000 Received: by mail-ee0-f52.google.com with SMTP id d49so42883eek.11 for ; Sat, 23 Mar 2013 05:58:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=BsH9ve0ILedzH6UGA+bq2MZRIyb28YYVb9nkigpCQ14=; b=byePub9kZfAkw8IdR1draS46gN4rxP35BNLuR3LA3ORXLIvOeg1LszkNvHL7GbDMqK uP5f8elFAEYacJuv/Ig0H/juc7ZCwUs+i2hjyMaLcya4Z5/wori1D1366TmBI2Suoh9z ialSc04SUn31aZdbljzKQaHbazbPJxhmolR75gA3cAfC9FS7X4QNB/x1mwGHrKmxfpQ7 JYF1Fi+lRMsn3Ut8xYncH6q7n+d76aK2H+x5Mf9JXmWrqp90GIkCXOIxrh1yiZp7dfm2 oCecNx8iYjylu3N3yVWfj0xTG54jhbCuOT+UWd7HOmwBo50Mm/ViufG4VKR43jc3znCy dXCw== X-Received: by 10.14.1.130 with SMTP id 2mr14393263eed.15.1364043496854; Sat, 23 Mar 2013 05:58:16 -0700 (PDT) Received: from nijin.lan (dslc-082-083-223-114.pools.arcor-ip.net. [82.83.223.114]) by mx.google.com with ESMTPS id u44sm8283734eel.7.2013.03.23.05.58.15 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 23 Mar 2013 05:58:16 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH] ARM: kirkwood: make use of DT mvsdio on guruplug board Date: Sat, 23 Mar 2013 13:58:09 +0100 Message-Id: <1364043489-17683-1-git-send-email-sebastian.hesselbarth@gmail.com> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130323_085818_600188_3BC015A5 X-CRM114-Status: GOOD ( 12.64 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.52 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (sebastian.hesselbarth[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Andrew Lunn , Russell King , Jason Cooper , linux-kernel@vger.kernel.org, Soeren Moch , Willy Tarreau , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Device tree based guruplug boards still use mvsdio platform_data and kirkwood_sdio_init to enable sdio. DT support for sdio is already there, so make use of it. This also fixes mvsdio accidentially breaking nand by configuring mpp0 to gpio, while used also by nand (nand_io2 on mpp0). Signed-off-by: Sebastian Hesselbarth Tested-by: Soeren Moch Acked-by: Andrew Lunn --- Cc: Soeren Moch Cc: Jason Cooper Cc: Andrew Lunn Cc: Russell King Cc: Willy Tarreau Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts | 4 ++++ arch/arm/mach-kirkwood/board-guruplug.c | 6 ------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts index 9555a86..44fd97d 100644 --- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts +++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts @@ -69,6 +69,10 @@ status = "okay"; nr-ports = <1>; }; + + mvsdio@90000 { + status = "okay"; + }; }; gpio-leds { diff --git a/arch/arm/mach-kirkwood/board-guruplug.c b/arch/arm/mach-kirkwood/board-guruplug.c index 0a0df45..a857163 100644 --- a/arch/arm/mach-kirkwood/board-guruplug.c +++ b/arch/arm/mach-kirkwood/board-guruplug.c @@ -13,7 +13,6 @@ #include #include #include -#include #include "common.h" static struct mv643xx_eth_platform_data guruplug_ge00_data = { @@ -24,10 +23,6 @@ static struct mv643xx_eth_platform_data guruplug_ge01_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(1), }; -static struct mvsdio_platform_data guruplug_mvsdio_data = { - /* unfortunately the CD signal has not been connected */ -}; - void __init guruplug_dt_init(void) { /* @@ -35,5 +30,4 @@ void __init guruplug_dt_init(void) */ kirkwood_ge00_init(&guruplug_ge00_data); kirkwood_ge01_init(&guruplug_ge01_data); - kirkwood_sdio_init(&guruplug_mvsdio_data); }