Skip to contentSkip to conversation

Add BananaPi R3

RFC Applied Frank Wunderlich 4 participants 27 messages Nov 6, 2022 – Nov 18, 2022

Subsystems (2)

v3 of 9 Applied Latest is v9 →

lore
Share & tools
lore
#0 lore raw

v3 cover Add BananaPi R3

From: Frank Wunderlich <[email protected]>

This Series adds some Nodes to mt7986 devicetree and the BananaPi R3

i included sams series for mt7986 DTS with small changes
https://patchwork.kernel.org/project/linux-mediatek/cover/[email protected]/

this series need these Patches:

i2c-support:
https://patchwork.kernel.org/project/linux-mediatek/cover/[email protected]/

mmc bindings:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=688675

update pinctrl-bindings:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=692462

hwrng and pinctrl (uart splitting) are already applied to next

i had run full dtbs-check but i end up with some strange warnings in ethernet-node that should not come up as phy-handle and sfp/managed properties are already defined.

phy-handle made optional
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/net/mediatek,net.yaml#n265

property sfp/managed (which is included for mac subnode in yaml above):
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/net/ethernet-controller.yaml#n137

changes:
v3:
- changed mmc pull-ups
- added patch for board binding (sent separately before)
- added pcie node in mt7986 (not yet again in r3)
- added dt overlays

Frank Wunderlich (5):
arm64: dts: mt7986: add i2c node
dt-bindings: arm64: dts: mediatek: add compatible for bananapi r3
arm64: dts: mt7986: add Bananapi R3
arm64: dts: mt7986: add PCIe nodes to BananaPi-R3
arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Sam Shih (6):
arm64: dts: mt7986: harmonize device node order
arm64: dts: mt7986: add spi related device nodes
arm64: dts: mt7986: add usb related device nodes
arm64: dts: mt7986: add crypto related device nodes
arm64: dts: mt7986: add mmc related device nodes
arm64: dts: mt7986: add pcie related device nodes

 .../devicetree/bindings/arm/mediatek.yaml     |   1 +
 arch/arm64/boot/dts/mediatek/Makefile         |   4 +
 .../mediatek/mt7986a-bananapi-bpi-r3-emmc.dts |  31 ++
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts |  53 ++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  |  67 +++
 .../mediatek/mt7986a-bananapi-bpi-r3-sd.dts   |  25 +
 .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi | 458 ++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts  | 264 ++++++++--
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi     | 179 +++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  |  83 +++-
 10 files changed, 1110 insertions(+), 55 deletions(-)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi
Signature · 1 line
2.34.1
#1 lore raw

RFC v3 1/11 arm64: dts: mt7986: harmonize device node order

From: Sam Shih <[email protected]>

This arrange device tree nodes in alphabetical order.

---
i modified sams patch

https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

by moving pio-node up instead of moving uarts down to ensure alphabetical order for switch-/wifi-node.

And moved uart0 and wifi in mt7986b-rfb too.

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 94 ++++++++++----------
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 22 ++---
 2 files changed, 58 insertions(+), 58 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +47 -47
index afe37b702eef..6189436fe31d 100644
@@ -54,6 +54,53 @@ switch: switch@0 {
 	};
 };
 
