From patchwork Thu Nov 14 10:32:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3181751 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 537379F3A0 for ; Thu, 14 Nov 2013 10:32:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 35C3520977 for ; Thu, 14 Nov 2013 10:32:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8B44220174 for ; Thu, 14 Nov 2013 10:32:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752978Ab3KNKcw (ORCPT ); Thu, 14 Nov 2013 05:32:52 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:47472 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753274Ab3KNKcj (ORCPT ); Thu, 14 Nov 2013 05:32:39 -0500 Received: by mail-pb0-f46.google.com with SMTP id un15so1845467pbc.19 for ; Thu, 14 Nov 2013 02:32:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:sender:message-id:to:cc:in-reply-to:references:from:subject :mime-version:content-type; bh=2YAM+vztQZUjLUT9E89/8al16unegtUFnkrilLwSVTY=; b=bG6TcuEGvHDA2O3li2tA9d/3IPTqEVLG9KIzbMDD5n/nQo9EL2VgYxOT3s3vpVivRa /APg3GixFr00SbrTMN3KQVsF9k7vviB02Od3iVc4d6xnwCzFXCHDr9ETKodOTsBmmiTi 2t2Zj6vggbA4NwW6Oquz33CDOgRZHCtRoZABr4Xci1bRktxEErrX6sCWJfYiUzXImduO sQlbifgiyey8s+Hha40bcIOWKoNcB4XxHx8OVt2E+vDzOXl3oZCNaTlflH44LpiyUIqt rG9slCPa5kwzs8laqu9bMvagNGQQBVdbL6+li9akb5HmGh2f1ohj1lwkEwk9xyrMBEgC JOOw== X-Received: by 10.69.31.1 with SMTP id ki1mr721828pbd.124.1384425159064; Thu, 14 Nov 2013 02:32:39 -0800 (PST) Received: from morimoto-Dell-XPS420.gmail.com (49.14.32.202.bf.2iij.net. [202.32.14.49]) by mx.google.com with ESMTPSA id gg10sm50528285pbc.46.2013.11.14.02.32.36 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 14 Nov 2013 02:32:38 -0800 (PST) Date: Thu, 14 Nov 2013 02:32:38 -0800 (PST) Message-ID: <87wqkbxohp.wl%kuninori.morimoto.gx@renesas.com> To: Chris Ball Cc: Simon , Laurent , Magnus , Linux-SH , Kuninori Morimoto , linux-mmc@vger.kernel.org In-Reply-To: <8761rvz37d.wl%kuninori.morimoto.gx@renesas.com> References: <87li0rz3to.wl%kuninori.morimoto.gx@renesas.com> <8761rvz37d.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 14/17] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7779 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 This patch updates r8a7779 DT data to have SoC specific settings. Latest Renesas Chip has some SDHI channels and the WP pin availability depends on its channel or HW implementation. Thus, this patch disables it as default, but we can use wp-gpios property to enable it. Signed-off-by: Kuninori Morimoto --- arch/arm/boot/dts/r8a7779.dtsi | 8 -------- drivers/mmc/host/sh_mobile_sdhi.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 05fd41c..084132e 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -212,8 +212,6 @@ reg = <0xffe4c000 0x100>; interrupt-parent = <&gic>; interrupts = <0 104 4>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -222,8 +220,6 @@ reg = <0xffe4d000 0x100>; interrupt-parent = <&gic>; interrupts = <0 105 4>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -232,8 +228,6 @@ reg = <0xffe4e000 0x100>; interrupt-parent = <&gic>; interrupts = <0 107 4>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -242,8 +236,6 @@ reg = <0xffe4f000 0x100>; interrupt-parent = <&gic>; interrupts = <0 106 4>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; }; diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index dc97027..9cffca1 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -58,7 +58,7 @@ static const struct of_device_id sh_mobile_sdhi_of_match[] = { { .compatible = "renesas,sdhi-r8a73a4", .data = &sh_mobile_sdhi_of_cfg[0], }, { .compatible = "renesas,sdhi-r8a7740", .data = &sh_mobile_sdhi_of_cfg[0], }, { .compatible = "renesas,sdhi-r8a7778", .data = &of_rcar_gen1_compatible, }, - { .compatible = "renesas,sdhi-r8a7779", .data = &sh_mobile_sdhi_of_cfg[0], }, + { .compatible = "renesas,sdhi-r8a7779", .data = &of_rcar_gen1_compatible, }, { .compatible = "renesas,sdhi-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, {}, };