Skip to contentSkip to conversation

staging: mt7621-dts: get rid of nodes with no in-tree driver

PATCH In review Sergio Paracuellos 2 participants 5 messages Oct 17, 2021 – Oct 18, 2021

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

PATCH 1/2 staging: mt7621-dts: get rid of nodes with no in-tree driver

Nodes for 'i2s' and 'nand' have no driver present inside the linux tree. The normal approach for a dts file to be mainlined is start with those stuff which is already mainlined and get rid of the other stuff. If needed it will be properly added afterwards together with the suitable device driver. Hence, remove both nodes from the device tree include file.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 36 --------------------------
 1 file changed, 36 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +0 -36
index 72b99d8b4647..fd4ab4006ed8 100644
@@ -102,28 +102,6 @@ i2c: i2c@900 {
 			pinctrl-0 = <&i2c_pins>;
 		};
 
-		i2s: i2s@a00 {
-			compatible = "mediatek,mt7621-i2s";
-			reg = <0xa00 0x100>;
-
-			clocks = <&sysc MT7621_CLK_I2S>;
-			clock-names = "i2s";
-			resets = <&sysc MT7621_RST_I2S>;
-			reset-names = "i2s";
-
-			interrupt-parent = <&gic>;
-			interrupts = <GIC_SHARED 16 IRQ_TYPE_LEVEL_HIGH>;
-
-			txdma-req = <2>;
-			rxdma-req = <3>;
-
-			dmas = <&gdma 4>,
-				<&gdma 6>;
-			dma-names = "tx", "rx";
-
-			status = "disabled";
-		};
-
 		memc: syscon@5000 {
 			compatible = "mediatek,mt7621-memc", "syscon";
 			reg = <0x5000 0x1000>;
@@ -355,20 +333,6 @@ cdmm: cdmm@1fbf8000 {
 		reg = <0x1fbf8000 0x8000>;
 	};
 
-	nand: nand@1e003000 {
-		status = "disabled";
-
-		compatible = "mediatek,mt7621-nand";
-		bank-width = <2>;
-		reg = <0x1e003000 0x800
-			0x1e003800 0x800>;
-		#address-cells = <1>;
-		#size-cells = <1>;
-
-		clocks = <&sysc MT7621_CLK_NAND>;
-		clock-names = "nand";
-	};
-
 	ethernet: ethernet@1e100000 {
 		compatible = "mediatek,mt7621-eth";
 		reg = <0x1e100000 0x10000>;
Signature · 1 line
2.33.0
#1 lore raw

PATCH 2/2 staging: mt7621-dts: change some node hex addresses to lower case

Hexadecimal addresses in device tree must be defined using lower case. There are some of them that are still in upper case. Change them all.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/staging/mt7621-dts/mt7621.dtsi +6 -6
index fd4ab4006ed8..787220d4d3b4 100644
@@ -48,10 +48,10 @@ mmc_fixed_1v8_io: fixedregulator@1 {
 		regulator-always-on;
 	};
 
-	palmbus: palmbus@1E000000 {
+	palmbus: palmbus@1e000000 {
 		compatible = "palmbus";
-		reg = <0x1E000000 0x100000>;
-		ranges = <0x0 0x1E000000 0x0FFFFF>;
+		reg = <0x1e000000 0x100000>;
+		ranges = <0x0 0x1e000000 0x0fffff>;
 
 		#address-cells = <1>;
 		#size-cells = <1>;
@@ -266,11 +266,11 @@ pinmux {
 		};
 	};
 
-	sdhci: sdhci@1E130000 {
+	sdhci: sdhci@1e130000 {
 		status = "disabled";
 
 		compatible = "mediatek,mt7620-mmc";
-		reg = <0x1E130000 0x4000>;
+		reg = <0x1e130000 0x4000>;
 
 		bus-width = <4>;
 		max-frequency = <48000000>;
@@ -292,7 +292,7 @@ sdhci: sdhci@1E130000 {
 		interrupts = <GIC_SHARED 20 IRQ_TYPE_LEVEL_HIGH>;
 	};
 
-	xhci: xhci@1E1C0000 {
+	xhci: xhci@1e1c0000 {
 		status = "okay";
 
 		compatible = "mediatek,mt8173-xhci";
Signature · 1 line
2.33.0
#2 lore raw
In reply to Sergio Paracuellos

Hi Greg,

Quoted 11 lines · Sergio Paracuellos

Nodes for 'i2s' and 'nand' have no driver present inside the linux tree. The normal approach for a dts file to be mainlined is start with those stuff which is already mainlined and get rid of the other stuff. If needed it will be properly added afterwards together with the suitable device driver. Hence, remove both nodes from the device tree include file.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 36 --------------------------
 1 file changed, 36 deletions(-)

I noticed PATCH 2/2 of this series was added but not this one which is the first one in the series. Since I did not see any mail or something complaining about it... is it possible you missed it?

Thanks,
Sergio Paracuellos

Quoted 58 lines
drivers/staging/mt7621-dts/mt7621.dtsi +0 -37
index 72b99d8b4647..fd4ab4006ed8 100644
@@ -102,28 +102,6 @@ i2c: i2c@900 {
                        pinctrl-0 = <&i2c_pins>;
                };
 
-               i2s: i2s@a00 {
-                       compatible = "mediatek,mt7621-i2s";
-                       reg = <0xa00 0x100>;
-
-                       clocks = <&sysc MT7621_CLK_I2S>;
-                       clock-names = "i2s";
-                       resets = <&sysc MT7621_RST_I2S>;
-                       reset-names = "i2s";
-
-                       interrupt-parent = <&gic>;
-                       interrupts = <GIC_SHARED 16 IRQ_TYPE_LEVEL_HIGH>;
-
-                       txdma-req = <2>;
-                       rxdma-req = <3>;
-
-                       dmas = <&gdma 4>,
-                               <&gdma 6>;
-                       dma-names = "tx", "rx";
-
-                       status = "disabled";
-               };
-
                memc: syscon@5000 {
                        compatible = "mediatek,mt7621-memc", "syscon";
                        reg = <0x5000 0x1000>;
@@ -355,20 +333,6 @@ cdmm: cdmm@1fbf8000 {
                reg = <0x1fbf8000 0x8000>;
        };
 
-       nand: nand@1e003000 {
-               status = "disabled";
-
-               compatible = "mediatek,mt7621-nand";
-               bank-width = <2>;
-               reg = <0x1e003000 0x800
-                       0x1e003800 0x800>;
-               #address-cells = <1>;
-               #size-cells = <1>;
-
-               clocks = <&sysc MT7621_CLK_NAND>;
-               clock-names = "nand";
-       };
-
        ethernet: ethernet@1e100000 {
                compatible = "mediatek,mt7621-eth";
                reg = <0x1e100000 0x10000>;
--

2.33.0

maintainer
#3 lore raw
Quoted 11 lines · Sergio Paracuellos

Hi Greg,

Quoted 7 lines · Sergio Paracuellos

Nodes for 'i2s' and 'nand' have no driver present inside the linux tree. The normal approach for a dts file to be mainlined is start with those stuff which is already mainlined and get rid of the other stuff. If needed it will be properly added afterwards together with the suitable device driver. Hence, remove both nodes from the device tree include file.

Quoted 8 lines
Quoted 4 lines
---
 drivers/staging/mt7621-dts/mt7621.dtsi | 36 --------------------------
 1 file changed, 36 deletions(-)

I noticed PATCH 2/2 of this series was added but not this one which is the first one in the series. Since I did not see any mail or something complaining about it... is it possible you missed it?

It did not apply to my tree as it seems to already be there. Try rebasing and resending if it really is not.

thanks,

greg k-h

#4 lore raw
Quoted 18 lines · Greg KH
Quoted 16 lines · Sergio Paracuellos

Hi Greg,

Quoted 11 lines · Sergio Paracuellos

Nodes for 'i2s' and 'nand' have no driver present inside the linux tree. The normal approach for a dts file to be mainlined is start with those stuff which is already mainlined and get rid of the other stuff. If needed it will be properly added afterwards together with the suitable device driver. Hence, remove both nodes from the device tree include file.

---
 drivers/staging/mt7621-dts/mt7621.dtsi | 36 --------------------------
 1 file changed, 36 deletions(-)
Quoted 6 lines
Quoted 3 lines

I noticed PATCH 2/2 of this series was added but not this one which is the first one in the series. Since I did not see any mail or something complaining about it... is it possible you missed it?

It did not apply to my tree as it seems to already be there. Try rebasing and resending if it really is not.

It was not there. Odd. I have just rebased and resend the patch alone.

Thanks,
Sergio Paracuellos

Quoted 4 lines

thanks,

greg k-h