diff mbox

[PATCHv4,2/4] arm: dts: Change dw-apb-timer-osc and dw-apb-timer-sp to just dw-apb-timer

Message ID 1377189026-16656-2-git-send-email-dinguyen@altera.com (mailing list archive)
State New, archived
Headers show

Commit Message

Dinh Nguyen Aug. 22, 2013, 4:30 p.m. UTC 
From: Dinh Nguyen <dinguyen@altera.com>

"dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
DW APB timer, just fed by different clocks. Thus, deprecate both
"dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>
Reviewed-by: Pavel Machek <pavel@denx.de>
CC: Rob Herring <rob.herring@calxeda.com>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Cc: Ian Campbell <ian.campbell@citrix.com>
CC: Arnd Bergmann <arnd@arndb.de>
Cc: Olof Johansson <olof@lixom.net>
CC: Jamie Iles <jamie@jamieiles.com>
Cc: John Stultz <john.stultz@linaro.org>
Cc: Heiko Stuebner <heiko@sntech.de>
Cc: Pavel Machek <pavel@denx.de>
Cc: devicetree@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org

v3:
- Split out a separate that cleans up the timer entries and clock information.
- Clearly states which binding is deprecated in the bindingd doc.

v2:
- Deprecate the "dw-apb-timer-osc" and "dw-apb-timer-sp" but maintain
  backwards compatibility in the driver.
---
 Documentation/devicetree/bindings/rtc/dw-apb.txt |   34 +++++++---------------
 arch/arm/boot/dts/socfpga.dtsi                   |    8 ++---
 2 files changed, 15 insertions(+), 27 deletions(-)

Comments

Stephen Warren Aug. 22, 2013, 10:20 p.m. UTC | #1 
On 08/22/2013 10:30 AM, dinguyen@altera.com wrote:
> From: Dinh Nguyen <dinguyen@altera.com>
> 
> "dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
> DW APB timer, just fed by different clocks. Thus, deprecate both
> "dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".

The binding change looks reasonable to me.

The *.dtsi change will cause the new DT not to work with older kernels
that don't support the new compatible values. Perhaps you're fine with that?

I assume that the driver has already been updated to support the new
values, and that the driver change is guaranteed to be merged before
this change? Otherwise, git bisect will be broken for a while.
Dinh Nguyen Aug. 22, 2013, 10:55 p.m. UTC | #2 
On Thu, 2013-08-22 at 16:20 -0600, Stephen Warren wrote:
> On 08/22/2013 10:30 AM, dinguyen@altera.com wrote:
> > From: Dinh Nguyen <dinguyen@altera.com>
> > 
> > "dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
> > DW APB timer, just fed by different clocks. Thus, deprecate both
> > "dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".
> 
> The binding change looks reasonable to me.
> 
> The *.dtsi change will cause the new DT not to work with older kernels
> that don't support the new compatible values. Perhaps you're fine with that?

I am okay with the older kernels not working as SOCFPGA is pretty new
and older kernel don't really have too much support for it.

> 
> I assume that the driver has already been updated to support the new
> values, and that the driver change is guaranteed to be merged before
> this change? Otherwise, git bisect will be broken for a while.

Yes, the patch to update the driver was part of this series, but not
merged yet. The driver's V1 patch was Acked-By: Jamie Iles who is the
maintainer for Picoxcell and is the only other platform using this timer
driver at the moment. The only changes since V1 is to maintain
compatibility for the new binding values.

Thanks,
Dinh
>
Dinh Nguyen Aug. 23, 2013, 10:44 p.m. UTC | #3 
On Thu, 2013-08-22 at 16:20 -0600, Stephen Warren wrote:
> On 08/22/2013 10:30 AM, dinguyen@altera.com wrote:
> > From: Dinh Nguyen <dinguyen@altera.com>
> > 
> > "dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
> > DW APB timer, just fed by different clocks. Thus, deprecate both
> > "dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".
> 
> The binding change looks reasonable to me.
> 
> The *.dtsi change will cause the new DT not to work with older kernels
> that don't support the new compatible values. Perhaps you're fine with that?
> 
> I assume that the driver has already been updated to support the new
> values, and that the driver change is guaranteed to be merged before
> this change? Otherwise, git bisect will be broken for a while.
> 

Can I have your Acked-by: for these bindings? I just received an Ack
from Linus Walleij for the driver portion.

