From patchwork Mon Nov 12 14:12:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 150843 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3190958ljp; Mon, 12 Nov 2018 06:13:03 -0800 (PST) X-Google-Smtp-Source: AJdET5f+udu2xCU94cyOZHYdtUkTdMfQra9Dod9k+QREeaLfAESoQaX99FmV1y4JiaXl655dbkKD X-Received: by 2002:a63:1444:: with SMTP id 4mr979183pgu.430.1542031982871; Mon, 12 Nov 2018 06:13:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542031982; cv=none; d=google.com; s=arc-20160816; b=hQ54KBn22Ej2KNUXsfXWttKzDdZaII6Ufrc21mu/dRVRge8NA3IZtqxD3rnLwmmFWa lGqf/yZrMoYdkeNl0QVbUXIfGMnInRmA1RPGPGc+PedimT7Cw3m7tL/lqWu21EhTER0r gOFrJ1lyep++zseHhCMqV+rdODb8EV40sye80cawoX7UVOM+BJu21tt9F4f5u6SHTSQh AaxhCG9USxfb7kBfKxm1jsj7nBkUErJCsYarGQpDFqv7o4Fj67fd5P5B2wC39o8EWeKC vlSF+VkLxBrpZ6AjGGu/AGML3MhwGjdPGVbDtxuA31ucOzBCmMpzz87k1kiw6/zT34nS gMmA== 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; bh=qkZwlfqSP1GOA5zKMvcQHayGFcaoX0T0U5rEkTSpe7o=; b=agHC9UHri+6WeL226KlYSGB22HSD8KM7UHbxAFfhVYp5IVq86ggEMHFLXwCwsB1hXu jkEvIgYW9M54tKQ0Pf4rxB6UhcrwQ7ncSufTswrFPlB7O2WYVXQY5hOFi/skSR3D+0Y8 sAFvykg9Kd0RPoGxKczAqz6WmqemzOawLIH2O/f4mzrhJ9TVFDH+ME6N9Sl6pwVIjEN/ CfZzb/z4VgWb+YCvyP36gb+KeZkqw/EFF1dPcxpzRW6CKw+j+BDPOqjJlRgc5nmL7kUY 04m5k+IUAI5xGLWC1Ykq925ziJOa781a0JbbRPCkhnyUjUzuCxxbwO3Sv3G/6srUzMc3 eBBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=It6XBGzN; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h68-v6si19277640pfb.142.2018.11.12.06.13.02; Mon, 12 Nov 2018 06:13:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-mmc-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=@linaro.org header.s=google header.b=It6XBGzN; spf=pass (google.com: best guess record for domain of linux-mmc-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-mmc-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729770AbeKMAG2 (ORCPT + 5 others); Mon, 12 Nov 2018 19:06:28 -0500 Received: from mail-lf1-f65.google.com ([209.85.167.65]:43263 "EHLO mail-lf1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727103AbeKMAG2 (ORCPT ); Mon, 12 Nov 2018 19:06:28 -0500 Received: by mail-lf1-f65.google.com with SMTP id u18so6256656lff.10 for ; Mon, 12 Nov 2018 06:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qkZwlfqSP1GOA5zKMvcQHayGFcaoX0T0U5rEkTSpe7o=; b=It6XBGzNHUZFMuWZDUlZ6i9/kixzhOmKvbewst++2huRSA/9pFFde/sxb11VvoIiCC WpOXnGB+Ko9hHLIGND98jK8XsDqrNDJCUUbq1YY14YQlC2q8zWv8BznUFN0REDNPrhK/ 2UbvQwERyxYhx610mhR91uj7stp2jWMqS+xQI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qkZwlfqSP1GOA5zKMvcQHayGFcaoX0T0U5rEkTSpe7o=; b=fdHPacCzd9qcDuQjM3MK1sQMGEIxvwrg37ZsJxgdnX64T8MYCdD+un1FRrd8+Z7/KY DhXl7Z6HV4btTFu0n8i43O81NPOJ88pvcYu6enOF6asfWS1BXRwbC/NQib4AMG4VK6Te bgPC6p589f6PSDDoY8S/6Lm14CO20HJdO49Jih7WPS4SZfW3KLi+sKyccwHeUK5J0Lw9 YZJI+mPKldIoPoS0rV7/u5Bm5mEbkficDmNUZjbwLailDekkUbuC2LLQH2QXOFvGjqgk sBX7kxC453kr6ceBsE+jQrRRsMg2QL/yhdvUxs/1DHCecheRh+pCM7sDHxxlLG5iUXvf EgeA== X-Gm-Message-State: AGRZ1gLJpTO9xIEe16rmeWJs3UNMTSuvRuAjXhx2nzQ/to+risF6uER9 qNhrdFi7yNlIEvrrFCUxdETZb68nEB+a9g== X-Received: by 2002:a19:9fcd:: with SMTP id i196mr724186lfe.82.1542031978598; Mon, 12 Nov 2018 06:12:58 -0800 (PST) Received: from genomnajs.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id m14-v6sm3056889lji.29.2018.11.12.06.12.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 12 Nov 2018 06:12:57 -0800 (PST) From: Linus Walleij To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Linus Walleij , Kuninori Morimoto , Laurent Pinchart Subject: [PATCH 05/10] mmc: host: tmio: Use GPIO descriptors Date: Mon, 12 Nov 2018 15:12:34 +0100 Message-Id: <20181112141239.19646-6-linus.walleij@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181112141239.19646-1-linus.walleij@linaro.org> References: <20181112141239.19646-1-linus.walleij@linaro.org> Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The TMIO MMC driver was passing global GPIO numbers around for card detect. It turns out only one single board in the kernel was actually making use of this feature so it is pretty easy to convert the driver to use only GPIO descriptors. The lines are flagged as GPIO_ACTIVE_LOW as that is what they are, but this will be ignored by the MMC slot GPIO code that uses the *raw accessors and rely on the caps2 flag for any inversion semantics. Cc: Kuninori Morimoto Cc: Laurent Pinchart Signed-off-by: Linus Walleij --- Kuninori/Laurent: any tests/ACKs appreciated. --- arch/sh/boards/mach-ecovec24/setup.c | 26 ++++++++++++++++++++++---- drivers/mmc/host/tmio_mmc_core.c | 12 +++++++----- include/linux/mfd/tmio.h | 9 ++------- 3 files changed, 31 insertions(+), 16 deletions(-) -- 2.17.2 diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 3097307b7cb7..af2c28946319 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -696,13 +696,20 @@ static struct gpiod_lookup_table sdhi0_power_gpiod_table = { }, }; +static struct gpiod_lookup_table sdhi0_gpio_table = { + .dev_id = "sh_mobile_sdhi.0", + .table = { + /* Card detect */ + GPIO_LOOKUP("sh7724_pfc", GPIO_PTY7, "cd", GPIO_ACTIVE_LOW), + { }, + }, +}; + static struct tmio_mmc_data sdhi0_info = { .chan_priv_tx = (void *)SHDMA_SLAVE_SDHI0_TX, .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI0_RX, .capabilities = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD | MMC_CAP_NEEDS_POLL, - .flags = TMIO_MMC_USE_GPIO_CD, - .cd_gpio = GPIO_PTY7, }; static struct resource sdhi0_resources[] = { @@ -735,8 +742,15 @@ static struct tmio_mmc_data sdhi1_info = { .chan_priv_rx = (void *)SHDMA_SLAVE_SDHI1_RX, .capabilities = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD | MMC_CAP_NEEDS_POLL, - .flags = TMIO_MMC_USE_GPIO_CD, - .cd_gpio = GPIO_PTW7, +}; + +static struct gpiod_lookup_table sdhi1_gpio_table = { + .dev_id = "sh_mobile_sdhi.1", + .table = { + /* Card detect */ + GPIO_LOOKUP("sh7724_pfc", GPIO_PTW7, "cd", GPIO_ACTIVE_LOW), + { }, + }, }; static struct resource sdhi1_resources[] = { @@ -1445,6 +1459,10 @@ static int __init arch_setup(void) gpiod_add_lookup_table(&cn12_power_gpiod_table); #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE) gpiod_add_lookup_table(&sdhi0_power_gpiod_table); + gpiod_add_lookup_table(&sdhi0_gpio_table); +#endif +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE) + gpiod_add_lookup_table(&sdhi1_gpio_table); #endif return platform_add_devices(ecovec_devices, diff --git a/drivers/mmc/host/tmio_mmc_core.c b/drivers/mmc/host/tmio_mmc_core.c index 8d64f6196f33..487b88dceff4 100644 --- a/drivers/mmc/host/tmio_mmc_core.c +++ b/drivers/mmc/host/tmio_mmc_core.c @@ -1167,11 +1167,13 @@ int tmio_mmc_host_probe(struct tmio_mmc_host *_host) if (ret < 0) return ret; - if (pdata->flags & TMIO_MMC_USE_GPIO_CD) { - ret = mmc_gpio_request_cd(mmc, pdata->cd_gpio, 0); - if (ret) - return ret; - } + /* + * Look for a card detect GPIO, if it fails with anything + * else than a probe deferral, just live without it. + */ + ret = mmc_gpiod_request_cd(mmc, "cd", 0, false, 0, NULL); + if (ret == -EPROBE_DEFER) + return ret; mmc->caps |= MMC_CAP_4_BIT_DATA | pdata->capabilities; mmc->caps2 |= pdata->capabilities2; diff --git a/include/linux/mfd/tmio.h b/include/linux/mfd/tmio.h index 1e70060c92ce..e2687a30e5a1 100644 --- a/include/linux/mfd/tmio.h +++ b/include/linux/mfd/tmio.h @@ -54,12 +54,8 @@ * idle before writing to some registers. */ #define TMIO_MMC_HAS_IDLE_WAIT BIT(4) -/* - * A GPIO is used for card hotplug detection. We need an extra flag for this, - * because 0 is a valid GPIO number too, and requiring users to specify - * cd_gpio < 0 to disable GPIO hotplug would break backwards compatibility. - */ -#define TMIO_MMC_USE_GPIO_CD BIT(5) + +/* BIT(5) is unused */ /* * Some controllers have CMD12 automatically @@ -104,7 +100,6 @@ struct tmio_mmc_data { unsigned long capabilities2; unsigned long flags; u32 ocr_mask; /* available voltages */ - unsigned int cd_gpio; int alignment_shift; dma_addr_t dma_rx_offset; unsigned int max_blk_count;