rk30-pwm-regulator: revert a14e8087e917c724a660be325baf53c284a2b6b2 wrong commit
author黄涛 <huangtao@rock-chips.com>
Wed, 29 Aug 2012 12:38:29 +0000 (20:38 +0800)
committer黄涛 <huangtao@rock-chips.com>
Wed, 29 Aug 2012 12:38:29 +0000 (20:38 +0800)
drivers/regulator/rk30-pwm-regulator.c

index 9a08db014d0b1b14b2f6c6a85012cd38506965e3..9d2ab001c58cb0dade9bd6eb4f57a72c37e0172c 100755 (executable)
@@ -61,7 +61,7 @@ struct rk_pwm_dcdc {
 };\r
 \r
 \r
-#if defined(CONFIG_ARCH_RK30) |defined(CONFIG_ARCH_RK3066B)\r
+#if defined(CONFIG_ARCH_RK30)\r
 #define pwm_write_reg(id, addr, val)        __raw_writel(val, addr+(RK30_PWM01_BASE+(id>>1)*0x20000)+id*0x10)\r
 #define pwm_read_reg(id, addr)              __raw_readl(addr+(RK30_PWM01_BASE+(id>>1)*0x20000+id*0x10))\r
 #elif defined(CONFIG_ARCH_RK29)\r
@@ -87,7 +87,7 @@ static int pwm_set_rate(struct pwm_platform_data *pdata,int nHz,u32 rate)
 \r
 #if defined(CONFIG_ARCH_RK29) || defined(CONFIG_ARCH_RK2928)\r
        clkrate = clk_get_rate(pwm_clk[0]);\r
-#elif defined(CONFIG_ARCH_RK30) || defined(CONFIG_ARCH_RK3066B)\r
+#elif defined(CONFIG_ARCH_RK30)\r
        if (id == 0 || id == 1) {\r
                clkrate = clk_get_rate(pwm_clk[0]);\r
        } else if (id== 2 || id == 3) {\r
@@ -316,7 +316,7 @@ static int __devinit pwm_regulator_probe(struct platform_device *pdev)
        \r
 #if defined(CONFIG_ARCH_RK29)\r
                pwm_clk[0] = clk_get(NULL, "pwm");\r
-#elif defined(CONFIG_ARCH_RK30) |defined(CONFIG_ARCH_RK3066B)\r
+#elif defined(CONFIG_ARCH_RK30)\r
                if (pwm_id == 0 || pwm_id == 1)\r
                {\r
                        pwm_clk[0] = clk_get(NULL, "pwm01");    \r