summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s5p
diff options
context:
space:
mode:
authorJonghwan Choi <jhbird.choi@samsung.com>2011-08-23 09:08:06 +0200
committerKukjin Kim <kgene.kim@samsung.com>2011-09-16 08:43:26 +0200
commit481411568062e1ab4424e6021e9ec500eaefc4ac (patch)
tree9df7826a5d0df26cbb5992d153b590358465c08b /arch/arm/plat-s5p
parentARM: SAMSUNG: Remove unnecessary duplication of plat_data on TSADC (diff)
downloadlinux-481411568062e1ab4424e6021e9ec500eaefc4ac.tar.xz
linux-481411568062e1ab4424e6021e9ec500eaefc4ac.zip
ARM: S5P: Remove duplicate kdiv calculation
Signed-off-by: Jonghwan Choi <jhbird.choi@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/plat-s5p')
-rw-r--r--arch/arm/plat-s5p/include/plat/pll.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/include/plat/pll.h b/arch/arm/plat-s5p/include/plat/pll.h
index bf28fadee7ae..ebc142c5c84c 100644
--- a/arch/arm/plat-s5p/include/plat/pll.h
+++ b/arch/arm/plat-s5p/include/plat/pll.h
@@ -72,7 +72,6 @@ static inline unsigned long s5p_get_pll46xx(unsigned long baseclk,
mdiv = (pll_con0 >> PLL46XX_MDIV_SHIFT) & PLL46XX_MDIV_MASK;
pdiv = (pll_con0 >> PLL46XX_PDIV_SHIFT) & PLL46XX_PDIV_MASK;
sdiv = (pll_con0 >> PLL46XX_SDIV_SHIFT) & PLL46XX_SDIV_MASK;
- kdiv = pll_con1 & PLL46XX_KDIV_MASK;
if (pll_type == pll_4650c)
kdiv = pll_con1 & PLL4650C_KDIV_MASK;