* [PATCH 0/3] ARM: dts: OMAP4/5 device-tree timer updates
@ 2012-11-01 15:49 ` Jon Hunter
0 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: linux-arm-kernel
A few device tree timer updates for OMAP4/5 devices.
This series adds ...
1. MPU private addresses for OMAP4 timers
2. Timer nodes for OMAP5
3. 32kHz counter node for OMAP5
This is based upon of Benoit Cousson's OMAP device-tree branch for v3.8.
git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.8/dts
Jon Hunter (3):
ARM: dts: Update OMAP4 timer addresses
ARM: dts: Add OMAP5 timer nodes
ARM: dts: Add OMAP5 counter node
arch/arm/boot/dts/omap4.dtsi | 20 +++++----
arch/arm/boot/dts/omap5.dtsi | 95 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+), 8 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/3] ARM: dts: Update OMAP4 timer addresses
2012-11-01 15:49 ` Jon Hunter
@ 2012-11-01 15:49 ` Jon Hunter
-1 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: Benoit Cousson; +Cc: device-tree, linux-omap, linux-arm, Jon Hunter
For OMAP4 devices, timers 5-8 have both a L3 bus address and a Cortex-A9
private bus address. Currently the device-tree source only contains the
L3 bus address for these timers. Update these timers to include the
Cortex-A9 private address and make the default address the Cortex-A9
private bus address to match the current HWMOD implementation.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 23ee149..739bb79 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -469,33 +469,37 @@
ti,hwmods = "timer4";
};
- timer5: timer@49038000 {
+ timer5: timer@40138000 {
compatible = "ti,omap2-timer";
- reg = <0x49038000 0x80>;
+ reg = <0x40138000 0x80>,
+ <0x49038000 0x80>;
interrupts = <0 41 0x4>;
ti,hwmods = "timer5";
ti,timer-dsp;
};
- timer6: timer@4903a000 {
+ timer6: timer@4013a000 {
compatible = "ti,omap2-timer";
- reg = <0x4903a000 0x80>;
+ reg = <0x4013a000 0x80>,
+ <0x4903a000 0x80>;
interrupts = <0 42 0x4>;
ti,hwmods = "timer6";
ti,timer-dsp;
};
- timer7: timer@4903c000 {
+ timer7: timer@4013c000 {
compatible = "ti,omap2-timer";
- reg = <0x4903c000 0x80>;
+ reg = <0x4013c000 0x80>,
+ <0x4903c000 0x80>;
interrupts = <0 43 0x4>;
ti,hwmods = "timer7";
ti,timer-dsp;
};
- timer8: timer@4903e000 {
+ timer8: timer@4013e000 {
compatible = "ti,omap2-timer";
- reg = <0x4903e000 0x80>;
+ reg = <0x4013e000 0x80>,
+ <0x4903e000 0x80>;
interrupts = <0 44 0x4>;
ti,hwmods = "timer8";
ti,timer-pwm;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 1/3] ARM: dts: Update OMAP4 timer addresses
@ 2012-11-01 15:49 ` Jon Hunter
0 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: linux-arm-kernel
For OMAP4 devices, timers 5-8 have both a L3 bus address and a Cortex-A9
private bus address. Currently the device-tree source only contains the
L3 bus address for these timers. Update these timers to include the
Cortex-A9 private address and make the default address the Cortex-A9
private bus address to match the current HWMOD implementation.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 23ee149..739bb79 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -469,33 +469,37 @@
ti,hwmods = "timer4";
};
- timer5: timer at 49038000 {
+ timer5: timer at 40138000 {
compatible = "ti,omap2-timer";
- reg = <0x49038000 0x80>;
+ reg = <0x40138000 0x80>,
+ <0x49038000 0x80>;
interrupts = <0 41 0x4>;
ti,hwmods = "timer5";
ti,timer-dsp;
};
- timer6: timer at 4903a000 {
+ timer6: timer at 4013a000 {
compatible = "ti,omap2-timer";
- reg = <0x4903a000 0x80>;
+ reg = <0x4013a000 0x80>,
+ <0x4903a000 0x80>;
interrupts = <0 42 0x4>;
ti,hwmods = "timer6";
ti,timer-dsp;
};
- timer7: timer at 4903c000 {
+ timer7: timer at 4013c000 {
compatible = "ti,omap2-timer";
- reg = <0x4903c000 0x80>;
+ reg = <0x4013c000 0x80>,
+ <0x4903c000 0x80>;
interrupts = <0 43 0x4>;
ti,hwmods = "timer7";
ti,timer-dsp;
};
- timer8: timer at 4903e000 {
+ timer8: timer at 4013e000 {
compatible = "ti,omap2-timer";
- reg = <0x4903e000 0x80>;
+ reg = <0x4013e000 0x80>,
+ <0x4903e000 0x80>;
interrupts = <0 44 0x4>;
ti,hwmods = "timer8";
ti,timer-pwm;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/3] ARM: dts: Add OMAP5 timer nodes
2012-11-01 15:49 ` Jon Hunter
@ 2012-11-01 15:49 ` Jon Hunter
-1 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: Benoit Cousson; +Cc: device-tree, linux-omap, linux-arm, Jon Hunter
Add the 11 timer nodes for OMAP5 devices.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 89 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 930dbfe..c8954f1 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -379,5 +379,94 @@
ti,buffer-size = <128>;
ti,hwmods = "mcbsp3";
};
+
+ timer1: timer@4ae18000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4ae18000 0x80>;
+ interrupts = <0 37 0x4>;
+ ti,hwmods = "timer1";
+ ti,timer-alwon;
+ };
+
+ timer2: timer@48032000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48032000 0x80>;
+ interrupts = <0 38 0x4>;
+ ti,hwmods = "timer2";
+ };
+
+ timer3: timer@48034000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48034000 0x80>;
+ interrupts = <0 39 0x4>;
+ ti,hwmods = "timer3";
+ };
+
+ timer4: timer@48036000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48036000 0x80>;
+ interrupts = <0 40 0x4>;
+ ti,hwmods = "timer4";
+ };
+
+ timer5: timer@40138000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x40138000 0x80>,
+ <0x49038000 0x80>;
+ interrupts = <0 41 0x4>;
+ ti,hwmods = "timer5";
+ ti,timer-dsp;
+ };
+
+ timer6: timer@4013a000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013a000 0x80>,
+ <0x4903a000 0x80>;
+ interrupts = <0 42 0x4>;
+ ti,hwmods = "timer6";
+ ti,timer-dsp;
+ ti,timer-pwm;
+ };
+
+ timer7: timer@4013c000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013c000 0x80>,
+ <0x4903c000 0x80>;
+ interrupts = <0 43 0x4>;
+ ti,hwmods = "timer7";
+ ti,timer-dsp;
+ };
+
+ timer8: timer@4013e000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013e000 0x80>,
+ <0x4903e000 0x80>;
+ interrupts = <0 44 0x4>;
+ ti,hwmods = "timer8";
+ ti,timer-dsp;
+ ti,timer-pwm;
+ };
+
+ timer9: timer@4803e000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4803e000 0x80>;
+ interrupts = <0 45 0x4>;
+ ti,hwmods = "timer9";
+ };
+
+ timer10: timer@48086000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48086000 0x80>;
+ interrupts = <0 46 0x4>;
+ ti,hwmods = "timer10";
+ };
+
+ timer11: timer@48088000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48088000 0x80>;
+ interrupts = <0 47 0x4>;
+ ti,hwmods = "timer11";
+ ti,timer-pwm;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/3] ARM: dts: Add OMAP5 timer nodes
@ 2012-11-01 15:49 ` Jon Hunter
0 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: linux-arm-kernel
Add the 11 timer nodes for OMAP5 devices.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 89 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 89 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 930dbfe..c8954f1 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -379,5 +379,94 @@
ti,buffer-size = <128>;
ti,hwmods = "mcbsp3";
};
+
+ timer1: timer at 4ae18000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4ae18000 0x80>;
+ interrupts = <0 37 0x4>;
+ ti,hwmods = "timer1";
+ ti,timer-alwon;
+ };
+
+ timer2: timer at 48032000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48032000 0x80>;
+ interrupts = <0 38 0x4>;
+ ti,hwmods = "timer2";
+ };
+
+ timer3: timer at 48034000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48034000 0x80>;
+ interrupts = <0 39 0x4>;
+ ti,hwmods = "timer3";
+ };
+
+ timer4: timer at 48036000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48036000 0x80>;
+ interrupts = <0 40 0x4>;
+ ti,hwmods = "timer4";
+ };
+
+ timer5: timer at 40138000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x40138000 0x80>,
+ <0x49038000 0x80>;
+ interrupts = <0 41 0x4>;
+ ti,hwmods = "timer5";
+ ti,timer-dsp;
+ };
+
+ timer6: timer at 4013a000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013a000 0x80>,
+ <0x4903a000 0x80>;
+ interrupts = <0 42 0x4>;
+ ti,hwmods = "timer6";
+ ti,timer-dsp;
+ ti,timer-pwm;
+ };
+
+ timer7: timer at 4013c000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013c000 0x80>,
+ <0x4903c000 0x80>;
+ interrupts = <0 43 0x4>;
+ ti,hwmods = "timer7";
+ ti,timer-dsp;
+ };
+
+ timer8: timer at 4013e000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4013e000 0x80>,
+ <0x4903e000 0x80>;
+ interrupts = <0 44 0x4>;
+ ti,hwmods = "timer8";
+ ti,timer-dsp;
+ ti,timer-pwm;
+ };
+
+ timer9: timer at 4803e000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x4803e000 0x80>;
+ interrupts = <0 45 0x4>;
+ ti,hwmods = "timer9";
+ };
+
+ timer10: timer at 48086000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48086000 0x80>;
+ interrupts = <0 46 0x4>;
+ ti,hwmods = "timer10";
+ };
+
+ timer11: timer at 48088000 {
+ compatible = "ti,omap2-timer";
+ reg = <0x48088000 0x80>;
+ interrupts = <0 47 0x4>;
+ ti,hwmods = "timer11";
+ ti,timer-pwm;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/3] ARM: dts: Add OMAP5 counter node
2012-11-01 15:49 ` Jon Hunter
@ 2012-11-01 15:49 ` Jon Hunter
-1 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: Benoit Cousson; +Cc: device-tree, linux-omap, linux-arm, Jon Hunter
Add the 32kHz counter node for OMAP5 devices.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c8954f1..ead74c8 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -77,6 +77,12 @@
ranges;
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
+ counter32k: counter@4ae04000 {
+ compatible = "ti,omap-counter32k";
+ reg = <0x4ae04000 0x40>;
+ ti,hwmods = "counter_32k";
+ };
+
omap5_pmx_core: pinmux@4a002840 {
compatible = "ti,omap4-padconf", "pinctrl-single";
reg = <0x4a002840 0x01b6>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/3] ARM: dts: Add OMAP5 counter node
@ 2012-11-01 15:49 ` Jon Hunter
0 siblings, 0 replies; 10+ messages in thread
From: Jon Hunter @ 2012-11-01 15:49 UTC (permalink / raw)
To: linux-arm-kernel
Add the 32kHz counter node for OMAP5 devices.
Signed-off-by: Jon Hunter <jon-hunter@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index c8954f1..ead74c8 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -77,6 +77,12 @@
ranges;
ti,hwmods = "l3_main_1", "l3_main_2", "l3_main_3";
+ counter32k: counter at 4ae04000 {
+ compatible = "ti,omap-counter32k";
+ reg = <0x4ae04000 0x40>;
+ ti,hwmods = "counter_32k";
+ };
+
omap5_pmx_core: pinmux at 4a002840 {
compatible = "ti,omap4-padconf", "pinctrl-single";
reg = <0x4a002840 0x01b6>;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/3] ARM: dts: OMAP4/5 device-tree timer updates
2012-11-01 15:49 ` Jon Hunter
@ 2012-11-01 16:14 ` Benoit Cousson
-1 siblings, 0 replies; 10+ messages in thread
From: Benoit Cousson @ 2012-11-01 16:14 UTC (permalink / raw)
To: Jon Hunter; +Cc: device-tree, linux-omap, linux-arm
Hi Jon,
On 11/01/2012 04:49 PM, Jon Hunter wrote:
> A few device tree timer updates for OMAP4/5 devices.
>
> This series adds ...
> 1. MPU private addresses for OMAP4 timers
> 2. Timer nodes for OMAP5
> 3. 32kHz counter node for OMAP5
Great, thanks for that update. Just in time before the pull request.
> This is based upon of Benoit Cousson's OMAP device-tree branch for v3.8.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.8/dts
>
> Jon Hunter (3):
> ARM: dts: Update OMAP4 timer addresses
> ARM: dts: Add OMAP5 timer nodes
> ARM: dts: Add OMAP5 counter node
I've just updated slightly the subjects:
3b3132f ARM: dts: OMAP5: Add counter node
df692a9 ARM: dts: OMAP5: Add timer nodes
d03a93b ARM: dts: OMAP4: Update timer addresses
There are now in my for_3.8/dts branch.
Thanks,
Benoit
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 0/3] ARM: dts: OMAP4/5 device-tree timer updates
@ 2012-11-01 16:14 ` Benoit Cousson
0 siblings, 0 replies; 10+ messages in thread
From: Benoit Cousson @ 2012-11-01 16:14 UTC (permalink / raw)
To: linux-arm-kernel
Hi Jon,
On 11/01/2012 04:49 PM, Jon Hunter wrote:
> A few device tree timer updates for OMAP4/5 devices.
>
> This series adds ...
> 1. MPU private addresses for OMAP4 timers
> 2. Timer nodes for OMAP5
> 3. 32kHz counter node for OMAP5
Great, thanks for that update. Just in time before the pull request.
> This is based upon of Benoit Cousson's OMAP device-tree branch for v3.8.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.8/dts
>
> Jon Hunter (3):
> ARM: dts: Update OMAP4 timer addresses
> ARM: dts: Add OMAP5 timer nodes
> ARM: dts: Add OMAP5 counter node
I've just updated slightly the subjects:
3b3132f ARM: dts: OMAP5: Add counter node
df692a9 ARM: dts: OMAP5: Add timer nodes
d03a93b ARM: dts: OMAP4: Update timer addresses
There are now in my for_3.8/dts branch.
Thanks,
Benoit
^ permalink raw reply [flat|nested] 10+ messages in thread