From: Sergio Paracuellos <sergio.paracuellos@gmail.com>
To: linux-clk@vger.kernel.org
Cc: sboyd@kernel.org, mturquette@baylibre.com,
tsbogend@alpha.franken.de, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, matthias.bgg@gmail.com,
angelogioacchino.delregno@collabora.com, p.zabel@pengutronix.de,
linux-mips@vger.kernel.org, devicetree@vger.kernel.org,
yangshiji66@outlook.com, linux-kernel@vger.kernel.org
Subject: [PATCH 6/6] mips: dts: ralink: mt7628a: update system controller node and its consumers
Date: Wed, 15 Jan 2025 16:30:19 +0100 [thread overview]
Message-ID: <20250115153019.407646-7-sergio.paracuellos@gmail.com> (raw)
In-Reply-To: <20250115153019.407646-1-sergio.paracuellos@gmail.com>
Current MT7628A device tree file is out of date and must be merged with real
device tree file used in openWRT project [0]. As a first iteration for this
changes, align the current file with the needed changes for system controller
from '6f3b15586eef ("clk: ralink: add clock and reset driver for MTMIPS SoCs")'.
[0]: https://github.com/openwrt/openwrt/blob/main/target/linux/ramips/dts/mt7628an.dtsi
Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
---
arch/mips/boot/dts/ralink/mt7628a.dtsi | 43 ++++++++++++++++----------
1 file changed, 27 insertions(+), 16 deletions(-)
diff --git a/arch/mips/boot/dts/ralink/mt7628a.dtsi b/arch/mips/boot/dts/ralink/mt7628a.dtsi
index 45a15e005cc4..bc69866e2134 100644
--- a/arch/mips/boot/dts/ralink/mt7628a.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7628a.dtsi
@@ -1,4 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
+#include <dt-bindings/clock/mediatek,mtmips-sysc.h>
+#include <dt-bindings/reset/mediatek,mtmips-sysc.h>
/ {
#address-cells = <1>;
@@ -16,11 +18,6 @@ cpu@0 {
};
};
- resetc: reset-controller {
- compatible = "ralink,rt2880-reset";
- #reset-cells = <1>;
- };
-
cpuintc: interrupt-controller {
#address-cells = <0>;
#interrupt-cells = <1>;
@@ -36,9 +33,11 @@ palmbus@10000000 {
#address-cells = <1>;
#size-cells = <1>;
- sysc: system-controller@0 {
- compatible = "ralink,mt7620a-sysc", "syscon";
+ sysc: syscon@0 {
+ compatible = "ralink,mt7628-sysc", "syscon";
reg = <0x0 0x60>;
+ #clock-cells = <1>;
+ #reset-cells = <1>;
};
pinmux: pinmux@60 {
@@ -138,7 +137,7 @@ watchdog: watchdog@100 {
compatible = "mediatek,mt7621-wdt";
reg = <0x100 0x30>;
- resets = <&resetc 8>;
+ resets = <&sysc MT76X8_RST_TIMER>;
reset-names = "wdt";
interrupt-parent = <&intc>;
@@ -154,7 +153,7 @@ intc: interrupt-controller@200 {
interrupt-controller;
#interrupt-cells = <1>;
- resets = <&resetc 9>;
+ resets = <&sysc MT76X8_RST_INTC>;
reset-names = "intc";
interrupt-parent = <&cpuintc>;
@@ -190,7 +189,9 @@ spi: spi@b00 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_spi_spi>;
- resets = <&resetc 18>;
+ clocks = <&sysc MT76X8_CLK_SPI1>;
+
+ resets = <&sysc MT76X8_RST_SPI>;
reset-names = "spi";
#address-cells = <1>;
@@ -206,7 +207,9 @@ i2c: i2c@900 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_i2c_i2c>;
- resets = <&resetc 16>;
+ clocks = <&sysc MT76X8_CLK_I2C>;
+
+ resets = <&sysc MT76X8_RST_I2C>;
reset-names = "i2c";
#address-cells = <1>;
@@ -222,7 +225,9 @@ uart0: uartlite@c00 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_uart0_uart>;
- resets = <&resetc 12>;
+ clocks = <&sysc MT76X8_CLK_UART0>;
+
+ resets = <&sysc MT76X8_RST_UART0>;
reset-names = "uart0";
interrupt-parent = <&intc>;
@@ -238,7 +243,9 @@ uart1: uart1@d00 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_uart1_uart>;
- resets = <&resetc 19>;
+ clocks = <&sysc MT76X8_CLK_UART1>;
+
+ resets = <&sysc MT76X8_RST_UART1>;
reset-names = "uart1";
interrupt-parent = <&intc>;
@@ -254,7 +261,9 @@ uart2: uart2@e00 {
pinctrl-names = "default";
pinctrl-0 = <&pinmux_uart2_uart>;
- resets = <&resetc 20>;
+ clocks = <&sysc MT76X8_CLK_UART2>;
+
+ resets = <&sysc MT76X8_RST_UART2>;
reset-names = "uart2";
interrupt-parent = <&intc>;
@@ -271,8 +280,8 @@ usb_phy: usb-phy@10120000 {
#phy-cells = <0>;
ralink,sysctl = <&sysc>;
- resets = <&resetc 22 &resetc 25>;
- reset-names = "host", "device";
+ resets = <&sysc MT76X8_RST_UHST>;
+ reset-names = "host";
};
usb@101c0000 {
@@ -290,6 +299,8 @@ wmac: wmac@10300000 {
compatible = "mediatek,mt7628-wmac";
reg = <0x10300000 0x100000>;
+ clocks = <&sysc MT76X8_CLK_WMAC>;
+
interrupt-parent = <&cpuintc>;
interrupts = <6>;
--
2.25.1
prev parent reply other threads:[~2025-01-15 15:30 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 15:30 [PATCH 0/6] mips: dts: ralink: update system controller nodes and its consumers Sergio Paracuellos
2025-01-15 15:30 ` [PATCH 1/6] dt-bindings: clock: add clock and reset definitions for Ralink SoCs Sergio Paracuellos
2025-01-16 9:15 ` Krzysztof Kozlowski
2025-01-16 9:53 ` Sergio Paracuellos
2025-01-18 9:11 ` Krzysztof Kozlowski
2025-01-15 15:30 ` [PATCH 2/6] mips: dts: ralink: rt2880: update system controller node and its consumers Sergio Paracuellos
2025-01-16 9:18 ` Krzysztof Kozlowski
2025-01-16 10:00 ` Sergio Paracuellos
2025-01-15 15:30 ` [PATCH 3/6] mips: dts: ralink: rt3050: " Sergio Paracuellos
2025-01-15 15:30 ` [PATCH 4/6] mips: dts: ralink: rt3883: " Sergio Paracuellos
2025-01-15 15:30 ` [PATCH 5/6] mips: dts: ralink: mt7620a: " Sergio Paracuellos
2025-01-15 15:30 ` Sergio Paracuellos [this message]
Reply instructions:
You may reply publicly 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=20250115153019.407646-7-sergio.paracuellos@gmail.com \
--to=sergio.paracuellos@gmail.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=krzk+dt@kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=matthias.bgg@gmail.com \
--cc=mturquette@baylibre.com \
--cc=p.zabel@pengutronix.de \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=tsbogend@alpha.franken.de \
--cc=yangshiji66@outlook.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox