Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/gpu/drm/tilcdc/tilcdc_panel.c | 7 -------
drivers/gpu/drm/tilcdc/tilcdc_slave.c | 7 -------
drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 7 -------
3 files changed, 21 deletions(-)
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_panel.c b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
index 7a0315855e90..5aec25d273f4 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_panel.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_panel.c
@@ -15,8 +15,6 @@
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/backlight.h>
#include <linux/gpio/consumer.h>
#include <video/display_timing.h>
@@ -351,7 +349,6 @@ static int panel_probe(struct platform_device *pdev)
struct device_node *bl_node, *node = pdev->dev.of_node;
struct panel_module *panel_mod;
struct tilcdc_module *mod;
- struct pinctrl *pinctrl;
int ret;
/* bail out early if no DT data: */
@@ -399,10 +396,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) {
dev_err(&pdev->dev, "could not get panel timings\n");
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_slave.c b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
index 3775fd49dac4..67cae0846365 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_slave.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_slave.c
@@ -16,8 +16,6 @@
*/
#include <linux/i2c.h>
-#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
#include <drm/drm_encoder_slave.h>
#include "tilcdc_drv.h"
@@ -312,7 +310,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;
@@ -361,10 +358,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 354c47ca6374..205f46135da4 100644
--- a/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
+++ b/drivers/gpu/drm/tilcdc/tilcdc_tfp410.c
@@ -18,8 +18,6 @@
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
-#include <linux/pinctrl/pinmux.h>
-#include <linux/pinctrl/consumer.h>
#include "tilcdc_drv.h"
@@ -312,7 +310,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;
@@ -331,10 +328,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;
--
2.1.3
Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/mmc/host/mvsdio.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index 4f8618f4522d..a2cb92851f1f 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>
@@ -704,7 +703,6 @@ static int mvsd_probe(struct platform_device *pdev)
const struct mbus_dram_target_info *dram;
struct resource *r;
int ret, irq;
- struct pinctrl *pinctrl;
r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
@@ -721,10 +719,6 @@ static int 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,
--
2.1.3
Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
core), we can rely on device core for setting the default pins.
Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/net/ieee802154/cc2520.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index c2b7da3da183..033473448d9f 100644
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -19,7 +19,6 @@
#include <linux/workqueue.h>
#include <linux/interrupt.h>
#include <linux/skbuff.h>
-#include <linux/pinctrl/consumer.h>
#include <linux/of_gpio.h>
#include <linux/ieee802154.h>
@@ -841,7 +840,6 @@ done:
static int cc2520_probe(struct spi_device *spi)
{
struct cc2520_private *priv;
- struct pinctrl *pinctrl;
struct cc2520_platform_data *pdata;
int ret;
@@ -854,11 +852,6 @@ static int cc2520_probe(struct spi_device *spi)
spi_set_drvdata(spi, priv);
- pinctrl = devm_pinctrl_get_select_default(&spi->dev);
- if (IS_ERR(pinctrl))
- dev_warn(&spi->dev,
- "pinctrl pins are not configured\n");
-
pdata = cc2520_get_platform_data(spi);
if (!pdata) {
dev_err(&spi->dev, "no platform data\n");
--
2.1.3
Thanks for the patch.
Acked-by: Varka Bhadram <[email protected]>
On Tue, Dec 23, 2014 at 5:40 AM, Varka Bhadram <[email protected]> wrote:
>
> Thanks for the patch.
>
> Acked-by: Varka Bhadram <[email protected]>
>
> On Tue, Dec 23, 2014 at 3:46 AM, Wolfram Sang <[email protected]> wrote:
>>
>> Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
>> core), we can rely on device core for setting the default pins.
>>
>> Signed-off-by: Wolfram Sang <[email protected]>
>> ---
>> drivers/net/ieee802154/cc2520.c | 7 -------
>> 1 file changed, 7 deletions(-)
>>
>> diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
>> index c2b7da3da183..033473448d9f 100644
>> --- a/drivers/net/ieee802154/cc2520.c
>> +++ b/drivers/net/ieee802154/cc2520.c
>> @@ -19,7 +19,6 @@
>> #include <linux/workqueue.h>
>> #include <linux/interrupt.h>
>> #include <linux/skbuff.h>
>> -#include <linux/pinctrl/consumer.h>
>> #include <linux/of_gpio.h>
>> #include <linux/ieee802154.h>
>>
>> @@ -841,7 +840,6 @@ done:
>> static int cc2520_probe(struct spi_device *spi)
>> {
>> struct cc2520_private *priv;
>> - struct pinctrl *pinctrl;
>> struct cc2520_platform_data *pdata;
>> int ret;
>>
>> @@ -854,11 +852,6 @@ static int cc2520_probe(struct spi_device *spi)
>>
>> spi_set_drvdata(spi, priv);
>>
>> - pinctrl = devm_pinctrl_get_select_default(&spi->dev);
>> - if (IS_ERR(pinctrl))
>> - dev_warn(&spi->dev,
>> - "pinctrl pins are not configured\n");
>> -
>> pdata = cc2520_get_platform_data(spi);
>> if (!pdata) {
>> dev_err(&spi->dev, "no platform data\n");
>> --
>> 2.1.3
>>
>
>
>
> --
> Thanks and Regards,
> Varka Bhadram.
--
Thanks and Regards,
Varka Bhadram.
On 22 December 2014 at 23:16, Wolfram Sang <[email protected]> wrote:
> Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
> core), we can rely on device core for setting the default pins.
>
> Signed-off-by: Wolfram Sang <[email protected]>
Thanks! Applied for next, with an updated prefix of the commit header
to "mmc: mvsdio:".
Kind regards
Uffe
> ---
> drivers/mmc/host/mvsdio.c | 6 ------
> 1 file changed, 6 deletions(-)
>
> diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
> index 4f8618f4522d..a2cb92851f1f 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>
> @@ -704,7 +703,6 @@ static int mvsd_probe(struct platform_device *pdev)
> const struct mbus_dram_target_info *dram;
> struct resource *r;
> int ret, irq;
> - struct pinctrl *pinctrl;
>
> r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
> irq = platform_get_irq(pdev, 0);
> @@ -721,10 +719,6 @@ static int 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,
> --
> 2.1.3
>
Hi Wolfram,
> Since commit ab78029ecc34 (drivers/pinctrl: grab default handles from device
> core), we can rely on device core for setting the default pins.
>
> Signed-off-by: Wolfram Sang <[email protected]>
> ---
> drivers/net/ieee802154/cc2520.c | 7 -------
> 1 file changed, 7 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel