Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 002e1ec5 authored by Jon Hunter's avatar Jon Hunter Committed by Benoit Cousson
Browse files

ARM: dts: OMAP2+: Update DMTIMER compatibility property 



Update the DMTIMER compatibility property to reflect the register level
compatibilty between devices and update the various OMAP/AM timer
bindings with the appropriate compatibility string.

By doing this we can add platform specific data applicable to specific
timer versions to the driver. For example, errata flags can be populated
for the timer versions that are impacted.

Signed-off-by: default avatarJon Hunter <jon-hunter@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarBenoit Cousson <benoit.cousson@linaro.org>
parent 8fc7fcb5

Documentation/devicetree/bindings/arm/omap/timer.txt

+15 −2
Original line number Diff line number Diff line 
OMAP Timer bindings



Required properties:

- compatible:		Must be "ti,omap2-timer" for OMAP2+ controllers.

- compatible:		Should be set to one of the below. Please note that

			OMAP44xx devices have timer instances that are 100%

			register compatible with OMAP3xxx devices as well as

			newer timers that are not 100% register compatible.

			So for OMAP44xx devices timer instances may use

			different compatible strings.



			ti,omap2420-timer (applicable to OMAP24xx devices)

			ti,omap3430-timer (applicable to OMAP3xxx/44xx devices)

			ti,omap4430-timer (applicable to OMAP44xx devices)

			ti,omap5430-timer (applicable to OMAP543x devices)

			ti,am335x-timer	(applicable to AM335x devices)

			ti,am335x-timer-1ms (applicable to AM335x devices)



- reg:			Contains timer register address range (base address and

			length).

- interrupts: 		Contains the interrupt information for the timer. The
@@ -22,7 +35,7 @@ Optional properties: 
Example:



timer12: timer@48304000 {

	compatible = "ti,omap2-timer";

	compatible = "ti,omap3430-timer";

	reg = <0x48304000 0x400>;

	interrupts = <95>;

	ti,hwmods = "timer12"

arch/arm/boot/dts/am33xx.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ 
		};



		timer1: timer@44e31000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer-1ms";

			reg = <0x44e31000 0x400>;

			interrupts = <67>;

			ti,hwmods = "timer1";
@@ -251,21 +251,21 @@ 
		};



		timer2: timer@48040000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x48040000 0x400>;

			interrupts = <68>;

			ti,hwmods = "timer2";

		};



		timer3: timer@48042000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x48042000 0x400>;

			interrupts = <69>;

			ti,hwmods = "timer3";

		};



		timer4: timer@48044000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x48044000 0x400>;

			interrupts = <92>;

			ti,hwmods = "timer4";
@@ -273,7 +273,7 @@ 
		};



		timer5: timer@48046000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x48046000 0x400>;

			interrupts = <93>;

			ti,hwmods = "timer5";
@@ -281,7 +281,7 @@ 
		};



		timer6: timer@48048000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x48048000 0x400>;

			interrupts = <94>;

			ti,hwmods = "timer6";
@@ -289,7 +289,7 @@ 
		};



		timer7: timer@4804a000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,am335x-timer";

			reg = <0x4804a000 0x400>;

			interrupts = <95>;

			ti,hwmods = "timer7";

arch/arm/boot/dts/omap2.dtsi

+11 −11
Original line number Diff line number Diff line
@@ -85,28 +85,28 @@ 
		};



		timer2: timer@4802a000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x4802a000 0x400>;

			interrupts = <38>;

			ti,hwmods = "timer2";

		};



		timer3: timer@48078000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48078000 0x400>;

			interrupts = <39>;

			ti,hwmods = "timer3";

		};



		timer4: timer@4807a000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x4807a000 0x400>;

			interrupts = <40>;

			ti,hwmods = "timer4";

		};



		timer5: timer@4807c000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x4807c000 0x400>;

			interrupts = <41>;

			ti,hwmods = "timer5";
@@ -114,7 +114,7 @@ 
		};



		timer6: timer@4807e000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x4807e000 0x400>;

			interrupts = <42>;

			ti,hwmods = "timer6";
@@ -122,7 +122,7 @@ 
		};



		timer7: timer@48080000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48080000 0x400>;

			interrupts = <43>;

			ti,hwmods = "timer7";
@@ -130,7 +130,7 @@ 
		};



		timer8: timer@48082000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48082000 0x400>;

			interrupts = <44>;

			ti,hwmods = "timer8";
@@ -138,7 +138,7 @@ 
		};



		timer9: timer@48084000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48084000 0x400>;

			interrupts = <45>;

			ti,hwmods = "timer9";
@@ -146,7 +146,7 @@ 
		};



		timer10: timer@48086000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48086000 0x400>;

			interrupts = <46>;

			ti,hwmods = "timer10";
@@ -154,7 +154,7 @@ 
		};



		timer11: timer@48088000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48088000 0x400>;

			interrupts = <47>;

			ti,hwmods = "timer11";
@@ -162,7 +162,7 @@ 
		};



		timer12: timer@4808a000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x4808a000 0x400>;

			interrupts = <48>;

			ti,hwmods = "timer12";

arch/arm/boot/dts/omap2420.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
		};



		timer1: timer@48028000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x48028000 0x400>;

			interrupts = <37>;

			ti,hwmods = "timer1";

arch/arm/boot/dts/omap2430.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ 
		};



		timer1: timer@49018000 {

			compatible = "ti,omap2-timer";

			compatible = "ti,omap2420-timer";

			reg = <0x49018000 0x400>;

			interrupts = <37>;

			ti,hwmods = "timer1";