rk fb: from rk3368 fb only need to reserved 1 framebuffer

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / tca6424.c

diff --git a/drivers/gpio/tca6424.c b/drivers/gpio/tca6424.c
index b9e043199a9d83077cab40db2cf034fd02f7139a..06e2ab9843db30d4de36bc8c164bf2aba053a163 100755 (executable)
--- a/drivers/gpio/tca6424.c
+++ b/drivers/gpio/tca6424.c
@@ -43,20 +43,15 @@ NOTES               :
 #include <linux/delay.h>
 #include <linux/i2c/tca6424.h>
 #include <linux/ktime.h>
-#include "../drivers/gpio/soft_interrupt.h"
+#include "../drivers/gpio/expand_gpio_soft_interrupt.h"
 
 #if 0
-#define TCA6424DEB
 #define DBG(x...)      printk(KERN_INFO x)
 #else
 #define DBG(x...)
 #endif
-
-#if 0
 #define DBGERR(x...)   printk(KERN_INFO x)
-#else
-#define DBGERR(x...)
-#endif
+
 
 struct tca6424_chip {
        
@@ -163,7 +158,7 @@ static int tca6424_read_three_reg(struct i2c_client *client, const char reg, cha
        return (ret>0)?0:ret;
 }
 
-static int tca6424_gpio_direction_input(struct gpio_chip *gc, uint8_t pin_num)
+static int tca6424_gpio_direction_input(struct gpio_chip *gc, unsigned pin_num)
 {
        struct tca6424_chip *chip;
        uint8_t gpioPortNum;
@@ -203,7 +198,7 @@ err:
        return (ret<0)?-1:0;
 }
 
-static int tca6424_gpio_direction_output(struct gpio_chip *gc,uint8_t pin_num, int val)
+static int tca6424_gpio_direction_output(struct gpio_chip *gc, unsigned pin_num, int val)
 {
        struct tca6424_chip *chip;
        uint8_t gpioPortNum;
@@ -283,7 +278,7 @@ static int tca6424_gpio_direction_output(struct gpio_chip *gc,uint8_t pin_num, i
     return (ret<0)?-1:0;
 }
 
-static int tca6424_gpio_get_value(struct gpio_chip *gc, uint8_t pin_num)
+static int tca6424_gpio_get_value(struct gpio_chip *gc, unsigned pin_num)
 {
        struct tca6424_chip *chip;
        uint8_t gpioPortNum;
@@ -293,10 +288,13 @@ static int tca6424_gpio_get_value(struct gpio_chip *gc, uint8_t pin_num)
 
        chip = container_of(gc, struct tca6424_chip, gpio_chip);
 
-       #ifdef CONFIG_SOFT_INTERRUPT
+       #ifdef CONFIG_EXPAND_GPIO_SOFT_INTERRUPT
        ret = wait_untill_input_reg_flash( );
        if(ret<0)
+       {
                return -1;
+               DBGERR("**********tca6424 get value error***************\n");
+       }
        #endif
        
        gpioPortNum = pin_num/8;
@@ -306,7 +304,7 @@ static int tca6424_gpio_get_value(struct gpio_chip *gc, uint8_t pin_num)
        if((gpioPortNum>=TCA6424_PortNum)||(gpioPortPinNum>=portnum[gpioPortNum]))
                return -1;
 
-       #ifndef CONFIG_SOFT_INTERRUPT
+       #ifndef CONFIG_EXPAND_GPIO_SOFT_INTERRUPT
        uint8_t reg_val;
        ret = tca6424_read_reg(chip->client, Regaddr, &reg_val);
        if (ret < 0) 
@@ -318,7 +316,7 @@ static int tca6424_gpio_get_value(struct gpio_chip *gc, uint8_t pin_num)
        return ((chip->gtca6424_struct.reg_input[gpioPortNum] >> gpioPortPinNum) & 0x01);
 }
 
-static void tca6424_gpio_set_value(struct gpio_chip *gc, uint8_t pin_num, int val)
+static void tca6424_gpio_set_value(struct gpio_chip *gc, unsigned pin_num, int val)
 {
        struct tca6424_chip *chip;
        uint8_t gpioPortNum;
@@ -511,9 +509,10 @@ static int __devinit tca6424_probe(struct i2c_client *client,const struct i2c_de
        
        chip->gpio_start = pdata->gpio_base;
        chip->gpio_pin_num=pdata->gpio_pin_num;
+       chip->client = client;
        chip->names = pdata->names;
 
-       #ifdef CONFIG_SOFT_INTERRUPT
+       #ifdef CONFIG_EXPAND_GPIO_SOFT_INTERRUPT
        chip->expand = &expand_irq_data;
        chip->expand->gpio_irq_start =pdata->gpio_irq_start;
        chip->expand->irq_pin_num = pdata->irq_pin_num;
@@ -541,9 +540,8 @@ static int __devinit tca6424_probe(struct i2c_client *client,const struct i2c_de
                        DBGERR(" %s setup failed, %d\n",__FUNCTION__,ret);
        }
        i2c_set_clientdata(client, chip);
-       chip->client = client;
 
-       #ifdef CONFIG_SOFT_INTERRUPT
+       #ifdef CONFIG_EXPAND_GPIO_SOFT_INTERRUPT
        expand_irq_init(chip,&chip->gtca6424_struct,tca6424_irq_read_inputreg);
        #endif
        return 0;