github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

rk3188: CIF_XXX --> CIF0_XXX

Browse Source
This commit is contained in:
kfx 2013-01-18 11:40:18 +08:00
parent 8d938f087a
commit 81d1be35b3
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-rk3188/include/mach/iomux.h
View File

@ -122,11 +122,11 @@ enum{
/* GPIO3_B */
GPIO3_B0 = 0x3b00, MMC0_DETN,
GPIO3_B1 = 0x3b10, MMC0_WRPRT,
GPIO3_B3 = 0x3b30, CIF_CLKOUT,
GPIO3_B4 = 0x3b40, CIF_D0, HSADC_D8,
GPIO3_B5 = 0x3b50, CIF_D1, HSADC_D9,
GPIO3_B6 = 0x3b60, CIF_D10, I2C3_SDA,
GPIO3_B7 = 0x3b70, CIF_D11, I2C3_SCL,
GPIO3_B3 = 0x3b30, CIF0_CLKOUT,
GPIO3_B4 = 0x3b40, CIF0_D0, HSADC_D8,
GPIO3_B5 = 0x3b50, CIF0_D1, HSADC_D9,
GPIO3_B6 = 0x3b60, CIF0_D10, I2C3_SDA,
GPIO3_B7 = 0x3b70, CIF0_D11, I2C3_SCL,
/* GPIO3_C */
GPIO3_C0 = 0x3c00, MMC1_CMD, RMII_TXEN,

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

@ -2889,11 +2889,7 @@ static void rk_camera_cif_iomux(int cif_index)
#if defined(CONFIG_ARCH_RK3066B) || defined(CONFIG_ARCH_RK3188)
switch(cif_index){
case 0:
#if defined(CONFIG_ARCH_RK3066B)
iomux_set(CIF0_CLKOUT);
#else
iomux_set(CIF_CLKOUT);
#endif
write_grf_reg(GRF_IO_CON3, (CIF_DRIVER_STRENGTH_MASK|CIF_DRIVER_STRENGTH_8MA));
write_grf_reg(GRF_IO_CON4, (CIF_CLKOUT_AMP_MASK|CIF_CLKOUT_AMP_1V8));
#if (CONFIG_CAMERA_INPUT_FMT_SUPPORT & (RK_CAM_INPUT_FMT_RAW10|RK_CAM_INPUT_FMT_RAW12))