From patchwork Tue Mar 11 22:40:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 26067 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f198.google.com (mail-yk0-f198.google.com [209.85.160.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 53FC420068 for ; Tue, 11 Mar 2014 22:45:28 +0000 (UTC) Received: by mail-yk0-f198.google.com with SMTP id 9sf49496129ykp.1 for ; Tue, 11 Mar 2014 15:45:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=roXwvlzmfpzXqAKlvOb+i50JTXZRTwRri5RceKFPF3I=; b=mnXaNLFP6Nru6rTFc7At8OKHdNG0tTv430er134BBBUwP57yH+etJYEL864H4QIEo8 Bc3dmiMzTXiV1iZYzUimbiQSW0pVWNfE+pcCNNzNHU7tgtO6fIPMatCRp/lrg50gSAIt yEsTq3VxHdLIVMi+lbvf0yLLGZeAYuRUtxdpEWCRg1BdpwqCw6uuPzCcmd30RfPsxHEN GZETeug8eIaOE9AZeaj7aVMW7YUYttWR1cqcklz0U5YfCETPq8H7CCn5KjUXSSCbKqAN D8LlsAb0hAdQmUhzGjiolCf/vWB/tsfTi6EIh+MeZfDGqxE96WcOPKL5H8ZQwogAWdcr AH1Q== X-Gm-Message-State: ALoCoQmyw7E64G/0xjdkrtvQ4z0ogWFOGRnWTyremiO9dxeq4QBpnifECzGcdyU94sWtcoA4JJKo X-Received: by 10.236.145.34 with SMTP id o22mr16220987yhj.22.1394577928066; Tue, 11 Mar 2014 15:45:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.236 with SMTP id 99ls443145qgb.4.gmail; Tue, 11 Mar 2014 15:45:27 -0700 (PDT) X-Received: by 10.52.61.133 with SMTP id p5mr28337722vdr.4.1394577927942; Tue, 11 Mar 2014 15:45:27 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id sr19si6201772vcb.146.2014.03.11.15.45.27 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Mar 2014 15:45:27 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id il7so4294146vcb.18 for ; Tue, 11 Mar 2014 15:45:27 -0700 (PDT) X-Received: by 10.52.27.9 with SMTP id p9mr8688911vdg.28.1394577927843; Tue, 11 Mar 2014 15:45:27 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp238995vck; Tue, 11 Mar 2014 15:45:27 -0700 (PDT) X-Received: by 10.66.250.161 with SMTP id zd1mr792985pac.136.1394577926753; Tue, 11 Mar 2014 15:45:26 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id tu7si357154pac.106.2014.03.11.15.45.24; Tue, 11 Mar 2014 15:45:24 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755993AbaCKWk7 (ORCPT + 26 others); Tue, 11 Mar 2014 18:40:59 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:36828 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755965AbaCKWk4 (ORCPT ); Tue, 11 Mar 2014 18:40:56 -0400 Received: by mail-wg0-f44.google.com with SMTP id m15so8387500wgh.27 for ; Tue, 11 Mar 2014 15:40:55 -0700 (PDT) X-Received: by 10.180.89.136 with SMTP id bo8mr4909877wib.52.1394577655019; Tue, 11 Mar 2014 15:40:55 -0700 (PDT) Received: from localhost.localdomain (AToulouse-654-1-526-136.w109-220.abo.wanadoo.fr. [109.220.245.136]) by mx.google.com with ESMTPSA id n3sm10411631wix.10.2014.03.11.15.40.53 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Mar 2014 15:40:54 -0700 (PDT) From: Daniel Lezcano To: tglx@linutronix.de, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, dan.carpenter@oracle.com, ezequiel.garcia@free-electrons.com, ivan.khoronzhuk@ti.com, linus.walleij@linaro.org, magnus.damm@gmail.com, matthias.bgg@gmail.com, soren.brinkmann@xilinx.com, sboyd@codeaurora.org Subject: [PATCH 03/17] clocksource: sunxi: Add new compatibles Date: Tue, 11 Mar 2014 23:40:39 +0100 Message-Id: <1394577653-8615-3-git-send-email-daniel.lezcano@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1394577653-8615-1-git-send-email-daniel.lezcano@linaro.org> References: <531F8FAC.2040902@linaro.org> <1394577653-8615-1-git-send-email-daniel.lezcano@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: daniel.lezcano@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.173 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Maxime Ripard The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Add compatibles matching the other pattern to the timer driver for consistency, and keep the older one for backward compatibility. Signed-off-by: Maxime Ripard Signed-off-by: Daniel Lezcano --- .../bindings/timer/allwinner,sun4i-timer.txt | 4 ++-- drivers/clocksource/sun4i_timer.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt index 48aeb78..5c2e235 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt @@ -2,7 +2,7 @@ Allwinner A1X SoCs Timer Controller Required properties: -- compatible : should be "allwinner,sun4i-timer" +- compatible : should be "allwinner,sun4i-a10-timer" - reg : Specifies base physical address and size of the registers. - interrupts : The interrupt of the first timer - clocks: phandle to the source clock (usually a 24 MHz fixed clock) @@ -10,7 +10,7 @@ Required properties: Example: timer { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x400>; interrupts = <22>; clocks = <&osc>; diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index bf497af..efb17c3 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -196,5 +196,5 @@ static void __init sun4i_timer_init(struct device_node *node) clockevents_config_and_register(&sun4i_clockevent, rate, TIMER_SYNC_TICKS, 0xffffffff); } -CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", +CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", sun4i_timer_init);