+&pio {
+	uart1_pins: uart1-pins {
+		mux {
+			function = "uart";
+			groups = "uart1";
+		};
+	};
+
+	uart2_pins: uart2-pins {
+		mux {
+			function = "uart";
+			groups = "uart2";
+		};
+	};
+
+	wf_2g_5g_pins: wf-2g-5g-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_2g", "wf_5g";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+			       "WF1_TOP_CLK", "WF1_TOP_DATA";
+			drive-strength = <4>;
+		};
+	};
+
+	wf_dbdc_pins: wf-dbdc-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_dbdc";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA";
+			drive-strength = <4>;
+		};
+	};
+};
+
 &switch {
 	ports {
 		#address-cells = <1>;
@@ -121,50 +168,3 @@ &wifi {
 	pinctrl-0 = <&wf_2g_5g_pins>;
 	pinctrl-1 = <&wf_dbdc_pins>;
 };
-
-&pio {
-	uart1_pins: uart1-pins {
-		mux {
-			function = "uart";
-			groups = "uart1";
-		};
-	};
-
-	uart2_pins: uart2-pins {
-		mux {
-			function = "uart";
-			groups = "uart2";
-		};
-	};
-
-	wf_2g_5g_pins: wf-2g-5g-pins {
-		mux {
-			function = "wifi";
-			groups = "wf_2g", "wf_5g";
-		};
-		conf {
-			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
-			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
-			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
-			       "WF1_TOP_CLK", "WF1_TOP_DATA";
-			drive-strength = <4>;
-		};
-	};
-
-	wf_dbdc_pins: wf-dbdc-pins {
-		mux {
-			function = "wifi";
-			groups = "wf_dbdc";
-		};
-		conf {
-			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			       "WF0_TOP_CLK", "WF0_TOP_DATA";
-			drive-strength = <4>;
-		};
-	};
-};
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +11 -11
index 3443013b5971..7459ddb6b6f0 100644
@@ -25,10 +25,6 @@ memory@40000000 {
 	};
 };
 
-&uart0 {
-	status = "okay";
-};
-
 &eth {
 	status = "okay";
 
@@ -99,13 +95,6 @@ fixed-link {
 	};
 };
 
-&wifi {
-	status = "okay";
-	pinctrl-names = "default", "dbdc";
-	pinctrl-0 = <&wf_2g_5g_pins>;
-	pinctrl-1 = <&wf_dbdc_pins>;
-};
-
 &pio {
 	wf_2g_5g_pins: wf-2g-5g-pins {
 		mux {
@@ -138,3 +127,14 @@ conf {
 		};
 	};
 };
+
+&uart0 {
+	status = "okay";
+};
+
+&wifi {
+	status = "okay";
+	pinctrl-names = "default", "dbdc";
+	pinctrl-0 = <&wf_2g_5g_pins>;
+	pinctrl-1 = <&wf_dbdc_pins>;
+};
Signature · 1 line
2.34.1
maintainer Applied
#2 lore raw

Re: [RFC v3 01/11] arm64: dts: mt7986: harmonize device node order

Quoted 7 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This arrange device tree nodes in alphabetical order.

Applied, thanks!

Quoted 167 lines

---
i modified sams patch

https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

by moving pio-node up instead of moving uarts down to ensure alphabetical order for switch-/wifi-node.

And moved uart0 and wifi in mt7986b-rfb too.

---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 94 ++++++++++----------
  arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 22 ++---
  2 files changed, 58 insertions(+), 58 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +47 -47
index afe37b702eef..6189436fe31d 100644
@@ -54,6 +54,53 @@ switch: switch@0 {
  	};
  };
 
+&pio {
+	uart1_pins: uart1-pins {
+		mux {
+			function = "uart";
+			groups = "uart1";
+		};
+	};
+
+	uart2_pins: uart2-pins {
+		mux {
+			function = "uart";
+			groups = "uart2";
+		};
+	};
+
+	wf_2g_5g_pins: wf-2g-5g-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_2g", "wf_5g";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+			       "WF1_TOP_CLK", "WF1_TOP_DATA";
+			drive-strength = <4>;
+		};
+	};
+
+	wf_dbdc_pins: wf-dbdc-pins {
+		mux {
+			function = "wifi";
+			groups = "wf_dbdc";
+		};
+		conf {
+			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+			       "WF0_TOP_CLK", "WF0_TOP_DATA";
+			drive-strength = <4>;
+		};
+	};
+};
+
  &switch {
  	ports {
  		#address-cells = <1>;
@@ -121,50 +168,3 @@ &wifi {
  	pinctrl-0 = <&wf_2g_5g_pins>;
  	pinctrl-1 = <&wf_dbdc_pins>;
  };
-
-&pio {
-	uart1_pins: uart1-pins {
-		mux {
-			function = "uart";
-			groups = "uart1";
-		};
-	};
-
-	uart2_pins: uart2-pins {
-		mux {
-			function = "uart";
-			groups = "uart2";
-		};
-	};
-
-	wf_2g_5g_pins: wf-2g-5g-pins {
-		mux {
-			function = "wifi";
-			groups = "wf_2g", "wf_5g";
-		};
-		conf {
-			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			       "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
-			       "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
-			       "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
-			       "WF1_TOP_CLK", "WF1_TOP_DATA";
-			drive-strength = <4>;
-		};
-	};
-
-	wf_dbdc_pins: wf-dbdc-pins {
-		mux {
-			function = "wifi";
-			groups = "wf_dbdc";
-		};
-		conf {
-			pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-			       "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-			       "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-			       "WF0_TOP_CLK", "WF0_TOP_DATA";
-			drive-strength = <4>;
-		};
-	};
-};
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +11 -11
index 3443013b5971..7459ddb6b6f0 100644
@@ -25,10 +25,6 @@ memory@40000000 {
  	};
  };
 
-&uart0 {
-	status = "okay";
-};
-
  &eth {
  	status = "okay";
 
@@ -99,13 +95,6 @@ fixed-link {
  	};
  };
 
-&wifi {
-	status = "okay";
-	pinctrl-names = "default", "dbdc";
-	pinctrl-0 = <&wf_2g_5g_pins>;
-	pinctrl-1 = <&wf_dbdc_pins>;
-};
-
  &pio {
  	wf_2g_5g_pins: wf-2g-5g-pins {
  		mux {
@@ -138,3 +127,14 @@ conf {
  		};
  	};
  };
+
+&uart0 {
+	status = "okay";
+};
+
+&wifi {
+	status = "okay";
+	pinctrl-names = "default", "dbdc";
+	pinctrl-0 = <&wf_2g_5g_pins>;
+	pinctrl-1 = <&wf_dbdc_pins>;
+};
maintainer
#3 lore raw

Re: [RFC v3 01/11] arm64: dts: mt7986: harmonize device node order

Quoted 5 lines · Matthias Brugger
Quoted 2 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

Quoted 8 lines
Quoted 5 lines

This arrange device tree nodes in alphabetical order.

Applied, thanks!

I realized that
wed_pcie: wed-pcie@10003000
is'nt ordered correctly. Please send a follow-up patch to fix that.

Regards,
Matthias

Quoted 163 lines
Quoted 163 lines

---
i modified sams patch

https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

by moving pio-node up instead of moving uarts down to ensure alphabetical order for switch-/wifi-node.

And moved uart0 and wifi in mt7986b-rfb too.
---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 94 ++++++++++---------- arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 22 ++---

  2 files changed, 58 insertions(+), 58 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +47 -47
index afe37b702eef..6189436fe31d 100644
@@ -54,6 +54,53 @@ switch: switch@0 {
       };
   };
+&pio {
+    uart1_pins: uart1-pins {
+        mux {
+            function = "uart";
+            groups = "uart1";
+        };
+    };
+
+    uart2_pins: uart2-pins {
+        mux {
+            function = "uart";
+            groups = "uart2";
+        };
+    };
+
+    wf_2g_5g_pins: wf-2g-5g-pins {
+        mux {
+            function = "wifi";
+            groups = "wf_2g", "wf_5g";
+        };
+        conf {
+            pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+                   "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+                   "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+                   "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
+                   "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
+                   "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
+                   "WF1_TOP_CLK", "WF1_TOP_DATA";
+            drive-strength = <4>;
+        };
+    };
+
+    wf_dbdc_pins: wf-dbdc-pins {
+        mux {
+            function = "wifi";
+            groups = "wf_dbdc";
+        };
+        conf {
+            pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
+                   "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
+                   "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
+                   "WF0_TOP_CLK", "WF0_TOP_DATA";
+            drive-strength = <4>;
+        };
+    };
+};
+
   &switch {
       ports {
           #address-cells = <1>;
@@ -121,50 +168,3 @@ &wifi {
       pinctrl-0 = <&wf_2g_5g_pins>;
       pinctrl-1 = <&wf_dbdc_pins>;
   };
-
-&pio {
-    uart1_pins: uart1-pins {
-        mux {
-            function = "uart";
-            groups = "uart1";
-        };
-    };
-
-    uart2_pins: uart2-pins {
-        mux {
-            function = "uart";
-            groups = "uart2";
-        };
-    };
-
-    wf_2g_5g_pins: wf-2g-5g-pins {
-        mux {
-            function = "wifi";
-            groups = "wf_2g", "wf_5g";
-        };
-        conf {
-            pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-                   "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-                   "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-                   "WF0_TOP_CLK", "WF0_TOP_DATA", "WF1_HB1",
-                   "WF1_HB2", "WF1_HB3", "WF1_HB4", "WF1_HB0",
-                   "WF1_HB5", "WF1_HB6", "WF1_HB7", "WF1_HB8",
-                   "WF1_TOP_CLK", "WF1_TOP_DATA";
-            drive-strength = <4>;
-        };
-    };
-
-    wf_dbdc_pins: wf-dbdc-pins {
-        mux {
-            function = "wifi";
-            groups = "wf_dbdc";
-        };
-        conf {
-            pins = "WF0_HB1", "WF0_HB2", "WF0_HB3", "WF0_HB4",
-                   "WF0_HB0", "WF0_HB0_B", "WF0_HB5", "WF0_HB6",
-                   "WF0_HB7", "WF0_HB8", "WF0_HB9", "WF0_HB10",
-                   "WF0_TOP_CLK", "WF0_TOP_DATA";
-            drive-strength = <4>;
-        };
-    };
-};
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +11 -11
index 3443013b5971..7459ddb6b6f0 100644
@@ -25,10 +25,6 @@ memory@40000000 {
       };
   };
-&uart0 {
-    status = "okay";
-};
-
   &eth {
       status = "okay";
@@ -99,13 +95,6 @@ fixed-link {
       };
   };
-&wifi {
-    status = "okay";
-    pinctrl-names = "default", "dbdc";
-    pinctrl-0 = <&wf_2g_5g_pins>;
-    pinctrl-1 = <&wf_dbdc_pins>;
-};
-
   &pio {
       wf_2g_5g_pins: wf-2g-5g-pins {
           mux {
@@ -138,3 +127,14 @@ conf {
           };
       };
   };
+
+&uart0 {
+    status = "okay";
+};
+
+&wifi {
+    status = "okay";
+    pinctrl-names = "default", "dbdc";
+    pinctrl-0 = <&wf_2g_5g_pins>;
+    pinctrl-1 = <&wf_dbdc_pins>;
+};
#4 lore raw

RFC v3 2/11 arm64: dts: mt7986: add spi related device nodes

In reply to Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds spi support for MT7986.

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 35 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 28 ++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 35 ++++++++++++++++++++
 3 files changed, 98 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +35 -0
index 6189436fe31d..58f7e6b169bf 100644
@@ -55,6 +55,20 @@ switch: switch@0 {
 };
 
 &pio {
+	spi_flash_pins: spi-flash-pins {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";
+		};
+	};
+
+	spic_pins: spic-pins {
+		mux {
+			function = "spi";
+			groups = "spi1_2";
+		};
+	};
+
 	uart1_pins: uart1-pins {
 		mux {
 			function = "uart";
@@ -101,6 +115,27 @@ conf {
 	};
 };
 
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_flash_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+	spi_nand: spi_nand@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-tx-buswidth = <4>;
+		spi-rx-buswidth = <4>;
+	};
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spic_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+};
+
 &switch {
 	ports {
 		#address-cells = <1>;
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +28 -0
index 226648f48df2..6d881095d933 100644
@@ -112,6 +112,34 @@ infracfg: infracfg@10001000 {
 			#clock-cells = <1>;
 		};
 
+		spi0: spi@1100a000 {
+			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0 0x1100a000 0 0x100>;
+			interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_MPLL_D2>,
+				 <&topckgen CLK_TOP_SPI_SEL>,
+				 <&infracfg CLK_INFRA_SPI0_CK>,
+				 <&infracfg CLK_INFRA_SPI0_HCK_CK>;
+			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
+			status = "disabled";
+		};
+
+		spi1: spi@1100b000 {
+			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0 0x1100b000 0 0x100>;
+			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_MPLL_D2>,
+				 <&topckgen CLK_TOP_SPIM_MST_SEL>,
+				 <&infracfg CLK_INFRA_SPI1_CK>,
+				 <&infracfg CLK_INFRA_SPI1_HCK_CK>;
+			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
+			status = "disabled";
+		};
+
 		topckgen: topckgen@1001b000 {
 			compatible = "mediatek,mt7986-topckgen", "syscon";
 			reg = <0 0x1001B000 0 0x1000>;
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +35 -0
index 7459ddb6b6f0..7673aa3fa6ae 100644
@@ -96,6 +96,20 @@ fixed-link {
 };
 
 &pio {
+	spi_flash_pins: spi-flash-pins {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";
+		};
+	};
+
+	spic_pins: spic-pins {
+		mux {
+			function = "spi";
+			groups = "spi1_2";
+		};
+	};
+
 	wf_2g_5g_pins: wf-2g-5g-pins {
 		mux {
 			function = "wifi";
@@ -128,6 +142,27 @@ conf {
 	};
 };
 
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_flash_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+	spi_nand: spi_nand@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-tx-buswidth = <4>;
+		spi-rx-buswidth = <4>;
+	};
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spic_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+};
+
 &uart0 {
 	status = "okay";
 };
Signature · 1 line
2.34.1
maintainer
#5 lore raw

Re: [RFC v3 02/11] arm64: dts: mt7986: add spi related device nodes

Quoted 109 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds spi support for MT7986.

---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 35 ++++++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 28 ++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 35 ++++++++++++++++++++
  3 files changed, 98 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +35 -0
index 6189436fe31d..58f7e6b169bf 100644
@@ -55,6 +55,20 @@ switch: switch@0 {
  };
 
  &pio {
+	spi_flash_pins: spi-flash-pins {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";
+		};
+	};
+
+	spic_pins: spic-pins {
+		mux {
+			function = "spi";
+			groups = "spi1_2";
+		};
+	};
+
  	uart1_pins: uart1-pins {
  		mux {
  			function = "uart";
@@ -101,6 +115,27 @@ conf {
  	};
  };
 
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_flash_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+	spi_nand: spi_nand@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-tx-buswidth = <4>;
+		spi-rx-buswidth = <4>;
+	};
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spic_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+};
+
  &switch {
  	ports {
  		#address-cells = <1>;
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +28 -0
index 226648f48df2..6d881095d933 100644
@@ -112,6 +112,34 @@ infracfg: infracfg@10001000 {
  			#clock-cells = <1>;
  		};
 
+		spi0: spi@1100a000 {
+			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0 0x1100a000 0 0x100>;
+			interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_MPLL_D2>,
+				 <&topckgen CLK_TOP_SPI_SEL>,
+				 <&infracfg CLK_INFRA_SPI0_CK>,
+				 <&infracfg CLK_INFRA_SPI0_HCK_CK>;
+			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
+			status = "disabled";
+		};
+
+		spi1: spi@1100b000 {
+			compatible = "mediatek,mt7986-spi-ipm", "mediatek,spi-ipm";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			reg = <0 0x1100b000 0 0x100>;
+			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_MPLL_D2>,
+				 <&topckgen CLK_TOP_SPIM_MST_SEL>,
+				 <&infracfg CLK_INFRA_SPI1_CK>,
+				 <&infracfg CLK_INFRA_SPI1_HCK_CK>;
+			clock-names = "parent-clk", "sel-clk", "spi-clk", "hclk";
+			status = "disabled";
+		};
+
  		topckgen: topckgen@1001b000 {
  			compatible = "mediatek,mt7986-topckgen", "syscon";
  			reg = <0 0x1001B000 0 0x1000>;
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +0 -0
index 7459ddb6b6f0..7673aa3fa6ae 100644

arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts fixed-link { · line 102

Quoted 7 lines
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +4 -0
@@ -96,6 +96,20 @@ fixed-link {
  };
 
  &pio {
+	spi_flash_pins: spi-flash-pins {
+		mux {
+			function = "spi";
+			groups = "spi0", "spi0_wp_hold";

Waiting on pinctrl binding:
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

Please resend once merged.

Regards,
Matthias

Quoted 41 lines
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +31 -0
+		};
+	};
+
+	spic_pins: spic-pins {
+		mux {
+			function = "spi";
+			groups = "spi1_2";
+		};
+	};
+
  	wf_2g_5g_pins: wf-2g-5g-pins {
  		mux {
  			function = "wifi";
@@ -128,6 +142,27 @@ conf {
  	};
  };
 
+&spi0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi_flash_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+	spi_nand: spi_nand@0 {
+		compatible = "spi-nand";
+		reg = <0>;
+		spi-max-frequency = <10000000>;
+		spi-tx-buswidth = <4>;
+		spi-rx-buswidth = <4>;
+	};
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spic_pins>;
+	cs-gpios = <0>, <0>;
+	status = "okay";
+};
+
  &uart0 {
  	status = "okay";
  };
#6 lore raw

RFC v3 3/11 arm64: dts: mt7986: add usb related device nodes

In reply to Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds USB support for MT7986.

---
changes compared to sams original version:
- reorder xhci-clocks based on yaml binding

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 28 ++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 55 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 28 ++++++++++
 3 files changed, 111 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +28 -0
index 58f7e6b169bf..de5d771e5251 100644
@@ -23,6 +23,24 @@ memory@40000000 {
 		device_type = "memory";
 		reg = <0 0x40000000 0 0x40000000>;
 	};
+
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	reg_5v: regulator-5v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &eth {
@@ -136,6 +154,12 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	vusb33-supply = <&reg_3p3v>;
+	vbus-supply = <&reg_5v>;
+	status = "okay";
+};
+
 &switch {
 	ports {
 		#address-cells = <1>;
@@ -197,6 +221,10 @@ &uart2 {
 	status = "okay";
 };
 
+&usb_phy {
+	status = "okay";
+};
+
 &wifi {
 	status = "okay";
 	pinctrl-names = "default", "dbdc";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +55 -0

61 lines not on this page · raw message

arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +28 -0
index 7673aa3fa6ae..cd1763fa7f19 100644
@@ -23,6 +23,24 @@ memory@40000000 {
 		device_type = "memory";
 		reg = <0 0x40000000 0 0x40000000>;
 	};
+
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	reg_5v: regulator-5v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &eth {
@@ -163,10 +181,20 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	vusb33-supply = <&reg_3p3v>;
+	vbus-supply = <&reg_5v>;
+	status = "okay";
+};
+
 &uart0 {
 	status = "okay";
 };
 
+&usb_phy {
+	status = "okay";
+};
+
 &wifi {
 	status = "okay";
 	pinctrl-names = "default", "dbdc";
Signature · 1 line
2.34.1
maintainer
#7 lore raw

Re: [RFC v3 03/11] arm64: dts: mt7986: add usb related device nodes

Quoted 73 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds USB support for MT7986.

---
changes compared to sams original version:
- reorder xhci-clocks based on yaml binding

---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 28 ++++++++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 55 ++++++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 28 ++++++++++
  3 files changed, 111 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +28 -0
index 58f7e6b169bf..de5d771e5251 100644
@@ -23,6 +23,24 @@ memory@40000000 {
  		device_type = "memory";
  		reg = <0 0x40000000 0 0x40000000>;
  	};
+
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	reg_5v: regulator-5v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
  };
 
  &eth {
@@ -136,6 +154,12 @@ &spi1 {
  	status = "okay";
  };
 
+&ssusb {
+	vusb33-supply = <&reg_3p3v>;
+	vbus-supply = <&reg_5v>;
+	status = "okay";
+};
+
  &switch {
  	ports {
  		#address-cells = <1>;
@@ -197,6 +221,10 @@ &uart2 {
  	status = "okay";
  };
 
+&usb_phy {
+	status = "okay";
+};
+
  &wifi {
  	status = "okay";
  	pinctrl-names = "default", "dbdc";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +0 -0
index 6d881095d933..58bbecfbab98 100644

arch/arm64/boot/dts/mediatek/mt7986a.dtsi uart2: serial@11004000 { · line 250

Quoted 5 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +2 -0
@@ -246,6 +246,61 @@ uart2: serial@11004000 {
  			status = "disabled";
  		};
 
+		ssusb: usb@11200000 {
+			compatible = "mediatek,mt7986-xhci",

I wasn't able to find the compatible in linux-next.

Quoted 13 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +13 -0
+				     "mediatek,mtk-xhci";
+			reg = <0 0x11200000 0 0x2e00>,
+			      <0 0x11203e00 0 0x0100>;
+			reg-names = "mac", "ippc";
+			interrupts = <GIC_SPI 173 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&infracfg CLK_INFRA_IUSB_SYS_CK>,
+				 <&infracfg CLK_INFRA_IUSB_CK>,
+				 <&infracfg CLK_INFRA_IUSB_133_CK>,
+				 <&infracfg CLK_INFRA_IUSB_66M_CK>,
+				 <&topckgen CLK_TOP_U2U3_XHCI_SEL>;
+			clock-names = "sys_ck",
+				      "ref_ck",
+				      "mcu_ck",

arch/arm64/boot/dts/mediatek/mt7986a.dtsi uart2: serial@11004000 { · line 273

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +10 -0
+				      "dma_ck",
+				      "xhci_ck";
+			phys = <&u2port0 PHY_TYPE_USB2>,
+			       <&u3port0 PHY_TYPE_USB3>,
+			       <&u2port1 PHY_TYPE_USB2>;
+			status = "disabled";
+		};
+
+		usb_phy: t-phy@11e10000 {
+			compatible = "mediatek,mt7986-tphy",

Same here.

Regards,
Matthias

Quoted 83 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +30 -0
+				     "mediatek,generic-tphy-v2";
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges;
+			status = "disabled";
+
+			u2port0: usb-phy@11e10000 {
+				reg = <0 0x11e10000 0 0x700>;
+				clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
+					 <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
+				clock-names = "ref", "da_ref";
+				#phy-cells = <1>;
+			};
+
+			u3port0: usb-phy@11e10700 {
+				reg = <0 0x11e10700 0 0x900>;
+				clocks = <&topckgen CLK_TOP_USB3_PHY_SEL>;
+				clock-names = "ref";
+				#phy-cells = <1>;
+			};
+
+			u2port1: usb-phy@11e11000 {
+				reg = <0 0x11e11000 0 0x700>;
+				clocks = <&topckgen CLK_TOP_DA_U2_REFSEL>,
+					 <&topckgen CLK_TOP_DA_U2_CK_1P_SEL>;
+				clock-names = "ref", "da_ref";
+				#phy-cells = <1>;
+			};
+		};
+
  		ethsys: syscon@15000000 {
  			 #address-cells = <1>;
  			 #size-cells = <1>;
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +28 -0
index 7673aa3fa6ae..cd1763fa7f19 100644
@@ -23,6 +23,24 @@ memory@40000000 {
  		device_type = "memory";
  		reg = <0 0x40000000 0 0x40000000>;
  	};
+
+	reg_3p3v: regulator-3p3v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-3.3V";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
+	reg_5v: regulator-5v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
  };
 
  &eth {
@@ -163,10 +181,20 @@ &spi1 {
  	status = "okay";
  };
 
+&ssusb {
+	vusb33-supply = <&reg_3p3v>;
+	vbus-supply = <&reg_5v>;
+	status = "okay";
+};
+
  &uart0 {
  	status = "okay";
  };
 
+&usb_phy {
+	status = "okay";
+};
+
  &wifi {
  	status = "okay";
  	pinctrl-names = "default", "dbdc";
#8 lore raw

RFC v3 4/11 arm64: dts: mt7986: add crypto related device nodes

In reply to Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds crypto engine support for MT7986.

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  4 ++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 15 +++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts |  4 ++++
 3 files changed, 23 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +4 -0
index de5d771e5251..2b5d7ea31b4d 100644
@@ -43,6 +43,10 @@ reg_5v: regulator-5v {
 	};
 };
 
+&crypto {
+	status = "okay";
+};
+
 &eth {
 	status = "okay";
 
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +15 -0
index 58bbecfbab98..1c7a973c28ca 100644
@@ -205,6 +205,21 @@ trng: rng@1020f000 {
 			status = "disabled";
 		};
 
+		crypto: crypto@10320000 {
+			compatible = "inside-secure,safexcel-eip97";
+			reg = <0 0x10320000 0 0x40000>;
+			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "ring0", "ring1", "ring2", "ring3";
+			clocks = <&infracfg CLK_INFRA_EIP97_CK>;
+			clock-names = "infra_eip97_ck";
+			assigned-clocks = <&topckgen CLK_TOP_EIP_B_SEL>;
+			assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>;
+			status = "disabled";
+		};
+
 		uart0: serial@11002000 {
 			compatible = "mediatek,mt7986-uart",
 				     "mediatek,mt6577-uart";
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +4 -0
index cd1763fa7f19..a98025112b5a 100644
@@ -43,6 +43,10 @@ reg_5v: regulator-5v {
 	};
 };
 
+&crypto {
+	status = "okay";
+};
+
 &eth {
 	status = "okay";
 
Signature · 1 line
2.34.1
maintainer Applied
#9 lore raw

Re: [RFC v3 04/11] arm64: dts: mt7986: add crypto related device nodes

Quoted 7 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds crypto engine support for MT7986.

Applied, thanks!

Quoted 62 lines
---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  4 ++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 15 +++++++++++++++
  arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts |  4 ++++
  3 files changed, 23 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +4 -0
index de5d771e5251..2b5d7ea31b4d 100644
@@ -43,6 +43,10 @@ reg_5v: regulator-5v {
  	};
  };
 
+&crypto {
+	status = "okay";
+};
+
  &eth {
  	status = "okay";
 
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +15 -0
index 58bbecfbab98..1c7a973c28ca 100644
@@ -205,6 +205,21 @@ trng: rng@1020f000 {
  			status = "disabled";
  		};
 
+		crypto: crypto@10320000 {
+			compatible = "inside-secure,safexcel-eip97";
+			reg = <0 0x10320000 0 0x40000>;
+			interrupts = <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "ring0", "ring1", "ring2", "ring3";
+			clocks = <&infracfg CLK_INFRA_EIP97_CK>;
+			clock-names = "infra_eip97_ck";
+			assigned-clocks = <&topckgen CLK_TOP_EIP_B_SEL>;
+			assigned-clock-parents = <&apmixedsys CLK_APMIXED_NET2PLL>;
+			status = "disabled";
+		};
+
  		uart0: serial@11002000 {
  			compatible = "mediatek,mt7986-uart",
  				     "mediatek,mt6577-uart";
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +4 -0
index cd1763fa7f19..a98025112b5a 100644
@@ -43,6 +43,10 @@ reg_5v: regulator-5v {
  	};
  };
 
+&crypto {
+	status = "okay";
+};
+
  &eth {
  	status = "okay";
 
#10 lore raw

RFC v3 5/11 arm64: dts: mt7986: add mmc related device nodes

In reply to Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds mmc support for MT7986.

---
v3:
- fix pullups/pulldowns for mt7986a-rfb to have generic bias-pull-*

v2:
- update mmc-node because clocks changed

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 87 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 15 ++++
 2 files changed, 102 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +87 -0
index 2b5d7ea31b4d..e1a0331aaa5f 100644
@@ -5,6 +5,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7986a.dtsi"
 
 / {
@@ -24,6 +26,15 @@ memory@40000000 {
 		reg = <0 0x40000000 0 0x40000000>;
 	};
 
+	reg_1p8v: regulator-1p8v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
 	reg_3p3v: regulator-3p3v {
 		compatible = "regulator-fixed";
 		regulator-name = "fixed-3.3V";
@@ -76,7 +87,83 @@ switch: switch@0 {
 	};
 };
 
+&mmc0 {
+	pinctrl-names = "default", "state_uhs";
+	pinctrl-0 = <&mmc0_pins_default>;
+	pinctrl-1 = <&mmc0_pins_uhs>;
+	bus-width = <8>;
+	max-frequency = <200000000>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	mmc-hs400-1_8v;
+	hs400-ds-delay = <0x14014>;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	non-removable;
+	no-sd;
+	no-sdio;
+	status = "okay";
+};
+
 &pio {
+	mmc0_pins_default: mmc0-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+	};
+
+	mmc0_pins_uhs: mmc0-uhs-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+	};
+
 	spi_flash_pins: spi-flash-pins {
 		mux {
 			function = "spi";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +15 -0
index 1c7a973c28ca..32c26b239ae6 100644
@@ -284,6 +284,21 @@ ssusb: usb@11200000 {
 			status = "disabled";
 		};
 
+		mmc0: mmc@11230000 {
+			compatible = "mediatek,mt7986-mmc";
+			reg = <0 0x11230000 0 0x1000>,
+			      <0 0x11c20000 0 0x1000>;
+			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
+				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,
+				 <&infracfg CLK_INFRA_MSDC_CK>,
+				 <&infracfg CLK_INFRA_MSDC_133M_CK>,
+				 <&infracfg CLK_INFRA_MSDC_66M_CK>;
+			clock-names = "source", "hclk", "source_cg", "bus_clk",
+				      "sys_cg";
+			status = "disabled";
+		};
+
 		usb_phy: t-phy@11e10000 {
 			compatible = "mediatek,mt7986-tphy",
 				     "mediatek,generic-tphy-v2";
Signature · 1 line
2.34.1
maintainer
#11 lore raw

Re: [RFC v3 05/11] arm64: dts: mt7986: add mmc related device nodes

Quoted 63 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds mmc support for MT7986.

---
v3:
- fix pullups/pulldowns for mt7986a-rfb to have generic bias-pull-*

v2:
- update mmc-node because clocks changed

---
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 87 ++++++++++++++++++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 15 ++++
  2 files changed, 102 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +24 -0
index 2b5d7ea31b4d..e1a0331aaa5f 100644
@@ -5,6 +5,8 @@
   */
 
  /dts-v1/;
+#include <dt-bindings/pinctrl/mt65xx.h>
+
  #include "mt7986a.dtsi"
 
  / {
@@ -24,6 +26,15 @@ memory@40000000 {
  		reg = <0 0x40000000 0 0x40000000>;
  	};
 
+	reg_1p8v: regulator-1p8v {
+		compatible = "regulator-fixed";
+		regulator-name = "fixed-1.8V";
+		regulator-min-microvolt = <1800000>;
+		regulator-max-microvolt = <1800000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
+
  	reg_3p3v: regulator-3p3v {
  		compatible = "regulator-fixed";
  		regulator-name = "fixed-3.3V";
@@ -76,7 +87,83 @@ switch: switch@0 {
  	};
  };
 
+&mmc0 {
+	pinctrl-names = "default", "state_uhs";
+	pinctrl-0 = <&mmc0_pins_default>;
+	pinctrl-1 = <&mmc0_pins_uhs>;
+	bus-width = <8>;
+	max-frequency = <200000000>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	mmc-hs400-1_8v;
+	hs400-ds-delay = <0x14014>;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	non-removable;

arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts switch: switch@0 { · line 112

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +9 -0
+	no-sd;
+	no-sdio;
+	status = "okay";
+};
+
  &pio {
+	mmc0_pins_default: mmc0-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";

Waiting on
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

Please correct me if I'm wrong.

Matthias

Quoted 83 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +54 -0
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+	};
+
+	mmc0_pins_uhs: mmc0-uhs-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";
+		};
+		conf-cmd-dat {
+			pins = "EMMC_DATA_0", "EMMC_DATA_1", "EMMC_DATA_2",
+			       "EMMC_DATA_3", "EMMC_DATA_4", "EMMC_DATA_5",
+			       "EMMC_DATA_6", "EMMC_DATA_7", "EMMC_CMD";
+			input-enable;
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+		conf-clk {
+			pins = "EMMC_CK";
+			drive-strength = <6>;
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-ds {
+			pins = "EMMC_DSL";
+			bias-pull-down = <MTK_PUPD_SET_R1R0_10>; /* pull-down 50K */
+		};
+		conf-rst {
+			pins = "EMMC_RSTB";
+			drive-strength = <4>;
+			bias-pull-up = <MTK_PUPD_SET_R1R0_01>; /* pull-up 10K */
+		};
+	};
+
  	spi_flash_pins: spi-flash-pins {
  		mux {
  			function = "spi";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +15 -0
index 1c7a973c28ca..32c26b239ae6 100644
@@ -284,6 +284,21 @@ ssusb: usb@11200000 {
  			status = "disabled";
  		};
 
+		mmc0: mmc@11230000 {
+			compatible = "mediatek,mt7986-mmc";
+			reg = <0 0x11230000 0 0x1000>,
+			      <0 0x11c20000 0 0x1000>;
+			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&topckgen CLK_TOP_EMMC_416M_SEL>,
+				 <&infracfg CLK_INFRA_MSDC_HCK_CK>,
+				 <&infracfg CLK_INFRA_MSDC_CK>,
+				 <&infracfg CLK_INFRA_MSDC_133M_CK>,
+				 <&infracfg CLK_INFRA_MSDC_66M_CK>;
+			clock-names = "source", "hclk", "source_cg", "bus_clk",
+				      "sys_cg";
+			status = "disabled";
+		};
+
  		usb_phy: t-phy@11e10000 {
  			compatible = "mediatek,mt7986-tphy",
  				     "mediatek,generic-tphy-v2";
#12 lore raw

Aw: Re: [RFC v3 05/11] arm64: dts: mt7986: add mmc related device nodes

Hi

Quoted 12 lines

Gesendet: Freitag, 11. November 2022 um 09:58 Uhr
Von: "Matthias Brugger" <[email protected]>

arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts switch: switch@0 { · line 112

Quoted 5 lines
  &pio {
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +4 -0
+	mmc0_pins_default: mmc0-pins {
+		mux {
+			function = "emmc";
+			groups = "emmc_51";

Waiting on
https://patchwork.kernel.org/project/linux-mediatek/patch/[email protected]/

Quoted 1 line

Please correct me if I'm wrong.

this (newer version with some pinctrl-fixes) is applied to linus pinctrl tree

https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git/commit/?h=for-next&id=c115e7f51e685536ecb885854bdd4b3f225ff3e4

Quoted 1 line

Matthias

regards Frank

#13 lore raw

RFC v3 6/11 arm64: dts: mt7986: add i2c node

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add i2c Node to mt7986 devicetree.

---
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +14 -0
index 32c26b239ae6..a1a788db113a 100644
@@ -261,6 +261,20 @@ uart2: serial@11004000 {
 			status = "disabled";
 		};
 
+		i2c0: i2c@11008000 {
+			compatible = "mediatek,mt7986-i2c";
+			reg = <0 0x11008000 0 0x90>,
+			      <0 0x10217080 0 0x80>;
+			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
+			clock-div = <5>;
+			clocks = <&infracfg CLK_INFRA_I2C0_CK>,
+				 <&infracfg CLK_INFRA_AP_DMA_CK>;
+			clock-names = "main", "dma";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
 		ssusb: usb@11200000 {
 			compatible = "mediatek,mt7986-xhci",
 				     "mediatek,mtk-xhci";
Signature · 1 line
2.34.1
maintainer Applied
#14 lore raw

Re: [RFC v3 06/11] arm64: dts: mt7986: add i2c node

Quoted 5 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add i2c Node to mt7986 devicetree.

Applied, thanks

Quoted 29 lines
---
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 14 ++++++++++++++
  1 file changed, 14 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +14 -0
index 32c26b239ae6..a1a788db113a 100644
@@ -261,6 +261,20 @@ uart2: serial@11004000 {
  			status = "disabled";
  		};
 
+		i2c0: i2c@11008000 {
+			compatible = "mediatek,mt7986-i2c";
+			reg = <0 0x11008000 0 0x90>,
+			      <0 0x10217080 0 0x80>;
+			interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
+			clock-div = <5>;
+			clocks = <&infracfg CLK_INFRA_I2C0_CK>,
+				 <&infracfg CLK_INFRA_AP_DMA_CK>;
+			clock-names = "main", "dma";
+			#address-cells = <1>;
+			#size-cells = <0>;
+			status = "disabled";
+		};
+
  		ssusb: usb@11200000 {
  			compatible = "mediatek,mt7986-xhci",
  				     "mediatek,mtk-xhci";
#15 lore raw

RFC v3 7/11 arm64: dts: mt7986: add pcie related device nodes

In reply to Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds PCIe support for MT7986.

---
changes compared to sams original version:

- add clock-names to pcie node
- update clocks to new binding

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 16 ++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 52 ++++++++++++++++++++
 2 files changed, 68 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +16 -0
index e1a0331aaa5f..01fa08c57c39 100644
@@ -102,6 +102,15 @@ &mmc0 {
 	non-removable;
 	no-sd;
 	no-sdio;
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins>;
+	status = "okay";
+};
+
+&pcie_phy {
 	status = "okay";
 };
 
@@ -164,6 +173,13 @@ conf-rst {
 		};
 	};
 
+	pcie_pins: pcie-pins {
+		mux {
+			function = "pcie";
+			groups = "pcie_clk", "pcie_wake", "pcie_pereset";
+		};
+	};
+
 	spi_flash_pins: spi-flash-pins {
 		mux {
 			function = "spi";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +52 -0

64 lines not on this page · raw message

Signature · 1 line
2.34.1
#16 lore raw

RFC v3 8/11 dt-bindings: arm64: dts: mediatek: add compatible for bananapi r3

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible for mt7986 based BananaPi R3 SBC.

---
 Documentation/devicetree/bindings/arm/mediatek.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/arm/mediatek.yaml +1 -0
index d76ce4c3819d..7642f9350d2c 100644
@@ -83,6 +83,7 @@ properties:
           - const: mediatek,mt7629
       - items:
           - enum:
+              - bananapi,bpi-r3
               - mediatek,mt7986a-rfb
           - const: mediatek,mt7986a
       - items:
Signature · 1 line
2.34.1
#17 lore raw

RFC v3 9/11 arm64: dts: mt7986: add Bananapi R3

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add support for Bananapi R3 SBC.

- SD/eMMC support (switching first 4 bits of data-bus with sw6/D)
- all rj45 ports and both SFP working (eth1/lan4)
- all USB-Ports + SIM-Slot tested
- i2c and all uarts tested
- wifi tested (with eeprom calibration data)

---
SPI-NAND/NOR switched (CS by sw5/C) not yet included
this is done with DT-Overlays in my tree, don't know how to do it in upstream the right way...added dts files for dtbo and added them with dtbo extension to Makefile works.

changes:
v3:
- rename factory-key to reset-key
- add dcin regulator and add it as input for 3v3 (with renaming)
- remove memory-node
- dropped wifi eeprom (calibration) data
- move mmc0 pinctrl to common dtsi and drop sdcard comment
- change mmc pull-up/down to have generic bias-pull*

v2:
- remove pcie to be added later (discussion about clocks)
- some fixes based on suggestions on ML
- add key suffix like it's done in mt7622-bpi-r64 devicetree
- add dash in sfp node names
- use reg as unit for switch-node
- drop "-3-4" suffix from i2c-pins node name
- fix order in Makefile

---
 arch/arm64/boot/dts/mediatek/Makefile         |   2 +
 .../mediatek/mt7986a-bananapi-bpi-r3-emmc.dts |  31 ++
 .../mediatek/mt7986a-bananapi-bpi-r3-sd.dts   |  25 +
 .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi | 441 ++++++++++++++++++
 4 files changed, 499 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi
arch/arm64/boot/dts/mediatek/Makefile +2 -0
index 0ec90cb3ef28..e8902f2cc58f 100644
@@ -7,6 +7,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-evb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dts new file +31 -0
new file mode 100644
index 000000000000..a0ca35b5977e
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+#include "mt7986a-bananapi-bpi-r3.dtsi"
+
+/ {
+	model = "Bananapi BPI-R3 (emmc)";
+};
+
+&mmc0 {
+	bus-width = <8>;
+	max-frequency = <200000000>;
+	cap-mmc-highspeed;
+	mmc-hs200-1_8v;
+	mmc-hs400-1_8v;
+	hs400-ds-delay = <0x14014>;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	non-removable;
+	no-sd;
+	no-sdio;
+	status = "okay";
+};
+
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dts new file +25 -0
new file mode 100644
index 000000000000..06e4691cb815
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/gpio/gpio.h>
+
+#include "mt7986a-bananapi-bpi-r3.dtsi"
+
+/ {
+	model = "Bananapi BPI-R3 (sdmmc)";
+};
+
+&mmc0 {
+	bus-width = <4>;
+	max-frequency = <52000000>;
+	cap-sd-highspeed;
+	vmmc-supply = <&reg_3p3v>;
+	vqmmc-supply = <&reg_1p8v>;
+	status = "okay";
+};
+
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi new file +441 -0

441 lines not on this page · raw message

Signature · 1 line
2.34.1
#18 lore raw

RFC v3 10/11 arm64: dts: mt7986: add PCIe nodes to BananaPi-R3

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add PCIe nodes to Banana Pi R3 SBC which is used on M.2 slot.

---
 .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi   | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi +17 -0
index 93ac67641351..01f92db3336a 100644
@@ -195,6 +195,16 @@ &i2c0 {
 	status = "okay";
 };
 
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins>;
+	status = "okay";
+};
+
+&pcie_phy {
+	status = "okay";
+};
+
 &pio {
 	i2c_pins: i2c-pins {
 		mux {
@@ -261,6 +271,13 @@ conf-rst {
 		};
 	};
 
+	pcie_pins: pcie-pins {
+		mux {
+			function = "pcie";
+			groups = "pcie_clk", "pcie_pereset";
+		};
+	};
+
 	spi_flash_pins: spi-flash-pins {
 		mux {
 			function = "spi";
Signature · 1 line
2.34.1
#19 lore raw

RFC v3 11/11 arm64: dts: mt7986: add BPI-R3 nand/nor overlays

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add devicetree overlays for using nand and nor on BPI-R3.

---
 arch/arm64/boot/dts/mediatek/Makefile         |  2 +
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 67 +++++++++++++++++++
 3 files changed, 122 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts
arch/arm64/boot/dts/mediatek/Makefile +2 -0
index e8902f2cc58f..d42208c4090d 100644
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts new file +53 -0

53 lines not on this page · raw message

arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
2.34.1
maintainer
#20 lore raw

Re: [RFC v3 11/11] arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Rob, Krzysztof,

Quoted 18 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add devicetree overlays for using nand and nor on BPI-R3.

---
  arch/arm64/boot/dts/mediatek/Makefile         |  2 +
  .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++
  .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 67 +++++++++++++++++++
  3 files changed, 122 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts

arch/arm64/boot/dts/mediatek/Makefile +0 -0
index e8902f2cc58f..d42208c4090d 100644

arch/arm64/boot/dts/mediatek/Makefile dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb · line 12

Quoted 5 lines
arch/arm64/boot/dts/mediatek/Makefile +2 -0
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo

Do we allow the inclusion of overlays in the kernel?
I don't think so. I see there are some dtbos for some freescale platforms, but I wasn't aware that we support that. I thought it is all about dtsi includes.

@frank In any case we would need to apply these overlays to some base board to create a valis dtb.

Regards,
Matthias

Quoted 135 lines
arch/arm64/boot/dts/mediatek/Makefile +0 -0
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-rfb.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts new file +53 -0
new file mode 100644
index 000000000000..e12ff825bb50
@@ -0,0 +1,53 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
+
+/dts-v1/;
+/plugin/;
+
+//dtc -O dtb -o bpi-r3-nand.dtbo mt7986a-bananapi-bpi-r3-nand.dts
+
+/ {
+	compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
+
+	fragment@0 {
+		target-path = "/soc/spi@1100a000";
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			spi_nand: spi_nand@0 {
+				compatible = "spi-nand";
+				reg = <0>;
+				spi-max-frequency = <10000000>;
+				spi-tx-buswidth = <4>;
+				spi-rx-buswidth = <4>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "bl2";
+						reg = <0x0 0x80000>;
+						read-only;
+					};
+
+					partition@80000 {
+						label = "reserved";
+						reg = <0x80000 0x300000>;
+					};
+
+					partition@380000 {
+						label = "fip";
+						reg = <0x380000 0x200000>;
+						read-only;
+					};
+
+					partition@580000 {
+						label = "ubi";
+						reg = <0x580000 0x7a80000>;
+					};
+				};
+			};
+		};
+	};
+};
arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts new file +67 -0
new file mode 100644
index 000000000000..f11ffd9c4bce
@@ -0,0 +1,67 @@
+/* SPDX-License-Identifier: (GPL-2.0-only OR MIT) */
+
+/dts-v1/;
+/plugin/;
+
+//dtc -O dtb -o bpi-r3-nor.dtbo mt7986a-bananapi-bpi-r3-nor.dts
+
+/ {
+	compatible = "bananapi,bpi-r3", "mediatek,mt7986a";
+
+	fragment@0 {
+		target-path = "/soc/spi@1100a000";
+		__overlay__ {
+			#address-cells = <1>;
+			#size-cells = <0>;
+			flash@0 {
+				compatible = "jedec,spi-nor";
+				reg = <0>;
+				spi-max-frequency = <10000000>;
+
+				partitions {
+					compatible = "fixed-partitions";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					partition@0 {
+						label = "bl2";
+						reg = <0x0 0x20000>;
+						read-only;
+					};
+
+					partition@20000 {
+						label = "reserved";
+						reg = <0x20000 0x20000>;
+					};
+
+					partition@40000 {
+						label = "u-boot-env";
+						reg = <0x40000 0x40000>;
+					};
+
+					partition@80000 {
+						label = "reserved2";
+						reg = <0x80000 0x80000>;
+					};
+
+					partition@100000 {
+						label = "fip";
+						reg = <0x100000 0x80000>;
+						read-only;
+					};
+
+					partition@180000 {
+						label = "recovery";
+						reg = <0x180000 0xa80000>;
+					};
+
+					partition@c00000 {
+						label = "fit";
+						reg = <0xc00000 0x1400000>;
+						compatible = "denx,fit";
+					};
+				};
+			};
+		};
+	};
+};
#21 lore raw

Aw: Re: [RFC v3 11/11] arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Hi

Quoted 37 lines

Gesendet: Freitag, 11. November 2022 um 10:16 Uhr
Von: "Matthias Brugger" <[email protected]>
An: "Frank Wunderlich" <[email protected]>, [email protected], "Rob Herring" <[email protected]>, "Krzysztof Kozlowski" <[email protected]>
Cc: "Frank Wunderlich" <[email protected]>, [email protected], [email protected], [email protected]
Betreff: Re: [RFC v3 11/11] arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Rob, Krzysztof,

Quoted 18 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add devicetree overlays for using nand and nor on BPI-R3.

---
  arch/arm64/boot/dts/mediatek/Makefile         |  2 +
  .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++
  .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 67 +++++++++++++++++++
  3 files changed, 122 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts

arch/arm64/boot/dts/mediatek/Makefile +0 -0
index e8902f2cc58f..d42208c4090d 100644

arch/arm64/boot/dts/mediatek/Makefile dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb · line 12

Quoted 5 lines
arch/arm64/boot/dts/mediatek/Makefile +2 -0
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo

Do we allow the inclusion of overlays in the kernel?
I don't think so. I see there are some dtbos for some freescale platforms, but I wasn't aware that we support that. I thought it is all about dtsi includes.

Quoted 2 lines

@frank In any case we would need to apply these overlays to some base board to create a valis dtb.

yes of course, the "base board" is either the sd or the emmc fdt i added 1 patch before. This way it allows all 4 combinations (sd+nand, sd+nor, emmc+nand, emmc+nor).

as i pointed in v4 of this Patch there is a commit in robs tree allow building dt overlays from dtso-files...

"kbuild: Allow DTB overlays to built from .dtso named source files"

    https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2

maybe this is the right way to go (rename my current dts to dtso)?

Quoted 2 lines

Regards,
Matthias

regards Frank

#22 lore raw

Re: [RFC v3 11/11] arm64: dts: mt7986: add BPI-R3 nand/nor overlays

In reply to Matthias Brugger
Quoted 7 lines · Matthias Brugger

Rob, Krzysztof,

Quoted 3 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add devicetree overlays for using nand and nor on BPI-R3.

Overlays are necessary because ...?

Quoted 9 lines
Quoted 9 lines
---
  arch/arm64/boot/dts/mediatek/Makefile         |  2 +
  .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 53 +++++++++++++++
  .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 67 +++++++++++++++++++
  3 files changed, 122 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dts

Quoted 14 lines

arch/arm64/boot/dts/mediatek/Makefile dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb · line 12

Quoted 10 lines
arch/arm64/boot/dts/mediatek/Makefile +2 -0
index e8902f2cc58f..d42208c4090d 100644
@@ -8,6 +8,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += mt6797-x20-dev.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-rfb1.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7622-bananapi-bpi-r64.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nand.dtbo
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-nor.dtbo

Do we allow the inclusion of overlays in the kernel?
I don't think so. I see there are some dtbos for some freescale platforms, but I wasn't aware that we support that. I thought it is all about dtsi includes.

Yes, we do.

Quoted 2 lines

@frank In any case we would need to apply these overlays to some base board to create a valis dtb.

Indeed. The build system supports this and it's a requirement (though not easily enforced) that overlays apply to something. It works much like how kbuild combines multiple .o files into a module.

Please rename to .dtso though. I copied you all on the PR I just sent.

Rob

#23 lore raw
In reply to Frank Wunderlich

Hi Rob,

can you please take Patches 1+3 of v1 into your tree? due to reordering in my tree i missed them in this version

https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798

pcie-bindings are here:

https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172

i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop the compile comment in dt overlays.

also i've found this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2

so maybe i need to rename my overlay dts files to dtso?

maybe the others can be applied (at least the mt7986 nodes)?

regards Frank

maintainer
#24 lore raw
Quoted 7 lines · Frank Wunderlich

Hi Rob,

can you please take Patches 1+3 of v1 into your tree? due to reordering in my tree i missed them in this version

https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798

They should go through the subsystem maintainers trees. I'd advise to resend, dropping the RFC prefix and add the corresponding maintainers.

Regards,
Matthias

Quoted 16 lines

pcie-bindings are here:

https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172

i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop the compile comment in dt overlays.

also i've found this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2

so maybe i need to rename my overlay dts files to dtso?

maybe the others can be applied (at least the mt7986 nodes)?

regards Frank

#25 lore raw

Hi

Quoted 11 lines

Gesendet: Freitag, 11. November 2022 um 10:17 Uhr
Von: "Matthias Brugger" <[email protected]>
An: "Frank Wunderlich" <[email protected]>, "Rob Herring" <[email protected]>
Cc: [email protected], "Krzysztof Kozlowski" <[email protected]>, [email protected], [email protected], [email protected], "Frank Wunderlich" <[email protected]>
Betreff: Re: Aw: [RFC v3 00/11] Add BananaPi R3

Quoted 2 lines · Frank Wunderlich

Hi Rob,

Quoted 8 lines
Quoted 5 lines

can you please take Patches 1+3 of v1 into your tree? due to reordering in my tree i missed them in this version

https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798

They should go through the subsystem maintainers trees. I'd advise to resend, dropping the RFC prefix and add the corresponding maintainers.

ok, wait for your push and i create v4 including the missing binding-patches and the reorder of wed-node together with my fixes.

Quoted 17 lines

Regards,
Matthias

Quoted 14 lines

pcie-bindings are here:

https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172

i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop the compile comment in dt overlays.

also i've found this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2

so maybe i need to rename my overlay dts files to dtso?

maybe the others can be applied (at least the mt7986 nodes)?

does this solve your question about dt-overlays?

just to note for all...it is all 1 board having sd+emmc on 1 mmc-controller and nand+nor on one spi. it depends on hardware-switches which devices are accessable (1mmc+1 spi). Adding dts for all possible combinations will add more dts (sd+nor, sd+nand, emmc+nor, emmc+nand) than adding the 2 overlays or adds redundant config.

or should i copy the emmc/sd dts and adding once nor or nand? so we have the dtsi and dts for combinations above (=5 total)?

Quoted 2 lines
Quoted 1 line

regards Frank

maintainer
#26 lore raw
Quoted 38 lines · Frank Wunderlich

Hi

Quoted 11 lines

Gesendet: Freitag, 11. November 2022 um 10:17 Uhr
Von: "Matthias Brugger" <[email protected]>
An: "Frank Wunderlich" <[email protected]>, "Rob Herring" <[email protected]>
Cc: [email protected], "Krzysztof Kozlowski" <[email protected]>, [email protected], [email protected], [email protected], "Frank Wunderlich" <[email protected]>
Betreff: Re: Aw: [RFC v3 00/11] Add BananaPi R3

Quoted 2 lines · Frank Wunderlich

Hi Rob,

Quoted 8 lines
Quoted 5 lines

can you please take Patches 1+3 of v1 into your tree? due to reordering in my tree i missed them in this version

https://patchwork.kernel.org/project/linux-mediatek/list/?series=685798

They should go through the subsystem maintainers trees. I'd advise to resend, dropping the RFC prefix and add the corresponding maintainers.

ok, wait for your push and i create v4 including the missing binding-patches and the reorder of wed-node together with my fixes.

Quoted 14 lines

Regards,
Matthias

Quoted 11 lines

pcie-bindings are here:

https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172

i found 1 error in bpi-r3 dts (properties from sfp1 not plural) which i will fix in next version and will drop the compile comment in dt overlays.

also i've found this commit:

https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git/commit/?h=dt/next&id=363547d2191cbc32ca954ba75d72908712398ff2

Quoted 8 lines
Quoted 3 lines
Quoted 3 lines

so maybe i need to rename my overlay dts files to dtso?

maybe the others can be applied (at least the mt7986 nodes)?

does this solve your question about dt-overlays?

just to note for all...it is all 1 board having sd+emmc on 1 mmc-controller and nand+nor on one spi. it depends on hardware-switches which devices are accessable (1mmc+1 spi). Adding dts for all possible combinations will add more dts (sd+nor, sd+nand, emmc+nor, emmc+nand) than adding the 2 overlays or adds redundant config.

I wonder if in the end that wouldn't be part of U-Boot to pass the correct DTB depending on the HW switches. Just one idea I had is, to create on DTS with sd+nor+nand+emmc if that's possible. And then leave the permutations to the boot firmware (U-Boot).

Regards,
Matthias

Quoted 4 lines

or should i copy the emmc/sd dts and adding once nor or nand? so we have the dtsi and dts for combinations above (=5 total)?

Quoted 2 lines
Quoted 1 line

regards Frank