Merge branch 'for-linus-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

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

diff --git a/drivers/gpio/gpio-f7188x.c b/drivers/gpio/gpio-f7188x.c
index 13350c9..0896c82 100644 (file)
--- a/drivers/gpio/gpio-f7188x.c
+++ b/drivers/gpio/gpio-f7188x.c
@@ -39,8 +39,10 @@
 #define SIO_F71889_ID          0x0909  /* F71889 chipset ID */
 #define SIO_F71889A_ID         0x1005  /* F71889A chipset ID */
 #define SIO_F81866_ID          0x1010  /* F81866 chipset ID */
+#define SIO_F81804_ID          0x1502  /* F81804 chipset ID, same for f81966 */
 
-enum chips { f71869, f71869a, f71882fg, f71889a, f71889f, f81866 };
+
+enum chips { f71869, f71869a, f71882fg, f71889a, f71889f, f81866, f81804 };
 
 static const char * const f7188x_names[] = {
        "f71869",
@@ -49,6 +51,7 @@ static const char * const f7188x_names[] = {
        "f71889a",
        "f71889f",
        "f81866",
+       "f81804",
 };
 
 struct f7188x_sio {
@@ -223,6 +226,18 @@ static struct f7188x_gpio_bank f81866_gpio_bank[] = {
        F7188X_GPIO_BANK(80, 8, 0x88),
 };
 
+
+static struct f7188x_gpio_bank f81804_gpio_bank[] = {
+       F7188X_GPIO_BANK(0, 8, 0xF0),
+       F7188X_GPIO_BANK(10, 8, 0xE0),
+       F7188X_GPIO_BANK(20, 8, 0xD0),
+       F7188X_GPIO_BANK(50, 8, 0xA0),
+       F7188X_GPIO_BANK(60, 8, 0x90),
+       F7188X_GPIO_BANK(70, 8, 0x80),
+       F7188X_GPIO_BANK(90, 8, 0x98),
+};
+
+
 static int f7188x_gpio_get_direction(struct gpio_chip *chip, unsigned offset)
 {
        int err;
@@ -407,6 +422,10 @@ static int f7188x_gpio_probe(struct platform_device *pdev)
                data->nr_bank = ARRAY_SIZE(f81866_gpio_bank);
                data->bank = f81866_gpio_bank;
                break;
+       case  f81804:
+               data->nr_bank = ARRAY_SIZE(f81804_gpio_bank);
+               data->bank = f81804_gpio_bank;
+               break;
        default:
                return -ENODEV;
        }
@@ -469,6 +488,9 @@ static int __init f7188x_find(int addr, struct f7188x_sio *sio)
        case SIO_F81866_ID:
                sio->type = f81866;
                break;
+       case SIO_F81804_ID:
+               sio->type = f81804;
+               break;
        default:
                pr_info(DRVNAME ": Unsupported Fintek device 0x%04x\n", devid);
                goto err;