diff options
Diffstat (limited to 'drivers/clocksource/sh_tmu.c')
-rw-r--r-- | drivers/clocksource/sh_tmu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 21bd77aa6a34..d6ea4398bf62 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
30 | #include <linux/clocksource.h> | 30 | #include <linux/clocksource.h> |
31 | #include <linux/clockchips.h> | 31 | #include <linux/clockchips.h> |
32 | #include <linux/sh_tmu.h> | 32 | #include <linux/sh_timer.h> |
33 | 33 | ||
34 | struct sh_tmu_priv { | 34 | struct sh_tmu_priv { |
35 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
@@ -51,7 +51,7 @@ static DEFINE_SPINLOCK(sh_tmu_lock); | |||
51 | 51 | ||
52 | static inline unsigned long sh_tmu_read(struct sh_tmu_priv *p, int reg_nr) | 52 | static inline unsigned long sh_tmu_read(struct sh_tmu_priv *p, int reg_nr) |
53 | { | 53 | { |
54 | struct sh_tmu_config *cfg = p->pdev->dev.platform_data; | 54 | struct sh_timer_config *cfg = p->pdev->dev.platform_data; |
55 | void __iomem *base = p->mapbase; | 55 | void __iomem *base = p->mapbase; |
56 | unsigned long offs; | 56 | unsigned long offs; |
57 | 57 | ||
@@ -69,7 +69,7 @@ static inline unsigned long sh_tmu_read(struct sh_tmu_priv *p, int reg_nr) | |||
69 | static inline void sh_tmu_write(struct sh_tmu_priv *p, int reg_nr, | 69 | static inline void sh_tmu_write(struct sh_tmu_priv *p, int reg_nr, |
70 | unsigned long value) | 70 | unsigned long value) |
71 | { | 71 | { |
72 | struct sh_tmu_config *cfg = p->pdev->dev.platform_data; | 72 | struct sh_timer_config *cfg = p->pdev->dev.platform_data; |
73 | void __iomem *base = p->mapbase; | 73 | void __iomem *base = p->mapbase; |
74 | unsigned long offs; | 74 | unsigned long offs; |
75 | 75 | ||
@@ -88,7 +88,7 @@ static inline void sh_tmu_write(struct sh_tmu_priv *p, int reg_nr, | |||
88 | 88 | ||
89 | static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start) | 89 | static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start) |
90 | { | 90 | { |
91 | struct sh_tmu_config *cfg = p->pdev->dev.platform_data; | 91 | struct sh_timer_config *cfg = p->pdev->dev.platform_data; |
92 | unsigned long flags, value; | 92 | unsigned long flags, value; |
93 | 93 | ||
94 | /* start stop register shared by multiple timer channels */ | 94 | /* start stop register shared by multiple timer channels */ |
@@ -106,7 +106,7 @@ static void sh_tmu_start_stop_ch(struct sh_tmu_priv *p, int start) | |||
106 | 106 | ||
107 | static int sh_tmu_enable(struct sh_tmu_priv *p) | 107 | static int sh_tmu_enable(struct sh_tmu_priv *p) |
108 | { | 108 | { |
109 | struct sh_tmu_config *cfg = p->pdev->dev.platform_data; | 109 | struct sh_timer_config *cfg = p->pdev->dev.platform_data; |
110 | int ret; | 110 | int ret; |
111 | 111 | ||
112 | /* enable clock */ | 112 | /* enable clock */ |
@@ -345,7 +345,7 @@ static int sh_tmu_register(struct sh_tmu_priv *p, char *name, | |||
345 | 345 | ||
346 | static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) | 346 | static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) |
347 | { | 347 | { |
348 | struct sh_tmu_config *cfg = pdev->dev.platform_data; | 348 | struct sh_timer_config *cfg = pdev->dev.platform_data; |
349 | struct resource *res; | 349 | struct resource *res; |
350 | int irq, ret; | 350 | int irq, ret; |
351 | ret = -ENXIO; | 351 | ret = -ENXIO; |
@@ -407,7 +407,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) | |||
407 | static int __devinit sh_tmu_probe(struct platform_device *pdev) | 407 | static int __devinit sh_tmu_probe(struct platform_device *pdev) |
408 | { | 408 | { |
409 | struct sh_tmu_priv *p = platform_get_drvdata(pdev); | 409 | struct sh_tmu_priv *p = platform_get_drvdata(pdev); |
410 | struct sh_tmu_config *cfg = pdev->dev.platform_data; | 410 | struct sh_timer_config *cfg = pdev->dev.platform_data; |
411 | int ret; | 411 | int ret; |
412 | 412 | ||
413 | if (p) { | 413 | if (p) { |