Thanks,
Dinh
Stephen Warren Aug. 23, 2013, 11:22 p.m. UTC | #4 
On 08/23/2013 04:44 PM, Dinh Nguyen wrote:
> On Thu, 2013-08-22 at 16:20 -0600, Stephen Warren wrote:
>> On 08/22/2013 10:30 AM, dinguyen@altera.com wrote:
>>> From: Dinh Nguyen <dinguyen@altera.com>
>>>
>>> "dw-apb-timer-osc" and "dw-apb-timer-sp" are the same implementation of the
>>> DW APB timer, just fed by different clocks. Thus, deprecate both
>>> "dw-apb-timer-osc" and "dw-apb-timer-sp" in lieu of "dw-apb-timer".
>>
>> The binding change looks reasonable to me.
>>
>> The *.dtsi change will cause the new DT not to work with older kernels
>> that don't support the new compatible values. Perhaps you're fine with that?
>>
>> I assume that the driver has already been updated to support the new
>> values, and that the driver change is guaranteed to be merged before
>> this change? Otherwise, git bisect will be broken for a while.
>>
> 
> Can I have your Acked-by: for these bindings? I just received an Ack
> from Linus Walleij for the driver portion.

Yes, the binding change,
Acked-by: Stephen Warren <swarren@nvidia.com>
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/rtc/dw-apb.txt b/Documentation/devicetree/bindings/rtc/dw-apb.txt
index eb2327b..c703d51 100644
--- a/Documentation/devicetree/bindings/rtc/dw-apb.txt
+++ b/Documentation/devicetree/bindings/rtc/dw-apb.txt
@@ -1,7 +1,10 @@ 
 * Designware APB timer
 
 Required properties:
-- compatible: "snps,dw-apb-timer-sp" or "snps,dw-apb-timer-osc"
+- compatible: One of:
+ 	"snps,dw-apb-timer"
+	"snps,dw-apb-timer-sp" <DEPRECATED>
+	"snps,dw-apb-timer-osc" <DEPRECATED>
 - reg: physical base address of the controller and length of memory mapped
   region.
 - interrupts: IRQ line for the timer.
@@ -20,25 +23,10 @@  systems may use one.
 
 
 Example:
-
-		timer1: timer@ffc09000 {
-				compatible = "snps,dw-apb-timer-sp";
-				interrupts = <0 168 4>;
-				clock-frequency = <200000000>;
-				reg = <0xffc09000 0x1000>;
-			};
-
-		timer2: timer@ffd00000 {
-				compatible = "snps,dw-apb-timer-osc";
-				interrupts = <0 169 4>;
-				clock-frequency = <200000000>;
-				reg = <0xffd00000 0x1000>;
-			};
-
-		timer3: timer@ffe00000 {
-				compatible = "snps,dw-apb-timer-osc";
-				interrupts = <0 170 4>;
-				reg = <0xffe00000 0x1000>;
-				clocks = <&timer_clk>, <&timer_pclk>;
-				clock-names = "timer", "pclk";
-			};
+	timer@ffe00000 {
+		compatible = "snps,dw-apb-timer";
+		interrupts = <0 170 4>;
+		reg = <0xffe00000 0x1000>;
+		clocks = <&timer_clk>, <&timer_pclk>;
+		clock-names = "timer", "pclk";
+	};
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 2cb5cb7..d9fda91 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -472,28 +472,28 @@ 
 		};
 
 		timer@ffc08000 {
-			compatible = "snps,dw-apb-timer-sp";
+			compatible = "snps,dw-apb-timer";
 			interrupts = <0 167 4>;
 			reg = <0xffc08000 0x1000>;
 			clocks = <&osc>;
 		};
 
 		timer@ffc09000 {
-			compatible = "snps,dw-apb-timer-sp";
+			compatible = "snps,dw-apb-timer";
 			interrupts = <0 168 4>;
 			reg = <0xffc09000 0x1000>;
 			clocks = <&osc>;
 		};
 
 		timer@ffd00000 {
-			compatible = "snps,dw-apb-timer-osc";
+			compatible = "snps,dw-apb-timer";
 			interrupts = <0 169 4>;
 			reg = <0xffd00000 0x1000>;
 			clocks = <&l4_sp_clk>;
 		};
 
 		timer@ffd01000 {
-			compatible = "snps,dw-apb-timer-osc";
+			compatible = "snps,dw-apb-timer";
 			interrupts = <0 170 4>;
 			reg = <0xffd01000 0x1000>;
 			clocks = <&l4_sp_clk>;