rk3188: CIF_XXX --> CIF0_XXX

diff --git a/arch/arm/mach-rk3188/include/mach/iomux.h b/arch/arm/mach-rk3188/include/mach/iomux.h
index 63236f31ef46ed88c071df2dd53b2a97db13d137..ce66df05f297e12df9c2a8a6f618b61756b76c77 100644 (file)
--- a/arch/arm/mach-rk3188/include/mach/iomux.h
+++ b/arch/arm/mach-rk3188/include/mach/iomux.h
@@ -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, 

diff --git a/drivers/media/video/rk30_camera_oneframe.c b/drivers/media/video/rk30_camera_oneframe.c
index f4777f7d3f6722243e423e259a07d22a6e6a17d0..5c634fd9db73f59fbf1bb040295f9b099084d2c8 100755 (executable)
--- a/drivers/media/video/rk30_camera_oneframe.c
+++ b/drivers/media/video/rk30_camera_oneframe.c
@@ -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))