Merge tag 'gpio-v4.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[linux-2.6-block.git] / drivers / pinctrl / mediatek / pinctrl-mtk-common.c

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index e22cbaf9f9cf56696acfe5d5cc628a1f81ee2c80..16d48a4ed2253b7760e296deb95de9d76a6d85b4 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -14,7 +14,7 @@
  */
 
 #include <linux/io.h>
-#include <linux/gpio.h>
+#include <linux/gpio/driver.h>
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
@@ -95,7 +95,7 @@ static void mtk_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
 {
        unsigned int reg_addr;
        unsigned int bit;
-       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
+       struct mtk_pinctrl *pctl = gpiochip_get_data(chip);
 
        reg_addr = mtk_get_port(pctl, offset) + pctl->devdata->dout_offset;
        bit = BIT(offset & 0xf);
@@ -750,7 +750,7 @@ static int mtk_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
        unsigned int bit;
        unsigned int read_val = 0;
 
-       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
+       struct mtk_pinctrl *pctl = gpiochip_get_data(chip);
 
        reg_addr =  mtk_get_port(pctl, offset) + pctl->devdata->dir_offset;
        bit = BIT(offset & 0xf);
@@ -763,7 +763,7 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned offset)
        unsigned int reg_addr;
        unsigned int bit;
        unsigned int read_val = 0;
-       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
+       struct mtk_pinctrl *pctl = gpiochip_get_data(chip);
 
        reg_addr = mtk_get_port(pctl, offset) +
                pctl->devdata->din_offset;
@@ -776,7 +776,7 @@ static int mtk_gpio_get(struct gpio_chip *chip, unsigned offset)
 static int mtk_gpio_to_irq(struct gpio_chip *chip, unsigned offset)
 {
        const struct mtk_desc_pin *pin;
-       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
+       struct mtk_pinctrl *pctl = gpiochip_get_data(chip);
        int irq;
 
        pin = pctl->devdata->pins + offset;
@@ -944,7 +944,7 @@ static void mtk_eint_unmask(struct irq_data *d)
 static int mtk_gpio_set_debounce(struct gpio_chip *chip, unsigned offset,
        unsigned debounce)
 {
-       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->dev);
+       struct mtk_pinctrl *pctl = dev_get_drvdata(chip->parent);
        int eint_num, virq, eint_offset;
        unsigned int set_offset, bit, clr_bit, clr_offset, rst, i, unmask, dbnc;
        static const unsigned int dbnc_arr[] = {0 , 1, 16, 32, 64, 128, 256};
@@ -1353,10 +1353,10 @@ int mtk_pctrl_init(struct platform_device *pdev,
        *pctl->chip = mtk_gpio_chip;
        pctl->chip->ngpio = pctl->devdata->npins;
        pctl->chip->label = dev_name(&pdev->dev);
-       pctl->chip->dev = &pdev->dev;
+       pctl->chip->parent = &pdev->dev;
        pctl->chip->base = -1;
 
-       ret = gpiochip_add(pctl->chip);
+       ret = gpiochip_add_data(pctl->chip, pctl);
        if (ret) {
                ret = -EINVAL;
                goto pctrl_error;