diff mbox

[v3,3/3] arm: dts: keystone: add keystone timer entry

Message ID 1387974724-31138-4-git-send-email-ivan.khoronzhuk@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Ivan Khoronzhuk Dec. 25, 2013, 12:32 p.m. UTC
Add keystone timer entry to keystone device tree.
This 64-bit timer is used as backup clock event device.

Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
 arch/arm/boot/dts/keystone-clocks.dtsi |   10 ++++++++++
 arch/arm/boot/dts/keystone.dtsi        |    7 +++++++
 2 files changed, 17 insertions(+)

Comments

Santosh Shilimkar Dec. 26, 2013, 6:02 p.m. UTC | #1
$subject
s/arm/ARM,

On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
> Add keystone timer entry to keystone device tree.
> This 64-bit timer is used as backup clock event device.
> 
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
> ---
No need to repost. I will fix it up while applying based
on state of PATCH 1/3 and 2/3.

Regards,
Santosh
Daniel Lezcano Dec. 28, 2013, 7:07 p.m. UTC | #2
On 12/26/2013 07:02 PM, Santosh Shilimkar wrote:
> $subject
> s/arm/ARM,
>
> On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
>> Add keystone timer entry to keystone device tree.
>> This 64-bit timer is used as backup clock event device.
>>
>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>> ---
> No need to repost. I will fix it up while applying based
> on state of PATCH 1/3 and 2/3.

I assume you will take the patchset in your tree.

I am back from vacations, give me a couple of days to review the 
patchset before applying it please.

Thanks
   -- Daniel
Santosh Shilimkar Dec. 29, 2013, 7:23 p.m. UTC | #3
On Saturday 28 December 2013 02:07 PM, Daniel Lezcano wrote:
> On 12/26/2013 07:02 PM, Santosh Shilimkar wrote:
>> $subject
>> s/arm/ARM,
>>
>> On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
>>> Add keystone timer entry to keystone device tree.
>>> This 64-bit timer is used as backup clock event device.
>>>
>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>>> ---
>> No need to repost. I will fix it up while applying based
>> on state of PATCH 1/3 and 2/3.
> 
> I assume you will take the patchset in your tree.
> 
I wasn't planning to take patch 1/3 and 2/3, assuming
they will go via clocksource tree. Only the dts
$subject patch is what I was planning to pick it up
if the 1/3 and 2/3 gets lined up via thomas's tree.

> I am back from vacations, give me a couple of days to review the patchset before applying it please.
> 
Take your time. Am not applying them as mentioned above.

Regards,
Santosh
Ivan Khoronzhuk Jan. 13, 2014, 11:28 a.m. UTC | #4
On 12/28/2013 09:07 PM, Daniel Lezcano wrote:
> On 12/26/2013 07:02 PM, Santosh Shilimkar wrote:
>> $subject
>> s/arm/ARM,
>>
>> On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
>>> Add keystone timer entry to keystone device tree.
>>> This 64-bit timer is used as backup clock event device.
>>>
>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>>> ---
>> No need to repost. I will fix it up while applying based
>> on state of PATCH 1/3 and 2/3.
>
> I assume you will take the patchset in your tree.
>
> I am back from vacations, give me a couple of days to review the
> patchset before applying it please.
>
> Thanks
>    -- Daniel
>

Hi, Daniel

Do you have any comments on this patch series?
Can we expect it in k3.14
Daniel Lezcano Jan. 13, 2014, 1:14 p.m. UTC | #5
On 01/13/2014 12:28 PM, ivan.khoronzhuk wrote:
> On 12/28/2013 09:07 PM, Daniel Lezcano wrote:
>> On 12/26/2013 07:02 PM, Santosh Shilimkar wrote:
>>> $subject
>>> s/arm/ARM,
>>>
>>> On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
>>>> Add keystone timer entry to keystone device tree.
>>>> This 64-bit timer is used as backup clock event device.
>>>>
>>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>>>> ---
>>> No need to repost. I will fix it up while applying based
>>> on state of PATCH 1/3 and 2/3.
>>
>> I assume you will take the patchset in your tree.
>>
>> I am back from vacations, give me a couple of days to review the
>> patchset before applying it please.
>>
>> Thanks
>>    -- Daniel
>>
>
> Hi, Daniel
>
> Do you have any comments on this patch series?
> Can we expect it in k3.14

