Message ID | 1373471889-18107-6-git-send-email-wsa@the-dreams.de |
---|---|
State | New, archived |
Headers | show |
于 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 <linus.walleij@linaro.org> (personally at LCE13) > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> > --- i remember Fabio had already sent a similar patch about this issue. thanks Huang Shijie
于 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 <linus.walleij@linaro.org> (personally at LCE13) >> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> >> --- > 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
On Wed, Jul 10, 2013 at 5:57 PM, 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> Artem if you're OK with this please carry it in the MTD tree. Yours, Linus Walleij
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 <linus.walleij@linaro.org> (personally at LCE13) > Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Pushed to l2-mtd.git, thanks!
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);