Add support for TCU of X1000

Add support for TCU of X1000

[周琰杰 (Zhou Yanjie)]

Add support for TCU of X1000 from Ingenic. X1000 has a different
TCU containing OST, since X1000, OST has been independent of TCU.
This patch is prepare for later OST driver.

[PATCH 0/4] Add support for TCU of X1000

[周琰杰 (Zhou Yanjie)]

Add support for TCU of X1000 from Ingenic. X1000 has
a different TCU containing OST, since X1000, OST has
been independent of TCU. This patch is prepare for
later OST driver.

周琰杰 (Zhou Yanjie) (4):
  dt-bindings: timer: Add X1000 bindings.
  clk: Ingenic: Add support for TCU of X1000.
  clocksource: Ingenic: Add support for TCU of X1000.
  irqchip: Ingenic: Add support for TCU of X1000.

 Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 +
 drivers/clk/ingenic/tcu.c                               | 8 ++++++++
 drivers/clocksource/ingenic-timer.c                     | 3 ++-
 drivers/irqchip/irq-ingenic-tcu.c                       | 1 +
 4 files changed, 12 insertions(+), 1 deletion(-)

-- 
2.7.4

[PATCH 1/4] dt-bindings: timer: Add X1000 bindings.

[周琰杰 (Zhou Yanjie)]

Add the timer bindings for the X1000 Soc from Ingenic.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
index 0b63ceb..91f7049 100644
--- a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
+++ b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
@@ -10,6 +10,7 @@ Required properties:
   * ingenic,jz4740-tcu
   * ingenic,jz4725b-tcu
   * ingenic,jz4770-tcu
+  * ingenic,x1000-tcu
   followed by "simple-mfd".
 - reg: Should be the offset/length value corresponding to the TCU registers
 - clocks: List of phandle & clock specifiers for clocks external to the TCU.
-- 
2.7.4

[PATCH 2/4] clk: Ingenic: Add support for TCU of X1000.

[周琰杰 (Zhou Yanjie)]

X1000 has a different TCU containing OST, since X1000, OST has been
independent of TCU. This patch is prepare for later OST driver.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 drivers/clk/ingenic/tcu.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/clk/ingenic/tcu.c b/drivers/clk/ingenic/tcu.c
index ad7daa4..8799907 100644
--- a/drivers/clk/ingenic/tcu.c
+++ b/drivers/clk/ingenic/tcu.c
@@ -317,10 +317,17 @@ static const struct ingenic_soc_info jz4770_soc_info = {
 	.has_tcu_clk = false,
 };
 
+static const struct ingenic_soc_info x1000_soc_info = {
+	.num_channels = 8,
+	.has_ost = false, /* X1000 has OST, but it not belong TCU */
+	.has_tcu_clk = false,
+};
+
 static const struct of_device_id ingenic_tcu_of_match[] __initconst = {
 	{ .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, },
 	{ .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, },
 	{ .compatible = "ingenic,jz4770-tcu", .data = &jz4770_soc_info, },
+	{ .compatible = "ingenic,x1000-tcu", .data = &x1000_soc_info, },
 	{ /* sentinel */ }
 };
 
@@ -471,3 +478,4 @@ static void __init ingenic_tcu_init(struct device_node *np)
 CLK_OF_DECLARE_DRIVER(jz4740_cgu, "ingenic,jz4740-tcu", ingenic_tcu_init);
 CLK_OF_DECLARE_DRIVER(jz4725b_cgu, "ingenic,jz4725b-tcu", ingenic_tcu_init);
 CLK_OF_DECLARE_DRIVER(jz4770_cgu, "ingenic,jz4770-tcu", ingenic_tcu_init);
+CLK_OF_DECLARE_DRIVER(x1000_cgu, "ingenic,x1000-tcu", ingenic_tcu_init);
-- 
2.7.4

[PATCH 3/4] clocksource: Ingenic: Add support for TCU of X1000.

[周琰杰 (Zhou Yanjie)]

X1000 has a different TCU containing OST, since X1000, OST has been
independent of TCU. This patch is prepare for later OST driver.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 drivers/clocksource/ingenic-timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 4bbdb3d..4963336 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -230,6 +230,7 @@ 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,jz4770-tcu", .data = &jz4740_soc_info, },
+	{ .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
 	{ /* sentinel */ }
 };
 
