* [PATCH 0/4] remove devm_pinctrl_get_select_default from drivers
@ 2013-10-13 16:17 Wolfram Sang
2013-10-13 16:17 ` [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe Wolfram Sang
0 siblings, 1 reply; 3+ messages in thread
From: Wolfram Sang @ 2013-10-13 16:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Wolfram Sang, alsa-devel, dri-devel, linux-kernel, linux-mmc,
linux-omap, linux-pwm
The core does this automatically, no need to do this explicitly in drivers.
Those patchces should go via the respective subtrees. Thanks!
Wolfram Sang (4):
drivers/gpu/drm/tilcdc: don't use devm_pinctrl_get_select_default() in
probe
drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe
drivers/pwm: don't use devm_pinctrl_get_select_default() in probe
sound/soc/atmel: don't use devm_pinctrl_get_select_default() in probe
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 ------
drivers/gpu/drm/tilcdc/tilcdc_slave.c | 6 ------
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 ------
drivers/mmc/host/mvsdio.c | 7 +------
drivers/mmc/host/omap_hsmmc.c | 7 -------
drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
drivers/pwm/pwm-tiecap.c | 6 ------
drivers/pwm/pwm-tiehrpwm.c | 6 ------
sound/soc/atmel/atmel_wm8904.c | 8 --------
9 files changed, 1 insertion(+), 59 deletions(-)
--
1.8.4.rc3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe
2013-10-13 16:17 [PATCH 0/4] remove devm_pinctrl_get_select_default from drivers Wolfram Sang
@ 2013-10-13 16:17 ` Wolfram Sang
2013-10-14 7:28 ` Romain Izard
0 siblings, 1 reply; 3+ messages in thread
From: Wolfram Sang @ 2013-10-13 16:17 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Wolfram Sang, Nicolas Pitre, Chris Ball, Balaji T K, linux-mmc,
linux-kernel, linux-omap
Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
we can rely on device core for setting the default pins. Compile tested only.
Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
---
drivers/mmc/host/mvsdio.c | 7 +------
drivers/mmc/host/omap_hsmmc.c | 7 -------
drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 06c5b0b..8c9f448 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -25,7 +25,6 @@
#include <linux/of_irq.h>
#include <linux/mmc/host.h>
#include <linux/mmc/slot-gpio.h>
-#include <linux/pinctrl/consumer.h>
#include <asm/sizes.h>
#include <asm/unaligned.h>
@@ -685,7 +684,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
const struct mbus_dram_target_info *dram;
struct resource *r;
int ret, irq;
- struct pinctrl *pinctrl;
+ int gpio_card_detect, gpio_write_protect;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
@@ -702,10 +701,6 @@ static int __init mvsd_probe(struct platform_device *pdev)
host->mmc = mmc;
host->dev = &pdev->dev;
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "no pins associated\n");
-
/*
* Some non-DT platforms do not pass a clock, and the clock
* frequency is passed through platform_data. On DT platforms,
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 6ac63df..f6606cf 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -38,7 +38,6 @@
#include <linux/io.h>
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/pm_runtime.h>
#include <linux/platform_data/mmc-omap.h>
@@ -1777,7 +1776,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
const struct of_device_id *match;
dma_cap_mask_t mask;
unsigned tx_req, rx_req;
- struct pinctrl *pinctrl;
match = of_match_device(of_match_ptr(omap_mmc_of_match), &pdev->dev);
if (match) {
@@ -1996,11 +1994,6 @@ static int omap_hsmmc_probe(struct platform_device *pdev)
omap_hsmmc_disable_irq(host);
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev,
- "pins are not configured from the driver\n");
-
omap_hsmmc_protect_card(host);
mmc_add_host(mmc);
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index abc8cf0..0ac8b1a 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -25,7 +25,6 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_gpio.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/platform_data/mmc-esdhc-imx.h>
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"
@@ -80,7 +79,6 @@ struct pltfm_imx_data {
int flags;
u32 scratchpad;
enum imx_esdhc_type devtype;
- struct pinctrl *pinctrl;
struct esdhc_platform_data boarddata;
struct clk *clk_ipg;
struct clk *clk_ahb;
@@ -568,12 +566,6 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
clk_prepare_enable(imx_data->clk_ipg);
clk_prepare_enable(imx_data->clk_ahb);
- imx_data->pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(imx_data->pinctrl)) {
- err = PTR_ERR(imx_data->pinctrl);
- goto disable_clk;
- }
-
host->quirks |= SDHCI_QUIRK_BROKEN_TIMEOUT_VAL;
if (is_imx25_esdhc(imx_data) || is_imx35_esdhc(imx_data))
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe
2013-10-13 16:17 ` [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe Wolfram Sang
@ 2013-10-14 7:28 ` Romain Izard
0 siblings, 0 replies; 3+ messages in thread
From: Romain Izard @ 2013-10-14 7:28 UTC (permalink / raw)
To: linux-mmc; +Cc: linux-arm-kernel, linux-kernel, linux-omap
On 2013-10-13, Wolfram Sang <wsa@the-dreams.de> wrote:
> Since commit ab78029 (drivers/pinctrl: grab default handles from device core),
> we can rely on device core for setting the default pins. Compile tested only.
>
> Acked-by: Linus Walleij <linus.walleij@linaro.org> (personally at LCE13)
> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
> ---
> drivers/mmc/host/mvsdio.c | 7 +------
> drivers/mmc/host/omap_hsmmc.c | 7 -------
> drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
> 3 files changed, 1 insertion(+), 21 deletions(-)
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index 06c5b0b..8c9f448 100644
> --- a/drivers/mmc/host/mvsdio.c
> +++ b/drivers/mmc/host/mvsdio.c
> @@ -25,7 +25,6 @@
> #include <linux/of_irq.h>
> #include <linux/mmc/host.h>
> #include <linux/mmc/slot-gpio.h>
> -#include <linux/pinctrl/consumer.h>
>
> #include <asm/sizes.h>
> #include <asm/unaligned.h>
> @@ -685,7 +684,7 @@ static int __init mvsd_probe(struct platform_device *pdev)
> const struct mbus_dram_target_info *dram;
> struct resource *r;
> int ret, irq;
> - struct pinctrl *pinctrl;
> + int gpio_card_detect, gpio_write_protect;
>
This new line does not belong to this patch.
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> @@ -702,10 +701,6 @@ static int __init mvsd_probe(struct platform_device *pdev)
> host->mmc = mmc;
> host->dev = &pdev->dev;
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl))
> - dev_warn(&pdev->dev, "no pins associated\n");
> -
> /*
> * Some non-DT platforms do not pass a clock, and the clock
> * frequency is passed through platform_data. On DT platforms,
Best regards,
--
Romain Izard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-14 7:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-13 16:17 [PATCH 0/4] remove devm_pinctrl_get_select_default from drivers Wolfram Sang
2013-10-13 16:17 ` [PATCH 2/4] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe Wolfram Sang
2013-10-14 7:28 ` Romain Izard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).