[v8,18/26] MIPS: jz4740: Add DTS nodes for the TCU drivers

Message ID	20181212220922.18759-19-paul@crapouillou.net (mailing list archive)
State	Superseded
Delegated to:	Paul Burton
Headers	show Return-Path: <linux-mips-owner@kernel.org> From: Paul Cercueil <paul@crapouillou.net> To: Thierry Reding <thierry.reding@gmail.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Thomas Gleixner <tglx@linutronix.de>, Ralf Baechle <ralf@linux-mips.org>, Paul Burton <paul.burton@mips.com>, James Hogan <jhogan@kernel.org>, Jonathan Corbet <corbet@lwn.net> Cc: Mathieu Malaterre <malat@debian.org>, Ezequiel Garcia <ezequiel@collabora.co.uk>, PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>, linux-pwm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, linux-mips@vger.kernel.org, linux-doc@vger.kernel.org, linux-clk@vger.kernel.org, od@zcrc.me, Paul Cercueil <paul@crapouillou.net> Subject: [PATCH v8 18/26] MIPS: jz4740: Add DTS nodes for the TCU drivers Date: Wed, 12 Dec 2018 23:09:13 +0100 Message-Id: <20181212220922.18759-19-paul@crapouillou.net> In-Reply-To: <20181212220922.18759-1-paul@crapouillou.net> References: <20181212220922.18759-1-paul@crapouillou.net> Sender: linux-mips-owner@vger.kernel.org Precedence: bulk
Series	Ingenic TCU patchset v8 \| expand [v8,00/26] Ingenic TCU patchset v8 [v8,01/26] dt-bindings: ingenic: Add DT bindings for TCU clocks [v8,02/26] doc: Add doc for the Ingenic TCU hardware [v8,03/26] dt-bindings: Add doc for the Ingenic TCU drivers [v8,04/26] clocksource: Add a new timer-ingenic driver [v8,05/26] clocksource: Add driver for the Ingenic JZ47xx OST [v8,06/26] MAINTAINERS: Add myself as maintainer for Ingenic TCU drivers [v8,07/26] watchdog: jz4740: Use WDT clock provided by TCU driver [v8,08/26] watchdog: jz4740: Use regmap provided by TCU driver [v8,09/26] watchdog: jz4740: Avoid starting watchdog in set_timeout [v8,10/26] watchdog: jz4740: Drop dependency on MACH_JZ47xx, use COMPILE_TEST [v8,11/26] pwm: jz4740: Use regmap and clocks from TCU driver [v8,12/26] pwm: jz4740: Allow selection of PWM channels 0 and 1 [v8,13/26] pwm: jz4740: Drop dependency on MACH_INGENIC, use COMPILE_TEST [v8,14/26] pwm: jz4740: Remove unused devicetree compatible strings [v8,15/26] pwm: jz4740: Add support for the JZ4725B [v8,16/26] clk: jz4740: Add TCU clock [v8,17/26] MIPS: Kconfig: Select TCU timer driver when MACH_INGENIC is set [v8,18/26] MIPS: jz4740: Add DTS nodes for the TCU drivers [v8,19/26] MIPS: qi_lb60: Move PWM devices to devicetree [v8,20/26] MIPS: qi_lb60: Reduce system timer and clocksource to 750 kHz [v8,21/26] MIPS: CI20: Reduce system timer and clocksource to 3 MHz [v8,22/26] MIPS: CI20: defconfig: enable OST driver [v8,23/26] MIPS: GCW0: Move clocksource to TCU channel 2 [v8,24/26] MIPS: GCW0: Reduce system timer and clocksource to 750 kHz [v8,25/26] MIPS: GCW0: defconfig: Enable OST, watchdog, PWM drivers [v8,26/26] MIPS: jz4740: Drop obsolete code

diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi index 6fb16fd24035..d625e8acb695 100644 --- a/arch/mips/boot/dts/ingenic/jz4740.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/clock/jz4740-cgu.h> +#include <dt-bindings/clock/ingenic,tcu.h> / { #address-cells = <1>; @@ -45,12 +46,70 @@ #clock-cells = <1>; }; - watchdog: watchdog@10002000 { - compatible = "ingenic,jz4740-watchdog"; - reg = <0x10002000 0x10>; + tcu: timer@10002000 { + compatible = "ingenic,jz4740-tcu"; + reg = <0x10002000 0x1000>; + #address-cells = <1>; + #size-cells = <1>; + ranges = <0x0 0x10002000 0x1000>; - clocks = <&cgu JZ4740_CLK_RTC>; - clock-names = "rtc"; + #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>; + + watchdog: watchdog@0 { + compatible = "ingenic,jz4740-watchdog"; + reg = <0x0 0xc>; + + clocks = <&tcu TCU_CLK_WDT>; + clock-names = "wdt"; + }; + + timer: timer@40 { + compatible = "ingenic,jz4740-tcu-timer"; + reg = <0x40 0x10>; + + clocks = <&tcu TCU_CLK_TIMER0>; + clock-names = "timer"; + + interrupts = <0>; + }; + + clocksource: timer@50 { + compatible = "ingenic,jz4740-tcu-clocksource"; + reg = <0x50 0x10>; + + clocks = <&tcu TCU_CLK_TIMER1>; + clock-names = "timer"; + }; + + pwm: pwm@60 { + compatible = "ingenic,jz4740-pwm"; + reg = <0x60 0x60>; + + #pwm-cells = <3>; + + clocks = <&tcu TCU_CLK_TIMER0 + &tcu TCU_CLK_TIMER1 + &tcu TCU_CLK_TIMER2 + &tcu TCU_CLK_TIMER3 + &tcu TCU_CLK_TIMER4 + &tcu TCU_CLK_TIMER5 + &tcu TCU_CLK_TIMER6 + &tcu TCU_CLK_TIMER7>; + clock-names = "timer0", "timer1", "timer2", "timer3", + "timer4", "timer5", "timer6", "timer7"; + }; }; rtc_dev: rtc@10003000 { diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi index 49ede6c14ff3..6008975a307f 100644 --- a/arch/mips/boot/dts/ingenic/jz4770.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/clock/jz4770-cgu.h> +#include <dt-bindings/clock/ingenic,tcu.h> / { #address-cells = <1>; @@ -46,6 +47,86 @@ #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 + &cgu JZ4770_CLK_EXT>; + clock-names = "rtc", "ext", "pclk", "tcu"; + + interrupt-controller; + #interrupt-cells = <1>; + + interrupt-parent = <&intc>; + interrupts = <27 26 25>; + + watchdog: watchdog@0 { + compatible = "ingenic,jz4740-watchdog"; + reg = <0x0 0xc>; + + clocks = <&tcu TCU_CLK_WDT>; + clock-names = "wdt"; + }; + + timer: timer@40 { + compatible = "ingenic,jz4740-tcu-timer"; + reg = <0x40 0x10>; + + clocks = <&tcu TCU_CLK_TIMER0>; + clock-names = "timer"; + + interrupts = <0>; + }; + + clocksource: timer@50 { + compatible = "ingenic,jz4740-tcu-clocksource"; + reg = <0x50 0x10>; + + clocks = <&tcu TCU_CLK_TIMER1>; + clock-names = "timer"; + + /* Disable by default, since the OST is more precise */ + status = "disabled"; + }; + + + pwm: pwm@60 { + compatible = "ingenic,jz4740-pwm"; + reg = <0x60 0x60>; + + #pwm-cells = <3>; + + clocks = <&tcu TCU_CLK_TIMER0 + &tcu TCU_CLK_TIMER1 + &tcu TCU_CLK_TIMER2 + &tcu TCU_CLK_TIMER3 + &tcu TCU_CLK_TIMER4 + &tcu TCU_CLK_TIMER5 + &tcu TCU_CLK_TIMER6 + &tcu TCU_CLK_TIMER7>; + clock-names = "timer0", "timer1", "timer2", "timer3", + "timer4", "timer5", "timer6", "timer7"; + }; + + ost: timer@e0 { + compatible = "ingenic,jz4770-ost"; + reg = <0xe0 0x20>; + + clocks = <&tcu TCU_CLK_OST>; + clock-names = "ost"; + + interrupts = <15>; + }; + }; + 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..b8eb8a385651 100644 --- a/arch/mips/boot/dts/ingenic/jz4780.dtsi +++ b/arch/mips/boot/dts/ingenic/jz4780.dtsi @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <dt-bindings/clock/jz4780-cgu.h> +#include <dt-bindings/clock/ingenic,tcu.h> #include <dt-bindings/dma/jz4780-dma.h> / { @@ -46,6 +47,85 @@ #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 JZ4780_CLK_RTCLK + &cgu JZ4780_CLK_EXCLK + &cgu JZ4780_CLK_PCLK + &cgu JZ4780_CLK_EXCLK>; + clock-names = "rtc", "ext", "pclk", "tcu"; + + interrupt-controller; + #interrupt-cells = <1>; + + interrupt-parent = <&intc>; + interrupts = <27 26 25>; + + watchdog: watchdog@0 { + compatible = "ingenic,jz4780-watchdog"; + reg = <0x0 0xc>; + + clocks = <&tcu TCU_CLK_WDT>; + clock-names = "wdt"; + }; + + timer: timer@40 { + compatible = "ingenic,jz4740-tcu-timer"; + reg = <0x40 0x10>; + + clocks = <&tcu TCU_CLK_TIMER0>; + clock-names = "timer"; + + interrupts = <0>; + }; + + clocksource: timer@50 { + compatible = "ingenic,jz4740-tcu-clocksource"; + reg = <0x50 0x10>; + + clocks = <&tcu TCU_CLK_TIMER1>; + clock-names = "timer"; + + /* Disable by default, since the OST is more precise */ + status = "disabled"; + }; + + pwm: pwm@60 { + compatible = "ingenic,jz4740-pwm"; + reg = <0x60 0x60>; + + #pwm-cells = <3>; + + clocks = <&tcu TCU_CLK_TIMER0 + &tcu TCU_CLK_TIMER1 + &tcu TCU_CLK_TIMER2 + &tcu TCU_CLK_TIMER3 + &tcu TCU_CLK_TIMER4 + &tcu TCU_CLK_TIMER5 + &tcu TCU_CLK_TIMER6 + &tcu TCU_CLK_TIMER7>; + clock-names = "timer0", "timer1", "timer2", "timer3", + "timer4", "timer5", "timer6", "timer7"; + }; + + ost: timer@e0 { + compatible = "ingenic,jz4770-ost"; + reg = <0xe0 0x20>; + + clocks = <&tcu TCU_CLK_OST>; + clock-names = "ost"; + + interrupts = <15>; + }; + }; + rtc_dev: rtc@10003000 { compatible = "ingenic,jz4780-rtc"; reg = <0x10003000 0x4c>; @@ -239,14 +319,6 @@ status = "disabled"; }; - watchdog: watchdog@10002000 { - compatible = "ingenic,jz4780-watchdog"; - reg = <0x10002000 0x10>; - - clocks = <&cgu JZ4780_CLK_RTCLK>; - clock-names = "rtc"; - }; - nemc: nemc@13410000 { compatible = "ingenic,jz4780-nemc"; reg = <0x13410000 0x10000>;

[v8,18/26] MIPS: jz4740: Add DTS nodes for the TCU drivers

Commit Message

Patch