mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
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	[thread overview]
Message-ID: <1394577653-8615-3-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1394577653-8615-1-git-send-email-daniel.lezcano@linaro.org>

From: Maxime Ripard <maxime.ripard@free-electrons.com>

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 <maxime.ripard@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 .../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);
-- 
1.7.9.5


  parent reply	other threads:[~2014-03-11 22:40 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-11 22:35 [GIT PR] clockevents : new material for 3.15 Daniel Lezcano
2014-03-11 22:40 ` [PATCH 01/17] clocksource: arch_timer: Set dynamic irq affinity on mmio clockevent Daniel Lezcano
2014-03-11 22:40   ` [PATCH 02/17] ARM: u300: move timer driver to clocksource Daniel Lezcano
2014-03-11 22:40   ` Daniel Lezcano [this message]
2014-03-11 22:40   ` [PATCH 04/17] ARM: sunxi: dt: Convert to the new clocksource compatible Daniel Lezcano
2014-03-11 22:40   ` [PATCH 05/17] clocksource: keystone: add bindings for keystone timer Daniel Lezcano
2014-03-11 22:40   ` [PATCH 06/17] clocksource: timer-keystone: introduce clocksource driver for Keystone Daniel Lezcano
2014-03-11 22:40   ` [PATCH 07/17] clocksource: timer-keystone: Delete unnecessary variable Daniel Lezcano
2014-03-11 22:40   ` [PATCH 08/17] clocksource: orion: Use atomic access for shared registers Daniel Lezcano
2014-03-11 22:40   ` [PATCH 09/17] clocksource: armada-370-xp: " Daniel Lezcano
2014-03-11 22:40   ` [PATCH 10/17] ARM: shmobile: Remove CMT, TMU and STI Kconfig entries Daniel Lezcano
2014-03-11 22:40   ` [PATCH 11/17] sh: Remove Kconfig entries for TMU, CMT and MTU2 Daniel Lezcano
2014-03-11 22:40   ` [PATCH 12/17] clocksource: Add Kconfig entries for CMT, MTU2, TMU and STI Daniel Lezcano
2014-03-11 22:40   ` [PATCH 13/17] clocksource/cadence_ttc: Call clockevents_update_freq() with IRQs enabled Daniel Lezcano
2014-03-11 22:40   ` [PATCH 14/17] clocksource/cadence_ttc: Overhaul clocksource frequency adjustment Daniel Lezcano
2014-03-11 22:40   ` [PATCH 15/17] arm: zynq: Don't use arm_global_timer with cpufreq Daniel Lezcano
2014-03-11 22:40   ` [PATCH 16/17] arm: zynq: Add support for cpufreq Daniel Lezcano
2014-03-11 22:40   ` [PATCH 17/17] clocksource: exynos_mct: silence a static checker warning Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394577653-8615-3-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=dan.carpenter@oracle.com \
    --cc=ezequiel.garcia@free-electrons.com \
    --cc=ivan.khoronzhuk@ti.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=magnus.damm@gmail.com \
    --cc=matthias.bgg@gmail.com \
    --cc=mingo@kernel.org \
    --cc=sboyd@codeaurora.org \
    --cc=soren.brinkmann@xilinx.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome