mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-16 07:35:14 +00:00
clocksource: samsung_pwm_timer: Do not request PWM mem region
PWM registers are shared between clocksource and PWM drivers and so can not be claimed for exclusive use. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Reviewed-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Tested-by: Heiko Stuebner <heiko@sntech.de> Tested-by: Mark Brown <broonie@linaro.org> Tested-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com> Acked-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
parent
c095ba7224
commit
e24154896e
1 changed files with 1 additions and 10 deletions
|
@ -404,7 +404,6 @@ void __init samsung_pwm_clocksource_init(void __iomem *base,
|
||||||
static void __init samsung_pwm_alloc(struct device_node *np,
|
static void __init samsung_pwm_alloc(struct device_node *np,
|
||||||
const struct samsung_pwm_variant *variant)
|
const struct samsung_pwm_variant *variant)
|
||||||
{
|
{
|
||||||
struct resource res;
|
|
||||||
struct property *prop;
|
struct property *prop;
|
||||||
const __be32 *cur;
|
const __be32 *cur;
|
||||||
u32 val;
|
u32 val;
|
||||||
|
@ -423,17 +422,9 @@ static void __init samsung_pwm_alloc(struct device_node *np,
|
||||||
pwm.variant.output_mask |= 1 << val;
|
pwm.variant.output_mask |= 1 << val;
|
||||||
}
|
}
|
||||||
|
|
||||||
of_address_to_resource(np, 0, &res);
|
pwm.base = of_iomap(np, 0);
|
||||||
if (!request_mem_region(res.start,
|
|
||||||
resource_size(&res), "samsung-pwm")) {
|
|
||||||
pr_err("%s: failed to request IO mem region\n", __func__);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
pwm.base = ioremap(res.start, resource_size(&res));
|
|
||||||
if (!pwm.base) {
|
if (!pwm.base) {
|
||||||
pr_err("%s: failed to map PWM registers\n", __func__);
|
pr_err("%s: failed to map PWM registers\n", __func__);
|
||||||
release_mem_region(res.start, resource_size(&res));
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue