rk3066b: update rk610 core
authorhxy <hxy@rock-chips.com>
Wed, 5 Sep 2012 10:16:08 +0000 (18:16 +0800)
committerhxy <hxy@rock-chips.com>
Wed, 5 Sep 2012 10:16:08 +0000 (18:16 +0800)
drivers/mfd/rk610-core.c

index 7b1fa0e73b4e6750d19fd284071aa07cbc3b693c..e83f2de8823e49288d77c5c454ce60be9b2c34a1 100755 (executable)
@@ -221,8 +221,13 @@ static int rk610_control_probe(struct i2c_client *client,
         return -ENOMEM;
     }
     memset(core_info, 0, sizeof(struct rk610_core_info));
-    
-               iis_clk = clk_get_sys("rk29_i2s.0", "i2s");
+               #if defined(CONFIG_SND_RK29_SOC_I2S_8CH)        
+               iis_clk = clk_get_sys("rk29_i2s.0", "i2s");
+               #elif defined(CONFIG_SND_RK29_SOC_I2S_2CH)
+               iis_clk = clk_get_sys("rk29_i2s.1", "i2s");
+               #else
+               iis_clk = clk_get_sys("rk29_i2s.2", "i2s");
+               #endif
                if (IS_ERR(iis_clk)) {
                        printk("failed to get i2s clk\n");
                        ret = PTR_ERR(iis_clk);