2022-09-20 17:31:23

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 00/10] dt-bindings and mt7621 devicetree changes

Hello there!

This patch series removes old MediaTek bindings, improves mediatek,mt7530
and mt7621 memory controller bindings and improves mt7621 DTs.

v4:
- Keep memory-controller node name.
- Change syscon to memory-controller on mt7621.dtsi.

v3:
- Explain the mt7621 memory controller binding change in more details.
- Remove explaining the remaining DTC warnings from the patch log as there
are new schemas submitted for them.

v2:
- Change memory controller node name to syscon on the schema example.
- Keep cpu compatible string and syscon on the memory controller node.
- Add Rob and Sergio's tags.

Arınç ÜNAL (10):
dt-bindings: net: drop old mediatek bindings
dt-bindings: net: dsa: mediatek,mt7530: change mt7530 switch address
dt-bindings: net: dsa: mediatek,mt7530: expand gpio-controller
description
dt-bindings: memory: mt7621: add syscon as compatible string
mips: dts: ralink: mt7621: fix some dtc warnings
mips: dts: ralink: mt7621: remove interrupt-parent from switch node
mips: dts: ralink: mt7621: change phy-mode of gmac1 to rgmii
mips: dts: ralink: mt7621: change mt7530 switch address
mips: dts: ralink: mt7621: fix external phy on GB-PC2
mips: dts: ralink: mt7621: add GB-PC2 LEDs

.../mediatek,mt7621-memc.yaml | 6 +-
.../bindings/net/dsa/mediatek,mt7530.yaml | 34 ++++++-----
.../bindings/net/mediatek,mt7620-gsw.txt | 24 --------
.../bindings/net/ralink,rt2880-net.txt | 59 --------------------
.../bindings/net/ralink,rt3050-esw.txt | 30 ----------
.../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 8 +--
.../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 50 +++++++++++++----
arch/mips/boot/dts/ralink/mt7621.dtsi | 35 +++++-------
8 files changed, 80 insertions(+), 166 deletions(-)



2022-09-20 17:36:31

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 01/10] dt-bindings: net: drop old mediatek bindings

Remove these old mediatek bindings which are not used.

Signed-off-by: Arınç ÜNAL <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
.../bindings/net/mediatek,mt7620-gsw.txt | 24 --------
.../bindings/net/ralink,rt2880-net.txt | 59 -------------------
.../bindings/net/ralink,rt3050-esw.txt | 30 ----------
3 files changed, 113 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt
delete mode 100644 Documentation/devicetree/bindings/net/ralink,rt2880-net.txt
delete mode 100644 Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt

