mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-21 03:17:18 +00:00
Koen Kooi
2177f80076
Duplicate patches between PSP and 3.2.17 have been dropped from the 3.2.17 series Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 69c74a3f01d30c6dd44991f6413a4f317f4591a7 Mon Sep 17 00:00:00 2001
|
|
From: Paul Walmsley <paul@pwsan.com>
|
|
Date: Tue, 10 Apr 2012 18:36:02 -0600
|
|
Subject: [PATCH 005/165] ARM: OMAP1: DMTIMER: fix broken timer clock source
|
|
selection
|
|
|
|
commit 6aaec67da1e41a0752a2b903b989e73b9f02e182 upstream.
|
|
|
|
DMTIMER source selection on OMAP1 is broken. omap1_dm_timer_set_src()
|
|
tries to use __raw_{read,write}l() to read from and write to physical
|
|
addresses, but those functions take virtual addresses.
|
|
|
|
sparse caught this:
|
|
|
|
arch/arm/mach-omap1/timer.c:50:13: warning: incorrect type in argument 1 (different base types)
|
|
arch/arm/mach-omap1/timer.c:50:13: expected void const volatile [noderef] <asn:2>*<noident>
|
|
arch/arm/mach-omap1/timer.c:50:13: got unsigned int
|
|
arch/arm/mach-omap1/timer.c:52:9: warning: incorrect type in argument 1 (different base types)
|
|
arch/arm/mach-omap1/timer.c:52:9: expected void const volatile [noderef] <asn:2>*<noident>
|
|
arch/arm/mach-omap1/timer.c:52:9: got unsigned int
|
|
|
|
Fix by using omap_{read,writel}(), just like the other users of the
|
|
MOD_CONF_CTRL_1 register in the OMAP1 codebase. Of course, in the long term,
|
|
removing omap_{read,write}l() is the appropriate thing to do; but
|
|
this will take some work to do this cleanly.
|
|
|
|
Looks like this was caused by 97933d6 (ARM: OMAP1: dmtimer: conversion
|
|
to platform devices) that dangerously moved code and changed it in
|
|
the same patch.
|
|
|
|
Signed-off-by: Paul Walmsley <paul@pwsan.com>
|
|
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
|
|
[tony@atomide.com: updated comments to include the breaking commit]
|
|
Signed-off-by: Tony Lindgren <tony@atomide.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
arch/arm/mach-omap1/timer.c | 4 ++--
|
|
1 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c
|
|
index 6e90665..fb202af 100644
|
|
--- a/arch/arm/mach-omap1/timer.c
|
|
+++ b/arch/arm/mach-omap1/timer.c
|
|
@@ -47,9 +47,9 @@ static int omap1_dm_timer_set_src(struct platform_device *pdev,
|
|
int n = (pdev->id - 1) << 1;
|
|
u32 l;
|
|
|
|
- l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
|
|
+ l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
|
|
l |= source << n;
|
|
- __raw_writel(l, MOD_CONF_CTRL_1);
|
|
+ omap_writel(l, MOD_CONF_CTRL_1);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
1.7.7.6
|
|
|