Linux-MIPS Archive on lore.kernel.org
 help / color / Atom feed
From: Paul Cercueil <paul@crapouillou.net>
To: Mathieu Malaterre <malat@debian.org>
Cc: Rob Herring <robh+dt@kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Ralf Baechle <ralf@linux-mips.org>,
	Paul Burton <paul.burton@mips.com>,
	James Hogan <jhogan@kernel.org>, Jonathan Corbet <corbet@lwn.net>,
	Daniel Lezcano <daniel.lezcano@linaro.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Michael Turquette <mturquette@baylibre.com>,
	Stephen Boyd <sboyd@kernel.org>,
	Jason Cooper <jason@lakedaemon.net>,
	Marc Zyngier <marc.zyngier@arm.com>,
	Lee Jones <lee.jones@linaro.org>,
	LKML <linux-kernel@vger.kernel.org>,
	"open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" 
	<devicetree@vger.kernel.org>,
	linux-mips@vger.kernel.org, linux-doc@vger.kernel.org,
	linux-clk@vger.kernel.org, od@zcrc.me
Subject: Re: [PATCH v12 09/13] MIPS: jz4740: Add DTS nodes for the TCU drivers
Date: Wed, 22 May 2019 13:15:56 +0200
Message-ID: <1558523756.3066.0@crapouillou.net> (raw)
In-Reply-To: <CA+7wUsxe4DLmAGNnnXZ3UokguMJ0cOGtu=opQpuAPvN_SH4KUw@mail.gmail.com>



