* [PATCH v2 2/3] clocksource: ingenic: Add support for the JZ4760
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
@ 2021-03-08 21:23 ` Paul Cercueil
2021-04-09 10:27 ` [tip: timers/core] clocksource/drivers/ingenic: " tip-bot2 for Paul Cercueil
2021-03-08 21:23 ` [PATCH v2 3/3] clocksource: ingenic-ost: Add support for the JZ4760B Paul Cercueil
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Paul Cercueil @ 2021-03-08 21:23 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner, Rob Herring
Cc: od, linux-kernel, devicetree, Paul Cercueil
Add support for the TCU (Timer/Counter Unit) of the JZ4760 and JZ4760B
SoCs.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
Notes:
v2: No change
drivers/clocksource/ingenic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 905fd6b163a8..24ed0f1f089b 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -264,6 +264,7 @@ static const struct ingenic_soc_info jz4725b_soc_info = {
static const struct of_device_id ingenic_tcu_of_match[] = {
{ .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, },
+ { .compatible = "ingenic,jz4760-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4770-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
{ /* sentinel */ }
@@ -358,6 +359,7 @@ static int __init ingenic_tcu_init(struct device_node *np)
TIMER_OF_DECLARE(jz4740_tcu_intc, "ingenic,jz4740-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4725b_tcu_intc, "ingenic,jz4725b-tcu", ingenic_tcu_init);
+TIMER_OF_DECLARE(jz4760_tcu_intc, "ingenic,jz4760-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4770_tcu_intc, "ingenic,jz4770-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(x1000_tcu_intc, "ingenic,x1000-tcu", ingenic_tcu_init);
--
2.30.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [tip: timers/core] clocksource/drivers/ingenic: Add support for the JZ4760
2021-03-08 21:23 ` [PATCH v2 2/3] clocksource: ingenic: Add support for the JZ4760 Paul Cercueil
@ 2021-04-09 10:27 ` tip-bot2 for Paul Cercueil
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot2 for Paul Cercueil @ 2021-04-09 10:27 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Paul Cercueil, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8a3f717f35a3e9a28a935f8e4459c72ba00e90ca
Gitweb: https://git.kernel.org/tip/8a3f717f35a3e9a28a935f8e4459c72ba00e90ca
Author: Paul Cercueil <paul@crapouillou.net>
AuthorDate: Mon, 08 Mar 2021 21:23:01
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 08 Apr 2021 13:23:22 +02:00
clocksource/drivers/ingenic: Add support for the JZ4760
Add support for the TCU (Timer/Counter Unit) of the JZ4760 and JZ4760B
SoCs.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210308212302.10288-2-paul@crapouillou.net
---
drivers/clocksource/ingenic-timer.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 905fd6b..24ed0f1 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -264,6 +264,7 @@ static const struct ingenic_soc_info jz4725b_soc_info = {
static const struct of_device_id ingenic_tcu_of_match[] = {
{ .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, },
+ { .compatible = "ingenic,jz4760-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,jz4770-tcu", .data = &jz4740_soc_info, },
{ .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
{ /* sentinel */ }
@@ -358,6 +359,7 @@ err_free_ingenic_tcu:
TIMER_OF_DECLARE(jz4740_tcu_intc, "ingenic,jz4740-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4725b_tcu_intc, "ingenic,jz4725b-tcu", ingenic_tcu_init);
+TIMER_OF_DECLARE(jz4760_tcu_intc, "ingenic,jz4760-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(jz4770_tcu_intc, "ingenic,jz4770-tcu", ingenic_tcu_init);
TIMER_OF_DECLARE(x1000_tcu_intc, "ingenic,x1000-tcu", ingenic_tcu_init);
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] clocksource: ingenic-ost: Add support for the JZ4760B
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
2021-03-08 21:23 ` [PATCH v2 2/3] clocksource: ingenic: Add support for the JZ4760 Paul Cercueil
@ 2021-03-08 21:23 ` Paul Cercueil
2021-04-09 10:27 ` [tip: timers/core] clocksource/drivers/ingenic-ost: " tip-bot2 for Paul Cercueil
2021-03-10 3:03 ` [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Rob Herring
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Paul Cercueil @ 2021-03-08 21:23 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner, Rob Herring
Cc: od, linux-kernel, devicetree, Paul Cercueil
The OST in the JZ4760B SoC works exactly the same as in the JZ4770. But
since the JZ4760B is older, its Device Tree string does not fall back to
the JZ4770 one; so add support for the JZ4760B compatible string here.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
---
Notes:
v2: No change
drivers/clocksource/ingenic-ost.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/ingenic-ost.c b/drivers/clocksource/ingenic-ost.c
index 029efc2731b4..d2d664601441 100644
--- a/drivers/clocksource/ingenic-ost.c
+++ b/drivers/clocksource/ingenic-ost.c
@@ -167,13 +167,14 @@ static const struct ingenic_ost_soc_info jz4725b_ost_soc_info = {
.is64bit = false,
};
-static const struct ingenic_ost_soc_info jz4770_ost_soc_info = {
+static const struct ingenic_ost_soc_info jz4760b_ost_soc_info = {
.is64bit = true,
};
static const struct of_device_id ingenic_ost_of_match[] = {
{ .compatible = "ingenic,jz4725b-ost", .data = &jz4725b_ost_soc_info, },
- { .compatible = "ingenic,jz4770-ost", .data = &jz4770_ost_soc_info, },
+ { .compatible = "ingenic,jz4760b-ost", .data = &jz4760b_ost_soc_info, },
+ { .compatible = "ingenic,jz4770-ost", .data = &jz4760b_ost_soc_info, },
{ }
};
--
2.30.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [tip: timers/core] clocksource/drivers/ingenic-ost: Add support for the JZ4760B
2021-03-08 21:23 ` [PATCH v2 3/3] clocksource: ingenic-ost: Add support for the JZ4760B Paul Cercueil
@ 2021-04-09 10:27 ` tip-bot2 for Paul Cercueil
0 siblings, 0 replies; 8+ messages in thread
From: tip-bot2 for Paul Cercueil @ 2021-04-09 10:27 UTC (permalink / raw)
To: linux-tip-commits; +Cc: Paul Cercueil, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 352408aff91d06fd2f0e35d52079bd0cd70cd29e
Gitweb: https://git.kernel.org/tip/352408aff91d06fd2f0e35d52079bd0cd70cd29e
Author: Paul Cercueil <paul@crapouillou.net>
AuthorDate: Mon, 08 Mar 2021 21:23:02
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 08 Apr 2021 13:23:23 +02:00
clocksource/drivers/ingenic-ost: Add support for the JZ4760B
The OST in the JZ4760B SoC works exactly the same as in the JZ4770. But
since the JZ4760B is older, its Device Tree string does not fall back to
the JZ4770 one; so add support for the JZ4760B compatible string here.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210308212302.10288-3-paul@crapouillou.net
---
drivers/clocksource/ingenic-ost.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/clocksource/ingenic-ost.c b/drivers/clocksource/ingenic-ost.c
index 029efc2..d2d6646 100644
--- a/drivers/clocksource/ingenic-ost.c
+++ b/drivers/clocksource/ingenic-ost.c
@@ -167,13 +167,14 @@ static const struct ingenic_ost_soc_info jz4725b_ost_soc_info = {
.is64bit = false,
};
-static const struct ingenic_ost_soc_info jz4770_ost_soc_info = {
+static const struct ingenic_ost_soc_info jz4760b_ost_soc_info = {
.is64bit = true,
};
static const struct of_device_id ingenic_ost_of_match[] = {
{ .compatible = "ingenic,jz4725b-ost", .data = &jz4725b_ost_soc_info, },
- { .compatible = "ingenic,jz4770-ost", .data = &jz4770_ost_soc_info, },
+ { .compatible = "ingenic,jz4760b-ost", .data = &jz4760b_ost_soc_info, },
+ { .compatible = "ingenic,jz4770-ost", .data = &jz4760b_ost_soc_info, },
{ }
};
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B)
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
2021-03-08 21:23 ` [PATCH v2 2/3] clocksource: ingenic: Add support for the JZ4760 Paul Cercueil
2021-03-08 21:23 ` [PATCH v2 3/3] clocksource: ingenic-ost: Add support for the JZ4760B Paul Cercueil
@ 2021-03-10 3:03 ` Rob Herring
2021-03-10 13:26 ` Daniel Lezcano
2021-04-09 10:27 ` [tip: timers/core] dt-bindings: timer: " tip-bot2 for Paul Cercueil
4 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2021-03-10 3:03 UTC (permalink / raw)
To: Paul Cercueil
Cc: linux-kernel, od, devicetree, Thomas Gleixner, Rob Herring,
Daniel Lezcano
On Mon, 08 Mar 2021 21:23:00 +0000, Paul Cercueil wrote:
> Add compatible strings to support the system timer, clocksource, OST,
> watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs.
>
> Newer SoCs which behave like the JZ4760 or JZ4760B now see their
> compatible string require a fallback compatible string that corresponds
> to one of these two SoCs.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
>
> Notes:
> v2: - Fix indentation
> - Fix example not using correct compatible strings
>
> .../bindings/timer/ingenic,tcu.yaml | 30 ++++++++++++++-----
> 1 file changed, 22 insertions(+), 8 deletions(-)
>
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B)
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
` (2 preceding siblings ...)
2021-03-10 3:03 ` [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Rob Herring
@ 2021-03-10 13:26 ` Daniel Lezcano
2021-04-09 10:27 ` [tip: timers/core] dt-bindings: timer: " tip-bot2 for Paul Cercueil
4 siblings, 0 replies; 8+ messages in thread
From: Daniel Lezcano @ 2021-03-10 13:26 UTC (permalink / raw)
To: Paul Cercueil, Thomas Gleixner, Rob Herring; +Cc: od, linux-kernel, devicetree
On 08/03/2021 22:23, Paul Cercueil wrote:
> Add compatible strings to support the system timer, clocksource, OST,
> watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs.
>
> Newer SoCs which behave like the JZ4760 or JZ4760B now see their
> compatible string require a fallback compatible string that corresponds
> to one of these two SoCs.
>
> Signed-off-by: Paul Cercueil <paul@crapouillou.net>
> ---
Applied, thanks
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 8+ messages in thread* [tip: timers/core] dt-bindings: timer: ingenic: Add compatible strings for JZ4760(B)
2021-03-08 21:23 [PATCH v2 1/3] dt-bindings/timer: ingenic: Add compatible strings for JZ4760(B) Paul Cercueil
` (3 preceding siblings ...)
2021-03-10 13:26 ` Daniel Lezcano
@ 2021-04-09 10:27 ` tip-bot2 for Paul Cercueil
4 siblings, 0 replies; 8+ messages in thread
From: tip-bot2 for Paul Cercueil @ 2021-04-09 10:27 UTC (permalink / raw)
To: linux-tip-commits
Cc: Paul Cercueil, Rob Herring, Daniel Lezcano, x86, linux-kernel
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 507d8c5a418a5d413bf9751d4ff94b259e947736
Gitweb: https://git.kernel.org/tip/507d8c5a418a5d413bf9751d4ff94b259e947736
Author: Paul Cercueil <paul@crapouillou.net>
AuthorDate: Mon, 08 Mar 2021 21:23:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 08 Apr 2021 13:23:22 +02:00
dt-bindings: timer: ingenic: Add compatible strings for JZ4760(B)
Add compatible strings to support the system timer, clocksource, OST,
watchdog and PWM blocks of the JZ4760 and JZ4760B SoCs.
Newer SoCs which behave like the JZ4760 or JZ4760B now see their
compatible string require a fallback compatible string that corresponds
to one of these two SoCs.
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210308212302.10288-1-paul@crapouillou.net
---
Documentation/devicetree/bindings/timer/ingenic,tcu.yaml | 30 +++++--
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml b/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml
index 024bcad..8165df4 100644
--- a/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml
+++ b/Documentation/devicetree/bindings/timer/ingenic,tcu.yaml
@@ -20,6 +20,8 @@ select:
enum:
- ingenic,jz4740-tcu
- ingenic,jz4725b-tcu
+ - ingenic,jz4760-tcu
+ - ingenic,jz4760b-tcu
- ingenic,jz4770-tcu
- ingenic,jz4780-tcu
- ingenic,x1000-tcu
@@ -52,12 +54,15 @@ properties:
- enum:
- ingenic,jz4740-tcu
- ingenic,jz4725b-tcu
- - ingenic,jz4770-tcu
+ - ingenic,jz4760-tcu
- ingenic,x1000-tcu
- const: simple-mfd
- items:
- - const: ingenic,jz4780-tcu
- - const: ingenic,jz4770-tcu
+ - enum:
+ - ingenic,jz4780-tcu
+ - ingenic,jz4770-tcu
+ - ingenic,jz4760b-tcu
+ - const: ingenic,jz4760-tcu
- const: simple-mfd
reg:
@@ -118,6 +123,8 @@ patternProperties:
- items:
- enum:
- ingenic,jz4770-watchdog
+ - ingenic,jz4760b-watchdog
+ - ingenic,jz4760-watchdog
- ingenic,jz4725b-watchdog
- const: ingenic,jz4740-watchdog
@@ -147,6 +154,8 @@ patternProperties:
- ingenic,jz4725b-pwm
- items:
- enum:
+ - ingenic,jz4760-pwm
+ - ingenic,jz4760b-pwm
- ingenic,jz4770-pwm
- ingenic,jz4780-pwm
- const: ingenic,jz4740-pwm
@@ -183,10 +192,15 @@ patternProperties:
oneOf:
- enum:
- ingenic,jz4725b-ost
- - ingenic,jz4770-ost
+ - ingenic,jz4760b-ost
- items:
- - const: ingenic,jz4780-ost
- - const: ingenic,jz4770-ost
+ - const: ingenic,jz4760-ost
+ - const: ingenic,jz4725b-ost
+ - items:
+ - enum:
+ - ingenic,jz4780-ost
+ - ingenic,jz4770-ost
+ - const: ingenic,jz4760b-ost
reg:
maxItems: 1
@@ -226,7 +240,7 @@ examples:
#include <dt-bindings/clock/jz4770-cgu.h>
#include <dt-bindings/clock/ingenic,tcu.h>
tcu: timer@10002000 {
- compatible = "ingenic,jz4770-tcu", "simple-mfd";
+ compatible = "ingenic,jz4770-tcu", "ingenic,jz4760-tcu", "simple-mfd";
reg = <0x10002000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
@@ -272,7 +286,7 @@ examples:
};
ost: timer@e0 {
- compatible = "ingenic,jz4770-ost";
+ compatible = "ingenic,jz4770-ost", "ingenic,jz4760b-ost";
reg = <0xe0 0x20>;
clocks = <&tcu TCU_CLK_OST>;
^ permalink raw reply related [flat|nested] 8+ messages in thread