Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 58 deletions
Documentation/devicetree/bindings/arm/omap/timer.txt
View file @ 002e1ec5
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
View file @ 002e1ec5
......@@ -243,7 +243,7 @@ dcan1: d_can@481d0000 {
};
timer1: timer@44e31000 {
compatible = "ti,omap2-timer";
compatible = "ti,am335x-timer-1ms";
reg = <0x44e31000 0x400>;
interrupts = <67>;
ti,hwmods = "timer1";
......@@ -251,21 +251,21 @@ timer1: timer@44e31000 {
};
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 @@ timer4: timer@48044000 {
};
timer5: timer@48046000 {
compatible = "ti,omap2-timer";
compatible = "ti,am335x-timer";
reg = <0x48046000 0x400>;
interrupts = <93>;
ti,hwmods = "timer5";
......@@ -281,7 +281,7 @@ timer5: timer@48046000 {
};
timer6: timer@48048000 {
compatible = "ti,omap2-timer";
compatible = "ti,am335x-timer";
reg = <0x48048000 0x400>;
interrupts = <94>;
ti,hwmods = "timer6";
......@@ -289,7 +289,7 @@ timer6: timer@48048000 {
};
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
View file @ 002e1ec5
......@@ -85,28 +85,28 @@ uart3: serial@4806e000 {
};
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 @@ timer5: timer@4807c000 {
};
timer6: timer@4807e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x4807e000 0x400>;
interrupts = <42>;
ti,hwmods = "timer6";
......@@ -122,7 +122,7 @@ timer6: timer@4807e000 {
};
timer7: timer@48080000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x48080000 0x400>;
interrupts = <43>;
ti,hwmods = "timer7";
......@@ -130,7 +130,7 @@ timer7: timer@48080000 {
};
timer8: timer@48082000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x48082000 0x400>;
interrupts = <44>;
ti,hwmods = "timer8";
......@@ -138,7 +138,7 @@ timer8: timer@48082000 {
};
timer9: timer@48084000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x48084000 0x400>;
interrupts = <45>;
ti,hwmods = "timer9";
......@@ -146,7 +146,7 @@ timer9: timer@48084000 {
};
timer10: timer@48086000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x48086000 0x400>;
interrupts = <46>;
ti,hwmods = "timer10";
......@@ -154,7 +154,7 @@ timer10: timer@48086000 {
};
timer11: timer@48088000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x48088000 0x400>;
interrupts = <47>;
ti,hwmods = "timer11";
......@@ -162,7 +162,7 @@ timer11: timer@48088000 {
};
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
View file @ 002e1ec5
......@@ -111,7 +111,7 @@ mcbsp2: mcbsp@48076000 {
};
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
View file @ 002e1ec5
......@@ -172,7 +172,7 @@ mcbsp5: mcbsp@48096000 {
};
timer1: timer@49018000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap2420-timer";
reg = <0x49018000 0x400>;
interrupts = <37>;
ti,hwmods = "timer1";
......
arch/arm/boot/dts/omap3.dtsi
View file @ 002e1ec5
......@@ -377,7 +377,7 @@ mcbsp5: mcbsp@48096000 {
};
timer1: timer@48318000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48318000 0x400>;
interrupts = <37>;
ti,hwmods = "timer1";
......@@ -385,28 +385,28 @@ timer1: timer@48318000 {
};
timer2: timer@49032000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x49032000 0x400>;
interrupts = <38>;
ti,hwmods = "timer2";
};
timer3: timer@49034000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x49034000 0x400>;
interrupts = <39>;
ti,hwmods = "timer3";
};
timer4: timer@49036000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x49036000 0x400>;
interrupts = <40>;
ti,hwmods = "timer4";
};
timer5: timer@49038000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x49038000 0x400>;
interrupts = <41>;
ti,hwmods = "timer5";
......@@ -414,7 +414,7 @@ timer5: timer@49038000 {
};
timer6: timer@4903a000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x4903a000 0x400>;
interrupts = <42>;
ti,hwmods = "timer6";
......@@ -422,7 +422,7 @@ timer6: timer@4903a000 {
};
timer7: timer@4903c000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x4903c000 0x400>;
interrupts = <43>;
ti,hwmods = "timer7";
......@@ -430,7 +430,7 @@ timer7: timer@4903c000 {
};
timer8: timer@4903e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x4903e000 0x400>;
interrupts = <44>;
ti,hwmods = "timer8";
......@@ -439,7 +439,7 @@ timer8: timer@4903e000 {
};
timer9: timer@49040000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x49040000 0x400>;
interrupts = <45>;
ti,hwmods = "timer9";
......@@ -447,7 +447,7 @@ timer9: timer@49040000 {
};
timer10: timer@48086000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48086000 0x400>;
interrupts = <46>;
ti,hwmods = "timer10";
......@@ -455,7 +455,7 @@ timer10: timer@48086000 {
};
timer11: timer@48088000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48088000 0x400>;
interrupts = <47>;
ti,hwmods = "timer11";
......@@ -463,7 +463,7 @@ timer11: timer@48088000 {
};
timer12: timer@48304000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48304000 0x400>;
interrupts = <95>;
ti,hwmods = "timer12";
......
arch/arm/boot/dts/omap4.dtsi
View file @ 002e1ec5
......@@ -520,7 +520,7 @@ usb2_phy: usb2phy@4a0ad080 {
};
timer1: timer@4a318000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x4a318000 0x80>;
interrupts = <0 37 0x4>;
ti,hwmods = "timer1";
......@@ -528,28 +528,28 @@ timer1: timer@4a318000 {
};
timer2: timer@48032000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48032000 0x80>;
interrupts = <0 38 0x4>;
ti,hwmods = "timer2";
};
timer3: timer@48034000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x48034000 0x80>;
interrupts = <0 39 0x4>;
ti,hwmods = "timer3";
};
timer4: timer@48036000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x48036000 0x80>;
interrupts = <0 40 0x4>;
ti,hwmods = "timer4";
};
timer5: timer@40138000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x40138000 0x80>,
<0x49038000 0x80>;
interrupts = <0 41 0x4>;
......@@ -558,7 +558,7 @@ timer5: timer@40138000 {
};
timer6: timer@4013a000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x4013a000 0x80>,
<0x4903a000 0x80>;
interrupts = <0 42 0x4>;
......@@ -567,7 +567,7 @@ timer6: timer@4013a000 {
};
timer7: timer@4013c000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x4013c000 0x80>,
<0x4903c000 0x80>;
interrupts = <0 43 0x4>;
......@@ -576,7 +576,7 @@ timer7: timer@4013c000 {
};
timer8: timer@4013e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x4013e000 0x80>,
<0x4903e000 0x80>;
interrupts = <0 44 0x4>;
......@@ -586,7 +586,7 @@ timer8: timer@4013e000 {
};
timer9: timer@4803e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x4803e000 0x80>;
interrupts = <0 45 0x4>;
ti,hwmods = "timer9";
......@@ -594,7 +594,7 @@ timer9: timer@4803e000 {
};
timer10: timer@48086000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap3430-timer";
reg = <0x48086000 0x80>;
interrupts = <0 46 0x4>;
ti,hwmods = "timer10";
......@@ -602,7 +602,7 @@ timer10: timer@48086000 {
};
timer11: timer@48088000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap4430-timer";
reg = <0x48088000 0x80>;
interrupts = <0 47 0x4>;
ti,hwmods = "timer11";
......
arch/arm/boot/dts/omap5.dtsi
View file @ 002e1ec5
......@@ -502,7 +502,7 @@ mcbsp3: mcbsp@40126000 {
};
timer1: timer@4ae18000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x4ae18000 0x80>;
interrupts = <0 37 0x4>;
ti,hwmods = "timer1";
......@@ -510,28 +510,28 @@ timer1: timer@4ae18000 {
};
timer2: timer@48032000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x48032000 0x80>;
interrupts = <0 38 0x4>;
ti,hwmods = "timer2";
};
timer3: timer@48034000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x48034000 0x80>;
interrupts = <0 39 0x4>;
ti,hwmods = "timer3";
};
timer4: timer@48036000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x48036000 0x80>;
interrupts = <0 40 0x4>;
ti,hwmods = "timer4";
};
timer5: timer@40138000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x40138000 0x80>,
<0x49038000 0x80>;
interrupts = <0 41 0x4>;
......@@ -540,7 +540,7 @@ timer5: timer@40138000 {
};
timer6: timer@4013a000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x4013a000 0x80>,
<0x4903a000 0x80>;
interrupts = <0 42 0x4>;
......@@ -550,7 +550,7 @@ timer6: timer@4013a000 {
};
timer7: timer@4013c000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x4013c000 0x80>,
<0x4903c000 0x80>;
interrupts = <0 43 0x4>;
......@@ -559,7 +559,7 @@ timer7: timer@4013c000 {
};
timer8: timer@4013e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x4013e000 0x80>,
<0x4903e000 0x80>;
interrupts = <0 44 0x4>;
......@@ -569,21 +569,21 @@ timer8: timer@4013e000 {
};
timer9: timer@4803e000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x4803e000 0x80>;
interrupts = <0 45 0x4>;
ti,hwmods = "timer9";
};
timer10: timer@48086000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x48086000 0x80>;
interrupts = <0 46 0x4>;
ti,hwmods = "timer10";
};
timer11: timer@48088000 {
compatible = "ti,omap2-timer";
compatible = "ti,omap5430-timer";
reg = <0x48088000 0x80>;
interrupts = <0 47 0x4>;
ti,hwmods = "timer11";
......
arch/arm/mach-omap2/timer.c
View file @ 002e1ec5
......@@ -143,7 +143,12 @@ static struct property device_disabled = {
};
static struct of_device_id omap_timer_match[] __initdata = {
{ .compatible = "ti,omap2-timer", },
{ .compatible = "ti,omap2420-timer", },
{ .compatible = "ti,omap3430-timer", },
{ .compatible = "ti,omap4430-timer", },
{ .compatible = "ti,omap5430-timer", },
{ .compatible = "ti,am335x-timer", },
{ .compatible = "ti,am335x-timer-1ms", },
{ }
};
......
arch/arm/plat-omap/dmtimer.c
View file @ 002e1ec5
......@@ -895,7 +895,12 @@ static int omap_dm_timer_remove(struct platform_device *pdev)
}
static const struct of_device_id omap_timer_match[] = {
{ .compatible = "ti,omap2-timer", },
{ .compatible = "ti,omap2420-timer", },
{ .compatible = "ti,omap3430-timer", },
{ .compatible = "ti,omap4430-timer", },
{ .compatible = "ti,omap5430-timer", },
{ .compatible = "ti,am335x-timer", },
{ .compatible = "ti,am335x-timer-1ms", },
{},
};
MODULE_DEVICE_TABLE(of, omap_timer_match);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7