From: addy-ubuntu <addy@ubuntu.(none)>
Date: Tue, 7 Aug 2012 09:00:30 +0000 (-0700)
Subject: rk2928: hdmi: fixed reg wr
X-Git-Tag: firefly_0821_release~8912^2~43
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4db8a0af3b3869eae6aa944a22ad29aa6a978a3f;p=firefly-linux-kernel-4.4.55.git

rk2928: hdmi: fixed reg wr
---

diff --git a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.h b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.h
index 6fd0f957a1ad..fcc6be786bd7 100644
--- a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.h
+++ b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.h
@@ -237,11 +237,11 @@ enum {
 #define PHY_PLL_LDO_PWR			0xe7
 	#define v_LDO_PWR_DOWN(n)	(n << 2)
 
-#define HDMIRdReg(addr)						__raw_readl(hdmi->regbase + addr)
-#define HDMIWrReg(addr, val)        		__raw_writel((val), hdmi->regbase + addr);
+#define HDMIRdReg(addr)						readl_relaxed(hdmi->regbase + (addr) * 0x04)
+#define HDMIWrReg(addr, val)        		writel_relaxed((val), hdmi->regbase + (addr) * 0x04);
 #define HDMIMskReg(temp, addr, msk, val)	\
-	temp = __raw_readl(hdmi->regbase + addr) & (0xFF - (msk)) ; \
-	__raw_writel(temp | ( (val) & (msk) ),  hdmi->regbase + addr); 
+	temp = readl_relaxed(hdmi->regbase + (addr) * 0x04) & (0xFF - (msk)) ; \
+	writel_relaxed(temp | ( (val) & (msk) ),  hdmi->regbase + (addr) * 0x04); 
 	
 extern int rk2928_hdmi_initial(void);