mirros/rockchip-kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rk312x : cif : cif driver v0.0x1.7

Browse Source
This commit is contained in:
zyc
2014-09-23 16:51:32 +08:00
parent bd01d6ee47
commit 5d9d0370bd
4 changed files with 1289 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
arch/arm/boot/dts/rk3126-cif-sensor.dtsi
View File

@@ -10,52 +10,26 @@
CONFIG_SENSOR_POWERDOWN_IOCTL_USR = <0>;
CONFIG_SENSOR_FLASH_IOCTL_USR = <0>;
CONFIG_SENSOR_AF_IOCTL_USR = <0>;
ov2659{
is_front = <1>;
rockchip,powerdown = <&gpio3 GPIO_B3 GPIO_ACTIVE_HIGH>;
pwdn_active = <ov2659_PWRDN_ACTIVE>;
#rockchip,power = <>;
pwr_active = <PWR_ACTIVE_HIGH>;
#rockchip,reset = <>;
#rst_active = <>;
#rockchip,flash = <>;
#rockchip,af = <>;
mir = <0>;
flash_attach = <0>;
resolution = <ov2659_FULL_RESOLUTION>;
powerup_sequence = <ov2659_PWRSEQ>;
orientation = <0>;
i2c_add = <ov2659_I2C_ADDR>;
i2c_rata = <100000>;
i2c_chl = <1>;
cif_chl = <0>;
mclk_rate = <24>;
};
gc0329{
is_front = <1>;
rockchip,powerdown = <&gpio3 GPIO_B3 GPIO_ACTIVE_HIGH>;
pwdn_active = <gc0329_PWRDN_ACTIVE>;
#rockchip,power = <>;
pwr_active = <PWR_ACTIVE_HIGH>;
#rockchip,reset = <>;
#rst_active = <>;
#rockchip,flash = <>;
#rockchip,af = <>;
mir = <0>;
flash_attach = <0>;
resolution = <gc0329_FULL_RESOLUTION>;
powerup_sequence = <gc0329_PWRSEQ>;
orientation = <0>;
i2c_add = <gc0329_I2C_ADDR>;
i2c_rata = <100000>;
i2c_chl = <1>;
cif_chl = <0>;
mclk_rate = <24>;
};
gc0308{
gc2035{
is_front = <0>;
rockchip,power = <&gpio2 GPIO_B2 GPIO_ACTIVE_HIGH>;
rockchip,powerdown = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>;
pwdn_active = <gc2035_PWRDN_ACTIVE>;
pwr_active = <PWR_ACTIVE_HIGH>;
mir = <0>;
flash_attach = <0>;
resolution = <gc2035_FULL_RESOLUTION>;
powerup_sequence = <gc2035_PWRSEQ>;
orientation = <0>;
i2c_add = <gc2035_I2C_ADDR>;
i2c_rata = <100000>;
i2c_chl = <1>;
cif_chl = <0>;
mclk_rate = <24>;
};
gc0308{
is_front = <1>;
rockchip,power = <&gpio2 GPIO_B2 GPIO_ACTIVE_HIGH>;
rockchip,powerdown = <&gpio1 GPIO_B2 GPIO_ACTIVE_HIGH>;
@@ -74,23 +48,30 @@
};
gc2035{
gc0309{
is_front = <0>;
rockchip,power = <&gpio2 GPIO_B2 GPIO_ACTIVE_HIGH>;
rockchip,powerdown = <&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>;
pwdn_active = <gc2035_PWRDN_ACTIVE>;
//rockchip,power = <&gpio2 GPIO_B2 GPIO_ACTIVE_HIGH>;
//rockchip,power_pmu_name1 = "rk818_ldo4";
//rockchip,power_pmu_voltage1 = <2800000>;
//rockchip,power_pmu_name2 = "rk818_ldo8";
//rockchip,power_pmu_voltage2 = <1800000>;
rockchip,powerdown = <&gpio3 GPIO_B3 GPIO_ACTIVE_HIGH>;
//rockchip,powerdown_pmu = "";
//rockchip,powerdown_pmu_voltage = <3000000>;
pwdn_active = <gc0309_PWRDN_ACTIVE>;
pwr_active = <PWR_ACTIVE_HIGH>;
mir = <0>;
flash_attach = <0>;
resolution = <gc2035_FULL_RESOLUTION>;
powerup_sequence = <gc2035_PWRSEQ>;
resolution = <gc0309_FULL_RESOLUTION>;
powerup_sequence = <gc0309_PWRSEQ>;
orientation = <0>;
i2c_add = <gc2035_I2C_ADDR>;
i2c_add = <gc0309_I2C_ADDR>;
i2c_rata = <100000>;
i2c_chl = <1>;
cif_chl = <0>;
mclk_rate = <24>;
};
};
};

2405
arch/arm/mach-rockchip/rk_camera.c
View File

File diff suppressed because it is too large Load Diff

6
arch/arm/mach-rockchip/rk_camera.h
View File

@@ -600,6 +600,12 @@ struct rkcamera_platform_data {
int mclk_rate; /* MHz : 24/48 */
int fov_h; /* fied of view horizontal */
int fov_v; /* fied of view vertical */
const char *power_pmu_name1;
const char *power_pmu_name2;
const char *powerdown_pmu_name;
int power_pmu_voltage1;
int power_pmu_voltage2;
int powerdown_pmu_voltage;
struct device_node *of_node;
struct rkcamera_platform_data *next_camera;/*yzm*/

4
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -268,8 +268,10 @@ static u32 DISABLE_INVERT_PCLK_CIF1;
1. Improve the code to support all configuration.reset,af,flash...
*v0.1.6:
1. Delete SOCAM_DATAWIDTH_8 in SENSOR_BUS_PARAM parameters,it conflict with V4L2_MBUS_PCLK_SAMPLE_FALLING.
*v0.1.7:
1. Add power and powerdown controled by PMU.
*/
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0x6)
#define RK_CAM_VERSION_CODE KERNEL_VERSION(0, 1, 0x7)
static int version = RK_CAM_VERSION_CODE;
module_param(version, int, S_IRUGO);