From patchwork Tue Dec 10 19:16:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 3320051 Return-Path: X-Original-To: patchwork-linux-arm@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 2617E9F1F0 for ; Tue, 10 Dec 2013 19:20:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED78E201D5 for ; Tue, 10 Dec 2013 19:20:10 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AE9A02012D for ; Tue, 10 Dec 2013 19:20:09 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqSor-0005uq-SU; Tue, 10 Dec 2013 19:18:10 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqSoI-0002Oh-Ok; Tue, 10 Dec 2013 19:17:34 +0000 Received: from mail-wi0-f175.google.com ([209.85.212.175]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VqSnS-0002Hg-Uk for linux-arm-kernel@lists.infradead.org; Tue, 10 Dec 2013 19:16:44 +0000 Received: by mail-wi0-f175.google.com with SMTP id hi5so5950042wib.2 for ; Tue, 10 Dec 2013 11:16:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=gmej38OiPYJV93rbSBOwKeitfyCITnM7GZQfWXCmjEU=; b=JhTDcuz4eFHUJ5FAAO9DumRlZhlkmAOM/94Ema587zHYZjy8v4JowM+OQcfEFOyNg6 avKfewUSS5YdUQI9IveIZevg5Iv+ouDosyGsEpeGWkv5PHCAZdZtVdsQDOdILHlADpel A2LGZTp6tTLQXNbGi/Ri+lOG32b+/Y7Zx42/WclYUmWbNQGJ90D69nkx359J5ZKUJHZc zzBxSDNoz4tJjnOyn4ieCe7ncgnI8rSOBcQ8CqpEQzMDYPIepj15rR31LXaO2Gg+QUkO rQ9K9qtcK6+IdcjGmOG062DqEPsmnUDVcO9XBKyE3ZCVKNAz5VTiBlby7/GzGxTk6kHM xXaw== X-Gm-Message-State: ALoCoQlj/X/AviqKNIxhCELaCF0AOJC13eLhm3w5Anx1nU01OaEtF5Ew5dtmkbBIDcEPSr0z0MZc X-Received: by 10.194.89.233 with SMTP id br9mr22515338wjb.15.1386702980929; Tue, 10 Dec 2013 11:16:20 -0800 (PST) Received: from localhost.localdomain (AToulouse-654-1-288-187.w90-5.abo.wanadoo.fr. [90.5.191.187]) by mx.google.com with ESMTPSA id xn17sm7758084wib.1.2013.12.10.11.16.19 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 11:16:20 -0800 (PST) From: Daniel Lezcano To: mingo@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH 6/6] clocksource: dw_apb_timer_of: Fix support for dts binding "snps, dw-apb-timer" Date: Tue, 10 Dec 2013 20:16:12 +0100 Message-Id: <1386702972-25565-6-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1386702972-25565-1-git-send-email-daniel.lezcano@linaro.org> References: <52A767CB.3010501@linaro.org> <1386702972-25565-1-git-send-email-daniel.lezcano@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131210_141643_190338_72C722FC X-CRM114-Status: GOOD ( 11.51 ) X-Spam-Score: -2.6 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 From: Dinh Nguyen In commit 620f5e1cbf (dts: Rename DW APB timer compatible strings), both "snps,dw-apb-timer-sp" and "snps,dw-apb-timer-osc" were deprecated in place of "snps,dw-apb-timer". But the driver also needs to be udpated in order to support this new binding "snps,dw-apb-timer". Signed-off-by: Dinh Nguyen Signed-off-by: Daniel Lezcano --- drivers/clocksource/dw_apb_timer_of.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/clocksource/dw_apb_timer_of.c b/drivers/clocksource/dw_apb_timer_of.c index b29d7cd..2a2ea27 100644 --- a/drivers/clocksource/dw_apb_timer_of.c +++ b/drivers/clocksource/dw_apb_timer_of.c @@ -113,7 +113,6 @@ static u64 read_sched_clock(void) static const struct of_device_id sptimer_ids[] __initconst = { { .compatible = "picochip,pc3x2-rtc" }, - { .compatible = "snps,dw-apb-timer-sp" }, { /* Sentinel */ }, }; @@ -151,4 +150,6 @@ static void __init dw_apb_timer_init(struct device_node *timer) num_called++; } CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init); -CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer-osc", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer_osc, "snps,dw-apb-timer-osc", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer_sp, "snps,dw-apb-timer-sp", dw_apb_timer_init); +CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer", dw_apb_timer_init);