2013-07-10 15:58:49

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 01/12] drivers/gpu/drm/tilcdc: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 ------
drivers/gpu/drm/tilcdc/tilcdc_slave.c | 6 ------
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 6 ------
3 files changed, 18 deletions(-)

diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 86c6732..f0ff5f8 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -16,7 +16,6 @@
*/

#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/backlight.h>
#include <video/display_timing.h>
#include <video/of_display_timing.h>
@@ -358,7 +357,6 @@ static int panel_probe(struct platform_device *pdev)
struct device_node *node = pdev->dev.of_node;
struct panel_module *panel_mod;
struct tilcdc_module *mod;
- struct pinctrl *pinctrl;
int ret = -EINVAL;


@@ -376,10 +374,6 @@ static int panel_probe(struct platform_device *pdev)

tilcdc_module_init(mod, "panel", &panel_module_ops);

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "pins are not configured\n");
-

panel_mod->timings = of_get_display_timings(node);
if (!panel_mod->timings) {
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
index dfffaf0..2bdbe5e 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
@@ -18,7 +18,6 @@
#include <linux/i2c.h>
#include <linux/of_i2c.h>
#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
#include <drm/drm_encoder_slave.h>

#include "tilcdc_drv.h"
@@ -296,7 +295,6 @@ static int slave_probe(struct platform_device *pdev)
struct device_node *i2c_node;
struct slave_module *slave_mod;
struct tilcdc_module *mod;
- struct pinctrl *pinctrl;
uint32_t i2c_phandle;
struct i2c_adapter *slavei2c;
int ret = -EINVAL;
@@ -342,10 +340,6 @@ static int slave_probe(struct platform_device *pdev)

tilcdc_module_init(mod, "slave", &slave_module_ops);

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "pins are not configured\n");
-
tilcdc_slave_probedefer(false);

return 0;
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
index 925c7cd..a38be60 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -20,7 +20,6 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>

#include "tilcdc_drv.h"

@@ -327,7 +326,6 @@ static int tfp410_probe(struct platform_device *pdev)
struct device_node *i2c_node;
struct tfp410_module *tfp410_mod;
struct tilcdc_module *mod;
- struct pinctrl *pinctrl;
uint32_t i2c_phandle;
int ret = -EINVAL;

@@ -345,10 +343,6 @@ static int tfp410_probe(struct platform_device *pdev)

tilcdc_module_init(mod, "tfp410", &tfp410_module_ops);

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "pins are not configured\n");
-
if (of_property_read_u32(node, "i2c", &i2c_phandle)) {
dev_err(&pdev->dev, "could not get i2c bus phandle\n");
goto fail;
--
1.7.10.4


2013-07-10 15:59:15

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 02/12] drivers/i2c/busses: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/i2c/busses/i2c-omap.c | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index 142b694d..d09512e 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -43,7 +43,6 @@
#include <linux/slab.h>
#include <linux/i2c-omap.h>
#include <linux/pm_runtime.h>
-#include <linux/pinctrl/consumer.h>

/* I2C controller revisions */
#define OMAP_I2C_OMAP1_REV_2 0x20
@@ -216,8 +215,6 @@ struct omap_i2c_dev {
u16 syscstate;
u16 westate;
u16 errata;
-
- struct pinctrl *pins;
};

static const u8 reg_map_ip_v1[] = {
@@ -1120,16 +1117,6 @@ omap_i2c_probe(struct platform_device *pdev)
dev->set_mpu_wkup_lat = pdata->set_mpu_wkup_lat;
}

- dev->pins = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(dev->pins)) {
- if (PTR_ERR(dev->pins) == -EPROBE_DEFER)
- return -EPROBE_DEFER;
-
- dev_warn(&pdev->dev, "did not get pins for i2c error: %li\n",
- PTR_ERR(dev->pins));
- dev->pins = NULL;
- }
-
dev->dev = &pdev->dev;
dev->irq = irq;

--
1.7.10.4

2013-07-10 15:59:30

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 05/12] drivers/mtd/nand: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/mtd/nand/atmel_nand.c | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/drivers/mtd/nand/atmel_nand.c b/drivers/mtd/nand/atmel_nand.c
index 2d23d29..4653b64a 100644
--- a/drivers/mtd/nand/atmel_nand.c
+++ b/drivers/mtd/nand/atmel_nand.c
@@ -41,7 +41,6 @@
#include <linux/gpio.h>
#include <linux/io.h>
#include <linux/platform_data/atmel.h>
-#include <linux/pinctrl/consumer.h>

#include <mach/cpu.h>

@@ -1470,7 +1469,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
struct resource *mem;
struct mtd_part_parser_data ppdata = {};
int res;
- struct pinctrl *pinctrl;

mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!mem) {
@@ -1515,13 +1513,6 @@ static int __init atmel_nand_probe(struct platform_device *pdev)
nand_chip->IO_ADDR_W = host->io_base;
nand_chip->cmd_ctrl = atmel_nand_cmd_ctrl;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- dev_err(host->dev, "Failed to request pinctrl\n");
- res = PTR_ERR(pinctrl);
- goto err_ecc_ioremap;
- }
-
if (gpio_is_valid(host->board.rdy_pin)) {
res = gpio_request(host->board.rdy_pin, "nand_rdy");
if (res < 0) {
--
1.7.10.4

2013-07-10 15:59:49

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 08/12] drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/net/ethernet/cadence/at91_ether.c | 11 -----------
1 file changed, 11 deletions(-)

diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
index 3f19571..bb5d63f 100644
--- a/drivers/net/ethernet/cadence/at91_ether.c
+++ b/drivers/net/ethernet/cadence/at91_ether.c
@@ -29,7 +29,6 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_net.h>
-#include <linux/pinctrl/consumer.h>

#include "macb.h"

@@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
struct resource *regs;
struct net_device *dev;
struct phy_device *phydev;
- struct pinctrl *pinctrl;
struct macb *lp;
int res;
u32 reg;
@@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
if (!regs)
return -ENOENT;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- res = PTR_ERR(pinctrl);
- if (res == -EPROBE_DEFER)
- return res;
-
- dev_warn(&pdev->dev, "No pinctrl provided\n");
- }
-
dev = alloc_etherdev(sizeof(struct macb));
if (!dev)
return -ENOMEM;
--
1.7.10.4

2013-07-10 15:59:42

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 07/12] drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/net/can/c_can/c_can_platform.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c
index b918c73..c6f838d 100644
--- a/drivers/net/can/c_can/c_can_platform.c
+++ b/drivers/net/can/c_can/c_can_platform.c
@@ -32,7 +32,6 @@
#include <linux/clk.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>

#include <linux/can/dev.h>

@@ -114,7 +113,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
struct c_can_priv *priv;
const struct of_device_id *match;
const struct platform_device_id *id;
- struct pinctrl *pinctrl;
struct resource *mem, *res;
int irq;
struct clk *clk;
@@ -131,11 +129,6 @@ static int c_can_plat_probe(struct platform_device *pdev)
id = platform_get_device_id(pdev);
}

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev,
- "failed to configure pins from driver\n");
-
/* get the appropriate clk */
clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(clk)) {
--
1.7.10.4

2013-07-10 15:59:54

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 09/12] drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/net/ieee802154/mrf24j40.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c
index ede3ce4..42e6dee 100644
--- a/drivers/net/ieee802154/mrf24j40.c
+++ b/drivers/net/ieee802154/mrf24j40.c
@@ -22,7 +22,6 @@
#include <linux/spi/spi.h>
#include <linux/interrupt.h>
#include <linux/module.h>
-#include <linux/pinctrl/consumer.h>
#include <net/wpan-phy.h>
#include <net/mac802154.h>
#include <net/ieee802154.h>
@@ -627,7 +626,6 @@ static int mrf24j40_probe(struct spi_device *spi)
int ret = -ENOMEM;
u8 val;
struct mrf24j40 *devrec;
- struct pinctrl *pinctrl;

printk(KERN_INFO "mrf24j40: probe(). IRQ: %d\n", spi->irq);

@@ -638,11 +636,6 @@ static int mrf24j40_probe(struct spi_device *spi)
if (!devrec->buf)
goto err_buf;

- pinctrl = devm_pinctrl_get_select_default(&spi->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&spi->dev,
- "pinctrl pins are not configured from the driver");
-
spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
spi->max_speed_hz = MAX_SPI_SPEED_HZ;
--
1.7.10.4

2013-07-10 16:00:01

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 10/12] drivers/pwm: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/pwm/pwm-mxs.c | 6 ------
drivers/pwm/pwm-tiecap.c | 6 ------
drivers/pwm/pwm-tiehrpwm.c | 6 ------
3 files changed, 18 deletions(-)

diff --git a/drivers/pwm/pwm-mxs.c b/drivers/pwm/pwm-mxs.c
index 3febddd..6489a4b 100644
--- a/drivers/pwm/pwm-mxs.c
+++ b/drivers/pwm/pwm-mxs.c
@@ -16,7 +16,6 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/of_address.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/platform_device.h>
#include <linux/pwm.h>
#include <linux/slab.h>
@@ -130,7 +129,6 @@ static int mxs_pwm_probe(struct platform_device *pdev)
struct device_node *np = pdev->dev.of_node;
struct mxs_pwm_chip *mxs;
struct resource *res;
- struct pinctrl *pinctrl;
int ret;

