radeon: P2G2CLK_ALWAYS_ONb tested twice, should 2nd be P2G2CLK_DAC_ALWAYS_ONb?

P2G2CLK_ALWAYS_ONb is tested twice, 2nd should be P2G2CLK_DAC_ALWAYS_ONb.

[akpm@linux-foundation.org: remove duplicated bitwise-OR of PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb too]
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/aty/radeon_pm.c b/drivers/video/aty/radeon_pm.c
index 97a1f095f327115524bdb9fcd55da6162d8497d2..515cf1978d19ef21fc5062471e1357826e4da8c6 100644 (file)
--- a/drivers/video/aty/radeon_pm.c
+++ b/drivers/video/aty/radeon_pm.c
@@ -213,7 +213,6 @@ static void radeon_pm_disable_dynamic_mode(struct radeonfb_info *rinfo)
                         PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb     |
                         PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb       |
                         PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb          |
                         PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb     |
                         PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb       |
                         PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb          |

-                        PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb          |

                         PIXCLKS_CNTL__R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
                 OUTPLL(pllPIXCLKS_CNTL, tmp);
 
                         PIXCLKS_CNTL__R300_DISP_DAC_PIXCLK_DAC2_BLANK_OFF);
                 OUTPLL(pllPIXCLKS_CNTL, tmp);
 


@@ -395,7 +394,7 @@ static void radeon_pm_enable_dynamic_mode(struct radeonfb_info *rinfo)
                        PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb      |
                        PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb        |
                        PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb           |
                        PIXCLKS_CNTL__R300_PIXCLK_TRANS_ALWAYS_ONb      |
                        PIXCLKS_CNTL__R300_PIXCLK_TVO_ALWAYS_ONb        |
                        PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb           |

-                       PIXCLKS_CNTL__R300_P2G2CLK_ALWAYS_ONb);
+                       PIXCLKS_CNTL__R300_P2G2CLK_DAC_ALWAYS_ONb);

                OUTPLL(pllPIXCLKS_CNTL, tmp);
 
                tmp = INPLL(pllMCLK_MISC);
                OUTPLL(pllPIXCLKS_CNTL, tmp);
 
                tmp = INPLL(pllMCLK_MISC);