@@ -302,7 +303,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(jz4770_tcu_intc,  "ingenic,jz4770-tcu",  ingenic_tcu_init);
-
+TIMER_OF_DECLARE(x1000_tcu_intc,  "ingenic,x1000-tcu",  ingenic_tcu_init);
 
 static int __init ingenic_tcu_probe(struct platform_device *pdev)
 {
-- 
2.7.4

[PATCH 4/4] irqchip: Ingenic: Add support for TCU of X1000.

[周琰杰 (Zhou Yanjie)]

X1000 has a different TCU containing OST, since X1000, OST has been
independent of TCU. This patch is prepare for later OST driver.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
---
 drivers/irqchip/irq-ingenic-tcu.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/irqchip/irq-ingenic-tcu.c b/drivers/irqchip/irq-ingenic-tcu.c
index 6d05cef..7a7222d 100644
--- a/drivers/irqchip/irq-ingenic-tcu.c
+++ b/drivers/irqchip/irq-ingenic-tcu.c
@@ -180,3 +180,4 @@ static int __init ingenic_tcu_irq_init(struct device_node *np,
 IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", ingenic_tcu_irq_init);
 IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", ingenic_tcu_irq_init);
 IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", ingenic_tcu_irq_init);
+IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", ingenic_tcu_irq_init);
-- 
2.7.4

Re: [PATCH 1/4] dt-bindings: timer: Add X1000 bindings.

[Rob Herring]

On Wed, 19 Feb 2020 16:29:31 +0800, =?UTF-8?q?=E5=91=A8=E7=90=B0=E6=9D=B0=20=28Zhou=20Yanjie=29?= wrote:
> Add the timer bindings for the X1000 Soc from Ingenic.
> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>  Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 +
>  1 file changed, 1 insertion(+)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 1/4] dt-bindings: timer: Add X1000 bindings.

[Daniel Lezcano]

On 19/02/2020 09:29, 周琰杰 (Zhou Yanjie) wrote:
> Add the timer bindings for the X1000 Soc from Ingenic.
> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>  Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
> index 0b63ceb..91f7049 100644
> --- a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
> +++ b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
> @@ -10,6 +10,7 @@ Required properties:
>    * ingenic,jz4740-tcu
>    * ingenic,jz4725b-tcu
>    * ingenic,jz4770-tcu
> +  * ingenic,x1000-tcu
>    followed by "simple-mfd".
>  - reg: Should be the offset/length value corresponding to the TCU registers
>  - clocks: List of phandle & clock specifiers for clocks external to the TCU.

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

Re: [PATCH 3/4] clocksource: Ingenic: Add support for TCU of X1000.

[Daniel Lezcano]

On 19/02/2020 09:29, 周琰杰 (Zhou Yanjie) wrote:
> X1000 has a different TCU containing OST, since X1000, OST has been
> independent of TCU. This patch is prepare for later OST driver.
> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>

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

Re: [PATCH 2/4] clk: Ingenic: Add support for TCU of X1000.

[Zhou Yanjie]

Hi,

On 2020年02月19日 16:29, 周琰杰 (Zhou Yanjie) wrote:
> X1000 has a different TCU containing OST, since X1000, OST has been
> independent of TCU. This patch is prepare for later OST driver.
>
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>

Any review/ack from clock framework subsystem?


Thanks and best regards!

> ---
>   drivers/clk/ingenic/tcu.c | 8 ++++++++
>   1 file changed, 8 insertions(+)
>
> diff --git a/drivers/clk/ingenic/tcu.c b/drivers/clk/ingenic/tcu.c
> index ad7daa4..8799907 100644
> --- a/drivers/clk/ingenic/tcu.c
> +++ b/drivers/clk/ingenic/tcu.c
> @@ -317,10 +317,17 @@ static const struct ingenic_soc_info jz4770_soc_info = {
>   	.has_tcu_clk = false,
>   };
>   
> +static const struct ingenic_soc_info x1000_soc_info = {
> +	.num_channels = 8,
> +	.has_ost = false, /* X1000 has OST, but it not belong TCU */
> +	.has_tcu_clk = false,
> +};
> +
>   static const struct of_device_id ingenic_tcu_of_match[] __initconst = {
>   	{ .compatible = "ingenic,jz4740-tcu", .data = &jz4740_soc_info, },
>   	{ .compatible = "ingenic,jz4725b-tcu", .data = &jz4725b_soc_info, },
>   	{ .compatible = "ingenic,jz4770-tcu", .data = &jz4770_soc_info, },
> +	{ .compatible = "ingenic,x1000-tcu", .data = &x1000_soc_info, },
>   	{ /* sentinel */ }
>   };
>   
> @@ -471,3 +478,4 @@ static void __init ingenic_tcu_init(struct device_node *np)
>   CLK_OF_DECLARE_DRIVER(jz4740_cgu, "ingenic,jz4740-tcu", ingenic_tcu_init);
>   CLK_OF_DECLARE_DRIVER(jz4725b_cgu, "ingenic,jz4725b-tcu", ingenic_tcu_init);
>   CLK_OF_DECLARE_DRIVER(jz4770_cgu, "ingenic,jz4770-tcu", ingenic_tcu_init);
> +CLK_OF_DECLARE_DRIVER(x1000_cgu, "ingenic,x1000-tcu", ingenic_tcu_init);

Re: [PATCH 4/4] irqchip: Ingenic: Add support for TCU of X1000.

[Marc Zyngier]

On 2020-02-19 08:29, 周琰杰 wrote:
> X1000 has a different TCU containing OST, since X1000, OST has been
> independent of TCU. This patch is prepare for later OST driver.

You keep on talking about OST (whatever that is), but never deals with 
it.
Why don't you just say

"Enable TCU support for Ingenic X1000, which can be supported by
the existing driver."

as this is what the patch is doing?

> 
> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
> ---
>  drivers/irqchip/irq-ingenic-tcu.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/irqchip/irq-ingenic-tcu.c
> b/drivers/irqchip/irq-ingenic-tcu.c
> index 6d05cef..7a7222d 100644
> --- a/drivers/irqchip/irq-ingenic-tcu.c
> +++ b/drivers/irqchip/irq-ingenic-tcu.c
> @@ -180,3 +180,4 @@ static int __init ingenic_tcu_irq_init(struct
> device_node *np,
>  IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", 
> ingenic_tcu_irq_init);
>  IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", 
> ingenic_tcu_irq_init);
>  IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", 
> ingenic_tcu_irq_init);
> +IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", 
> ingenic_tcu_irq_init);