mxs = devm_kzalloc(&pdev->dev, sizeof(*mxs), GFP_KERNEL);
@@ -142,10 +140,6 @@ static int mxs_pwm_probe(struct platform_device *pdev)
if (IS_ERR(mxs->base))
return PTR_ERR(mxs->base);

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- return PTR_ERR(pinctrl);
-
mxs->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(mxs->clk))
return PTR_ERR(mxs->clk);
diff --git a/drivers/pwm/pwm-tiecap.c b/drivers/pwm/pwm-tiecap.c
index 72ca42d..050abe1 100644
--- a/drivers/pwm/pwm-tiecap.c
+++ b/drivers/pwm/pwm-tiecap.c
@@ -26,7 +26,6 @@
#include <linux/pm_runtime.h>
#include <linux/pwm.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>

#include "pwm-tipwmss.h"

@@ -208,11 +207,6 @@ static int ecap_pwm_probe(struct platform_device *pdev)
struct clk *clk;
struct ecap_pwm_chip *pc;
u16 status;
- struct pinctrl *pinctrl;
-
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "unable to select pin group\n");

pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
if (!pc) {
diff --git a/drivers/pwm/pwm-tiehrpwm.c b/drivers/pwm/pwm-tiehrpwm.c
index 48a485c..5f7632d 100644
--- a/drivers/pwm/pwm-tiehrpwm.c
+++ b/drivers/pwm/pwm-tiehrpwm.c
@@ -26,7 +26,6 @@
#include <linux/clk.h>
#include <linux/pm_runtime.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>

#include "pwm-tipwmss.h"

@@ -439,11 +438,6 @@ static int ehrpwm_pwm_probe(struct platform_device *pdev)
struct clk *clk;
struct ehrpwm_pwm_chip *pc;
u16 status;
- struct pinctrl *pinctrl;
-
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&pdev->dev, "unable to select pin group\n");

pc = devm_kzalloc(&pdev->dev, sizeof(*pc), GFP_KERNEL);
if (!pc) {
--
1.7.10.4

2013-07-10 16:00:06

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 11/12] drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/tty/serial/atmel_serial.c | 8 --------
drivers/tty/serial/imx.c | 9 ---------
drivers/tty/serial/mxs-auart.c | 8 --------
drivers/tty/serial/omap-serial.c | 9 ---------
4 files changed, 34 deletions(-)

diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
index 691265f..0e39fac 100644
--- a/drivers/tty/serial/atmel_serial.c
+++ b/drivers/tty/serial/atmel_serial.c
@@ -39,7 +39,6 @@
#include <linux/atmel_pdc.h>
#include <linux/atmel_serial.h>
#include <linux/uaccess.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/platform_data/atmel.h>

#include <asm/io.h>
@@ -1775,7 +1774,6 @@ static int atmel_serial_probe(struct platform_device *pdev)
struct atmel_uart_data *pdata = pdev->dev.platform_data;
void *data;
int ret = -ENODEV;
- struct pinctrl *pinctrl;

BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));

@@ -1809,12 +1807,6 @@ static int atmel_serial_probe(struct platform_device *pdev)
if (ret)
goto err;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- goto err;
- }
-
if (!atmel_use_dma_rx(&port->uart)) {
ret = -ENOMEM;
data = kmalloc(sizeof(struct atmel_uart_char)
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 415cec6..2797e55 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -47,7 +47,6 @@
#include <linux/slab.h>
#include <linux/of.h>
#include <linux/of_device.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/io.h>

#include <asm/irq.h>
@@ -1507,7 +1506,6 @@ static int serial_imx_probe(struct platform_device *pdev)
void __iomem *base;
int ret = 0;
struct resource *res;
- struct pinctrl *pinctrl;

sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);
if (!sport)
@@ -1543,13 +1541,6 @@ static int serial_imx_probe(struct platform_device *pdev)
sport->timer.function = imx_timeout;
sport->timer.data = (unsigned long)sport;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret);
- return ret;
- }
-
sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
if (IS_ERR(sport->clk_ipg)) {
ret = PTR_ERR(sport->clk_ipg);
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
index 4f5f161..a63a20e 100644
--- a/drivers/tty/serial/mxs-auart.c
+++ b/drivers/tty/serial/mxs-auart.c
@@ -32,7 +32,6 @@
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/of_device.h>
#include <linux/dma-mapping.h>
#include <linux/dmaengine.h>
@@ -1015,7 +1014,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
u32 version;
int ret = 0;
struct resource *r;
- struct pinctrl *pinctrl;

s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);
if (!s) {
@@ -1029,12 +1027,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
else if (ret < 0)
goto out_free;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- goto out_free;
- }
-
if (of_id) {
pdev->id_entry = of_id->data;
s->devtype = pdev->id_entry->driver_data;
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index b6d1728..eacb0de 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -40,7 +40,6 @@
#include <linux/pm_runtime.h>
#include <linux/of.h>
#include <linux/gpio.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/platform_data/serial-omap.h>

#define OMAP_MAX_HSUART_PORTS 6
@@ -160,7 +159,6 @@ struct uart_omap_port {
u32 latency;
u32 calc_latency;
struct work_struct qos_work;
- struct pinctrl *pins;
bool is_suspending;
};

@@ -1468,13 +1466,6 @@ static int serial_omap_probe(struct platform_device *pdev)
goto err_port_line;
}

- up->pins = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(up->pins)) {
- dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n",
- up->port.line, PTR_ERR(up->pins));
- up->pins = NULL;
- }
-
sprintf(up->name, "OMAP UART%d", up->port.line);
up->port.mapbase = mem->start;
up->port.membase = devm_ioremap(&pdev->dev, mem->start,
--
1.7.10.4

2013-07-10 16:00:13

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 12/12] drivers/video: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/video/mxsfb.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/drivers/video/mxsfb.c b/drivers/video/mxsfb.c
index 3ba3771..5861ba2 100644
--- a/drivers/video/mxsfb.c
+++ b/drivers/video/mxsfb.c
@@ -46,7 +46,6 @@
#include <linux/clk.h>
#include <linux/dma-mapping.h>
#include <linux/io.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/fb.h>
#include <linux/regulator/consumer.h>
#include <video/of_display_timing.h>
@@ -877,7 +876,6 @@ static int mxsfb_probe(struct platform_device *pdev)
struct mxsfb_info *host;
struct fb_info *fb_info;
struct fb_modelist *modelist;
- struct pinctrl *pinctrl;
int ret;

if (of_id)
@@ -908,12 +906,6 @@ static int mxsfb_probe(struct platform_device *pdev)

host->devdata = &mxsfb_devdata[pdev->id_entry->driver_data];

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- goto fb_release;
- }
-
host->clk = devm_clk_get(&host->pdev->dev, NULL);
if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk);
--
1.7.10.4

2013-07-10 16:01:31

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 06/12] drivers/mtd/nand/gpmi-nand: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 ---------
1 file changed, 9 deletions(-)

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 25ecfa1..fd49464 100644
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -26,7 +26,6 @@
#include <linux/interrupt.h>
#include <linux/module.h>
#include <linux/mtd/partitions.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/of_mtd.h>
@@ -516,7 +515,6 @@ err_clock:

static int acquire_resources(struct gpmi_nand_data *this)
{
- struct pinctrl *pinctrl;
int ret;

ret = acquire_register_block(this, GPMI_NAND_GPMI_REGS_ADDR_RES_NAME);
@@ -535,19 +533,12 @@ static int acquire_resources(struct gpmi_nand_data *this)
if (ret)
goto exit_dma_channels;

- pinctrl = devm_pinctrl_get_select_default(&this->pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- goto exit_pin;
- }
-
ret = gpmi_get_clks(this);
if (ret)
goto exit_clock;
return 0;

exit_clock:
-exit_pin:
release_dma_channels(this);
exit_dma_channels:
release_bch_irq(this);
--
1.7.10.4

2013-07-10 16:01:50

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 04/12] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/mmc/host/mvsdio.c | 6 ------
drivers/mmc/host/mxs-mmc.c | 8 --------
drivers/mmc/host/omap_hsmmc.c | 7 -------
drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
drivers/mmc/host/sdhci-sirf.c | 8 --------
5 files changed, 37 deletions(-)

diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 8960fc8..ed5edc2 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>
@@ -686,7 +685,6 @@ static int __init mvsd_probe(struct platform_device *pdev)
struct resource *r;
int ret, irq;
int gpio_card_detect, gpio_write_protect;
- struct pinctrl *pinctrl;

r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
@@ -703,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/mxs-mmc.c b/drivers/mmc/host/mxs-mmc.c
index 4278a17..1eb3224 100644
--- a/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@ -41,7 +41,6 @@
#include <linux/gpio.h>
#include <linux/regulator/consumer.h>
#include <linux/module.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/stmp_device.h>
#include <linux/spi/mxs-spi.h>

@@ -580,7 +579,6 @@ static int mxs_mmc_probe(struct platform_device *pdev)
struct mxs_mmc_host *host;
struct mmc_host *mmc;
struct resource *iores;
- struct pinctrl *pinctrl;
int ret = 0, irq_err;
struct regulator *reg_vmmc;
enum of_gpio_flags flags;
@@ -620,12 +618,6 @@ static int mxs_mmc_probe(struct platform_device *pdev)
}
}

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- ret = PTR_ERR(pinctrl);
- goto out_mmc_free;
- }
-
ssp->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(ssp->clk)) {
ret = PTR_ERR(ssp->clk);
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index eccedc7..332ce51 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -37,7 +37,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>

@@ -1776,7 +1775,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) {
@@ -1995,11 +1993,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 d5f0d59..0880e3a 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;
@@ -544,12 +542,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))
diff --git a/drivers/mmc/host/sdhci-sirf.c b/drivers/mmc/host/sdhci-sirf.c
index 09805af..ccf12dd 100644
--- a/drivers/mmc/host/sdhci-sirf.c
+++ b/drivers/mmc/host/sdhci-sirf.c
@@ -13,7 +13,6 @@
#include <linux/of.h>
#include <linux/of_gpio.h>
#include <linux/mmc/slot-gpio.h>
-#include <linux/pinctrl/consumer.h>
#include "sdhci-pltfm.h"

struct sdhci_sirf_priv {
@@ -46,15 +45,8 @@ static int sdhci_sirf_probe(struct platform_device *pdev)
struct sdhci_host *host;
struct sdhci_pltfm_host *pltfm_host;
struct sdhci_sirf_priv *priv;
- struct pinctrl *pinctrl;
int ret;

- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- dev_err(&pdev->dev, "unable to get pinmux");
- return PTR_ERR(pinctrl);
- }
-
priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_sirf_priv),
GFP_KERNEL);
if (!priv) {
--
1.7.10.4

2013-07-10 15:59:20

by Wolfram Sang

[permalink] [raw]
Subject: [PATCH 03/12] drivers/misc: don't use devm_pinctrl_get_select_default() in probe

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 <[email protected]> (personally at LCE13)
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/misc/atmel-ssc.c | 8 --------
1 file changed, 8 deletions(-)

diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c
index f7b90661..551ddde 100644
--- a/drivers/misc/atmel-ssc.c
+++ b/drivers/misc/atmel-ssc.c
@@ -19,7 +19,6 @@
#include <linux/module.h>

#include <linux/of.h>
-#include <linux/pinctrl/consumer.h>

/* Serialize access to ssc_list and user count */
static DEFINE_SPINLOCK(user_lock);
@@ -132,13 +131,6 @@ static int ssc_probe(struct platform_device *pdev)
struct resource *regs;
struct ssc_device *ssc;
const struct atmel_ssc_platform_data *plat_dat;
- struct pinctrl *pinctrl;
-
- pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
- if (IS_ERR(pinctrl)) {
- dev_err(&pdev->dev, "Failed to request pinctrl\n");
- return PTR_ERR(pinctrl);
- }

ssc = devm_kzalloc(&pdev->dev, sizeof(struct ssc_device), GFP_KERNEL);
if (!ssc) {
--
1.7.10.4

2013-07-10 19:57:25

by Marek Vasut

[permalink] [raw]
Subject: Re: [PATCH 04/12] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe

Dear Wolfram Sang,

> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Something like that is already in -next:

mmc: mxs-mmc: Let device core handle pinctrl

Otherwise

Tested-by: Marek Vasut <[email protected]>

Best regards,
Marek Vasut

2013-07-10 21:03:15

by Marc Kleine-Budde

[permalink] [raw]
Subject: Re: [PATCH 07/12] drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe

On 07/10/2013 05:57 PM, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Acked-by: Marc Kleine-Budde <[email protected]>

Who takes care of this patch/patch series?

Marc
--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |

Attachments:
signature.asc (259.00 B)
OpenPGP digital signature

2013-07-10 21:14:59

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 07/12] drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe

From: Marc Kleine-Budde <[email protected]>
Date: Wed, 10 Jul 2013 23:02:57 +0200

> On 07/10/2013 05:57 PM, Wolfram Sang 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 <[email protected]> (personally at LCE13)
>> Signed-off-by: Wolfram Sang <[email protected]>
>
> Acked-by: Marc Kleine-Budde <[email protected]>
>
> Who takes care of this patch/patch series?

Good question :-)

2013-07-10 23:14:19

by Arnd Bergmann

[permalink] [raw]
Subject: Re: [PATCH 03/12] drivers/misc: don't use devm_pinctrl_get_select_default() in probe

On Wednesday 10 July 2013, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Acked-by: Arnd Bergmann <[email protected]>

2013-07-11 02:10:52

by Huang Shijie

[permalink] [raw]
Subject: Re: [PATCH 06/12] drivers/mtd/nand/gpmi-nand: don't use devm_pinctrl_get_select_default() in probe

?? 2013??07??10?? 23:57, Wolfram Sang д??:
> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
i remember Fabio had already sent a similar patch about this issue.

