From patchwork Mon Dec 16 04:50:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3351941 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 424909F32E for ; Mon, 16 Dec 2013 04:50:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66A3020379 for ; Mon, 16 Dec 2013 04:50:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8AC8A2034D for ; Mon, 16 Dec 2013 04:50:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752514Ab3LPEuH (ORCPT ); Sun, 15 Dec 2013 23:50:07 -0500 Received: from mail-pa0-f44.google.com ([209.85.220.44]:33838 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752240Ab3LPEuG (ORCPT ); Sun, 15 Dec 2013 23:50:06 -0500 Received: by mail-pa0-f44.google.com with SMTP id fa1so2435675pad.3 for ; Sun, 15 Dec 2013 20:50:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:to:cc:in-reply-to:references:from:subject :user-agent:mime-version:content-type; bh=fYlsTw+LCay2saIo5Tynosd3WEmE+OaDgIZyXPxHyUc=; b=UssZFveM/djzPeQQOT58XZC+zhKb/PVmjC36po79kmp7tqc158DTRIpPmBXh7HHWUj bMW11q+TREUF/4TseaNJK1LCXsWQjLbTdP4w9ceQyoa0ejoeYerDXv+QIMmRMkv/cYWd SInmjX2d73nR+/nNY2ES6naXDIs8ovKtrVSuF6Rd6gcea10bE9uF5t0R16XEXyrYfRDX tLRlWm3sFF/mtLQYT9RXHf4t6Y+RxIGp9LV9yd5/JPjC0ezWmgUmAOpOH1AHYCbER+xu MtzD6QVzrURSqVshYlCjb3j1SHq8/b1vTBXbcSM9iLXZquvxzau6kO2pv2ErkKXryFPQ xzsw== X-Received: by 10.68.237.228 with SMTP id vf4mr17914458pbc.131.1387169405547; Sun, 15 Dec 2013 20:50:05 -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 ik1sm22912655pbc.9.2013.12.15.20.50.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 15 Dec 2013 20:50:04 -0800 (PST) Date: Sun, 15 Dec 2013 20:50:04 -0800 (PST) Message-ID: <8761qp1jt3.wl%kuninori.morimoto.gx@gmail.com> To: Simon Cc: Ben Dooks , Magnus , linux-sh@vger.kernel.org, Kuninori Morimoto In-Reply-To: <87a9g11jxt.wl%kuninori.morimoto.gx@gmail.com> References: <87a9g11jxt.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 3/6][RFC] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7779 User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 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=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 From: Kuninori Morimoto 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 d0561d4..2105059 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -220,8 +220,6 @@ reg = <0xffe4c000 0x100>; interrupt-parent = <&gic>; interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -230,8 +228,6 @@ reg = <0xffe4d000 0x100>; interrupt-parent = <&gic>; interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -240,8 +236,6 @@ reg = <0xffe4e000 0x100>; interrupt-parent = <&gic>; interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -250,8 +244,6 @@ reg = <0xffe4f000 0x100>; interrupt-parent = <&gic>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; - 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 6442286..322cd35 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], }, {}, };