Skip to contentSkip to conversation

staging: mt7621-dts: organice syscons inside device tree

PATCH New Sergio Paracuellos 1 participant 3 messages May 5, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover staging: mt7621-dts: organice syscons inside device tree

This two patches organice all the syscons inside the device tree.

We currently have 'sysc' and 'memc' syscons that can be used. There is also a 'ethsys' node that can be replaced in favor of 'sysc'. We also should use standard 'syscon' strings in all of them.

Sergio Paracuellos (2):
staging: mt7621-dts: remove ethsys node
staging: mt7621-dts: use standard 'syscon' string

 drivers/staging/mt7621-dts/mt7621.dtsi | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/2 staging: mt7621-dts: remove ethsys node

DT 'ethsys' node is being configured as a syscon
to get access to reset and other registers in the 'mediateķ,mt7621-eth' driver. Since the 'sysc' is also a syscon, provides the clock and also is virtually mapped from the same physical address 0x1e000000 we can just use 'sysc' as the phandle for the syscon in the ethernet node. Compatible string 'mediatek,mt7621-ethsys' of the node is not being used anywhere inside the kernel so, this node can be safely removed.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +1 -8
index 5759ba8742ca..b39c7968239f 100644
@@ -372,13 +372,6 @@ nand: nand@1e003000 {
 		clock-names = "nand";
 	};
 
-	ethsys: syscon@1e000000 {
-		compatible = "mediatek,mt7621-ethsys",
-			     "syscon";
-		reg = <0x1e000000 0x1000>;
-		#clock-cells = <1>;
-	};
-
 	ethernet: ethernet@1e100000 {
 		compatible = "mediatek,mt7621-eth";
 		reg = <0x1e100000 0x10000>;
@@ -396,7 +389,7 @@ ethernet: ethernet@1e100000 {
 		interrupt-parent = <&gic>;
 		interrupts = <GIC_SHARED 3 IRQ_TYPE_LEVEL_HIGH>;
 
-		mediatek,ethsys = <&ethsys>;
+		mediatek,ethsys = <&sysc>;
 
 
 		gmac0: mac@0 {
Signature · 1 line
2.25.1
#2 lore raw

PATCH 2/2 staging: mt7621-dts: use standard 'syscon' string

In reply to Sergio Paracuellos

Both 'memc' and 'sysc' nodes are not using 'syscon' as a node string which is the standard one to be used. Update both of them.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +2 -2
index b39c7968239f..5623d542bcf2 100644
@@ -55,7 +55,7 @@ palmbus: palmbus@1E000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 
-		sysc: sysc@0 {
+		sysc: syscon@0 {
 			compatible = "mediatek,mt7621-sysc", "syscon";
 			reg = <0x0 0x100>;
 			#clock-cells = <1>;
@@ -122,7 +122,7 @@ i2s: i2s@a00 {
 			status = "disabled";
 		};
 
-		memc: memc@5000 {
+		memc: syscon@5000 {
 			compatible = "mediatek,mt7621-memc", "syscon";
 			reg = <0x5000 0x1000>;
 		};
Signature · 1 line
2.25.1