thanks
Huang Shijie

2013-07-11 02:15:18

by Huang Shijie

[permalink] [raw]
Subject: Re: [PATCH 06/12] drivers/mtd/nand/gpmi-nand: don't use devm_pinctrl_get_select_default() in probe

?? 2013??07??11?? 10:14, Huang Shijie д??:
> ?? 2013??07??10?? 23:57, Wolfram Sang д??:
>> 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 <[email protected]> (personally at LCE13)
>> Signed-off-by: Wolfram Sang <[email protected]>
>> ---
> i remember Fabio had already sent a similar patch about this issue.
>
sorry. Fabio just fix it in the gpmi driver, maybe he did not fix the
atmel-nand.

thanks
Huang Shijie

2013-07-11 07:40:06

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH 08/12] drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe

On 10/07/2013 17:57, Wolfram Sang :
> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Acked-by: Nicolas Ferre <[email protected]>

Thanks Wolfram.

Bye,

> ---
> drivers/net/ethernet/cadence/at91_ether.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/net/ethernet/cadence/at91_ether.c b/drivers/net/ethernet/cadence/at91_ether.c
> index 3f19571..bb5d63f 100644
> --- a/drivers/net/ethernet/cadence/at91_ether.c
> +++ b/drivers/net/ethernet/cadence/at91_ether.c
> @@ -29,7 +29,6 @@
> #include <linux/of.h>
> #include <linux/of_device.h>
> #include <linux/of_net.h>
> -#include <linux/pinctrl/consumer.h>
>
> #include "macb.h"
>
> @@ -309,7 +308,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
> struct resource *regs;
> struct net_device *dev;
> struct phy_device *phydev;
> - struct pinctrl *pinctrl;
> struct macb *lp;
> int res;
> u32 reg;
> @@ -319,15 +317,6 @@ static int __init at91ether_probe(struct platform_device *pdev)
> if (!regs)
> return -ENOENT;
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl)) {
> - res = PTR_ERR(pinctrl);
> - if (res == -EPROBE_DEFER)
> - return res;
> -
> - dev_warn(&pdev->dev, "No pinctrl provided\n");
> - }
> -
> dev = alloc_etherdev(sizeof(struct macb));
> if (!dev)
> return -ENOMEM;
>


--
Nicolas Ferre

2013-07-11 07:40:48

by Nicolas Ferre

[permalink] [raw]
Subject: Re: [PATCH 11/12] drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe

On 10/07/2013 17:57, Wolfram Sang :
> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/tty/serial/atmel_serial.c | 8 --------

For atmel_serial.c:

Acked-by: Nicolas Ferre <[email protected]>

Thanks.

> drivers/tty/serial/imx.c | 9 ---------
> drivers/tty/serial/mxs-auart.c | 8 --------
> drivers/tty/serial/omap-serial.c | 9 ---------
> 4 files changed, 34 deletions(-)
>
> diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c
> index 691265f..0e39fac 100644
> --- a/drivers/tty/serial/atmel_serial.c
> +++ b/drivers/tty/serial/atmel_serial.c
> @@ -39,7 +39,6 @@
> #include <linux/atmel_pdc.h>
> #include <linux/atmel_serial.h>
> #include <linux/uaccess.h>
> -#include <linux/pinctrl/consumer.h>
> #include <linux/platform_data/atmel.h>
>
> #include <asm/io.h>
> @@ -1775,7 +1774,6 @@ static int atmel_serial_probe(struct platform_device *pdev)
> struct atmel_uart_data *pdata = pdev->dev.platform_data;
> void *data;
> int ret = -ENODEV;
> - struct pinctrl *pinctrl;
>
> BUILD_BUG_ON(ATMEL_SERIAL_RINGSIZE & (ATMEL_SERIAL_RINGSIZE - 1));
>
> @@ -1809,12 +1807,6 @@ static int atmel_serial_probe(struct platform_device *pdev)
> if (ret)
> goto err;
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl)) {
> - ret = PTR_ERR(pinctrl);
> - goto err;
> - }
> -
> if (!atmel_use_dma_rx(&port->uart)) {
> ret = -ENOMEM;
> data = kmalloc(sizeof(struct atmel_uart_char)
> diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
> index 415cec6..2797e55 100644
> --- a/drivers/tty/serial/imx.c
> +++ b/drivers/tty/serial/imx.c
> @@ -47,7 +47,6 @@
> #include <linux/slab.h>
> #include <linux/of.h>
> #include <linux/of_device.h>
> -#include <linux/pinctrl/consumer.h>
> #include <linux/io.h>
>
> #include <asm/irq.h>
> @@ -1507,7 +1506,6 @@ static int serial_imx_probe(struct platform_device *pdev)
> void __iomem *base;
> int ret = 0;
> struct resource *res;
> - struct pinctrl *pinctrl;
>
> sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);
> if (!sport)
> @@ -1543,13 +1541,6 @@ static int serial_imx_probe(struct platform_device *pdev)
> sport->timer.function = imx_timeout;
> sport->timer.data = (unsigned long)sport;
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl)) {
> - ret = PTR_ERR(pinctrl);
> - dev_err(&pdev->dev, "failed to get default pinctrl: %d\n", ret);
> - return ret;
> - }
> -
> sport->clk_ipg = devm_clk_get(&pdev->dev, "ipg");
> if (IS_ERR(sport->clk_ipg)) {
> ret = PTR_ERR(sport->clk_ipg);
> diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c
> index 4f5f161..a63a20e 100644
> --- a/drivers/tty/serial/mxs-auart.c
> +++ b/drivers/tty/serial/mxs-auart.c
> @@ -32,7 +32,6 @@
> #include <linux/clk.h>
> #include <linux/delay.h>
> #include <linux/io.h>
> -#include <linux/pinctrl/consumer.h>
> #include <linux/of_device.h>
> #include <linux/dma-mapping.h>
> #include <linux/dmaengine.h>
> @@ -1015,7 +1014,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
> u32 version;
> int ret = 0;
> struct resource *r;
> - struct pinctrl *pinctrl;
>
> s = kzalloc(sizeof(struct mxs_auart_port), GFP_KERNEL);
> if (!s) {
> @@ -1029,12 +1027,6 @@ static int mxs_auart_probe(struct platform_device *pdev)
> else if (ret < 0)
> goto out_free;
>
> - pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(pinctrl)) {
> - ret = PTR_ERR(pinctrl);
> - goto out_free;
> - }
> -
> if (of_id) {
> pdev->id_entry = of_id->data;
> s->devtype = pdev->id_entry->driver_data;
> diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
> index b6d1728..eacb0de 100644
> --- a/drivers/tty/serial/omap-serial.c
> +++ b/drivers/tty/serial/omap-serial.c
> @@ -40,7 +40,6 @@
> #include <linux/pm_runtime.h>
> #include <linux/of.h>
> #include <linux/gpio.h>
> -#include <linux/pinctrl/consumer.h>
> #include <linux/platform_data/serial-omap.h>
>
> #define OMAP_MAX_HSUART_PORTS 6
> @@ -160,7 +159,6 @@ struct uart_omap_port {
> u32 latency;
> u32 calc_latency;
> struct work_struct qos_work;
> - struct pinctrl *pins;
> bool is_suspending;
> };
>
> @@ -1468,13 +1466,6 @@ static int serial_omap_probe(struct platform_device *pdev)
> goto err_port_line;
> }
>
> - up->pins = devm_pinctrl_get_select_default(&pdev->dev);
> - if (IS_ERR(up->pins)) {
> - dev_warn(&pdev->dev, "did not get pins for uart%i error: %li\n",
> - up->port.line, PTR_ERR(up->pins));
> - up->pins = NULL;
> - }
> -
> sprintf(up->name, "OMAP UART%d", up->port.line);
> up->port.mapbase = mem->start;
> up->port.membase = devm_ioremap(&pdev->dev, mem->start,
>


--
Nicolas Ferre

2013-07-12 00:18:54

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 07/12] drivers/net/can/c_can: don't use devm_pinctrl_get_select_default() in probe

From: Wolfram Sang <[email protected]>
Date: Wed, 10 Jul 2013 16:57:42 +0100

> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Applied.

2013-07-12 00:19:05

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 08/12] drivers/net/ethernet/cadence: don't use devm_pinctrl_get_select_default() in probe

From: Wolfram Sang <[email protected]>
Date: Wed, 10 Jul 2013 16:57:43 +0100

> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Applied.

2013-07-12 00:19:11

by David Miller

[permalink] [raw]
Subject: Re: [PATCH 09/12] drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe

From: Wolfram Sang <[email protected]>
Date: Wed, 10 Jul 2013 16:57:44 +0100

> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Applied.

2013-07-12 03:40:10

by Barry Song

[permalink] [raw]
Subject: Re: [PATCH 04/12] drivers/mmc/host: don't use devm_pinctrl_get_select_default() in probe

2013/7/10 Wolfram Sang <[email protected]>:
> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/mmc/host/mvsdio.c | 6 ------
> drivers/mmc/host/mxs-mmc.c | 8 --------
> drivers/mmc/host/omap_hsmmc.c | 7 -------
> drivers/mmc/host/sdhci-esdhc-imx.c | 8 --------
> drivers/mmc/host/sdhci-sirf.c | 8 --------

