These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpio / gpio-moxart.c

diff --git a/kernel/drivers/gpio/gpio-moxart.c b/kernel/drivers/gpio/gpio-moxart.c
index c3ab46e..d3355a6 100644 (file)
--- a/kernel/drivers/gpio/gpio-moxart.c
+++ b/kernel/drivers/gpio/gpio-moxart.c
@@ -29,27 +29,6 @@
 #define GPIO_DATA_IN           0x04
 #define GPIO_PIN_DIRECTION     0x08
 
-static int moxart_gpio_request(struct gpio_chip *chip, unsigned offset)
-{
-       return pinctrl_request_gpio(offset);
-}
-
-static void moxart_gpio_free(struct gpio_chip *chip, unsigned offset)
-{
-       pinctrl_free_gpio(offset);
-}
-
-static int moxart_gpio_get(struct gpio_chip *chip, unsigned offset)
-{
-       struct bgpio_chip *bgc = to_bgpio_chip(chip);
-       u32 ret = bgc->read_reg(bgc->reg_dir);
-
-       if (ret & BIT(offset))
-               return !!(bgc->read_reg(bgc->reg_set) & BIT(offset));
-       else
-               return !!(bgc->read_reg(bgc->reg_dat) & BIT(offset));
-}
-
 static int moxart_gpio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
@@ -68,17 +47,17 @@ static int moxart_gpio_probe(struct platform_device *pdev)
                return PTR_ERR(base);
 
        ret = bgpio_init(bgc, dev, 4, base + GPIO_DATA_IN,
-                   base + GPIO_DATA_OUT, NULL,
-                   base + GPIO_PIN_DIRECTION, NULL, 0);
+                        base + GPIO_DATA_OUT, NULL,
+                        base + GPIO_PIN_DIRECTION, NULL,
+                        BGPIOF_READ_OUTPUT_REG_SET);
        if (ret) {
                dev_err(&pdev->dev, "bgpio_init failed\n");
                return ret;
        }
 
        bgc->gc.label = "moxart-gpio";
-       bgc->gc.request = moxart_gpio_request;
-       bgc->gc.free = moxart_gpio_free;
-       bgc->gc.get = moxart_gpio_get;
+       bgc->gc.request = gpiochip_generic_request;
+       bgc->gc.free = gpiochip_generic_free;
        bgc->data = bgc->read_reg(bgc->reg_set);
        bgc->gc.base = 0;
        bgc->gc.ngpio = 32;