Otherwise,

Acked-by: Marc Zyngier <maz@kernel.org>

I expect this to go via the MIPS tree as a series.

Thanks,

         M.
-- 
Jazz is not dead. It just smells funny...

Re: [PATCH 4/4] irqchip: Ingenic: Add support for TCU of X1000.

[Zhou Yanjie]

Hi Marc,

On 2020年03月04日 18:58, Marc Zyngier wrote:
> On 2020-02-19 08:29, 周琰杰 wrote:
>> X1000 has a different TCU containing OST, since X1000, OST has been
>> independent of TCU. This patch is prepare for later OST driver.
>
> You keep on talking about OST (whatever that is), but never deals with 
> it.

Sorry, I didn't make it clear. My intention was to explain why we need 
to add an IRQCHIP_DECLARE to x1000 separately.

> Why don't you just say
>
> "Enable TCU support for Ingenic X1000, which can be supported by
> the existing driver."
>
> as this is what the patch is doing?

Yes, this patch is to ensure that TCU can be used normally when the new 
OST driver is merged, thank you for your suggestion.

Thanks and best regards!

>
>>
>> Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
>> ---
>>  drivers/irqchip/irq-ingenic-tcu.c | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/drivers/irqchip/irq-ingenic-tcu.c
>> b/drivers/irqchip/irq-ingenic-tcu.c
>> index 6d05cef..7a7222d 100644
>> --- a/drivers/irqchip/irq-ingenic-tcu.c
>> +++ b/drivers/irqchip/irq-ingenic-tcu.c
>> @@ -180,3 +180,4 @@ static int __init ingenic_tcu_irq_init(struct
>> device_node *np,
>>  IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", 
>> ingenic_tcu_irq_init);
>>  IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", 
>> ingenic_tcu_irq_init);
>>  IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", 
>> ingenic_tcu_irq_init);
>> +IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", 
>> ingenic_tcu_irq_init);
>
> Otherwise,
>
> Acked-by: Marc Zyngier <maz@kernel.org>
>
> I expect this to go via the MIPS tree as a series.
>
> Thanks,
>
>         M.