Wolfram, this has been done for sirf, which version are you based on?

> 5 files changed, 37 deletions(-)

-barry

2013-07-20 17:45:44

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH 03/12] drivers/misc: don't use devm_pinctrl_get_select_default() in probe

On Thu, Jul 11, 2013 at 1:13 AM, Arnd Bergmann <[email protected]> wrote:
> On Wednesday 10 July 2013, Wolfram Sang 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 <[email protected]> (personally at LCE13)
>> Signed-off-by: Wolfram Sang <[email protected]>
>
> Acked-by: Arnd Bergmann <[email protected]>

I think that the idea is to merge this through respective subsystem.
Greg, can you take this into your misc-char tree?

Yours,
Linus Walleij

2013-07-20 17:46:50

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH 11/12] drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe

On Thu, Jul 11, 2013 at 9:40 AM, Nicolas Ferre <[email protected]> wrote:
> On 10/07/2013 17:57, Wolfram Sang :
>
>> 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 <[email protected]> (personally at LCE13)
>> Signed-off-by: Wolfram Sang <[email protected]>
>> ---
>> drivers/tty/serial/atmel_serial.c | 8 --------
>
>
> For atmel_serial.c:
>
> Acked-by: Nicolas Ferre <[email protected]>

Greg can you please apply this to the TTY tree if it looks
OK to you?

Yours,
Linus Walleij

2013-07-20 17:48:03

by Linus Walleij

[permalink] [raw]
Subject: Re: [PATCH 06/12] drivers/mtd/nand/gpmi-nand: don't use devm_pinctrl_get_select_default() in probe

On Wed, Jul 10, 2013 at 5:57 PM, Wolfram Sang <[email protected]> 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Artem if you're OK with this please carry it in the MTD tree.

Yours,
Linus Walleij

2013-07-20 17:50:31

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 03/12] drivers/misc: don't use devm_pinctrl_get_select_default() in probe

On Sat, Jul 20, 2013 at 07:45:42PM +0200, Linus Walleij wrote:
> On Thu, Jul 11, 2013 at 1:13 AM, Arnd Bergmann <[email protected]> wrote:
> > On Wednesday 10 July 2013, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> >> Signed-off-by: Wolfram Sang <[email protected]>
> >
> > Acked-by: Arnd Bergmann <[email protected]>
>
> I think that the idea is to merge this through respective subsystem.
> Greg, can you take this into your misc-char tree?

Sure, will do.

greg k-h

2013-07-20 17:50:41

by Greg Kroah-Hartman

[permalink] [raw]
Subject: Re: [PATCH 11/12] drivers/tty/serial: don't use devm_pinctrl_get_select_default() in probe

On Sat, Jul 20, 2013 at 07:46:48PM +0200, Linus Walleij wrote:
> On Thu, Jul 11, 2013 at 9:40 AM, Nicolas Ferre <[email protected]> wrote:
> > On 10/07/2013 17:57, Wolfram Sang :
> >
> >> 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 <[email protected]> (personally at LCE13)
> >> Signed-off-by: Wolfram Sang <[email protected]>
> >> ---
> >> drivers/tty/serial/atmel_serial.c | 8 --------
> >
> >
> > For atmel_serial.c:
> >
> > Acked-by: Nicolas Ferre <[email protected]>
>
> Greg can you please apply this to the TTY tree if it looks
> OK to you?

Will do, thanks.

greg k-h

2013-08-02 15:32:25

by Artem Bityutskiy

[permalink] [raw]
Subject: Re: [PATCH 06/12] drivers/mtd/nand/gpmi-nand: don't use devm_pinctrl_get_select_default() in probe

On Wed, 2013-07-10 at 16:57 +0100, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Pushed to l2-mtd.git, thanks!

--
Best Regards,
Artem Bityutskiy

2013-08-02 15:46:17

by Artem Bityutskiy

[permalink] [raw]
Subject: Re: [PATCH 05/12] drivers/mtd/nand: don't use devm_pinctrl_get_select_default() in probe

On Wed, 2013-07-10 at 16:57 +0100, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Pushed to l2-mtd.git, thanks!

--
Best Regards,
Artem Bityutskiy

2013-08-07 15:37:14

by Wolfram Sang

[permalink] [raw]
Subject: Re: [PATCH 02/12] drivers/i2c/busses: don't use devm_pinctrl_get_select_default() in probe

On Wed, Jul 10, 2013 at 04:57:37PM +0100, Wolfram Sang 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 <[email protected]> (personally at LCE13)
> Signed-off-by: Wolfram Sang <[email protected]>

Applied to for-next, thanks!

Attachments:
(No filename) (382.00 B)
 signature.asc (836.00 B)
Digital signature Download all attachments