mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 22:51:35 +00:00
5a0e3ad6af
percpu.h is included by sched.h and module.h and thus ends up being included when building most .c files. percpu.h includes slab.h which in turn includes gfp.h making everything defined by the two files universally available and complicating inclusion dependencies. percpu.h -> slab.h dependency is about to be removed. Prepare for this change by updating users of gfp and slab facilities include those headers directly instead of assuming availability. As this conversion needs to touch large number of source files, the following script is used as the basis of conversion. http://userweb.kernel.org/~tj/misc/slabh-sweep.py The script does the followings. * Scan files for gfp and slab usages and update includes such that only the necessary includes are there. ie. if only gfp is used, gfp.h, if slab is used, slab.h. * When the script inserts a new include, it looks at the include blocks and try to put the new include such that its order conforms to its surrounding. It's put in the include block which contains core kernel includes, in the same order that the rest are ordered - alphabetical, Christmas tree, rev-Xmas-tree or at the end if there doesn't seem to be any matching order. * If the script can't find a place to put a new include (mostly because the file doesn't have fitting include block), it prints out an error message indicating which .h file needs to be added to the file. The conversion was done in the following steps. 1. The initial automatic conversion of all .c files updated slightly over 4000 files, deleting around 700 includes and adding ~480 gfp.h and ~3000 slab.h inclusions. The script emitted errors for ~400 files. 2. Each error was manually checked. Some didn't need the inclusion, some needed manual addition while adding it to implementation .h or embedding .c file was more appropriate for others. This step added inclusions to around 150 files. 3. The script was run again and the output was compared to the edits from #2 to make sure no file was left behind. 4. Several build tests were done and a couple of problems were fixed. e.g. lib/decompress_*.c used malloc/free() wrappers around slab APIs requiring slab.h to be added manually. 5. The script was run on all .h files but without automatically editing them as sprinkling gfp.h and slab.h inclusions around .h files could easily lead to inclusion dependency hell. Most gfp.h inclusion directives were ignored as stuff from gfp.h was usually wildly available and often used in preprocessor macros. Each slab.h inclusion directive was examined and added manually as necessary. 6. percpu.h was updated not to include slab.h. 7. Build test were done on the following configurations and failures were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my distributed build env didn't work with gcov compiles) and a few more options had to be turned off depending on archs to make things build (like ipr on powerpc/64 which failed due to missing writeq). * x86 and x86_64 UP and SMP allmodconfig and a custom test config. * powerpc and powerpc64 SMP allmodconfig * sparc and sparc64 SMP allmodconfig * ia64 SMP allmodconfig * s390 SMP allmodconfig * alpha SMP allmodconfig * um on x86_64 SMP allmodconfig 8. percpu.h modifications were reverted so that it could be applied as a separate patch and serve as bisection point. Given the fact that I had only a couple of failures from tests on step 6, I'm fairly confident about the coverage of this conversion patch. If there is a breakage, it's likely to be something in one of the arch headers which should be easily discoverable easily on most builds of the specific arch. Signed-off-by: Tejun Heo <tj@kernel.org> Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org> Cc: Ingo Molnar <mingo@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
271 lines
7.4 KiB
C
271 lines
7.4 KiB
C
/*
|
|
* Oki MSM6242 RTC Driver
|
|
*
|
|
* Copyright 2009 Geert Uytterhoeven
|
|
*
|
|
* Based on the A2000 TOD code in arch/m68k/amiga/config.c
|
|
* Copyright (C) 1993 Hamish Macdonald
|
|
*/
|
|
|
|
#include <linux/delay.h>
|
|
#include <linux/io.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/rtc.h>
|
|
#include <linux/slab.h>
|
|
|
|
|
|
enum {
|
|
MSM6242_SECOND1 = 0x0, /* 1-second digit register */
|
|
MSM6242_SECOND10 = 0x1, /* 10-second digit register */
|
|
MSM6242_MINUTE1 = 0x2, /* 1-minute digit register */
|
|
MSM6242_MINUTE10 = 0x3, /* 10-minute digit register */
|
|
MSM6242_HOUR1 = 0x4, /* 1-hour digit register */
|
|
MSM6242_HOUR10 = 0x5, /* PM/AM, 10-hour digit register */
|
|
MSM6242_DAY1 = 0x6, /* 1-day digit register */
|
|
MSM6242_DAY10 = 0x7, /* 10-day digit register */
|
|
MSM6242_MONTH1 = 0x8, /* 1-month digit register */
|
|
MSM6242_MONTH10 = 0x9, /* 10-month digit register */
|
|
MSM6242_YEAR1 = 0xa, /* 1-year digit register */
|
|
MSM6242_YEAR10 = 0xb, /* 10-year digit register */
|
|
MSM6242_WEEK = 0xc, /* Week register */
|
|
MSM6242_CD = 0xd, /* Control Register D */
|
|
MSM6242_CE = 0xe, /* Control Register E */
|
|
MSM6242_CF = 0xf, /* Control Register F */
|
|
};
|
|
|
|
#define MSM6242_HOUR10_AM (0 << 2)
|
|
#define MSM6242_HOUR10_PM (1 << 2)
|
|
#define MSM6242_HOUR10_HR_MASK (3 << 0)
|
|
|
|
#define MSM6242_WEEK_SUNDAY 0
|
|
#define MSM6242_WEEK_MONDAY 1
|
|
#define MSM6242_WEEK_TUESDAY 2
|
|
#define MSM6242_WEEK_WEDNESDAY 3
|
|
#define MSM6242_WEEK_THURSDAY 4
|
|
#define MSM6242_WEEK_FRIDAY 5
|
|
#define MSM6242_WEEK_SATURDAY 6
|
|
|
|
#define MSM6242_CD_30_S_ADJ (1 << 3) /* 30-second adjustment */
|
|
#define MSM6242_CD_IRQ_FLAG (1 << 2)
|
|
#define MSM6242_CD_BUSY (1 << 1)
|
|
#define MSM6242_CD_HOLD (1 << 0)
|
|
|
|
#define MSM6242_CE_T_MASK (3 << 2)
|
|
#define MSM6242_CE_T_64HZ (0 << 2) /* period 1/64 second */
|
|
#define MSM6242_CE_T_1HZ (1 << 2) /* period 1 second */
|
|
#define MSM6242_CE_T_1MINUTE (2 << 2) /* period 1 minute */
|
|
#define MSM6242_CE_T_1HOUR (3 << 2) /* period 1 hour */
|
|
|
|
#define MSM6242_CE_ITRPT_STND (1 << 1)
|
|
#define MSM6242_CE_MASK (1 << 0) /* STD.P output control */
|
|
|
|
#define MSM6242_CF_TEST (1 << 3)
|
|
#define MSM6242_CF_12H (0 << 2)
|
|
#define MSM6242_CF_24H (1 << 2)
|
|
#define MSM6242_CF_STOP (1 << 1)
|
|
#define MSM6242_CF_REST (1 << 0) /* reset */
|
|
|
|
|
|
struct msm6242_priv {
|
|
u32 __iomem *regs;
|
|
struct rtc_device *rtc;
|
|
};
|
|
|
|
static inline unsigned int msm6242_read(struct msm6242_priv *priv,
|
|
unsigned int reg)
|
|
{
|
|
return __raw_readl(&priv->regs[reg]) & 0xf;
|
|
}
|
|
|
|
static inline void msm6242_write(struct msm6242_priv *priv, unsigned int val,
|
|
unsigned int reg)
|
|
{
|
|
return __raw_writel(val, &priv->regs[reg]);
|
|
}
|
|
|
|
static inline void msm6242_set(struct msm6242_priv *priv, unsigned int val,
|
|
unsigned int reg)
|
|
{
|
|
msm6242_write(priv, msm6242_read(priv, reg) | val, reg);
|
|
}
|
|
|
|
static inline void msm6242_clear(struct msm6242_priv *priv, unsigned int val,
|
|
unsigned int reg)
|
|
{
|
|
msm6242_write(priv, msm6242_read(priv, reg) & ~val, reg);
|
|
}
|
|
|
|
static void msm6242_lock(struct msm6242_priv *priv)
|
|
{
|
|
int cnt = 5;
|
|
|
|
msm6242_set(priv, MSM6242_CD_HOLD, MSM6242_CD);
|
|
|
|
while ((msm6242_read(priv, MSM6242_CD) & MSM6242_CD_BUSY) && cnt) {
|
|
msm6242_clear(priv, MSM6242_CD_HOLD, MSM6242_CD);
|
|
udelay(70);
|
|
msm6242_set(priv, MSM6242_CD_HOLD, MSM6242_CD);
|
|
cnt--;
|
|
}
|
|
|
|
if (!cnt)
|
|
pr_warning("msm6242: timed out waiting for RTC (0x%x)\n",
|
|
msm6242_read(priv, MSM6242_CD));
|
|
}
|
|
|
|
static void msm6242_unlock(struct msm6242_priv *priv)
|
|
{
|
|
msm6242_clear(priv, MSM6242_CD_HOLD, MSM6242_CD);
|
|
}
|
|
|
|
static int msm6242_read_time(struct device *dev, struct rtc_time *tm)
|
|
{
|
|
struct msm6242_priv *priv = dev_get_drvdata(dev);
|
|
|
|
msm6242_lock(priv);
|
|
|
|
tm->tm_sec = msm6242_read(priv, MSM6242_SECOND10) * 10 +
|
|
msm6242_read(priv, MSM6242_SECOND1);
|
|
tm->tm_min = msm6242_read(priv, MSM6242_MINUTE10) * 10 +
|
|
msm6242_read(priv, MSM6242_MINUTE1);
|
|
tm->tm_hour = (msm6242_read(priv, MSM6242_HOUR10 & 3)) * 10 +
|
|
msm6242_read(priv, MSM6242_HOUR1);
|
|
tm->tm_mday = msm6242_read(priv, MSM6242_DAY10) * 10 +
|
|
msm6242_read(priv, MSM6242_DAY1);
|
|
tm->tm_wday = msm6242_read(priv, MSM6242_WEEK);
|
|
tm->tm_mon = msm6242_read(priv, MSM6242_MONTH10) * 10 +
|
|
msm6242_read(priv, MSM6242_MONTH1) - 1;
|
|
tm->tm_year = msm6242_read(priv, MSM6242_YEAR10) * 10 +
|
|
msm6242_read(priv, MSM6242_YEAR1);
|
|
if (tm->tm_year <= 69)
|
|
tm->tm_year += 100;
|
|
|
|
if (!(msm6242_read(priv, MSM6242_CF) & MSM6242_CF_24H)) {
|
|
unsigned int pm = msm6242_read(priv, MSM6242_HOUR10) &
|
|
MSM6242_HOUR10_PM;
|
|
if (!pm && tm->tm_hour == 12)
|
|
tm->tm_hour = 0;
|
|
else if (pm && tm->tm_hour != 12)
|
|
tm->tm_hour += 12;
|
|
}
|
|
|
|
msm6242_unlock(priv);
|
|
|
|
return rtc_valid_tm(tm);
|
|
}
|
|
|
|
static int msm6242_set_time(struct device *dev, struct rtc_time *tm)
|
|
{
|
|
struct msm6242_priv *priv = dev_get_drvdata(dev);
|
|
|
|
msm6242_lock(priv);
|
|
|
|
msm6242_write(priv, tm->tm_sec / 10, MSM6242_SECOND10);
|
|
msm6242_write(priv, tm->tm_sec % 10, MSM6242_SECOND1);
|
|
msm6242_write(priv, tm->tm_min / 10, MSM6242_MINUTE10);
|
|
msm6242_write(priv, tm->tm_min % 10, MSM6242_MINUTE1);
|
|
if (msm6242_read(priv, MSM6242_CF) & MSM6242_CF_24H)
|
|
msm6242_write(priv, tm->tm_hour / 10, MSM6242_HOUR10);
|
|
else if (tm->tm_hour >= 12)
|
|
msm6242_write(priv, MSM6242_HOUR10_PM + (tm->tm_hour - 12) / 10,
|
|
MSM6242_HOUR10);
|
|
else
|
|
msm6242_write(priv, tm->tm_hour / 10, MSM6242_HOUR10);
|
|
msm6242_write(priv, tm->tm_hour % 10, MSM6242_HOUR1);
|
|
msm6242_write(priv, tm->tm_mday / 10, MSM6242_DAY10);
|
|
msm6242_write(priv, tm->tm_mday % 10, MSM6242_DAY1);
|
|
if (tm->tm_wday != -1)
|
|
msm6242_write(priv, tm->tm_wday, MSM6242_WEEK);
|
|
msm6242_write(priv, (tm->tm_mon + 1) / 10, MSM6242_MONTH10);
|
|
msm6242_write(priv, (tm->tm_mon + 1) % 10, MSM6242_MONTH1);
|
|
if (tm->tm_year >= 100)
|
|
tm->tm_year -= 100;
|
|
msm6242_write(priv, tm->tm_year / 10, MSM6242_YEAR10);
|
|
msm6242_write(priv, tm->tm_year % 10, MSM6242_YEAR1);
|
|
|
|
msm6242_unlock(priv);
|
|
return 0;
|
|
}
|
|
|
|
static const struct rtc_class_ops msm6242_rtc_ops = {
|
|
.read_time = msm6242_read_time,
|
|
.set_time = msm6242_set_time,
|
|
};
|
|
|
|
static int __init msm6242_rtc_probe(struct platform_device *dev)
|
|
{
|
|
struct resource *res;
|
|
struct msm6242_priv *priv;
|
|
struct rtc_device *rtc;
|
|
int error;
|
|
|
|
res = platform_get_resource(dev, IORESOURCE_MEM, 0);
|
|
if (!res)
|
|
return -ENODEV;
|
|
|
|
priv = kzalloc(sizeof(*priv), GFP_KERNEL);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
priv->regs = ioremap(res->start, resource_size(res));
|
|
if (!priv->regs) {
|
|
error = -ENOMEM;
|
|
goto out_free_priv;
|
|
}
|
|
|
|
rtc = rtc_device_register("rtc-msm6242", &dev->dev, &msm6242_rtc_ops,
|
|
THIS_MODULE);
|
|
if (IS_ERR(rtc)) {
|
|
error = PTR_ERR(rtc);
|
|
goto out_unmap;
|
|
}
|
|
|
|
priv->rtc = rtc;
|
|
platform_set_drvdata(dev, priv);
|
|
return 0;
|
|
|
|
out_unmap:
|
|
iounmap(priv->regs);
|
|
out_free_priv:
|
|
kfree(priv);
|
|
return error;
|
|
}
|
|
|
|
static int __exit msm6242_rtc_remove(struct platform_device *dev)
|
|
{
|
|
struct msm6242_priv *priv = platform_get_drvdata(dev);
|
|
|
|
rtc_device_unregister(priv->rtc);
|
|
iounmap(priv->regs);
|
|
kfree(priv);
|
|
return 0;
|
|
}
|
|
|
|
static struct platform_driver msm6242_rtc_driver = {
|
|
.driver = {
|
|
.name = "rtc-msm6242",
|
|
.owner = THIS_MODULE,
|
|
},
|
|
.remove = __exit_p(msm6242_rtc_remove),
|
|
};
|
|
|
|
static int __init msm6242_rtc_init(void)
|
|
{
|
|
return platform_driver_probe(&msm6242_rtc_driver, msm6242_rtc_probe);
|
|
}
|
|
|
|
static void __exit msm6242_rtc_fini(void)
|
|
{
|
|
platform_driver_unregister(&msm6242_rtc_driver);
|
|
}
|
|
|
|
module_init(msm6242_rtc_init);
|
|
module_exit(msm6242_rtc_fini);
|
|
|
|
MODULE_AUTHOR("Geert Uytterhoeven <geert@linux-m68k.org>");
|
|
MODULE_LICENSE("GPL");
|
|
MODULE_DESCRIPTION("Oki MSM6242 RTC driver");
|
|
MODULE_ALIAS("platform:rtc-msm6242");
|