[tip: timers/core] clocksource/drivers/ingenic: Add support for TCU of X1000

[tip-bot2 for 周琰杰]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     a7cd39552194954bcdecfd9ff775466a61bda5bb
Gitweb:        https://git.kernel.org/tip/a7cd39552194954bcdecfd9ff775466a61bda5bb
Author:        周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
AuthorDate:    Wed, 19 Feb 2020 16:29:33 +08:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 27 Feb 2020 11:22:22 +01:00

clocksource/drivers/ingenic: Add support for TCU of X1000

X1000 has a different TCU containing OST, since X1000, OST has been
independent of TCU. This patch is prepare for later OST driver.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1582100974-129559-5-git-send-email-zhouyanjie@wanyeetech.com
---
 drivers/clocksource/ingenic-timer.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/clocksource/ingenic-timer.c b/drivers/clocksource/ingenic-timer.c
index 4bbdb3d..4963336 100644
--- a/drivers/clocksource/ingenic-timer.c
+++ b/drivers/clocksource/ingenic-timer.c
@@ -230,6 +230,7 @@ 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,jz4770-tcu", .data = &jz4740_soc_info, },
+	{ .compatible = "ingenic,x1000-tcu", .data = &jz4740_soc_info, },
 	{ /* sentinel */ }
 };
 
@@ -302,7 +303,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(jz4770_tcu_intc,  "ingenic,jz4770-tcu",  ingenic_tcu_init);
-
+TIMER_OF_DECLARE(x1000_tcu_intc,  "ingenic,x1000-tcu",  ingenic_tcu_init);
 
 static int __init ingenic_tcu_probe(struct platform_device *pdev)
 {

[tip: timers/core] dt-bindings: timer: Add X1000 bindings.

[tip-bot2 for 周琰杰]

The following commit has been merged into the timers/core branch of tip:

Commit-ID:     fe6c2d6a80680a875a856eb174d12acea7681247
Gitweb:        https://git.kernel.org/tip/fe6c2d6a80680a875a856eb174d12acea7681247
Author:        周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
AuthorDate:    Wed, 19 Feb 2020 16:29:31 +08:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 27 Feb 2020 11:21:38 +01:00

dt-bindings: timer: Add X1000 bindings.

Add the timer bindings for the X1000 Soc from Ingenic.

Signed-off-by: 周琰杰 (Zhou Yanjie) <zhouyanjie@wanyeetech.com>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/1582100974-129559-3-git-send-email-zhouyanjie@wanyeetech.com
---
 Documentation/devicetree/bindings/timer/ingenic,tcu.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
index 0b63ceb..91f7049 100644
--- a/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
+++ b/Documentation/devicetree/bindings/timer/ingenic,tcu.txt
@@ -10,6 +10,7 @@ Required properties:
   * ingenic,jz4740-tcu
   * ingenic,jz4725b-tcu
   * ingenic,jz4770-tcu
+  * ingenic,x1000-tcu
   followed by "simple-mfd".
 - reg: Should be the offset/length value corresponding to the TCU registers
 - clocks: List of phandle & clock specifiers for clocks external to the TCU.

Re: [PATCH 2/4] clk: Ingenic: Add support for TCU of X1000.

[Stephen Boyd]

Quoting Zhou Yanjie (2020-02-19 00:29:32)
> X1000 has a different TCU containing OST, since X1000, OST has been
> independent of TCU. This patch is prepare for later OST driver.
> 

Acked-by: Stephen Boyd <sboyd@kernel.org>

Add support for TCU of X1000.

[周琰杰 (Zhou Yanjie)]

Add support for TCU of X1000 from Ingenic. X1000 has a different TCU,
since X1000 OST has been independent of TCU. This patch is add TCU
support of X1000, and prepare for later OST driver.