camera: rockchip: camsys driver v0.0x22.1

gpio0_D is unavailable on rk3288 with current pinctrl driver.

Change-Id: I7d38ebd3b00ac0df31861406f758bdd9e57f9903
Signed-off-by: xcq <shawn.xu@rock-chips.com>

diff --git a/drivers/media/video/rk_camsys/camsys_gpio.h b/drivers/media/video/rk_camsys/camsys_gpio.h
old mode 100755 (executable)
new mode 100644 (file)
index 88602af..7c188b2
--- a/drivers/media/video/rk_camsys/camsys_gpio.h
+++ b/drivers/media/video/rk_camsys/camsys_gpio.h
@@ -6,6 +6,7 @@
 #define NUM_GROUP (32)
 #define GPIO_BANKS (9)
 #endif
+extern unsigned int CHIP_TYPE;
 
 static inline unsigned int camsys_gpio_group_pin(unsigned char *io_name)
 {
@@ -79,6 +80,9 @@ static inline unsigned int camsys_gpio_get(unsigned char *io_name)
                        else
                                gpio += group * NUM_GROUP + group_pin;
                }
+               /* gpio0_D is unavailable on rk3288. */
+               if (!strstr(io_name, "PIN0") && 3288 == CHIP_TYPE)
+                       gpio -= 8;
        }
 #endif
        return gpio;

diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h
index 43f6c8d9f20e890d58c7b7f4c9d1a2181b21a0a2..62a47882bc565a9f8aecfc4cbbd824bdb1f36215 100644 (file)
--- a/drivers/media/video/rk_camsys/camsys_internal.h
+++ b/drivers/media/video/rk_camsys/camsys_internal.h
@@ -166,8 +166,10 @@
        1) add reference count for marvin.
 *v0.0x22.0:
        1) delete node in irqpool list when thread disconnect.
+*v0.0x22.1:
+       1) gpio0_D is unavailable on rk3288 with current pinctrl driver.
 */
-#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x22, 0)
+#define CAMSYS_DRIVER_VERSION                   KERNEL_VERSION(0, 0x22, 1)
 
 #define CAMSYS_PLATFORM_DRV_NAME                "RockChip-CamSys"
 #define CAMSYS_PLATFORM_MARVIN_NAME             "Platform_MarvinDev"