Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

[karo-tx-linux.git] / drivers / mtd / nand / gpmi-nand / gpmi-nand.c

diff --git a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
index 3eafc68154edc464f24026eb0f4987fb671e1b40..a05b7b444d4f1f8a92d6f0e10a2ee1db19d3c722 100644 (file)
--- a/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
+++ b/drivers/mtd/nand/gpmi-nand/gpmi-nand.c
@@ -24,6 +24,7 @@
 #include <linux/module.h>
 #include <linux/mtd/gpmi-nand.h>
 #include <linux/mtd/partitions.h>
+#include <linux/pinctrl/consumer.h>
 #include <linux/of.h>
 #include <linux/of_device.h>
 #include "gpmi-nand.h"
@@ -466,6 +467,7 @@ acquire_err:
 static int __devinit acquire_resources(struct gpmi_nand_data *this)
 {
        struct resources *res = &this->resources;
+       struct pinctrl *pinctrl;
        int ret;
 
        ret = acquire_register_block(this, GPMI_NAND_GPMI_REGS_ADDR_RES_NAME);
@@ -484,6 +486,12 @@ static int __devinit 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;
+       }
+
        res->clock = clk_get(&this->pdev->dev, NULL);
        if (IS_ERR(res->clock)) {
                pr_err("can not get the clock\n");
@@ -493,6 +501,7 @@ static int __devinit acquire_resources(struct gpmi_nand_data *this)
        return 0;
 
 exit_clock:
+exit_pin:
        release_dma_channels(this);
 exit_dma_channels:
        release_bch_irq(this);