aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/mpc8xxx_wdt.c
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2008-07-04 02:51:35 -0400
committerWim Van Sebroeck <wim@iguana.be>2008-08-06 09:07:06 -0400
commit59ca1b0d14ca71bdefef372ccd5035341e0ca091 (patch)
tree2008c9acb66da4b8531bbfe6468057e5a44c62cc /drivers/watchdog/mpc8xxx_wdt.c
parent28acd02f9f9efe44718de3bbe8be22d6dfb7e47f (diff)
[WATCHDOG] mpc8xxx_wdt: various renames, mostly s/mpc83xx/mpc8xxx/g
mpc83xx_wdt.c renamed to mpc8xxx_wdt.c, now we can do various renames in the file itself. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> Cc: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers/watchdog/mpc8xxx_wdt.c')
-rw-r--r--drivers/watchdog/mpc8xxx_wdt.c104
1 files changed, 52 insertions, 52 deletions
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index fa82ec99ba81..8b82b91caee7 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * mpc83xx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface 2 * mpc8xxx_wdt.c - MPC83xx/MPC86xx watchdog userspace interface
3 * 3 *
4 * Authors: Dave Updegraff <dave@cray.org> 4 * Authors: Dave Updegraff <dave@cray.org>
5 * Kumar Gala <galak@kernel.crashing.org> 5 * Kumar Gala <galak@kernel.crashing.org>
@@ -29,7 +29,7 @@
29#include <linux/uaccess.h> 29#include <linux/uaccess.h>
30#include <sysdev/fsl_soc.h> 30#include <sysdev/fsl_soc.h>
31 31
32struct mpc83xx_wdt { 32struct mpc8xxx_wdt {
33 __be32 res0; 33 __be32 res0;
34 __be32 swcrr; /* System watchdog control register */ 34 __be32 swcrr; /* System watchdog control register */
35#define SWCRR_SWTC 0xFFFF0000 /* Software Watchdog Time Count. */ 35#define SWCRR_SWTC 0xFFFF0000 /* Software Watchdog Time Count. */
@@ -42,12 +42,12 @@ struct mpc83xx_wdt {
42 u8 res2[0xF0]; 42 u8 res2[0xF0];
43}; 43};
44 44
45struct mpc83xx_wdt_type { 45struct mpc8xxx_wdt_type {
46 int prescaler; 46 int prescaler;
47 bool hw_enabled; 47 bool hw_enabled;
48}; 48};
49 49
50static struct mpc83xx_wdt __iomem *wd_base; 50static struct mpc8xxx_wdt __iomem *wd_base;
51 51
52static u16 timeout = 0xffff; 52static u16 timeout = 0xffff;
53module_param(timeout, ushort, 0); 53module_param(timeout, ushort, 0);
@@ -74,7 +74,7 @@ static unsigned int timeout_sec;
74static unsigned long wdt_is_open; 74static unsigned long wdt_is_open;
75static DEFINE_SPINLOCK(wdt_spinlock); 75static DEFINE_SPINLOCK(wdt_spinlock);
76 76
77static void mpc83xx_wdt_keepalive(void) 77static void mpc8xxx_wdt_keepalive(void)
78{ 78{
79 /* Ping the WDT */ 79 /* Ping the WDT */
80 spin_lock(&wdt_spinlock); 80 spin_lock(&wdt_spinlock);
@@ -83,31 +83,31 @@ static void mpc83xx_wdt_keepalive(void)
83 spin_unlock(&wdt_spinlock); 83 spin_unlock(&wdt_spinlock);
84} 84}
85 85
86static void mpc83xx_wdt_timer_ping(unsigned long arg); 86static void mpc8xxx_wdt_timer_ping(unsigned long arg);
87static DEFINE_TIMER(wdt_timer, mpc83xx_wdt_timer_ping, 0, 0); 87static DEFINE_TIMER(wdt_timer, mpc8xxx_wdt_timer_ping, 0, 0);
88 88
89static void mpc83xx_wdt_timer_ping(unsigned long arg) 89static void mpc8xxx_wdt_timer_ping(unsigned long arg)
90{ 90{
91 mpc83xx_wdt_keepalive(); 91 mpc8xxx_wdt_keepalive();
92 /* We're pinging it twice faster than needed, just to be sure. */ 92 /* We're pinging it twice faster than needed, just to be sure. */
93 mod_timer(&wdt_timer, jiffies + HZ * timeout_sec / 2); 93 mod_timer(&wdt_timer, jiffies + HZ * timeout_sec / 2);
94} 94}
95 95
96static void mpc83xx_wdt_pr_warn(const char *msg) 96static void mpc8xxx_wdt_pr_warn(const char *msg)
97{ 97{
98 pr_crit("mpc83xx_wdt: %s, expect the %s soon!\n", msg, 98 pr_crit("mpc8xxx_wdt: %s, expect the %s soon!\n", msg,
99 reset ? "reset" : "machine check exception"); 99 reset ? "reset" : "machine check exception");
100} 100}
101 101
102static ssize_t mpc83xx_wdt_write(struct file *file, const char __user *buf, 102static ssize_t mpc8xxx_wdt_write(struct file *file, const char __user *buf,
103 size_t count, loff_t *ppos) 103 size_t count, loff_t *ppos)
104{ 104{
105 if (count) 105 if (count)
106 mpc83xx_wdt_keepalive(); 106 mpc8xxx_wdt_keepalive();
107 return count; 107 return count;
108} 108}
109 109
110static int mpc83xx_wdt_open(struct inode *inode, struct file *file) 110static int mpc8xxx_wdt_open(struct inode *inode, struct file *file)
111{ 111{
112 u32 tmp = SWCRR_SWEN; 112 u32 tmp = SWCRR_SWEN;
113 if (test_and_set_bit(0, &wdt_is_open)) 113 if (test_and_set_bit(0, &wdt_is_open))
@@ -132,17 +132,17 @@ static int mpc83xx_wdt_open(struct inode *inode, struct file *file)
132 return nonseekable_open(inode, file); 132 return nonseekable_open(inode, file);
133} 133}
134 134
135static int mpc83xx_wdt_release(struct inode *inode, struct file *file) 135static int mpc8xxx_wdt_release(struct inode *inode, struct file *file)
136{ 136{
137 if (!nowayout) 137 if (!nowayout)
138 mpc83xx_wdt_timer_ping(0); 138 mpc8xxx_wdt_timer_ping(0);
139 else 139 else
140 mpc83xx_wdt_pr_warn("watchdog closed"); 140 mpc8xxx_wdt_pr_warn("watchdog closed");
141 clear_bit(0, &wdt_is_open); 141 clear_bit(0, &wdt_is_open);
142 return 0; 142 return 0;
143} 143}
144 144
145static long mpc83xx_wdt_ioctl(struct file *file, unsigned int cmd, 145static long mpc8xxx_wdt_ioctl(struct inode *inode, struct file *file,
146 unsigned long arg) 146 unsigned long arg)
147{ 147{
148 void __user *argp = (void __user *)arg; 148 void __user *argp = (void __user *)arg;
@@ -150,7 +150,7 @@ static long mpc83xx_wdt_ioctl(struct file *file, unsigned int cmd,
150 static struct watchdog_info ident = { 150 static struct watchdog_info ident = {
151 .options = WDIOF_KEEPALIVEPING, 151 .options = WDIOF_KEEPALIVEPING,
152 .firmware_version = 1, 152 .firmware_version = 1,
153 .identity = "MPC83xx", 153 .identity = "MPC8xxx",
154 }; 154 };
155 155
156 switch (cmd) { 156 switch (cmd) {
@@ -160,7 +160,7 @@ static long mpc83xx_wdt_ioctl(struct file *file, unsigned int cmd,
160 case WDIOC_GETBOOTSTATUS: 160 case WDIOC_GETBOOTSTATUS:
161 return put_user(0, p); 161 return put_user(0, p);
162 case WDIOC_KEEPALIVE: 162 case WDIOC_KEEPALIVE:
163 mpc83xx_wdt_keepalive(); 163 mpc8xxx_wdt_keepalive();
164 return 0; 164 return 0;
165 case WDIOC_GETTIMEOUT: 165 case WDIOC_GETTIMEOUT:
166 return put_user(timeout_sec, p); 166 return put_user(timeout_sec, p);
@@ -169,27 +169,27 @@ static long mpc83xx_wdt_ioctl(struct file *file, unsigned int cmd,
169 } 169 }
170} 170}
171 171
172static const struct file_operations mpc83xx_wdt_fops = { 172static const struct file_operations mpc8xxx_wdt_fops = {
173 .owner = THIS_MODULE, 173 .owner = THIS_MODULE,
174 .llseek = no_llseek, 174 .llseek = no_llseek,
175 .write = mpc83xx_wdt_write, 175 .write = mpc8xxx_wdt_write,
176 .unlocked_ioctl = mpc83xx_wdt_ioctl, 176 .unlocked_ioctl = mpc8xxx_wdt_ioctl,
177 .open = mpc83xx_wdt_open, 177 .open = mpc8xxx_wdt_open,
178 .release = mpc83xx_wdt_release, 178 .release = mpc8xxx_wdt_release,
179}; 179};
180 180
181static struct miscdevice mpc83xx_wdt_miscdev = { 181static struct miscdevice mpc8xxx_wdt_miscdev = {
182 .minor = WATCHDOG_MINOR, 182 .minor = WATCHDOG_MINOR,
183 .name = "watchdog", 183 .name = "watchdog",
184 .fops = &mpc83xx_wdt_fops, 184 .fops = &mpc8xxx_wdt_fops,
185}; 185};
186 186
187static int __devinit mpc83xx_wdt_probe(struct of_device *ofdev, 187static int __devinit mpc8xxx_wdt_probe(struct of_device *ofdev,
188 const struct of_device_id *match) 188 const struct of_device_id *match)
189{ 189{
190 int ret; 190 int ret;
191 struct device_node *np = ofdev->node; 191 struct device_node *np = ofdev->node;
192 struct mpc83xx_wdt_type *wdt_type = match->data; 192 struct mpc8xxx_wdt_type *wdt_type = match->data;
193 u32 freq = fsl_get_sys_freq(); 193 u32 freq = fsl_get_sys_freq();
194 bool enabled; 194 bool enabled;
195 195
@@ -202,12 +202,12 @@ static int __devinit mpc83xx_wdt_probe(struct of_device *ofdev,
202 202
203 enabled = in_be32(&wd_base->swcrr) & SWCRR_SWEN; 203 enabled = in_be32(&wd_base->swcrr) & SWCRR_SWEN;
204 if (!enabled && wdt_type->hw_enabled) { 204 if (!enabled && wdt_type->hw_enabled) {
205 pr_info("mpc83xx_wdt: could not be enabled in software\n"); 205 pr_info("mpc8xxx_wdt: could not be enabled in software\n");
206 ret = -ENOSYS; 206 ret = -ENOSYS;
207 goto err_unmap; 207 goto err_unmap;
208 } 208 }
209 209
210 ret = misc_register(&mpc83xx_wdt_miscdev); 210 ret = misc_register(&mpc8xxx_wdt_miscdev);
211 if (ret) { 211 if (ret) {
212 pr_err("cannot register miscdev on minor=%d (err=%d)\n", 212 pr_err("cannot register miscdev on minor=%d (err=%d)\n",
213 WATCHDOG_MINOR, ret); 213 WATCHDOG_MINOR, ret);
@@ -220,73 +220,73 @@ static int __devinit mpc83xx_wdt_probe(struct of_device *ofdev,
220 else 220 else
221 timeout_sec = timeout / freq; 221 timeout_sec = timeout / freq;
222 222
223 pr_info("WDT driver for MPC83xx initialized. mode:%s timeout=%d " 223 pr_info("WDT driver for MPC8xxx initialized. mode:%s timeout=%d "
224 "(%d seconds)\n", reset ? "reset" : "interrupt", timeout, 224 "(%d seconds)\n", reset ? "reset" : "interrupt", timeout,
225 timeout_sec); 225 timeout_sec);
226 226
227 /* 227 /*
228 * If the watchdog was previously enabled or we're running on 228 * If the watchdog was previously enabled or we're running on
229 * MPC86xx, we should ping the wdt from the kernel until the 229 * MPC8xxx, we should ping the wdt from the kernel until the
230 * userspace handles it. 230 * userspace handles it.
231 */ 231 */
232 if (enabled) 232 if (enabled)
233 mpc83xx_wdt_timer_ping(0); 233 mpc8xxx_wdt_timer_ping(0);
234 return 0; 234 return 0;
235err_unmap: 235err_unmap:
236 iounmap(wd_base); 236 iounmap(wd_base);
237 return ret; 237 return ret;
238} 238}
239 239
240static int __devexit mpc83xx_wdt_remove(struct of_device *ofdev) 240static int __devexit mpc8xxx_wdt_remove(struct of_device *ofdev)
241{ 241{
242 mpc83xx_wdt_pr_warn("watchdog removed"); 242 mpc8xxx_wdt_pr_warn("watchdog removed");
243 del_timer_sync(&wdt_timer); 243 del_timer_sync(&wdt_timer);
244 misc_deregister(&mpc83xx_wdt_miscdev); 244 misc_deregister(&mpc8xxx_wdt_miscdev);
245 iounmap(wd_base); 245 iounmap(wd_base);
246 246
247 return 0; 247 return 0;
248} 248}
249 249
250static const struct of_device_id mpc83xx_wdt_match[] = { 250static const struct of_device_id mpc8xxx_wdt_match[] = {
251 { 251 {
252 .compatible = "mpc83xx_wdt", 252 .compatible = "mpc83xx_wdt",
253 .data = &(struct mpc83xx_wdt_type) { 253 .data = &(struct mpc8xxx_wdt_type) {
254 .prescaler = 0x10000, 254 .prescaler = 0x10000,
255 }, 255 },
256 }, 256 },
257 { 257 {
258 .compatible = "fsl,mpc8610-wdt", 258 .compatible = "fsl,mpc8610-wdt",
259 .data = &(struct mpc83xx_wdt_type) { 259 .data = &(struct mpc8xxx_wdt_type) {
260 .prescaler = 0x10000, 260 .prescaler = 0x10000,
261 .hw_enabled = true, 261 .hw_enabled = true,
262 }, 262 },
263 }, 263 },
264 {}, 264 {},
265}; 265};
266MODULE_DEVICE_TABLE(of, mpc83xx_wdt_match); 266MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match);
267 267
268static struct of_platform_driver mpc83xx_wdt_driver = { 268static struct of_platform_driver mpc8xxx_wdt_driver = {
269 .match_table = mpc83xx_wdt_match, 269 .match_table = mpc8xxx_wdt_match,
270 .probe = mpc83xx_wdt_probe, 270 .probe = mpc8xxx_wdt_probe,
271 .remove = __devexit_p(mpc83xx_wdt_remove), 271 .remove = __devexit_p(mpc8xxx_wdt_remove),
272 .driver = { 272 .driver = {
273 .name = "mpc83xx_wdt", 273 .name = "mpc8xxx_wdt",
274 .owner = THIS_MODULE, 274 .owner = THIS_MODULE,
275 }, 275 },
276}; 276};
277 277
278static int __init mpc83xx_wdt_init(void) 278static int __init mpc8xxx_wdt_init(void)
279{ 279{
280 return of_register_platform_driver(&mpc83xx_wdt_driver); 280 return of_register_platform_driver(&mpc8xxx_wdt_driver);
281} 281}
282 282
283static void __exit mpc83xx_wdt_exit(void) 283static void __exit mpc8xxx_wdt_exit(void)
284{ 284{
285 of_unregister_platform_driver(&mpc83xx_wdt_driver); 285 of_unregister_platform_driver(&mpc8xxx_wdt_driver);
286} 286}
287 287
288subsys_initcall(mpc83xx_wdt_init); 288subsys_initcall(mpc8xxx_wdt_init);
289module_exit(mpc83xx_wdt_exit); 289module_exit(mpc8xxx_wdt_exit);
290 290
291MODULE_AUTHOR("Dave Updegraff, Kumar Gala"); 291MODULE_AUTHOR("Dave Updegraff, Kumar Gala");
292MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx/MPC86xx uProcessors"); 292MODULE_DESCRIPTION("Driver for watchdog timer in MPC83xx/MPC86xx uProcessors");