]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
clocksource: samsung_pwm_timer: Do not request PWM mem region
authorTomasz Figa <tomasz.figa@gmail.com>
Sun, 16 Jun 2013 21:21:14 +0000 (06:21 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Sun, 16 Jun 2013 21:21:14 +0000 (06:21 +0900)
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>
Acked-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
drivers/clocksource/samsung_pwm_timer.c

index 0234c8d2c8f26ccefc187be2385f103e8197f48c..553115bd4355b3ee5be625e0b1b438f0dc2c9ca7 100644 (file)
@@ -404,7 +404,6 @@ void __init samsung_pwm_clocksource_init(void __iomem *base,
 static void __init samsung_pwm_alloc(struct device_node *np,
                                     const struct samsung_pwm_variant *variant)
 {
-       struct resource res;
        struct property *prop;
        const __be32 *cur;
        u32 val;
@@ -423,17 +422,9 @@ static void __init samsung_pwm_alloc(struct device_node *np,
                pwm.variant.output_mask |= 1 << val;
        }
 
-       of_address_to_resource(np, 0, &res);
-       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));
+       pwm.base = of_iomap(np, 0);
        if (!pwm.base) {
                pr_err("%s: failed to map PWM registers\n", __func__);
-               release_mem_region(res.start, resource_size(&res));
                return;
        }