From patchwork Tue Aug 30 21:09:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 9306061 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 2C5DE601C0 for ; Tue, 30 Aug 2016 21:10:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1B29528D4C for ; Tue, 30 Aug 2016 21:10:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0FD7628D5B; Tue, 30 Aug 2016 21:10:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B542728D4C for ; Tue, 30 Aug 2016 21:10:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756549AbcH3VK0 (ORCPT ); Tue, 30 Aug 2016 17:10:26 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:45906 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758615AbcH3VK0 (ORCPT ); Tue, 30 Aug 2016 17:10:26 -0400 Received: from penelope.kanocho.kobe.vergenet.net (52D9BC73.cm-11-1c.dynamic.ziggo.nl [82.217.188.115]) by kirsty.vergenet.net (Postfix) with ESMTPSA id 3EAB525BE94; Wed, 31 Aug 2016 07:10:18 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1472591418; bh=DBT+b0UXHFgabfLNaOMCvjJc9Miw+2NSChv/OIS2uPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bncRB1WXgpFknZ7LvOc1MZcTp4Q2FiWBMAOL1F9hXhWNNgV1ASkQwrvYZqLY2omp5 PmSVHHywAhCYyG+7ahP55r9NFqFj7OzwLnERsy4rjhFcSwUCu1AeLJu3awNhKPprHY blD2vzmK9RosvcNDmBdkfxGlXNfoSIYfxCXImdDg= Received: by penelope.kanocho.kobe.vergenet.net (Postfix, from userid 7100) id B94EE66E93; Tue, 30 Aug 2016 23:10:14 +0200 (CEST) From: Simon Horman To: Wolfram Sang , Ulf Hansson Cc: Magnus Damm , linux-mmc@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Ai Kyuse , Simon Horman Subject: [PATCH v5 03/11] mmc: tmio: Add hw reset support Date: Tue, 30 Aug 2016 23:09:51 +0200 Message-Id: <1472591399-13907-4-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.7.0.rc3.207.g0ac5344 In-Reply-To: <1472591399-13907-1-git-send-email-horms+renesas@verge.net.au> References: <1472591399-13907-1-git-send-email-horms+renesas@verge.net.au> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ai Kyuse Add hw reset support. Signed-off-by: Ai Kyuse Signed-off-by: Simon Horman --- This is required by tuning support which will be introduced by follow-up patches. v5 [Simon Horman] * As suggested by Ulf Hansson - Broke out of a larger patch --- drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_pio.c | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index 4b36cb5c2d9c..4b71f31fba63 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -164,6 +164,7 @@ struct tmio_mmc_host { int (*start_signal_voltage_switch)(struct mmc_host *mmc, struct mmc_ios *ios); int (*write16_hook)(struct tmio_mmc_host *host, int addr); + void (*hw_reset)(struct tmio_mmc_host *host); }; struct tmio_mmc_host *tmio_mmc_host_alloc(struct platform_device *pdev); diff --git a/drivers/mmc/host/tmio_mmc_pio.c b/drivers/mmc/host/tmio_mmc_pio.c index 806308ac93e7..90758647bae6 100644 --- a/drivers/mmc/host/tmio_mmc_pio.c +++ b/drivers/mmc/host/tmio_mmc_pio.c @@ -756,6 +756,17 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host, return 0; } +static void tmio_mmc_hw_reset(struct mmc_host *mmc) +{ + struct tmio_mmc_host *host = mmc_priv(mmc); + + if (host->hw_reset) + host->hw_reset(host); + + mmc_retune_timer_stop(host->mmc); + mmc_retune_needed(host->mmc); +} + /* Process requests from the MMC layer */ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq) { @@ -970,6 +981,7 @@ static struct mmc_host_ops tmio_mmc_ops = { .get_cd = mmc_gpio_get_cd, .enable_sdio_irq = tmio_mmc_enable_sdio_irq, .multi_io_quirk = tmio_multi_io_quirk, + .hw_reset = tmio_mmc_hw_reset, }; static int tmio_mmc_init_ocr(struct tmio_mmc_host *host)