From patchwork Fri Feb 21 00:54:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 3692471 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 97DCCBF13A for ; Fri, 21 Feb 2014 00:55:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C414520179 for ; Fri, 21 Feb 2014 00:55:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F0C6B20173 for ; Fri, 21 Feb 2014 00:55:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932259AbaBUAzD (ORCPT ); Thu, 20 Feb 2014 19:55:03 -0500 Received: from mail-pb0-f46.google.com ([209.85.160.46]:48761 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932256AbaBUAzB (ORCPT ); Thu, 20 Feb 2014 19:55:01 -0500 Received: by mail-pb0-f46.google.com with SMTP id um1so2672741pbc.19 for ; Thu, 20 Feb 2014 16:54:59 -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:mime-version:to:cc :in-reply-to:references:content-type; bh=dtKWk5BcdDXOUCN6WPQYQIrTpyJOA7diDiYXWSLFcMY=; b=kPfPYr1fZ6akN1R8P9LB29X3ire1l8nz3loBMJXtUoVS3V5IFxee+ofVdcPJKn+Fwl 7nKXVdzm0+02Xd/B8PCv/tZ7NVkSZYEu2+T533M1NLwHQ0TV0/LvldjYeQ6p/ul/5R2x WZYvPC4ZWG6UXXbFuddXhjAmJpgcMtunMTE0lyiOrswnMNXDz5XebdXjmpTD+K89OpGJ XASvlSbmAfxdyNihMmZkkHLi4VrA+VnT7ShQGfkaHY0oB1E001Vx/GPwvCCuqxGZ7vke 68Fbkcf/ArNrTB9jyhLm8gjx+5IzBPX1zluywRAn3kORSxJNxODT6JrSs6a8SwfiFBem t+WA== X-Received: by 10.66.160.225 with SMTP id xn1mr5647540pab.108.1392944099488; Thu, 20 Feb 2014 16:54:59 -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 n6sm15380556pbj.22.2014.02.20.16.54.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 20 Feb 2014 16:54:58 -0800 (PST) Date: Thu, 20 Feb 2014 16:54:58 -0800 (PST) Message-ID: <8761o9qo80.wl%kuninori.morimoto.gx@gmail.com> From: Kuninori Morimoto Subject: [PATCH 2/5][RESENT] mmc: SDHI: update sh_mobile_sdhi_of_data for r8a7778 User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") To: Chris Ball Cc: Simon , Magnus , Linux-SH , linux-mmc@vger.kernel.org In-Reply-To: <878ut5qo9d.wl%kuninori.morimoto.gx@gmail.com> References: <87lhy090m0.wl%kuninori.morimoto.gx@gmail.com> <878ut5qo9d.wl%kuninori.morimoto.gx@gmail.com> 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.4 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 r8a7778 DT data to have SoC specific settings. Acked-by: Simon Horman Signed-off-by: Kuninori Morimoto --- drivers/mmc/host/sh_mobile_sdhi.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index a7a3f68..e956bc4 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -37,6 +37,7 @@ struct sh_mobile_sdhi_of_data { unsigned long tmio_flags; + unsigned long capabilities; }; static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = { @@ -45,13 +46,18 @@ static const struct sh_mobile_sdhi_of_data sh_mobile_sdhi_of_cfg[] = { }, }; +static const struct sh_mobile_sdhi_of_data of_rcar_gen1_compatible = { + .tmio_flags = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE, + .capabilities = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ, +}; + static const struct of_device_id sh_mobile_sdhi_of_match[] = { { .compatible = "renesas,sdhi-shmobile" }, { .compatible = "renesas,sdhi-sh7372" }, { .compatible = "renesas,sdhi-sh73a0", .data = &sh_mobile_sdhi_of_cfg[0], }, { .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 = &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-r8a7790", .data = &sh_mobile_sdhi_of_cfg[0], }, {}, @@ -212,6 +218,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) if (of_id && of_id->data) { const struct sh_mobile_sdhi_of_data *of_data = of_id->data; mmc_data->flags |= of_data->tmio_flags; + mmc_data->capabilities |= of_data->capabilities; } /* SD control register space size is 0x100, 0x200 for bus_shift=1 */