From patchwork Tue Jan 28 04:45:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3545081 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5701AC02DC for ; Tue, 28 Jan 2014 04:45:30 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8C54B20138 for ; Tue, 28 Jan 2014 04:45:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B55CE20127 for ; Tue, 28 Jan 2014 04:45:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253AbaA1Ep0 (ORCPT ); Mon, 27 Jan 2014 23:45:26 -0500 Received: from mail-pd0-f172.google.com ([209.85.192.172]:38256 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754046AbaA1Ep0 (ORCPT ); Mon, 27 Jan 2014 23:45:26 -0500 Received: by mail-pd0-f172.google.com with SMTP id p10so6609183pdj.31 for ; Mon, 27 Jan 2014 20:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:message-id:from:subject:user-agent:to:cc:in-reply-to :references:mime-version:content-type; bh=fYlsTw+LCay2saIo5Tynosd3WEmE+OaDgIZyXPxHyUc=; b=OUlYNSU4SDoCFmEIJLayCln6kJED6XX4X8aQSz5DhbZOWoBK3wOKC5iEkTXXnhclRu D608F7sM9KIwgDeX+NQaw1ahJAuvA0jwSq8f/1xkNfQkPJySLVY2MtxKx8Fg7Yxd49iY sdo6NbUvn6xExqOmWBOV2r+vmlDTSGgmsWbd/YVVj404AflCgoo2/oSbD/6aMlGCLxSB TJBd2Vmktsv1Jn7QJZ9U5HzYvhGxYCPYbK29yApLQJPhNQ0fHofaAO3FARs/Y+HuR/8p 1thJCACingFCEduVGV1/z+26AwX985dTPYqoFuBE+lyFXnXIxhPmn0ebGWJoeXtrX6Av gwFw== X-Received: by 10.66.121.68 with SMTP id li4mr34487005pab.33.1390884325527; Mon, 27 Jan 2014 20:45:25 -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 de3sm37400777pbb.33.2014.01.27.20.45.23 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 27 Jan 2014 20:45:24 -0800 (PST) Date: Mon, 27 Jan 2014 20:45:24 -0800 (PST) Message-ID: <87ha8o90kf.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 3/4] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7779 User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 To: Simon , Chris Ball Cc: Magnus , Linux-SH , linux-mmc@vger.kernel.org In-Reply-To: <87lhy090m0.wl%kuninori.morimoto.gx@gmail.com> References: <87lhy090m0.wl%kuninori.morimoto.gx@gmail.com> MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@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=unavailable 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], }, {}, };