From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Mon, 12 Oct 2015 09:28:33 +0000 (+0200)
Subject: remove obsolete functions ocotp_clk_{en,dis}able
X-Git-Tag: KARO-TX6UL-2015-10-23~17
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=2e62c0bab7fe68ba2ab3baf6777537267a26ac02;ds=sidebyside

remove obsolete functions ocotp_clk_{en,dis}able
---

diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c
index c9f604e3ab..6a5117394e 100644
--- a/arch/arm/cpu/armv7/mx6/clock.c
+++ b/arch/arm/cpu/armv7/mx6/clock.c
@@ -1103,20 +1103,6 @@ void ldb_clk_disable(int ldb)
 	}
 }
 
-void ocotp_clk_enable(void)
-{
-	u32 reg = readl(&imx_ccm->CCGR2);
-	reg |= MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
-	writel(reg, &imx_ccm->CCGR2);
-}
-
-void ocotp_clk_disable(void)
-{
-	u32 reg = readl(&imx_ccm->CCGR2);
-	reg &= ~MXC_CCM_CCGR2_OCOTP_CTRL_MASK;
-	writel(reg, &imx_ccm->CCGR2);
-}
-
 unsigned int mxc_get_clock(enum mxc_clock clk)
 {
 	switch (clk) {
diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
index eefb58ed7c..c45c2f9d03 100644
--- a/arch/arm/cpu/armv7/mx6/soc.c
+++ b/arch/arm/cpu/armv7/mx6/soc.c
@@ -394,11 +394,11 @@ int read_cpu_temperature(void)
 	struct mx6_ocotp_regs *const ocotp_regs = (void *)OCOTP_BASE_ADDR;
 
 	if (!thermal_calib) {
-		ocotp_clk_enable();
+		enable_ocotp_clk(1);
 		writel(1, &ocotp_regs->hw_ocotp_read_ctrl);
 		thermal_calib = readl(&ocotp_regs->hw_ocotp_ana1);
 		writel(0, &ocotp_regs->hw_ocotp_read_ctrl);
-		ocotp_clk_disable();
+		enable_ocotp_clk(0);
 	}
 
 	if (thermal_calib == 0 || thermal_calib == 0xffffffff)
diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h
index fccddbac0b..0c6f3fd0d7 100644
--- a/arch/arm/include/asm/arch-mx6/clock.h
+++ b/arch/arm/include/asm/arch-mx6/clock.h
@@ -121,6 +121,4 @@ void ipu_di_clk_enable(int di);
 void ipu_di_clk_disable(int di);
 void ldb_clk_enable(int ldb);
 void ldb_clk_disable(int ldb);
-void ocotp_clk_enable(void);
-void ocotp_clk_disable(void);
 #endif /* __ASM_ARCH_CLOCK_H */