diff --git a/Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt b/Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt
deleted file mode 100644
index 358fed2fab43..000000000000
--- a/Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-Mediatek Gigabit Switch
-=======================
-
-The mediatek gigabit switch can be found on Mediatek SoCs (mt7620, mt7621).
-
-Required properties:
-- compatible: Should be "mediatek,mt7620-gsw" or "mediatek,mt7621-gsw"
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the gigabit switches interrupt
-- resets: Should contain the gigabit switches resets
-- reset-names: Should contain the reset names "gsw"
-
-Example:
-
[email protected] {
- compatible = "ralink,mt7620-gsw";
- reg = <0x10110000 8000>;
-
- resets = <&rstctrl 23>;
- reset-names = "gsw";
-
- interrupt-parent = <&intc>;
- interrupts = <17>;
-};
diff --git a/Documentation/devicetree/bindings/net/ralink,rt2880-net.txt b/Documentation/devicetree/bindings/net/ralink,rt2880-net.txt
deleted file mode 100644
index 9fe1a0a22e44..000000000000
--- a/Documentation/devicetree/bindings/net/ralink,rt2880-net.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-Ralink Frame Engine Ethernet controller
-=======================================
-
-The Ralink frame engine ethernet controller can be found on Ralink and
-Mediatek SoCs (RT288x, RT3x5x, RT366x, RT388x, rt5350, mt7620, mt7621, mt76x8).
-
-Depending on the SoC, there is a number of ports connected to the CPU port
-directly and/or via a (gigabit-)switch.
-
-* Ethernet controller node
-
-Required properties:
-- compatible: Should be one of "ralink,rt2880-eth", "ralink,rt3050-eth",
- "ralink,rt3050-eth", "ralink,rt3883-eth", "ralink,rt5350-eth",
- "mediatek,mt7620-eth", "mediatek,mt7621-eth"
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the frame engines interrupt
-- resets: Should contain the frame engines resets
-- reset-names: Should contain the reset names "fe". If a switch is present
- "esw" is also required.
-
-
-* Ethernet port node
-
-Required properties:
-- compatible: Should be "ralink,eth-port"
-- reg: The number of the physical port
-- phy-handle: reference to the node describing the phy
-
-Example:
-
-mdio-bus {
- ...
- phy0: [email protected] {
- phy-mode = "mii";
- reg = <0>;
- };
-};
-
[email protected] {
- compatible = "ralink,rt2880-eth";
- reg = <0x00400000 10000>;
-
- #address-cells = <1>;
- #size-cells = <0>;
-
- resets = <&rstctrl 18>;
- reset-names = "fe";
-
- interrupt-parent = <&cpuintc>;
- interrupts = <5>;
-
- [email protected] {
- compatible = "ralink,eth-port";
- reg = <0>;
- phy-handle = <&phy0>;
- };
-
-};
diff --git a/Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt b/Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt
deleted file mode 100644
index 87e315856efa..000000000000
--- a/Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Ralink Fast Ethernet Embedded Switch
-====================================
-
-The ralink fast ethernet embedded switch can be found on Ralink and Mediatek
-SoCs (RT3x5x, RT5350, MT76x8).
-
-Required properties:
-- compatible: Should be "ralink,rt3050-esw"
-- reg: Address and length of the register set for the device
-- interrupts: Should contain the embedded switches interrupt
-- resets: Should contain the embedded switches resets
-- reset-names: Should contain the reset names "esw"
-
-Optional properties:
-- ralink,portmap: can be used to choose if the default switch setup is
- llllw or wllll
-- ralink,led_polarity: override the active high/low settings of the leds
-
-Example:
-
[email protected] {
- compatible = "ralink,rt3050-esw";
- reg = <0x10110000 8000>;
-
- resets = <&rstctrl 23>;
- reset-names = "esw";
-
- interrupt-parent = <&intc>;
- interrupts = <17>;
-};
--
2.34.1

2022-09-20 17:45:14

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 09/10] mips: dts: ralink: mt7621: fix external phy on GB-PC2

The address of the external phy on the mdio bus is 5. Update the devicetree
for GB-PC2 accordingly.

Fixes: 5bc148649cf3 ("staging: mt7621-dts: fix GB-PC2 devicetree")
Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index 2e534ea5bab7..5f52193a4c37 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -83,12 +83,12 @@ &pcie {

&gmac1 {
status = "okay";
- phy-handle = <&ethphy7>;
+ phy-handle = <&ethphy5>;
};

&mdio {
- ethphy7: [email protected] {
- reg = <7>;
+ ethphy5: [email protected] {
+ reg = <5>;
phy-mode = "rgmii-rxid";
};
};
--
2.34.1

2022-09-20 17:47:40

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 05/10] mips: dts: ralink: mt7621: fix some dtc warnings

Fix the dtc warnings below.

[email protected]: $nodename:0: '[email protected]' does not match '^serial(@.*)?$'
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml
[email protected]: Unevaluated properties are not allowed ('clock-names' was unexpected)
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/serial/8250.yaml
[email protected]: $nodename:0: '[email protected]' does not match '^mmc(@.*)?$'
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/mmc/mtk-sd.yaml
[email protected]: $nodename:0: '[email protected]' does not match '^usb(@.*)?'
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
[email protected]: compatible: ['mediatek,mt8173-xhci'] is too short
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml
[email protected]: $nodename:0: '[email protected]' does not match '^(ethernet-)?switch(@.*)?$'
From schema: /home/arinc9/Documents/linux/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
[email protected]: status:0: 'off' is not one of ['okay', 'disabled', 'reserved']
From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml
[email protected]: status:0: 'off' is not one of ['okay', 'disabled', 'reserved']
From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml
[email protected]: status:0: 'off' is not one of ['okay', 'disabled', 'reserved']
From schema: /home/arinc9/.local/lib/python3.10/site-packages/dtschema/schemas/dt-core.yaml

- Change "memc: [email protected]" to "memc: [email protected]".
- Change "uartlite: [email protected]" to "serial0: [email protected]" and remove the
aliases node.
- Remove "clock-names" from the serial0 node. The property doesn't exist on
the 8250.yaml schema.
- Change "sdhci: [email protected]" to "mmc: [email protected]".
- Change "xhci: [email protected]" to "usb: [email protected]".
- Add "mediatek,mtk-xhci" as the second compatible string on the usb node.
- Change "switch0: [email protected]" to "switch0: [email protected]"
- Change "off" to "disabled" for disabled nodes.

Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
.../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +-
.../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +-
arch/mips/boot/dts/ralink/mt7621.dtsi | 30 ++++++++-----------
3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
index 24eebc5a85b1..6ecb8165efe8 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
@@ -53,7 +53,7 @@ system {
};
};

