|
@@ -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>
|
|
@@ -520,7 +519,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);
|
|
@@ -539,19 +537,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);
|