I have applied the patch 1/3 and 2/3 in my tree but I was expecting the 
DT folks to give their acked-by for the patch 2/3.

It is a bit late for 3.14 but if the patch 3/3 is in Santosh's tree, the 
patch 2/3 gets its acked-by and you absolutely need the driver for this 
version, I may consider to send another PR to the upstream maintainers. 
That will be up to them to accept to pull it or not.
Santosh Shilimkar Jan. 13, 2014, 2:20 p.m. UTC | #6
On Monday 13 January 2014 08:14 AM, Daniel Lezcano wrote:
> On 01/13/2014 12:28 PM, ivan.khoronzhuk wrote:
>> On 12/28/2013 09:07 PM, Daniel Lezcano wrote:
>>> On 12/26/2013 07:02 PM, Santosh Shilimkar wrote:
>>>> $subject
>>>> s/arm/ARM,
>>>>
>>>> On Wednesday 25 December 2013 07:32 AM, Ivan Khoronzhuk wrote:
>>>>> Add keystone timer entry to keystone device tree.
>>>>> This 64-bit timer is used as backup clock event device.
>>>>>
>>>>> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
>>>>> ---
>>>> No need to repost. I will fix it up while applying based
>>>> on state of PATCH 1/3 and 2/3.
>>>
>>> I assume you will take the patchset in your tree.
>>>
>>> I am back from vacations, give me a couple of days to review the
>>> patchset before applying it please.
>>>
>>> Thanks
>>>    -- Daniel
>>>
>>
>> Hi, Daniel
>>
>> Do you have any comments on this patch series?
>> Can we expect it in k3.14
> 
> I have applied the patch 1/3 and 2/3 in my tree but I was expecting the DT folks to give their acked-by for the patch 2/3.
> 
> It is a bit late for 3.14 but if the patch 3/3 is in Santosh's tree, the patch 2/3 gets its acked-by and you absolutely need the driver for this version, I may consider to send another PR to the upstream maintainers. That will be up to them to accept to pull it or not.
> 
They can wait for next merge window (3.15).

Regards,
Santosh
diff mbox

Patch

diff --git a/arch/arm/boot/dts/keystone-clocks.dtsi b/arch/arm/boot/dts/keystone-clocks.dtsi
index 2363593..16d2aba 100644
--- a/arch/arm/boot/dts/keystone-clocks.dtsi
+++ b/arch/arm/boot/dts/keystone-clocks.dtsi
@@ -737,6 +737,16 @@  clocks {
 		domain-id = <0>;
 	};
 
+	clktimer15: clktimer15 {
+		#clock-cells = <0>;
+		compatible = "ti,keystone,psc-clock";
+		clocks = <&clkmodrst0>;
+		clock-output-names = "timer15";
+		reg = <0x02350000 0xb00>, <0x02350000 0x400>;
+		reg-names = "control", "domain";
+		domain-id = <0>;
+	};
+
 	clkuart0: clkuart0 {
 		#clock-cells = <0>;
 		compatible = "ti,keystone,psc-clock";
diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index f6d6d9e..3f05c07 100644
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -181,5 +181,12 @@ 
 			interrupts = <GIC_SPI 300 IRQ_TYPE_EDGE_RISING>;
 			clocks = <&clkspi>;
 		};
+
+		clock_event: timer@22f0000 {
+			compatible = "ti,keystone-timer";
+			reg = <0x022f0000 0x80>;
+			interrupts = <GIC_SPI 110 IRQ_TYPE_EDGE_RISING>;
+			clocks = <&clktimer15>;
+		};
 	};
 };