From: dalon.zhang <dalon.zhang@rock-chips.com>
Date: Wed, 4 Mar 2015 13:40:28 +0000 (+0800)
Subject:     camera:
X-Git-Tag: firefly_0821_release~4158^2~406
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=1f99b9f4f8a8b4c022fb9f48389a051b1910e7af;p=firefly-linux-kernel-4.4.55.git

camera:
	camsys_drv: v0.0x1c.0
    oneframe: v0.2.0
    pingpong: v0.1.a

Conflicts:
	drivers/media/video/rk_camsys/camsys_gpio.h
	drivers/media/video/rk_camsys/camsys_internal.h
	drivers/media/video/rk_camsys/camsys_soc_priv.c
	include/linux/rockchip/cru.h
---

1f99b9f4f8a8b4c022fb9f48389a051b1910e7af
diff --cc drivers/media/video/rk30_camera_oneframe.c
index 71e5ea01f132,e6c499abb34b..b20d8b757cef
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@@ -544,9 -508,11 +508,11 @@@ static inline void rk_cru_set_soft_rese
  		val = on ? 0x10001U << 14 : 0x10000U << 14;
  	}else if(CHIP_NAME == 3288){
  		val = on ? 0x10001U << 8 : 0x10000U << 8;
+ 	}else if(CHIP_NAME == 3368){
+ 		val = on ? 0x10001U << 8 : 0x10000U << 8;
  	}
  	writel_relaxed(val, reg);
 -	dsb();
 +	dsb(sy);
  }
  
  static void rk_camera_cif_reset(struct rk_camera_dev *pcdev, int only_rst)
diff --cc drivers/media/video/rk_camsys/camsys_gpio.h
index 1c6d2e2a8f2d,d3c74994cf5d..f180b9773d0b
--- a/drivers/media/video/rk_camsys/camsys_gpio.h
+++ b/drivers/media/video/rk_camsys/camsys_gpio.h
@@@ -1,7 -1,9 +1,7 @@@
  #ifndef __RKCAMSYS_GPIO_H__
  #define __RKCAMSYS_GPIO_H__
  
- #include <linux/gpio.h>
 -
+ //#include <asm/gpio.h>
 -
  #if defined(CONFIG_ARCH_ROCKCHIP)
  #define RK30_PIN0_PA0 (0)
  #define NUM_GROUP 	(32)