Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-f7188x.c

diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index d62fd6bbaf823b1789559b4d0349607a76300c75..daac2d480db1de8081f46f40c94306a8662b88cc 100644 (file)
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -1,5 +1,5 @@
 /*
- * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882 and F71889
+ * GPIO driver for Fintek Super-I/O F71869, F71869A, F71882, F71889 and F81866
  *
  * Copyright (C) 2010-2013 LaCie
  *
@@ -36,14 +36,16 @@
 #define SIO_F71869A_ID         0x1007  /* F71869A chipset ID */
 #define SIO_F71882_ID          0x0541  /* F71882 chipset ID */
 #define SIO_F71889_ID          0x0909  /* F71889 chipset ID */
+#define SIO_F81866_ID          0x1010  /* F81866 chipset ID */
 
-enum chips { f71869, f71869a, f71882fg, f71889f };
+enum chips { f71869, f71869a, f71882fg, f71889f, f81866 };
 
 static const char * const f7188x_names[] = {
        "f71869",
        "f71869a",
        "f71882fg",
        "f71889f",
+       "f81866",
 };
 
 struct f7188x_sio {
@@ -190,6 +192,18 @@ static struct f7188x_gpio_bank f71889_gpio_bank[] = {
        F7188X_GPIO_BANK(70, 8, 0x80),
 };
 
+static struct f7188x_gpio_bank f81866_gpio_bank[] = {
+       F7188X_GPIO_BANK(0, 8, 0xF0),
+       F7188X_GPIO_BANK(10, 8, 0xE0),
+       F7188X_GPIO_BANK(20, 8, 0xD0),
+       F7188X_GPIO_BANK(30, 8, 0xC0),
+       F7188X_GPIO_BANK(40, 8, 0xB0),
+       F7188X_GPIO_BANK(50, 8, 0xA0),
+       F7188X_GPIO_BANK(60, 8, 0x90),
+       F7188X_GPIO_BANK(70, 8, 0x80),
+       F7188X_GPIO_BANK(80, 8, 0x88),
+};
+
 static int f7188x_gpio_direction_in(struct gpio_chip *chip, unsigned offset)
 {
        int err;
@@ -318,6 +332,10 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
                data->nr_bank = ARRAY_SIZE(f71889_gpio_bank);
                data->bank = f71889_gpio_bank;
                break;
+       case f81866:
+               data->nr_bank = ARRAY_SIZE(f81866_gpio_bank);
+               data->bank = f81866_gpio_bank;
+               break;
        default:
                return -ENODEV;
        }
@@ -332,36 +350,15 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
                bank->chip.parent = &pdev->dev;
                bank->data = data;
 
-               err = gpiochip_add_data(&bank->chip, bank);
+               err = devm_gpiochip_add_data(&pdev->dev, &bank->chip, bank);
                if (err) {
                        dev_err(&pdev->dev,
                                "Failed to register gpiochip %d: %d\n",
                                i, err);
-                       goto err_gpiochip;
+                       return err;
                }
        }
 
-       return 0;
-
-err_gpiochip:
-       for (i = i - 1; i >= 0; i--) {
-               struct f7188x_gpio_bank *bank = &data->bank[i];
-               gpiochip_remove(&bank->chip);
-       }
-
-       return err;
-}
-
-static int f7188x_gpio_remove(struct platform_device *pdev)
-{
-       int i;
-       struct f7188x_gpio_data *data = platform_get_drvdata(pdev);
-
-       for (i = 0; i < data->nr_bank; i++) {
-               struct f7188x_gpio_bank *bank = &data->bank[i];
-               gpiochip_remove(&bank->chip);
-       }
-
        return 0;
 }
 
@@ -395,6 +392,9 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio)
        case SIO_F71889_ID:
                sio->type = f71889f;
                break;
+       case SIO_F81866_ID:
+               sio->type = f81866;
+               break;
        default:
                pr_info(DRVNAME ": Unsupported Fintek device 0x%04x\n", devid);
                goto err;
@@ -455,7 +455,6 @@ static struct platform_driver f7188x_gpio_driver = {
                .name   = DRVNAME,
        },
        .probe          = f7188x_gpio_probe,
-       .remove         = f7188x_gpio_remove,
 };
 
 static int __init f7188x_gpio_init(void)
@@ -485,6 +484,6 @@ static void __exit f7188x_gpio_exit(void)
 }
 module_exit(f7188x_gpio_exit);
 
-MODULE_DESCRIPTION("GPIO driver for Super-I/O chips F71869, F71869A, F71882FG and F71889F");
+MODULE_DESCRIPTION("GPIO driver for Super-I/O chips F71869, F71869A, F71882FG, F71889F and F81866");
 MODULE_AUTHOR("Simon Guinot <simon.guinot@sequanux.org>");
 MODULE_LICENSE("GPL");