From patchwork Thu Jun 13 19:22:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2718381 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 11E5C9F472 for ; Thu, 13 Jun 2013 19:22:59 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1C6FE2046C for ; Thu, 13 Jun 2013 19:22:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 71C442045E for ; Thu, 13 Jun 2013 19:22:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756856Ab3FMTWw (ORCPT ); Thu, 13 Jun 2013 15:22:52 -0400 Received: from mail-ea0-f177.google.com ([209.85.215.177]:62474 "EHLO mail-ea0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756785Ab3FMTWw (ORCPT ); Thu, 13 Jun 2013 15:22:52 -0400 Received: by mail-ea0-f177.google.com with SMTP id j14so7936025eak.22 for ; Thu, 13 Jun 2013 12:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=GoKKXEOfc0FSNf/9/lkDPoaAT0kExf5SSwurh+RuFD0=; b=x/uv7c8bdsdjuYTAhEJNMawuvLM97zqpDtvOJF8dGpiNV1kjD3RJGaHTK/D0EEIV/o B12JnQHtn81EOZg5dmA6kaZ+zDrZvAa3pHs0bvzwHuezQBe2weXNAleUVQR2AQHtf1rc AJPyFv5uwdtx6ICqclG+dPeHugPxs81Hh1M/l6nA6qRBrXRfaupRuhAnvjqlG0n9oncm 3zIgftVE3O3CYNzO1FqGym1mFgqOc4rktEi0EVqhvI43pkieoPBkNiXJ2A6xHC4bbCIw XYPPRDQoX2Uj0dBx5tBL6lXwJFIaFpQKhnzHmFJ7rzGyMXGujrCt3UWLr1+uSLXcTsmz ak9w== X-Received: by 10.14.174.198 with SMTP id x46mr2738934eel.139.1371151371319; Thu, 13 Jun 2013 12:22:51 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id s43sm45742840eem.13.2013.06.13.12.22.49 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 12:22:50 -0700 (PDT) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Kukjin Kim , Arnd Bergmann , Olof Johansson , john.stultz@linaro.org, tglx@linutronix.de, Tomasz Figa Subject: [PATCH] clocksource: samsung_pwm_timer: Do not request PWM mem region Date: Thu, 13 Jun 2013 21:22:44 +0200 Message-Id: <1371151364-8121-1-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP PWM registers are shared between clocksource and PWM drivers and so can not be claimed for exclusive use. Signed-off-by: Tomasz Figa Acked-by: Olof Johansson --- drivers/clocksource/samsung_pwm_timer.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 0234c8d..553115b 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c @@ -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; }