On Wed, May 22, 2019 at 11:21 AM, Mathieu Malaterre <malat@debian.org> 
wrote:
> On Tue, May 21, 2019 at 4:52 PM Paul Cercueil <paul@crapouillou.net> 
> wrote:
>> 
>>  Add DTS nodes for the JZ4780, JZ4770 and JZ4740 devicetree files.
>> 
>>  Signed-off-by: Paul Cercueil <paul@crapouillou.net>
>>  ---
>> 
>>  Notes:
>>      v5: New patch
>> 
>>      v6: Fix register lengths in watchdog/pwm nodes
>> 
>>      v7: No change
>> 
>>      v8: - Fix wrong start address for PWM node
>>          - Add system timer and clocksource sub-nodes
>> 
>>      v9: Drop timer and clocksource sub-nodes
>> 
>>      v10-v11: No change
>> 
>>      v12: Drop PWM/watchdog/OST sub-nodes, for now.
>> 
>>   arch/mips/boot/dts/ingenic/jz4740.dtsi | 22 ++++++++++++++++++++++
>>   arch/mips/boot/dts/ingenic/jz4770.dtsi | 21 +++++++++++++++++++++
>>   arch/mips/boot/dts/ingenic/jz4780.dtsi | 21 +++++++++++++++++++++
>>   3 files changed, 64 insertions(+)
>> 
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  index 2beb78a62b7d..807d9702d4cf 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
>>  @@ -53,6 +53,28 @@
>>                  clock-names = "rtc";
>>          };
>> 
>>  +       tcu: timer@10002000 {
>>  +               compatible = "ingenic,jz4740-tcu";
>>  +               reg = <0x10002000 0x1000>;
>>  +               #address-cells = <1>;
>>  +               #size-cells = <1>;
>>  +               ranges = <0x0 0x10002000 0x1000>;
>>  +
>>  +               #clock-cells = <1>;
>>  +
>>  +               clocks = <&cgu JZ4740_CLK_RTC
>>  +                         &cgu JZ4740_CLK_EXT
>>  +                         &cgu JZ4740_CLK_PCLK
>>  +                         &cgu JZ4740_CLK_TCU>;
>>  +               clock-names = "rtc", "ext", "pclk", "tcu";
>>  +
>>  +               interrupt-controller;
>>  +               #interrupt-cells = <1>;
>>  +
>>  +               interrupt-parent = <&intc>;
>>  +               interrupts = <23 22 21>;
>>  +       };
>>  +
>>          rtc_dev: rtc@10003000 {
>>                  compatible = "ingenic,jz4740-rtc";
>>                  reg = <0x10003000 0x40>;
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  index 49ede6c14ff3..70932fd90902 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
>>  @@ -46,6 +46,27 @@
>>                  #clock-cells = <1>;
>>          };
>> 
>>  +       tcu: timer@10002000 {
>>  +               compatible = "ingenic,jz4770-tcu";
>>  +               reg = <0x10002000 0x1000>;
>>  +               #address-cells = <1>;
>>  +               #size-cells = <1>;
>>  +               ranges = <0x0 0x10002000 0x1000>;
>>  +
>>  +               #clock-cells = <1>;
>>  +
>>  +               clocks = <&cgu JZ4770_CLK_RTC
>>  +                         &cgu JZ4770_CLK_EXT
>>  +                         &cgu JZ4770_CLK_PCLK>;
>>  +               clock-names = "rtc", "ext", "pclk";
>>  +
>>  +               interrupt-controller;
>>  +               #interrupt-cells = <1>;
>>  +
>>  +               interrupt-parent = <&intc>;
>>  +               interrupts = <27 26 25>;
>>  +       };
>>  +
>>          pinctrl: pin-controller@10010000 {
>>                  compatible = "ingenic,jz4770-pinctrl";
>>                  reg = <0x10010000 0x600>;
>>  diff --git a/arch/mips/boot/dts/ingenic/jz4780.dtsi 
>> b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  index b03cdec56de9..495082ce7fc5 100644
>>  --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi
>>  @@ -46,6 +46,27 @@
>>                  #clock-cells = <1>;
>>          };
>> 
>>  +       tcu: timer@10002000 {
> 
> With W=1, I see:
> 
> ../arch/mips/boot/dts/ingenic/jz4780.dtsi:64.22-83.4: Warning
> (unique_unit_address): /timer@10002000: duplicate unit-address (also
> used in node /watchdog@1000
> 2000)

That didn't happen in V11 because there I was also migrating the
watchdog and PWM drivers to children nodes of the TCU. It was more
atomic, but it also was a 27-patches bomb touching a lot of
subsystems that nobody was ever going to merge.

Is the address conflict OK, knowing that the watchdog node will
move out of the way as soon as this patchset is merged?

Should I add an extra patch to remove the watchdog node instead?

(and yes, devicetree ABI will break, which is sort-of OK in this
case - as on Ingenic boards the devicetree blobs are always
compiled within the kernel, so I think we should make this
much-needed change while we still can).


>>  +               compatible = "ingenic,jz4770-tcu";
>>  +               reg = <0x10002000 0x1000>;
>>  +               #address-cells = <1>;
>>  +               #size-cells = <1>;
>>  +               ranges = <0x0 0x10002000 0x1000>;
>>  +
>>  +               #clock-cells = <1>;
>>  +
>>  +               clocks = <&cgu JZ4780_CLK_RTCLK
>>  +                         &cgu JZ4780_CLK_EXCLK
>>  +                         &cgu JZ4780_CLK_PCLK>;
>>  +               clock-names = "rtc", "ext", "pclk";
>>  +
>>  +               interrupt-controller;
>>  +               #interrupt-cells = <1>;
>>  +
>>  +               interrupt-parent = <&intc>;
>>  +               interrupts = <27 26 25>;
>>  +       };
>>  +
>>          rtc_dev: rtc@10003000 {
>>                  compatible = "ingenic,jz4780-rtc";
>>                  reg = <0x10003000 0x4c>;
>>  --
>>  2.21.0.593.g511ec345e18
>> 



  reply index

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-21 14:51 Ingenic Timer/Counter Unit (TCU) patchset v12 Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 01/13] dt-bindings: ingenic: Add DT bindings for TCU clocks Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 02/13] doc: Add doc for the Ingenic TCU hardware Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 03/13] dt-bindings: Add doc for the Ingenic TCU drivers Paul Cercueil
2019-05-24 20:21   ` Rob Herring
2019-05-25 19:13     ` Paul Cercueil
2019-06-11 14:57       ` Rob Herring
2019-05-21 14:51 ` [PATCH v12 04/13] mfd: Add Ingenic TCU driver Paul Cercueil
2019-06-22 12:21   ` Paul Cercueil
2019-06-26 13:18   ` Lee Jones
2019-06-26 13:55     ` Paul Cercueil
2019-06-27  6:58       ` Lee Jones
2019-06-27  8:49         ` Paul Cercueil
2019-06-27  9:01           ` Lee Jones
2019-06-27  9:19             ` Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 05/13] clk: ingenic: Add driver for the TCU clocks Paul Cercueil
2019-06-07 21:28   ` Stephen Boyd
2019-06-07 21:59     ` Paul Cercueil
2019-06-07 22:50       ` Stephen Boyd
2019-05-21 14:51 ` [PATCH v12 06/13] irqchip: Add irq-ingenic-tcu driver Paul Cercueil
2019-06-22 12:22   ` Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 07/13] clocksource: Add a new timer-ingenic driver Paul Cercueil
2019-06-22 12:23   ` Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 08/13] clk: jz4740: Add TCU clock Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 09/13] MIPS: jz4740: Add DTS nodes for the TCU drivers Paul Cercueil
2019-05-22  9:21   ` Mathieu Malaterre
2019-05-22 11:15     ` Paul Cercueil [this message]
2019-05-21 14:51 ` [PATCH v12 10/13] MIPS: qi_lb60: Reduce system timer and clocksource to 750 kHz Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 11/13] MIPS: CI20: Reduce system timer and clocksource to 3 MHz Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 12/13] MIPS: GCW0: Reduce system timer and clocksource to 750 kHz Paul Cercueil
2019-05-21 14:51 ` [PATCH v12 13/13] MIPS: jz4740: Drop obsolete code Paul Cercueil
2019-05-27 11:39 ` Ingenic Timer/Counter Unit (TCU) patchset v12 Mathieu Malaterre

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1558523756.3066.0@crapouillou.net \
    --to=paul@crapouillou.net \
    --cc=corbet@lwn.net \
    --cc=daniel.lezcano@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=jason@lakedaemon.net \
    --cc=jhogan@kernel.org \
    --cc=lee.jones@linaro.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mips@vger.kernel.org \
    --cc=malat@debian.org \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=mturquette@baylibre.com \
    --cc=od@zcrc.me \
    --cc=paul.burton@mips.com \
    --cc=ralf@linux-mips.org \
    --cc=robh+dt@kernel.org \
    --cc=sboyd@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-MIPS Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-mips/0 linux-mips/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-mips linux-mips/ https://lore.kernel.org/linux-mips \
		linux-mips@vger.kernel.org
	public-inbox-index linux-mips

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-mips


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git