-&sdhci {
+&mmc {
status = "okay";
};

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index 34006e667780..2e534ea5bab7 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -37,7 +37,7 @@ key-reset {
};
};

-&sdhci {
+&mmc {
status = "okay";
};

diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi
index ee46ace0bcc1..7cef1273796d 100644
--- a/arch/mips/boot/dts/ralink/mt7621.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7621.dtsi
@@ -33,11 +33,6 @@ cpuintc: cpuintc {
compatible = "mti,cpu-interrupt-controller";
};

- aliases {
- serial0 = &uartlite;
- };
-
-
mmc_fixed_3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "mmc_power";
@@ -110,17 +105,16 @@ i2c: [email protected] {
pinctrl-0 = <&i2c_pins>;
};

- memc: [email protected] {
+ memc: [email protected] {
compatible = "mediatek,mt7621-memc", "syscon";
reg = <0x5000 0x1000>;
};

- uartlite: [email protected] {
+ serial0: [email protected] {
compatible = "ns16550a";
reg = <0xc00 0x100>;

clocks = <&sysc MT7621_CLK_UART1>;
- clock-names = "uart1";

interrupt-parent = <&gic>;
interrupts = <GIC_SHARED 26 IRQ_TYPE_LEVEL_HIGH>;
@@ -236,7 +230,7 @@ pinmux {
};
};

- sdhci: [email protected] {
+ mmc: [email protected] {
status = "disabled";

compatible = "mediatek,mt7620-mmc";
@@ -262,8 +256,8 @@ sdhci: [email protected] {
interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
};

- xhci: [email protected] {
- compatible = "mediatek,mt8173-xhci";
+ usb: [email protected] {
+ compatible = "mediatek,mt8173-xhci", "mediatek,mtk-xhci";
reg = <0x1e1c0000 0x1000
0x1e1d0700 0x0100>;
reg-names = "mac", "ippc";
@@ -338,7 +332,7 @@ fixed-link {
gmac1: [email protected] {
compatible = "mediatek,eth-mac";
reg = <1>;
- status = "off";
+ status = "disabled";
phy-mode = "rgmii-rxid";
};

@@ -346,7 +340,7 @@ mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;

- switch0: [email protected] {
+ switch0: [email protected] {
compatible = "mediatek,mt7621";
reg = <0>;
mediatek,mcm;
@@ -362,31 +356,31 @@ ports {
#size-cells = <0>;

[email protected] {
- status = "off";
+ status = "disabled";
reg = <0>;
label = "lan0";
};

[email protected] {
- status = "off";
+ status = "disabled";
reg = <1>;
label = "lan1";
};

[email protected] {
- status = "off";
+ status = "disabled";
reg = <2>;
label = "lan2";
};

[email protected] {
- status = "off";
+ status = "disabled";
reg = <3>;
label = "lan3";
};

[email protected] {
- status = "off";
+ status = "disabled";
reg = <4>;
label = "lan4";
};
--
2.34.1

2022-09-20 17:47:50

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 06/10] mips: dts: ralink: mt7621: remove interrupt-parent from switch node

The interrupt-parent property is inherited from the ethernet node as it's a
parent node of the switch node. Therefore, remove the unnecessary
interrupt-parent property from the switch node.

Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
arch/mips/boot/dts/ralink/mt7621.dtsi | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi
index 7cef1273796d..bcedb84e1618 100644
--- a/arch/mips/boot/dts/ralink/mt7621.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7621.dtsi
@@ -348,7 +348,6 @@ switch0: [email protected] {
reset-names = "mcm";
interrupt-controller;
#interrupt-cells = <1>;
- interrupt-parent = <&gic>;
interrupts = <GIC_SHARED 23 IRQ_TYPE_LEVEL_HIGH>;

ports {
--
2.34.1

2022-09-20 17:48:32

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 02/10] dt-bindings: net: dsa: mediatek,mt7530: change mt7530 switch address

In the case of muxing phy0 of the MT7530 switch, the switch and the phy
will have the same address on the mdio bus, 0. This causes the ethernet
driver to fail since devices on the mdio bus cannot share an address.

Any address can be used for the switch, therefore, change the switch
address to 0x1f.

Suggested-by: Sungbo Eo <[email protected]>
Signed-off-by: Arınç ÜNAL <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
.../bindings/net/dsa/mediatek,mt7530.yaml | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
index bc6446e1f55a..138ee6bff267 100644
--- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
@@ -285,9 +285,9 @@ examples:
#address-cells = <1>;
#size-cells = <0>;

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7530";
- reg = <0>;
+ reg = <0x1f>;

reset-gpios = <&pio 33 0>;

@@ -346,9 +346,9 @@ examples:
#address-cells = <1>;
#size-cells = <0>;

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7530";
- reg = <0>;
+ reg = <0x1f>;

mediatek,mcm;
resets = <&ethsys MT2701_ETHSYS_MCM_RST>;
@@ -474,9 +474,9 @@ examples:
#address-cells = <1>;
#size-cells = <0>;

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7621";
- reg = <0>;
+ reg = <0x1f>;

mediatek,mcm;
resets = <&sysc MT7621_RST_MCM>;
@@ -560,9 +560,9 @@ examples:
reg = <4>;
};

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7621";
- reg = <0>;
+ reg = <0x1f>;

mediatek,mcm;
resets = <&sysc MT7621_RST_MCM>;
@@ -650,9 +650,9 @@ examples:
phy-mode = "rgmii";
};

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7621";
- reg = <0>;
+ reg = <0x1f>;

mediatek,mcm;
resets = <&sysc MT7621_RST_MCM>;
@@ -730,9 +730,9 @@ examples:
phy-mode = "rgmii";
};

- [email protected] {
+ [email protected] {
compatible = "mediatek,mt7621";
- reg = <0>;
+ reg = <0x1f>;

mediatek,mcm;
resets = <&sysc MT7621_RST_MCM>;
--
2.34.1

2022-09-20 18:05:36

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 03/10] dt-bindings: net: dsa: mediatek,mt7530: expand gpio-controller description

Expand the description of the gpio-controller property to include the
controllable pins of the MT7530 switch.

The gpio-controller property is only used for the MT7530 switch. Therefore,
invalidate it for the MT7531 switch.

Signed-off-by: Arınç ÜNAL <[email protected]>
Acked-by: Rob Herring <[email protected]>
---
.../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
index 138ee6bff267..f2e9ff3f580b 100644
--- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
@@ -104,7 +104,14 @@ properties:
gpio-controller:
type: boolean
description:
- If defined, MT7530's LED controller will run on GPIO mode.
+ If defined, LED controller of the MT7530 switch will run on GPIO mode.
+
+ There are 15 controllable pins.
+ port 0 LED 0..2 as GPIO 0..2
+ port 1 LED 0..2 as GPIO 3..5
+ port 2 LED 0..2 as GPIO 6..8
+ port 3 LED 0..2 as GPIO 9..11
+ port 4 LED 0..2 as GPIO 12..14

"#interrupt-cells":
const: 1
@@ -263,6 +270,7 @@ allOf:
then:
$ref: "#/$defs/mt7531-dsa-port"
properties:
+ gpio-controller: false
mediatek,mcm: false

- if:
--
2.34.1

2022-09-20 18:08:32

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 07/10] mips: dts: ralink: mt7621: change phy-mode of gmac1 to rgmii

Change phy-mode of gmac1 to rgmii on mt7621.dtsi. Same code path is
followed for delayed rgmii and rgmii phy-mode on mtk_eth_soc.c.

Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
arch/mips/boot/dts/ralink/mt7621.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi
index bcedb84e1618..edb7dd8b34da 100644
--- a/arch/mips/boot/dts/ralink/mt7621.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7621.dtsi
@@ -333,7 +333,7 @@ gmac1: [email protected] {
compatible = "mediatek,eth-mac";
reg = <1>;
status = "disabled";
- phy-mode = "rgmii-rxid";
+ phy-mode = "rgmii";
};

mdio: mdio-bus {
--
2.34.1

2022-09-20 18:10:02

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 10/10] mips: dts: ralink: mt7621: add GB-PC2 LEDs

Add the missing LEDs for GB-PC2. The ethblack-green, ethblue-green, power
and system LEDs weren't added previously, because they don't exist on the
device schematics. Tests on a GB-PC2 by me and Petr proved otherwise.

The i2c bus cannot be used on GB-PC2 as its pins are wired to LEDs instead,
and GB-PC1 does not use it. Therefore, do not enable it on both devices.

Link: https://github.com/ngiger/GnuBee_Docs/blob/master/GB-PCx/Documents/GB-PC2_V1.1_schematic.pdf
Tested-by: Petr Louda <[email protected]>
Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
.../boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 6 ---
.../boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 42 ++++++++++++++++---
2 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
index 6ecb8165efe8..0128bd8fa7ed 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts
@@ -20,12 +20,6 @@ chosen {
bootargs = "console=ttyS0,57600";
};

- palmbus: [email protected] {
- [email protected] {
- status = "okay";
- };
- };
-
gpio-keys {
compatible = "gpio-keys";

diff --git a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
index 5f52193a4c37..7515555388ae 100644
--- a/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
+++ b/arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts
@@ -20,12 +20,6 @@ chosen {
bootargs = "console=ttyS0,57600";
};

- palmbus: [email protected] {
- [email protected] {
- status = "okay";
- };
- };
-
gpio-keys {
compatible = "gpio-keys";

@@ -35,6 +29,42 @@ key-reset {
linux,code = <KEY_RESTART>;
};
};
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ ethblack-green {
+ label = "green:ethblack";
+ gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
+ };
+
+ ethblue-green {
+ label = "green:ethblue";
+ gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
+ };
+
+ ethyellow-green {
+ label = "green:ethyellow";
+ gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+ };
+
+ ethyellow-orange {
+ label = "orange:ethyellow";
+ gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+ };
+
+ power {
+ label = "green:power";
+ gpios = <&gpio 6 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "default-on";
+ };
+
+ system {
+ label = "green:system";
+ gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+ linux,default-trigger = "disk-activity";
+ };
+ };
};

&mmc {
--
2.34.1

2022-09-20 18:11:52

by Arınç ÜNAL

[permalink] [raw]
Subject: [PATCH v4 net-next 08/10] mips: dts: ralink: mt7621: change mt7530 switch address

In the case of muxing phy0 of the MT7530 switch, the switch and the phy
will have the same address on the mdio bus, 0. This causes the ethernet
driver to fail since devices on the mdio bus cannot share an address.

Any address can be used for the switch, therefore, change the switch
address to 0x1f.

Suggested-by: Sungbo Eo <[email protected]>
Signed-off-by: Arınç ÜNAL <[email protected]>
Reviewed-by: Sergio Paracuellos <[email protected]>
---
arch/mips/boot/dts/ralink/mt7621.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi
index edb7dd8b34da..f3f4c1f26e01 100644
--- a/arch/mips/boot/dts/ralink/mt7621.dtsi
+++ b/arch/mips/boot/dts/ralink/mt7621.dtsi
@@ -340,9 +340,9 @@ mdio: mdio-bus {
#address-cells = <1>;
#size-cells = <0>;

- switch0: [email protected] {
+ switch0: [email protected] {
compatible = "mediatek,mt7621";
- reg = <0>;
+ reg = <0x1f>;
mediatek,mcm;
resets = <&sysc MT7621_RST_MCM>;
reset-names = "mcm";
--
2.34.1

2022-09-23 11:08:45

by patchwork-bot+netdevbpf

[permalink] [raw]
Subject: Re: [PATCH v4 net-next 00/10] dt-bindings and mt7621 devicetree changes

Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <[email protected]>:

On Tue, 20 Sep 2022 20:25:46 +0300 you wrote:
> Hello there!
>
> This patch series removes old MediaTek bindings, improves mediatek,mt7530
> and mt7621 memory controller bindings and improves mt7621 DTs.
>
> v4:
> - Keep memory-controller node name.
> - Change syscon to memory-controller on mt7621.dtsi.
>
> [...]

Here is the summary with links:
- [v4,net-next,01/10] dt-bindings: net: drop old mediatek bindings
https://git.kernel.org/netdev/net-next/c/e8619b05870d
- [v4,net-next,02/10] dt-bindings: net: dsa: mediatek,mt7530: change mt7530 switch address
https://git.kernel.org/netdev/net-next/c/3737c6aaf22d
- [v4,net-next,03/10] dt-bindings: net: dsa: mediatek,mt7530: expand gpio-controller description
https://git.kernel.org/netdev/net-next/c/0fbca84eea37
- [v4,net-next,04/10] dt-bindings: memory: mt7621: add syscon as compatible string
https://git.kernel.org/netdev/net-next/c/862b19b7d4a1
- [v4,net-next,05/10] mips: dts: ralink: mt7621: fix some dtc warnings
https://git.kernel.org/netdev/net-next/c/5ae75a1ae5c9
- [v4,net-next,06/10] mips: dts: ralink: mt7621: remove interrupt-parent from switch node
https://git.kernel.org/netdev/net-next/c/08b9eaf454ee
- [v4,net-next,07/10] mips: dts: ralink: mt7621: change phy-mode of gmac1 to rgmii
https://git.kernel.org/netdev/net-next/c/97721e84f546
- [v4,net-next,08/10] mips: dts: ralink: mt7621: change mt7530 switch address
https://git.kernel.org/netdev/net-next/c/2b653a373b41
- [v4,net-next,09/10] mips: dts: ralink: mt7621: fix external phy on GB-PC2
https://git.kernel.org/netdev/net-next/c/247825f991b3
- [v4,net-next,10/10] mips: dts: ralink: mt7621: add GB-PC2 LEDs
https://git.kernel.org/netdev/net-next/c/394c3032fe0e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html


2022-09-23 13:53:24

by Krzysztof Kozlowski

[permalink] [raw]
Subject: Re: [PATCH v4 net-next 00/10] dt-bindings and mt7621 devicetree changes

On 23/09/2022 12:10, [email protected] wrote:
> Hello:
>
> This series was applied to netdev/net-next.git (master)
> by David S. Miller <[email protected]>:
>
> On Tue, 20 Sep 2022 20:25:46 +0300 you wrote:
>> Hello there!
>>
>> This patch series removes old MediaTek bindings, improves mediatek,mt7530
>> and mt7621 memory controller bindings and improves mt7621 DTs.
>>
>> v4:
>> - Keep memory-controller node name.
>> - Change syscon to memory-controller on mt7621.dtsi.
>>
>> [...]
>
> Here is the summary with links:
> - [v4,net-next,01/10] dt-bindings: net: drop old mediatek bindings
> https://git.kernel.org/netdev/net-next/c/e8619b05870d
> - [v4,net-next,02/10] dt-bindings: net: dsa: mediatek,mt7530: change mt7530 switch address
> https://git.kernel.org/netdev/net-next/c/3737c6aaf22d
> - [v4,net-next,03/10] dt-bindings: net: dsa: mediatek,mt7530: expand gpio-controller description
> https://git.kernel.org/netdev/net-next/c/0fbca84eea37
> - [v4,net-next,04/10] dt-bindings: memory: mt7621: add syscon as compatible string
> https://git.kernel.org/netdev/net-next/c/862b19b7d4a1
> - [v4,net-next,05/10] mips: dts: ralink: mt7621: fix some dtc warnings
> https://git.kernel.org/netdev/net-next/c/5ae75a1ae5c9
> - [v4,net-next,06/10] mips: dts: ralink: mt7621: remove interrupt-parent from switch node
> https://git.kernel.org/netdev/net-next/c/08b9eaf454ee
> - [v4,net-next,07/10] mips: dts: ralink: mt7621: change phy-mode of gmac1 to rgmii
> https://git.kernel.org/netdev/net-next/c/97721e84f546
> - [v4,net-next,08/10] mips: dts: ralink: mt7621: change mt7530 switch address
> https://git.kernel.org/netdev/net-next/c/2b653a373b41
> - [v4,net-next,09/10] mips: dts: ralink: mt7621: fix external phy on GB-PC2
> https://git.kernel.org/netdev/net-next/c/247825f991b3
> - [v4,net-next,10/10] mips: dts: ralink: mt7621: add GB-PC2 LEDs
> https://git.kernel.org/netdev/net-next/c/394c3032fe0e


DTS patches should not go via network tree... We keep them separate on
purpose - to split hardware description from OS-specific implementation.

Best regards,
Krzysztof