summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2010-07-12 16:17:51 +0800
committerLily Zhang <r58066@freescale.com>2010-07-19 14:46:32 +0800
commitdd8eaf4b237b1c6be210a5c91068a211a3186f7d (patch)
tree91811979780253fd418549d0349a8e9c1ab032e0
parent0d5ad8a336fc5f5db7045e7a3ebf9824593e8dcf (diff)
ENGR00125056-2 MX5: Fix one wire wrong clock name
one wire master driver is coming from upstream. clock name is owire, not owire_clk Signed-off-by: Frank Li <Frank.Li@freescale.com>
-rw-r--r--arch/arm/mach-mx5/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/clock.c b/arch/arm/mach-mx5/clock.c
index bded58677bed..8a5a3e744644 100644
--- a/arch/arm/mach-mx5/clock.c
+++ b/arch/arm/mach-mx5/clock.c
@@ -3962,7 +3962,8 @@ static struct clk ata_clk = {
};
static struct clk owire_clk = {
- .name = "owire_clk",
+ /* 1w driver come from upstream and use owire as clock name*/
+ .name = "owire",
.parent = &ipg_perclk,
.enable = _clk_enable,
.enable_reg = MXC_CCM_CCGR2,