mirror of
https://github.com/torvalds/linux.git
synced 2024-12-22 10:56:40 +00:00
6aaec67da1
DMTIMER source selection on OMAP1 is broken. omap1_dm_timer_set_src()
tries to use __raw_{read,write}l() to read from and write to physical
addresses, but those functions take virtual addresses.
sparse caught this:
arch/arm/mach-omap1/timer.c:50:13: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/timer.c:50:13: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/timer.c:50:13: got unsigned int
arch/arm/mach-omap1/timer.c:52:9: warning: incorrect type in argument 1 (different base types)
arch/arm/mach-omap1/timer.c:52:9: expected void const volatile [noderef] <asn:2>*<noident>
arch/arm/mach-omap1/timer.c:52:9: got unsigned int
Fix by using omap_{read,writel}(), just like the other users of the
MOD_CONF_CTRL_1 register in the OMAP1 codebase. Of course, in the long term,
removing omap_{read,write}l() is the appropriate thing to do; but
this will take some work to do this cleanly.
Looks like this was caused by 97933d6
(ARM: OMAP1: dmtimer: conversion
to platform devices) that dangerously moved code and changed it in
the same patch.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
Cc: stable@vger.kernel.org
[tony@atomide.com: updated comments to include the breaking commit]
Signed-off-by: Tony Lindgren <tony@atomide.com>
174 lines
4.0 KiB
C
174 lines
4.0 KiB
C
/**
|
|
* OMAP1 Dual-Mode Timers - platform device registration
|
|
*
|
|
* Contains first level initialization routines which internally
|
|
* generates timer device information and registers with linux
|
|
* device model. It also has low level function to chnage the timer
|
|
* input clock source.
|
|
*
|
|
* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
|
|
* Tarun Kanti DebBarma <tarun.kanti@ti.com>
|
|
* Thara Gopinath <thara@ti.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed "as is" WITHOUT ANY WARRANTY of any
|
|
* kind, whether express or implied; without even the implied warranty
|
|
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/io.h>
|
|
#include <linux/err.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/platform_device.h>
|
|
|
|
#include <mach/irqs.h>
|
|
|
|
#include <plat/dmtimer.h>
|
|
|
|
#define OMAP1610_GPTIMER1_BASE 0xfffb1400
|
|
#define OMAP1610_GPTIMER2_BASE 0xfffb1c00
|
|
#define OMAP1610_GPTIMER3_BASE 0xfffb2400
|
|
#define OMAP1610_GPTIMER4_BASE 0xfffb2c00
|
|
#define OMAP1610_GPTIMER5_BASE 0xfffb3400
|
|
#define OMAP1610_GPTIMER6_BASE 0xfffb3c00
|
|
#define OMAP1610_GPTIMER7_BASE 0xfffb7400
|
|
#define OMAP1610_GPTIMER8_BASE 0xfffbd400
|
|
|
|
#define OMAP1_DM_TIMER_COUNT 8
|
|
|
|
static int omap1_dm_timer_set_src(struct platform_device *pdev,
|
|
int source)
|
|
{
|
|
int n = (pdev->id - 1) << 1;
|
|
u32 l;
|
|
|
|
l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
|
|
l |= source << n;
|
|
omap_writel(l, MOD_CONF_CTRL_1);
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int __init omap1_dm_timer_init(void)
|
|
{
|
|
int i;
|
|
int ret;
|
|
struct dmtimer_platform_data *pdata;
|
|
struct platform_device *pdev;
|
|
|
|
if (!cpu_is_omap16xx())
|
|
return 0;
|
|
|
|
for (i = 1; i <= OMAP1_DM_TIMER_COUNT; i++) {
|
|
struct resource res[2];
|
|
u32 base, irq;
|
|
|
|
switch (i) {
|
|
case 1:
|
|
base = OMAP1610_GPTIMER1_BASE;
|
|
irq = INT_1610_GPTIMER1;
|
|
break;
|
|
case 2:
|
|
base = OMAP1610_GPTIMER2_BASE;
|
|
irq = INT_1610_GPTIMER2;
|
|
break;
|
|
case 3:
|
|
base = OMAP1610_GPTIMER3_BASE;
|
|
irq = INT_1610_GPTIMER3;
|
|
break;
|
|
case 4:
|
|
base = OMAP1610_GPTIMER4_BASE;
|
|
irq = INT_1610_GPTIMER4;
|
|
break;
|
|
case 5:
|
|
base = OMAP1610_GPTIMER5_BASE;
|
|
irq = INT_1610_GPTIMER5;
|
|
break;
|
|
case 6:
|
|
base = OMAP1610_GPTIMER6_BASE;
|
|
irq = INT_1610_GPTIMER6;
|
|
break;
|
|
case 7:
|
|
base = OMAP1610_GPTIMER7_BASE;
|
|
irq = INT_1610_GPTIMER7;
|
|
break;
|
|
case 8:
|
|
base = OMAP1610_GPTIMER8_BASE;
|
|
irq = INT_1610_GPTIMER8;
|
|
break;
|
|
default:
|
|
/*
|
|
* not supposed to reach here.
|
|
* this is to remove warning.
|
|
*/
|
|
return -EINVAL;
|
|
}
|
|
|
|
pdev = platform_device_alloc("omap_timer", i);
|
|
if (!pdev) {
|
|
pr_err("%s: Failed to device alloc for dmtimer%d\n",
|
|
__func__, i);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
memset(res, 0, 2 * sizeof(struct resource));
|
|
res[0].start = base;
|
|
res[0].end = base + 0x46;
|
|
res[0].flags = IORESOURCE_MEM;
|
|
res[1].start = irq;
|
|
res[1].end = irq;
|
|
res[1].flags = IORESOURCE_IRQ;
|
|
ret = platform_device_add_resources(pdev, res,
|
|
ARRAY_SIZE(res));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "%s: Failed to add resources.\n",
|
|
__func__);
|
|
goto err_free_pdev;
|
|
}
|
|
|
|
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
|
|
if (!pdata) {
|
|
dev_err(&pdev->dev, "%s: Failed to allocate pdata.\n",
|
|
__func__);
|
|
ret = -ENOMEM;
|
|
goto err_free_pdata;
|
|
}
|
|
|
|
pdata->set_timer_src = omap1_dm_timer_set_src;
|
|
pdata->needs_manual_reset = 1;
|
|
|
|
ret = platform_device_add_data(pdev, pdata, sizeof(*pdata));
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "%s: Failed to add platform data.\n",
|
|
__func__);
|
|
goto err_free_pdata;
|
|
}
|
|
|
|
ret = platform_device_add(pdev);
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "%s: Failed to add platform device.\n",
|
|
__func__);
|
|
goto err_free_pdata;
|
|
}
|
|
|
|
dev_dbg(&pdev->dev, " Registered.\n");
|
|
}
|
|
|
|
return 0;
|
|
|
|
err_free_pdata:
|
|
kfree(pdata);
|
|
|
|
err_free_pdev:
|
|
platform_device_unregister(pdev);
|
|
|
|
return ret;
|
|
}
|
|
arch_initcall(omap1_dm_timer_init);
|