Commit c1d013a7 authored by Keerthy's avatar Keerthy Committed by Linus Walleij
Browse files

gpio: davinci: Shuffle IRQ resource fetching from DT to beginning of probe 



This is needed in case of PROBE_DEFER if IRQ resource is not yet ready.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 29d43c22

drivers/gpio/gpio-davinci.c

+11 −18
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static inline struct davinci_gpio_regs __iomem *irq2regs(struct irq_data *d) 
	return g;

}



static int davinci_gpio_irq_setup(struct platform_device *pdev);

static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq);



/*--------------------------------------------------------------------------*/
@@ -167,7 +167,7 @@ davinci_gpio_get_pdata(struct platform_device *pdev) 
static int davinci_gpio_probe(struct platform_device *pdev)

{

	static int ctrl_num, bank_base;

	int gpio, bank, ret = 0;

	int gpio, bank, bank_irq, ret = 0;

	unsigned ngpio, nbank;

	struct davinci_gpio_controller *chips;

	struct davinci_gpio_platform_data *pdata;
@@ -209,6 +209,12 @@ static int davinci_gpio_probe(struct platform_device *pdev) 
	if (IS_ERR(gpio_base))

		return PTR_ERR(gpio_base);



	bank_irq = platform_get_irq(pdev, 0);

	if (bank_irq < 0) {

		dev_dbg(dev, "IRQ not populated\n");

		return bank_irq;

	}



	snprintf(label, MAX_LABEL_SIZE, "davinci_gpio.%d", ctrl_num++);

	chips->chip.label = devm_kstrdup(dev, label, GFP_KERNEL);

		if (!chips->chip.label)
@@ -243,7 +249,7 @@ static int davinci_gpio_probe(struct platform_device *pdev) 
		goto err;



	platform_set_drvdata(pdev, chips);

	ret = davinci_gpio_irq_setup(pdev);

	ret = davinci_gpio_irq_setup(pdev, bank_irq);

	if (ret)

		goto err;
@@ -452,16 +458,15 @@ static const struct of_device_id davinci_gpio_ids[]; 
 * (dm6446) can be set appropriately for GPIOV33 pins.

 */



static int davinci_gpio_irq_setup(struct platform_device *pdev)

static int davinci_gpio_irq_setup(struct platform_device *pdev, int bank_irq)

{

	unsigned	gpio, bank;

	int		irq;

	int		ret;

	struct clk	*clk;

	u32		binten = 0;

	unsigned	ngpio, bank_irq;

	unsigned	ngpio;

	struct device *dev = &pdev->dev;

	struct resource	*res;

	struct davinci_gpio_controller *chips = platform_get_drvdata(pdev);

	struct davinci_gpio_platform_data *pdata = dev->platform_data;

	struct davinci_gpio_regs __iomem *g;
@@ -481,18 +486,6 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev) 
		gpio_get_irq_chip = (gpio_get_irq_chip_cb_t)match->data;



	ngpio = pdata->ngpio;

	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!res) {

		dev_err(dev, "Invalid IRQ resource\n");

		return -EBUSY;

	}



	bank_irq = res->start;



	if (!bank_irq) {

		dev_err(dev, "Invalid IRQ resource\n");

		return -ENODEV;

	}



	clk = devm_clk_get(dev, "gpio");

	if (IS_ERR(clk)) {