From 95a2b5174655d3bf5b15ebe5d33588cf1bc354dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Sat, 26 Jan 2013 14:35:04 +0800 Subject: [PATCH] rk30: pm.c: revert 03650ab --- arch/arm/mach-rk30/pm.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/arch/arm/mach-rk30/pm.c b/arch/arm/mach-rk30/pm.c index c73a3930b081..bdc04fec7593 100755 --- a/arch/arm/mach-rk30/pm.c +++ b/arch/arm/mach-rk30/pm.c @@ -23,7 +23,6 @@ #include #include #include -#include #define cru_readl(offset) readl_relaxed(RK30_CRU_BASE + offset) #define cru_writel(v, offset) do { writel_relaxed(v, RK30_CRU_BASE + offset); dsb(); } while (0) @@ -403,8 +402,6 @@ static void rk30_pm_set_power_domain(u32 pmu_pwrdn_st, bool state) if (pm_pmu_power_domain_is_on(PD_VIO, pmu_pwrdn_st)) { u32 gate[10]; - static u32 lcdc0_qos[CPU_AXI_QOS_NUM_REGS]; - static u32 lcdc1_qos[CPU_AXI_QOS_NUM_REGS]; gate[0] = cru_readl(CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC0_SRC)); gate[1] = cru_readl(CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC1_SRC)); gate[2] = cru_readl(CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC0)); @@ -425,15 +422,7 @@ static void rk30_pm_set_power_domain(u32 pmu_pwrdn_st, bool state) cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_VIO1), CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_VIO1)); cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_IPP), CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_IPP)); cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_RGA), CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_RGA)); - if (!state) { - CPU_AXI_SAVE_QOS(lcdc0_qos, LCDC0); - CPU_AXI_SAVE_QOS(lcdc1_qos, LCDC0); - } pmu_set_power_domain(PD_VIO, state); - if (state) { - CPU_AXI_RESTORE_QOS(lcdc0_qos, LCDC0); - CPU_AXI_RESTORE_QOS(lcdc1_qos, LCDC0); - } cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_LCDC0_SRC) | gate[0], CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC0_SRC)); cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_LCDC1_SRC) | gate[1], CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC1_SRC)); cru_writel(CLK_GATE_W_MSK(CLK_GATE_ACLK_LCDC0) | gate[2], CLK_GATE_CLKID_CONS(CLK_GATE_ACLK_LCDC0)); -- 2.34.1