aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/smartreflex.c
diff options
context:
space:
mode:
authorThara Gopinath <thara@ti.com>2010-08-18 02:53:12 -0400
committerKevin Hilman <khilman@deeprootsystems.com>2010-12-22 17:31:50 -0500
commitb35cecf978e33bf8f4be0f36ffe00fe10f381c4a (patch)
treee64d7071a277931f9481761c1fa788994faab418 /arch/arm/mach-omap2/smartreflex.c
parentfb200cfb2330b959eabc94e2f2c15717ce8466af (diff)
OMAP4: Smartreflex framework extensions
This patch extends the smartreflex framework to support OMAP4. The changes are minor like compiling smartreflex Kconfig option for OMAP4 also, and a couple of OMAP4 checks in the smartreflex framework. The change in sr_device.c where new logic has to be introduced for reading the efuse registers is due to the fact that in OMAP4 the efuse registers are 24 bit aligned. A __raw_readl will fail for non-32 bit aligned address and hence the 8-bit read and shift. Signed-off-by: Thara Gopinath <thara@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-omap2/smartreflex.c')
-rw-r--r--arch/arm/mach-omap2/smartreflex.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/smartreflex.c b/arch/arm/mach-omap2/smartreflex.c
index 52a05b336c08..77ecebf3fae2 100644
--- a/arch/arm/mach-omap2/smartreflex.c
+++ b/arch/arm/mach-omap2/smartreflex.c
@@ -153,7 +153,11 @@ static void sr_set_clk_length(struct omap_sr *sr)
153 struct clk *sys_ck; 153 struct clk *sys_ck;
154 u32 sys_clk_speed; 154 u32 sys_clk_speed;
155 155
156 sys_ck = clk_get(NULL, "sys_ck"); 156 if (cpu_is_omap34xx())
157 sys_ck = clk_get(NULL, "sys_ck");
158 else
159 sys_ck = clk_get(NULL, "sys_clkin_ck");
160
157 if (IS_ERR(sys_ck)) { 161 if (IS_ERR(sys_ck)) {
158 dev_err(&sr->pdev->dev, "%s: unable to get sys clk\n", 162 dev_err(&sr->pdev->dev, "%s: unable to get sys clk\n",
159 __func__); 163 __func__);
@@ -193,7 +197,7 @@ static void sr_set_regfields(struct omap_sr *sr)
193 * file or pmic specific data structure. In that case these structure 197 * file or pmic specific data structure. In that case these structure
194 * fields will have to be populated using the pdata or pmic structure. 198 * fields will have to be populated using the pdata or pmic structure.
195 */ 199 */
196 if (cpu_is_omap34xx()) { 200 if (cpu_is_omap34xx() || cpu_is_omap44xx()) {
197 sr->err_weight = OMAP3430_SR_ERRWEIGHT; 201 sr->err_weight = OMAP3430_SR_ERRWEIGHT;
198 sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT; 202 sr->err_maxlimit = OMAP3430_SR_ERRMAXLIMIT;
199 sr->accum_data = OMAP3430_SR_ACCUMDATA; 203 sr->accum_data = OMAP3430_SR_ACCUMDATA;