Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial fix from Greg KH:
"Here is a single revert for the of-serial driver that resolves a
reported issue.
This revert has been in linux-next for a while"
* tag 'tty-3.18-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
Revert "serial: of-serial: add PM suspend/resume support"
-27
-27
drivers/tty/serial/of_serial.c
-27
drivers/tty/serial/of_serial.c
···
240
240
return 0;
241
241
}
242
242
243
-
#ifdef CONFIG_PM_SLEEP
244
-
static int of_serial_suspend(struct device *dev)
245
-
{
246
-
struct of_serial_info *info = dev_get_drvdata(dev);
247
-
248
-
serial8250_suspend_port(info->line);
249
-
if (info->clk)
250
-
clk_disable_unprepare(info->clk);
251
-
252
-
return 0;
253
-
}
254
-
255
-
static int of_serial_resume(struct device *dev)
256
-
{
257
-
struct of_serial_info *info = dev_get_drvdata(dev);
258
-
259
-
if (info->clk)
260
-
clk_prepare_enable(info->clk);
261
-
262
-
serial8250_resume_port(info->line);
263
-
264
-
return 0;
265
-
}
266
-
#endif
267
-
static SIMPLE_DEV_PM_OPS(of_serial_pm_ops, of_serial_suspend, of_serial_resume);
268
-
269
243
/*
270
244
* A few common types, add more as needed.
271
245
*/
···
271
297
.name = "of_serial",
272
298
.owner = THIS_MODULE,
273
299
.of_match_table = of_platform_serial_table,
274
-
.pm = &of_serial_pm_ops,
275
300
},
276
301
.probe = of_platform_serial_probe,
277
302
.remove = of_platform_serial_remove,