From patchwork Wed Oct 3 11:36:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 148050 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6349881lji; Wed, 3 Oct 2018 04:37:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV61u7vQweVqofLqY2ntFnaFMxl/bjgaifrNFFHsgENQ1yVWxv9MU1ObHExwZmIY0k6cUvzvu X-Received: by 2002:a63:9c3:: with SMTP id 186-v6mr1001458pgj.249.1538566653042; Wed, 03 Oct 2018 04:37:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538566653; cv=none; d=google.com; s=arc-20160816; b=j+CxoEk+t/++m6SEVpxannDMluxz6f2De5u2SuMEIfKyM0vponf92U4Fe5nWzVpfvY KIOpy9rOUrUyFZeUrenGt0UBn37r7I3KCewpg0o0cZJE+z0tVTLp8p8PvTTdmFLbw9p7 J3uS8ZOi9cZgXUtnR2oSL1YoIinDxYIwguJt6rWNFzjSDMfjFKpg6viroTycweY45Y95 O1QvTVGWZ31R24hJX4IzUJEsQTmdG9v8julDGnT1Y87SapzRTkPKAMgbec87K5I2MApE u2M2Zv1IMfLVysD3hrXJtLwxJ42y+Ye1afoGOFLRIpUwjbOhZdrIYPZAQOIMYDSW259s WIwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:dkim-filter; bh=3xT6ayLsUJs6m+vBGK/6yogwPyPjq131/KnWwukGn8o=; b=aRw7iKizu8UB2dfhJmVtMA/b8ORfZuqW7M0tNslapF9/AkKQs8s1wysAcTG3jdBWzq vI/2M0WijCWAFu5S5RfC4cP+2Hdmm87hqt0Cs9G5VStL6t34ISZc9P4JVrVUfhIRgBkA OTLYXPlRfp6n2i6jIQm/pKgBedBrlmbWz+UVwp4CWSP4eSBvy8Ldl81hSHLBdn3VMW2I zV8yuq4t3J/XuufmQgLQzuzrils7VmYM2SSqtdhErHATTjRm6MNyu6lyx8JNxenSTlGq OAiZvhRIxlbreXln2AwAt9O2HcRsapCLNL8PUXTuRp8xcil838jWrM2AfyviFA03O7Dy Yjjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="iHi/zBBf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k26-v6si1339215pfe.36.2018.10.03.04.37.32; Wed, 03 Oct 2018 04:37:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="iHi/zBBf"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727471AbeJCSZ0 (ORCPT + 32 others); Wed, 3 Oct 2018 14:25:26 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:27453 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726819AbeJCSZZ (ORCPT ); Wed, 3 Oct 2018 14:25:25 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id w93BaXuR004652; Wed, 3 Oct 2018 20:36:35 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com w93BaXuR004652 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1538566595; bh=3xT6ayLsUJs6m+vBGK/6yogwPyPjq131/KnWwukGn8o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iHi/zBBfxTuh9TJFsQVhBjkxU4sQIS+HFwnScrXUxJkQyN4nW/8vFCpLhFkwpKCuq 0c0EarXNPPAK8rhaNkyVfTrg0wCwfu7ODqr7zi8ra0RW/81YV0/N7yVr5CPzURPaks ON2coe1DvigWK4qyEQyZ/9usVkcuEMIKx2T7w3SAMu+VlWj0pW8maBay0uoe+4YP3v f0SXKym/0aM13GtYjdsCrBOXApHzdTkgu9OEFJ7Ggtc8tHeVKKvVnrkHhAHy9yi35J Rn12ekZ5WP/DpBzsaA26Lyw3M4QUw5N8mgHWUoyLAQBxDZuAZ9YRSozTOTo9d6lyjX l/YVH4dPustPg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Wolfram Sang , linux-mmc@vger.kernel.org Cc: Ulf Hansson , linux-renesas-soc@vger.kernel.org, Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v2 1/2] mmc: tmio: move MFD variant reset to a platform hook Date: Wed, 3 Oct 2018 20:36:26 +0900 Message-Id: <1538566587-29452-2-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1538566587-29452-1-git-send-email-yamada.masahiro@socionext.com> References: <1538566587-29452-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org CTL_RESET_SDIO register is specific to the TMIO MFD (tmio_mmc.c). Add a new hook host->reset for performing a platform-specific reset sequence, and move CTL_RESET_SDIO over there. Signed-off-by: Masahiro Yamada --- Changes in v2: - Preserve the current sequence for tmio_mmc.c drivers/mmc/host/tmio_mmc.c | 17 +++++++++++++++++ drivers/mmc/host/tmio_mmc.h | 1 + drivers/mmc/host/tmio_mmc_core.c | 8 +++----- 3 files changed, 21 insertions(+), 5 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c index e04c322..00d291c 100644 --- a/drivers/mmc/host/tmio_mmc.c +++ b/drivers/mmc/host/tmio_mmc.c @@ -78,6 +78,22 @@ static void tmio_mmc_set_clock(struct tmio_mmc_host *host, tmio_mmc_clk_start(host); } +static void tmio_mmc_reset(struct tmio_mmc_host *host) +{ + /* FIXME - should we set stop clock reg here */ + sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); + usleep_range(10000, 11000); + sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); + sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); + usleep_range(10000, 11000); + + if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { + sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); + sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); + } +} + #ifdef CONFIG_PM_SLEEP static int tmio_mmc_suspend(struct device *dev) { @@ -156,6 +172,7 @@ static int tmio_mmc_probe(struct platform_device *pdev) /* SD control register space size is 0x200, 0x400 for bus_shift=1 */ host->bus_shift = resource_size(res) >> 10; host->set_clock = tmio_mmc_set_clock; + host->reset = tmio_mmc_reset; host->mmc->f_max = pdata->hclk; host->mmc->f_min = pdata->hclk / 512; diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h index e6aa13a..a1a661b 100644 --- a/drivers/mmc/host/tmio_mmc.h +++ b/drivers/mmc/host/tmio_mmc.h @@ -176,6 +176,7 @@ struct tmio_mmc_host { int (*multi_io_quirk)(struct mmc_card *card, unsigned int direction, int blk_size); int (*write16_hook)(struct tmio_mmc_host *host, int addr); + void (*reset)(struct tmio_mmc_host *host); void (*hw_reset)(struct tmio_mmc_host *host); void (*prepare_tuning)(struct tmio_mmc_host *host, unsigned long tap); bool (*check_scc_error)(struct tmio_mmc_host *host); diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 0611824..9bcc760 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -164,19 +164,14 @@ static void tmio_mmc_reset(struct tmio_mmc_host *host) { /* FIXME - should we set stop clock reg here */ sd_ctrl_write16(host, CTL_RESET_SD, 0x0000); - if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) - sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0000); usleep_range(10000, 11000); sd_ctrl_write16(host, CTL_RESET_SD, 0x0001); - if (host->pdata->flags & TMIO_MMC_HAVE_HIGH_REG) - sd_ctrl_write16(host, CTL_RESET_SDIO, 0x0001); usleep_range(10000, 11000); if (host->pdata->flags & TMIO_MMC_SDIO_IRQ) { sd_ctrl_write16(host, CTL_SDIO_IRQ_MASK, host->sdio_irq_mask); sd_ctrl_write16(host, CTL_TRANSACTION_CTL, 0x0001); } - } static void tmio_mmc_reset_work(struct work_struct *work) @@ -1212,6 +1207,9 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) mmc->caps & MMC_CAP_NEEDS_POLL || !mmc_card_is_removable(mmc)); + if (!_host->reset) + _host->reset = tmio_mmc_reset; + /* * On Gen2+, eMMC with NONREMOVABLE currently fails because native * hotplug gets disabled. It seems RuntimePM related yet we need further