Skip to contentSkip to conversation

Add BananaPi R3

PATCH Applied Frank Wunderlich 6 participants 29 messages Nov 18, 2022 – Nov 27, 2022

Subsystems (9)

v6 of 9 Applied Latest is v9 →

lore
Share & tools
lore
#9 lore raw

PATCH v6 5/11 dt-bindings: PCI: mediatek-gen3: add support for mt7986

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string and clock-definition for mt7986. It needs 4 clocks for PCIe, define them in binding.

---
v2:
- squashed patch 2+3 (compatible and clock definition)

---
 .../bindings/pci/mediatek-pcie-gen3.yaml        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml +17 -0
index 5d7369debff2..f7a02019daea 100644
@@ -48,6 +48,7 @@ properties:
     oneOf:
       - items:
           - enum:
+              - mediatek,mt7986-pcie
               - mediatek,mt8188-pcie
               - mediatek,mt8195-pcie
           - const: mediatek,mt8192-pcie
@@ -78,9 +79,11 @@ properties:
       - const: mac
 
   clocks:
+    minItems: 4
     maxItems: 6
 
   clock-names:
+    minItems: 4
     maxItems: 6
 
   assigned-clocks:
@@ -160,6 +163,20 @@ allOf:
             - const: tl_32k
             - const: peri_26m
             - const: peri_mem
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - mediatek,mt7986-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: peri_26m
+            - const: top_133m
 
 unevaluatedProperties: false
 
Signature · 1 line
2.34.1
#11 lore raw

PATCH v6 6/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 2f48cc3d3ddb..006878e3f2b2 100644
@@ -59,6 +59,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";
@@ -105,6 +119,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 afc01abfa99c..29da9b8ed753 100644
@@ -253,6 +253,34 @@ i2c0: i2c@11008000 {
 			status = "disabled";
 		};
 
+		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";
+		};
+
 		ethsys: syscon@15000000 {
 			 #address-cells = <1>;
 			 #size-cells = <1>;
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +35 -0
index 79c5c78f7a14..2c7f1d4fb352 100644
@@ -100,6 +100,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";
@@ -132,6 +146,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
#3 lore raw

PATCH v6 2/11 dt-bindings: phy: mediatek,tphy: add support for mt7986

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string for mt7986.

---
 Documentation/devicetree/bindings/phy/mediatek,tphy.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/phy/mediatek,tphy.yaml +1 -0
index 5613cc5106e3..230a17f24966 100644
@@ -79,6 +79,7 @@ properties:
           - enum:
               - mediatek,mt2712-tphy
               - mediatek,mt7629-tphy
+              - mediatek,mt7986-tphy
               - mediatek,mt8183-tphy
               - mediatek,mt8186-tphy
               - mediatek,mt8192-tphy
Signature · 1 line
2.34.1
#15 lore raw

PATCH v6 8/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.

---
v2:
- update mmc-node because clocks changed

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

v6:
- add 3v3 regulator in mt7986a-rfb (was in usb patch before)
- dropped AngeloGioacchino RB because of this change

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 96 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 15 +++
 2 files changed, 111 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +96 -0
index 828d504a4e48..4c0b879d6703 100644
@@ -5,6 +5,8 @@
  */
 
 /dts-v1/;
+#include <dt-bindings/pinctrl/mt65xx.h>
+
 #include "mt7986a.dtsi"
 
 / {
@@ -23,6 +25,24 @@ memory@40000000 {
 		device_type = "memory";
 		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";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		regulator-always-on;
+	};
 };
 
 &crypto {
@@ -58,7 +78,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 c69b8bff7f4a..b3ad8978b563 100644
@@ -304,6 +304,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
#16 lore raw

PATCH v6 9/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
---
bindings-patches:
https://patchwork.kernel.org/project/linux-mediatek/list/?series=690172

---
 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 4c0b879d6703..8eaee9ff1822 100644
@@ -93,6 +93,15 @@ &mmc0 {
 	non-removable;
 	no-sd;
 	no-sdio;
+};
+
+&pcie {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pcie_pins>;
+	status = "okay";
+};
+
+&pcie_phy {
 	status = "okay";
 };
 
@@ -155,6 +164,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
#0 lore raw

v6 cover Add BananaPi R3

From: Frank Wunderlich <[email protected]>

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

This version is rebased on Matthias' DTS64 next Branch from 2022/11/11.

i included sams series for mt7986 DTS with small changes
https://patchwork.kernel.org/project/linux-mediatek/cover/20220427124741.18245->

6.2 will support dtso extension for dt overlays:

"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

There is some discussion about inclusion of dt-overlays and if it is better to support mmc also by these:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

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:
v6:
- dropped regulators from usb-patch as suggested by chunfeng yun
- moved 3v3 regulator to mmc-patch as it is needed for emmc to work rfbs were tested by sam shih, r3 by me
- dropped RB from AngeloGioacchino from mmc-patch due to this change
- fixed links in coverletter which were broken in v5
- i hope this series is sent without errors now (my mailprovider limited mails last 2 times while sending part 10)

v5:
- changed usb ranges/reg/unit-adress
- added reviewd-by's except usb-part due to changes

v4:
- dropped RFC prefix
- rebase on matthias' mtk dts-next (for 6.2) branch
- added author information to overlays
- fixed sfp binding error
- added fix for moving wed_pcie node
- readded missing compatible patches

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 (7):
arm64: dts: mt7986: move wed_pcie node
dt-bindings: phy: mediatek,tphy: add support for mt7986
dt-bindings: usb: mtk-xhci: add support for mt7986
dt-bindings: PCI: mediatek-gen3: add SoC based clock config
dt-bindings: PCI: mediatek-gen3: add support for mt7986
arm64: dts: mt7986: add Bananapi R3
arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Sam Shih (4):
arm64: dts: mt7986: add spi related device nodes
arm64: dts: mt7986: add usb related device nodes
arm64: dts: mt7986: add mmc related device nodes
arm64: dts: mt7986: add pcie related device nodes

 .../bindings/pci/mediatek-pcie-gen3.yaml      |  64 ++-
 .../bindings/phy/mediatek,tphy.yaml           |   1 +
 .../bindings/usb/mediatek,mtk-xhci.yaml       |   1 +
 arch/arm64/boot/dts/mediatek/Makefile         |   4 +
 .../mediatek/mt7986a-bananapi-bpi-r3-emmc.dts |  31 ++
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts |  55 +++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  |  69 +++
 .../mediatek/mt7986a-bananapi-bpi-r3-sd.dts   |  25 +
 .../dts/mediatek/mt7986a-bananapi-bpi-r3.dtsi | 446 ++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts  | 155 ++++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi     | 162 ++++++-
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  |  43 ++
 12 files changed, 1038 insertions(+), 18 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
#7 lore raw

PATCH v6 4/11 dt-bindings: PCI: mediatek-gen3: add SoC based clock config

From: Frank Wunderlich <[email protected]>

The PCIe driver covers different SOC which needing different clock configs. Define them based on compatible.

---
v2:
- fix typo in mediatek,mt8192-pcie
v3:
- remove contains to match only if compatible is no fallback tested with series "Add driver nodes for MT8195 SoC" and mt7986 pcie-nodes, dtbs_check is now clean

---
 .../bindings/pci/mediatek-pcie-gen3.yaml      | 47 ++++++++++++++-----
 1 file changed, 35 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml +35 -12
index c00be39af64e..5d7369debff2 100644
@@ -43,9 +43,6 @@ description: |+
   each set has its own address for MSI message, and supports 32 MSI vectors
   to generate interrupt.
 
-allOf:
-  - $ref: /schemas/pci/pci-bus.yaml#
-
 properties:
   compatible:
     oneOf:
@@ -84,15 +81,7 @@ properties:
     maxItems: 6
 
   clock-names:
-    items:
-      - const: pl_250m
-      - const: tl_26m
-      - const: tl_96m
-      - const: tl_32k
-      - const: peri_26m
-      - enum:
-          - top_133m        # for MT8192
-          - peri_mem        # for MT8188/MT8195
+    maxItems: 6
 
   assigned-clocks:
     maxItems: 1
@@ -138,6 +127,40 @@ required:
   - '#interrupt-cells'
   - interrupt-controller
 
+allOf:
+  - $ref: /schemas/pci/pci-bus.yaml#
+  - if:
+      properties:
+        compatible:
+          const: mediatek,mt8192-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: tl_96m
+            - const: tl_32k
+            - const: peri_26m
+            - const: top_133m
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - mediatek,mt8188-pcie
+              - mediatek,mt8195-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: tl_96m
+            - const: tl_32k
+            - const: peri_26m
+            - const: peri_mem
+
 unevaluatedProperties: false
 
 examples:
Signature · 1 line
2.34.1
#1 lore raw

PATCH v6 1/11 arm64: dts: mt7986: move wed_pcie node

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Move the wed_pcie node to have node aligned by address.

Fixes 00b9903996b3 ("arm64: dts: mediatek: mt7986: add support for Wireless Ethernet Dispatch")
---
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +6 -6
index a22e10e89ab9..afc01abfa99c 100644
@@ -112,6 +112,12 @@ infracfg: infracfg@10001000 {
 			#clock-cells = <1>;
 		};
 
+		wed_pcie: wed-pcie@10003000 {
+			compatible = "mediatek,mt7986-wed-pcie",
+				     "syscon";
+			reg = <0 0x10003000 0 0x10>;
+		};
+
 		topckgen: topckgen@1001b000 {
 			compatible = "mediatek,mt7986-topckgen", "syscon";
 			reg = <0 0x1001B000 0 0x1000>;
@@ -257,12 +263,6 @@ ethsys: syscon@15000000 {
 			 #reset-cells = <1>;
 		};
 
-		wed_pcie: wed-pcie@10003000 {
-			compatible = "mediatek,mt7986-wed-pcie",
-				     "syscon";
-			reg = <0 0x10003000 0 0x10>;
-		};
-
 		wed0: wed@15010000 {
 			compatible = "mediatek,mt7986-wed",
 				     "syscon";
Signature · 1 line
2.34.1
#13 lore raw

PATCH v6 7/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

v5:
- update ranges/reg of usb-phy
- not added RB from AngeloGioacchino for v4 because of these changes

v6:
- remove unused usb regulators
- remove 3v3 regulator (will be added with emmc-patch)

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  8 +++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 55 ++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts |  8 +++
 3 files changed, 71 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +8 -0
index 006878e3f2b2..828d504a4e48 100644
@@ -140,6 +140,10 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	status = "okay";
+};
+
 &switch {
 	ports {
 		#address-cells = <1>;
@@ -201,6 +205,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 +8 -0
index 2c7f1d4fb352..cdfc292002cf 100644
@@ -167,10 +167,18 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	status = "okay";
+};
+
 &uart0 {
 	status = "okay";
 };
 
+&usb_phy {
+	status = "okay";
+};
+
 &wifi {
 	status = "okay";
 	pinctrl-names = "default", "dbdc";
Signature · 1 line
2.34.1
#5 lore raw

PATCH v6 3/11 dt-bindings: usb: mtk-xhci: add support for mt7986

In reply to Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string for mt7986.

---
 Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml +1 -0
index 939623867a64..a3c37944c630 100644
@@ -28,6 +28,7 @@ properties:
           - mediatek,mt7622-xhci
           - mediatek,mt7623-xhci
           - mediatek,mt7629-xhci
+          - mediatek,mt7986-xhci
           - mediatek,mt8173-xhci
           - mediatek,mt8183-xhci
           - mediatek,mt8186-xhci
Signature · 1 line
2.34.1
#18 lore raw

PATCH v6 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.

---
maybe rename to dtso?

"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

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/
---
v4:
- drop compile-comment from overlays
- add author-information to dt-overlays

---
 arch/arm64/boot/dts/mediatek/Makefile         |  2 +
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 55 +++++++++++++++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 69 +++++++++++++++++++
 3 files changed, 126 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 +55 -0

55 lines not on this page · raw message

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

69 lines not on this page · raw message

Signature · 1 line
2.34.1
#17 lore raw

PATCH v6 10/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)

---

The device can boot from all 4 storage options. Both, SPI and MMC, can be switched using hardware switches on the board, see
https://wiki.banana-pi.org/Banana_Pi_BPI-R3#Jumper_setting

I have added base dtb for sd/emmc to have a bootable version in mainline linux. SPI-NAND/NOR switched (CS by sw5/C) can be done with DT-Overlays, but 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.

there is a commit which adds support building dtso files to dtbo in next:

"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

if Overlays are accepted then we can change my current dts from here to overlays too to have all as such. Till then imho the best way is to have mmc as board dts and add the right spi-device via overlay if needed.

changes:
v6:
- drop usb 5v regulator from bpi-r3
based on chunfengs response it is only needed if regulator is switched (like for otg), usb works without it.

v4:
- add PCIe nodes
- fix sfp-properties of sfp-1 (need to be plural)
thx to Denis Odintsov for this

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 | 446 ++++++++++++++++++
 4 files changed, 504 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 +446 -0

446 lines not on this page · raw message

Signature · 1 line
2.34.1
#19 lore raw

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

In reply to Frank Wunderlich
Quoted 4 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 28 lines

---
maybe rename to dtso?

"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

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/
---
v4:
- drop compile-comment from overlays
- add author-information to dt-overlays

---
 arch/arm64/boot/dts/mediatek/Makefile         |  2 +
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 55 +++++++++++++++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 69 +++++++++++++++++++
 3 files changed, 126 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

These need rules to apply them to the base dtb(s). You just need:

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Rob

#20 lore raw

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

Quoted 50 lines · Rob Herring
Quoted 4 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 28 lines

---
maybe rename to dtso?

"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

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/
---
v4:
- drop compile-comment from overlays
- add author-information to dt-overlays

---
 arch/arm64/boot/dts/mediatek/Makefile         |  2 +
 .../mediatek/mt7986a-bananapi-bpi-r3-nand.dts | 55 +++++++++++++++
 .../mediatek/mt7986a-bananapi-bpi-r3-nor.dts  | 69 +++++++++++++++++++
 3 files changed, 126 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 1 line

full.dtb := base.dtb overlay.dtb

Oops, that should be:

full-dtbs := base.dtb overlay.dtb
dtb-y += full.dtb

Just like multiple objs in a module.

Rob

#21 lore raw

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

In reply to Rob Herring

Am 18. November 2022 22:39:52 MEZ schrieb Rob Herring <[email protected]>:

Quoted 11 lines · Frank Wunderlich
Quoted 4 lines

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

It is not the decision about bootdevice,more available devices.

Only 1 spi device (nand OR nor) is available at boottime as they share same spi bus and chipselect is set via hw jumper.
Both nodes have reg 0,which is imho not supported in linux.

I choosed overlays to add the right spi device on the right mmc device where similar selection happens (see patch 10). Either sd OR emmc can be used (1 mmc controller,first 4bits from bus switched by hardware jumper).But for mmc i use it as base fdt because i see mmc as primary device which holds rootfs too. Nand/nor is imho helping device for accessing emmc or like rescue system (only uboot).

I probe in uboot if emmc is available (mmc
partconf) and choose emmc else sd. For spi i try with sf command to check for nor,if this does not work i apply nand overlay.

Quoted 6 lines
Quoted 6 lines

---
maybe rename to dtso?

"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

Should i do this?

Quoted 4 lines
Quoted 4 lines

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

Daniel suggest define sd/emmc as overlay too...with way you mention below we could create 4 full fdt without applying overlays in uboot.

Quoted 11 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 2 lines

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

I would prefer to do this in bootloader to allow all 4 possible configurations:

Sd+nand
Sd+nor
Emmc+nand
Emmc+nor

Quoted 1 line

Rob

Hi,
regards Frank

#22 lore raw

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

Quoted 14 lines · Frank Wunderlich

Am 18. November 2022 22:39:52 MEZ schrieb Rob Herring <[email protected]>:

Quoted 11 lines · Frank Wunderlich
Quoted 4 lines

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 7 lines

It is not the decision about bootdevice,more available devices.

Only 1 spi device (nand OR nor) is available at boottime as they share same spi bus and chipselect is set via hw jumper.
Both nodes have reg 0,which is imho not supported in linux.

As long as one is set to disabled, it should be fine.

Quoted 10 lines

I choosed overlays to add the right spi device on the right mmc device where similar selection happens (see patch 10). Either sd OR emmc can be used (1 mmc controller,first 4bits from bus switched by hardware jumper).But for mmc i use it as base fdt because i see mmc as primary device which holds rootfs too. Nand/nor is imho helping device for accessing emmc or like rescue system (only uboot).

No way to read the jumper state or know what you booted from I gues?

Quoted 4 lines

I probe in uboot if emmc is available (mmc
partconf) and choose emmc else sd. For spi i try with sf command to check for nor,if this does not work i apply nand overlay.

Instead of applying overlays, wouldn't just changing 'status' be easier?

Quoted 9 lines
Quoted 7 lines
Quoted 7 lines

---
maybe rename to dtso?

"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

Should i do this?

Yes. .dts -> .dtbo is going to be removed.

Quoted 6 lines
Quoted 4 lines
Quoted 4 lines

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

Daniel suggest define sd/emmc as overlay too...with way you mention below we could create 4 full fdt without applying overlays in uboot.

Yes, but if you are going to do that, then you can just do all this with includes.

Quoted 14 lines
Quoted 11 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 2 lines

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Quoted 6 lines

I would prefer to do this in bootloader to allow all 4 possible configurations:

Sd+nand
Sd+nor
Emmc+nand
Emmc+nor

That's fine. The purpose here is to document what the overlays apply to, check that they actually apply, and validate them when applied (unless someone wants to figure out all the issues with validating just an overlay and make that work). You for example have an undocumented compatible in yours (denx,fit).

Rob

Signature · 3 lines
linux-phy mailing list
[email protected]
https://lists.infradead.org/mailman/listinfo/linux-phy
#23 lore raw

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

Am 8. November 2022 15:45:49 MEZ schrieb Rob Herring <[email protected]>:

Quoted 38 lines
Quoted 14 lines · Frank Wunderlich

Am 18. November 2022 22:39:52 MEZ schrieb Rob Herring <[email protected]>:

Quoted 11 lines · Frank Wunderlich
Quoted 4 lines

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 7 lines

It is not the decision about bootdevice,more available devices.

Only 1 spi device (nand OR nor) is available at boottime as they share same spi bus and chipselect is set via hw jumper.
Both nodes have reg 0,which is imho not supported in linux.

As long as one is set to disabled, it should be fine.

Quoted 10 lines

I choosed overlays to add the right spi device on the right mmc device where similar selection happens (see patch 10). Either sd OR emmc can be used (1 mmc controller,first 4bits from bus switched by hardware jumper).But for mmc i use it as base fdt because i see mmc as primary device which holds rootfs too. Nand/nor is imho helping device for accessing emmc or like rescue system (only uboot).

Quoted 8 lines

No way to read the jumper state or know what you booted from I gues?

Quoted 4 lines

I probe in uboot if emmc is available (mmc
partconf) and choose emmc else sd. For spi i try with sf command to check for nor,if this does not work i apply nand overlay.

Instead of applying overlays, wouldn't just changing 'status' be easier?

It will be easier,but requires dts for all
combinations,we have have sd/emmc
combination twice (once for nand
enabling,once for nor) and we have then 4
full dts instead of smaller overlays in fit.

So i should add spi subnodes both disabled
in base dtsi and create 4 dts (sd-nand,sd-nor,emmc-nand,emmc-nor) with mmc node and enabling the right spi node?

Quoted 11 lines
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines

---
maybe rename to dtso?

"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

Should i do this?

Yes. .dts -> .dtbo is going to be removed.

Do this if still using overlays,will test new way.

Maybe we can apply parts 1-9 first?

Quoted 9 lines
Quoted 6 lines
Quoted 4 lines
Quoted 4 lines

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

Daniel suggest define sd/emmc as overlay too...with way you mention below we could create 4 full fdt without applying overlays in uboot.

Yes, but if you are going to do that, then you can just do all this with includes.

This is a third way if i understand correctly

Make all of them as overlay (dtso?) but
build dtb by combining them in makefile.

This looks the best way because it avoids
redundand code for mmc node and allows
my current spi config (not the status way
which may break due to same unit address).

I guess my base dtsi is then a dts too?

Or should these overlays only duplicated and either include sd dts or emmc dts (but this creates again redundant code)?

Quoted 21 lines
Quoted 14 lines
Quoted 11 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 2 lines

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Quoted 6 lines

I would prefer to do this in bootloader to allow all 4 possible configurations:

Sd+nand
Sd+nor
Emmc+nand
Emmc+nor

Quoted 5 lines

That's fine. The purpose here is to document what the overlays apply to, check that they actually apply, and validate them when applied (unless someone wants to figure out all the issues with validating just an overlay and make that work). You for example have an undocumented compatible in yours (denx,fit).

Oh,need to check,copied partitions from my
uboot dts...maybe there is a linux version
for marking it as fit partition,else i drop
completely.

So i i stay with current way i have to rename
overlays to dtso and add info about base
dtb (bpi-r3-sd/emmc) to commit message
or into the overlay itself?

Quoted 1 line

Rob

regards Frank

maintainer
#24 lore raw

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

Quoted 46 lines · Frank Wunderlich

Am 8. November 2022 15:45:49 MEZ schrieb Rob Herring <[email protected]>:

Quoted 45 lines
Quoted 14 lines · Frank Wunderlich

Am 18. November 2022 22:39:52 MEZ schrieb Rob Herring <[email protected]>:

Quoted 11 lines · Frank Wunderlich
Quoted 4 lines

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 7 lines

It is not the decision about bootdevice,more available devices.

Only 1 spi device (nand OR nor) is available at boottime as they share same spi bus and chipselect is set via hw jumper.
Both nodes have reg 0,which is imho not supported in linux.

As long as one is set to disabled, it should be fine.

Quoted 10 lines

I choosed overlays to add the right spi device on the right mmc device where similar selection happens (see patch 10). Either sd OR emmc can be used (1 mmc controller,first 4bits from bus switched by hardware jumper).But for mmc i use it as base fdt because i see mmc as primary device which holds rootfs too. Nand/nor is imho helping device for accessing emmc or like rescue system (only uboot).

No way to read the jumper state or know what you booted from I gues?

Quoted 4 lines

I probe in uboot if emmc is available (mmc
partconf) and choose emmc else sd. For spi i try with sf command to check for nor,if this does not work i apply nand overlay.

Quoted 7 lines
Quoted 1 line

Instead of applying overlays, wouldn't just changing 'status' be easier?

It will be easier,but requires dts for all
combinations,we have have sd/emmc
combination twice (once for nand
enabling,once for nor) and we have then 4
full dts instead of smaller overlays in fit.

No, I mean can't you have 1 dtb with everything, but nand, nor, emmc, and sd are all disabled. Then at boot change 'status' for what's enabled.

Quoted 11 lines

So i should add spi subnodes both disabled
in base dtsi and create 4 dts (sd-nand,sd-nor,emmc-nand,emmc-nor) with mmc node and enabling the right spi node?

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines

---
maybe rename to dtso?

"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

Quoted 7 lines
Quoted 3 lines
Quoted 1 line

Should i do this?

Yes. .dts -> .dtbo is going to be removed.

Do this if still using overlays,will test new way.

Maybe we can apply parts 1-9 first?

Sure.

Quoted 16 lines
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

Daniel suggest define sd/emmc as overlay too...with way you mention below we could create 4 full fdt without applying overlays in uboot.

Yes, but if you are going to do that, then you can just do all this with includes.

This is a third way if i understand correctly

Make all of them as overlay (dtso?) but
build dtb by combining them in makefile.

Quoted 6 lines

This looks the best way because it avoids
redundand code for mmc node and allows
my current spi config (not the status way
which may break due to same unit address).

I guess my base dtsi is then a dts too?

Yes, it can be.

Quoted 29 lines

Or should these overlays only duplicated and either include sd dts or emmc dts (but this creates again redundant code)?

Quoted 21 lines
Quoted 14 lines
Quoted 11 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 2 lines

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Quoted 6 lines

I would prefer to do this in bootloader to allow all 4 possible configurations:

Sd+nand
Sd+nor
Emmc+nand
Emmc+nor

Quoted 5 lines

That's fine. The purpose here is to document what the overlays apply to, check that they actually apply, and validate them when applied (unless someone wants to figure out all the issues with validating just an overlay and make that work). You for example have an undocumented compatible in yours (denx,fit).

Quoted 4 lines

Oh,need to check,copied partitions from my
uboot dts...maybe there is a linux version
for marking it as fit partition,else i drop
completely.

You just need to document it. But the first thing I'm going to say, is 'u-boot' is the vendor, not 'denx'. So 'u-boot,fit'.

Rob

#25 lore raw

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

Hi

Quoted 57 lines

Gesendet: Sonntag, 20. November 2022 um 17:12 Uhr
Von: "Rob Herring" <[email protected]>

Quoted 46 lines · Frank Wunderlich

Am 8. November 2022 15:45:49 MEZ schrieb Rob Herring <[email protected]>:

Quoted 45 lines
Quoted 14 lines · Frank Wunderlich

Am 18. November 2022 22:39:52 MEZ schrieb Rob Herring <[email protected]>:

Quoted 11 lines · Frank Wunderlich
Quoted 4 lines

From: Frank Wunderlich <[email protected]>

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

Can you not tell at runtime which one you booted from? If not, how does one choose which overlay to apply? If you can, why not populate both nodes and enable the right one? IMO, if all h/w is present, it should all be in the DT. Selecting what h/w to use is a separate problem and overlays aren't a great solution for that.

Quoted 7 lines

It is not the decision about bootdevice,more available devices.

Only 1 spi device (nand OR nor) is available at boottime as they share same spi bus and chipselect is set via hw jumper.
Both nodes have reg 0,which is imho not supported in linux.

As long as one is set to disabled, it should be fine.

Quoted 10 lines

I choosed overlays to add the right spi device on the right mmc device where similar selection happens (see patch 10). Either sd OR emmc can be used (1 mmc controller,first 4bits from bus switched by hardware jumper).But for mmc i use it as base fdt because i see mmc as primary device which holds rootfs too. Nand/nor is imho helping device for accessing emmc or like rescue system (only uboot).

No way to read the jumper state or know what you booted from I gues?

Quoted 4 lines

I probe in uboot if emmc is available (mmc
partconf) and choose emmc else sd. For spi i try with sf command to check for nor,if this does not work i apply nand overlay.

Quoted 7 lines
Quoted 1 line

Instead of applying overlays, wouldn't just changing 'status' be easier?

It will be easier,but requires dts for all
combinations,we have have sd/emmc
combination twice (once for nand
enabling,once for nor) and we have then 4
full dts instead of smaller overlays in fit.

Quoted 3 lines

No, I mean can't you have 1 dtb with everything, but nand, nor, emmc, and sd are all disabled. Then at boot change 'status' for what's enabled.

at least for sd/emmc: no, as they share same mmc-node with different settings (bus-width,speed,...).

for nand/nor i'm not sure if spi can have 2 childs with same unit-address/reg even if disabled. Then i do not know how to enable a dts-node in uboot...only know (not long time) how to apply overlay ;)

Quoted 13 lines
Quoted 13 lines

So i should add spi subnodes both disabled
in base dtsi and create 4 dts (sd-nand,sd-nor,emmc-nand,emmc-nor) with mmc node and enabling the right spi node?

Quoted 10 lines
Quoted 9 lines
Quoted 7 lines
Quoted 7 lines

---
maybe rename to dtso?

"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

Should i do this?

Quoted 7 lines
Quoted 5 lines
Quoted 1 line

Yes. .dts -> .dtbo is going to be removed.

Do this if still using overlays,will test new way.

Maybe we can apply parts 1-9 first?

Sure.

i would wait for them applied before posting next version, i hope they can go into 6.2. Then it is easier because depencies are all in.

overlay was only for discussion the right way...my preferred way was mmc in board dts and spi as overlay, daniel preferred base fdt without them all and 4 overlays. another way already discussed were 4 full fdt, but how to get all 4 combinations with less files and not defining mmc/spi device twice? i see only the overlay version and combining via Makefile.

what is your preferred way (except all devices in 1 dts which is afair not possible, daniel please correct me if i'm wrong)?

Quoted 54 lines
Quoted 16 lines
Quoted 10 lines
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines

more comments about the dt overlay-support:

https://patchwork.kernel.org/comment/25092116/
https://patchwork.kernel.org/comment/25085681/

Daniel suggest define sd/emmc as overlay too...with way you mention below we could create 4 full fdt without applying overlays in uboot.

Yes, but if you are going to do that, then you can just do all this with includes.

This is a third way if i understand correctly

Make all of them as overlay (dtso?) but
build dtb by combining them in makefile.

Quoted 6 lines

This looks the best way because it avoids
redundand code for mmc node and allows
my current spi config (not the status way
which may break due to same unit address).

I guess my base dtsi is then a dts too?

Yes, it can be.

Quoted 29 lines

Or should these overlays only duplicated and either include sd dts or emmc dts (but this creates again redundant code)?

Quoted 26 lines
Quoted 14 lines
Quoted 11 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

Quoted 2 lines

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Quoted 6 lines

I would prefer to do this in bootloader to allow all 4 possible configurations:

Sd+nand
Sd+nor
Emmc+nand
Emmc+nor

That's fine. The purpose here is to document what the overlays apply to, check that they actually apply, and validate them when applied (unless someone wants to figure out all the issues with validating just an overlay and make that work). You for example have an undocumented compatible in yours (denx,fit).

Quoted 7 lines
Quoted 4 lines

Oh,need to check,copied partitions from my
uboot dts...maybe there is a linux version
for marking it as fit partition,else i drop
completely.

You just need to document it. But the first thing I'm going to say, is 'u-boot' is the vendor, not 'denx'. So 'u-boot,fit'.

imho it is not needed in linux, so i drop it.

regards Frank

maintainer Reviewed-by on v6 7/11
#14 lore raw

Re: [PATCH v6 07/11] arm64: dts: mt7986: add usb related device nodes

In reply to Frank Wunderlich
Quoted 137 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

v5:
- update ranges/reg of usb-phy
- not added RB from AngeloGioacchino for v4 because of these changes

v6:
- remove unused usb regulators
- remove 3v3 regulator (will be added with emmc-patch)

---
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  8 +++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 55
++++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts |  8 +++
 3 files changed, 71 insertions(+)
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts +8 -0
index 006878e3f2b2..828d504a4e48 100644
@@ -140,6 +140,10 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	status = "okay";
+};
+
 &switch {
 	ports {
 		#address-cells = <1>;
@@ -201,6 +205,10 @@ &uart2 {
 	status = "okay";
 };
 
+&usb_phy {
+	status = "okay";
+};
+
 &wifi {
 	status = "okay";
 	pinctrl-names = "default", "dbdc";
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +49 -0
index 29da9b8ed753..c69b8bff7f4a 100644
@@ -281,6 +281,61 @@ spi1: spi@1100b000 {
 			status = "disabled";
 		};
 
+		ssusb: usb@11200000 {
+			compatible = "mediatek,mt7986-xhci",
+				     "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",
+				      "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",
+				     "mediatek,generic-tphy-v2";
+			#address-cells = <1>;
+			#size-cells = <1>;
+			ranges = <0 0 0x11e10000 0x1700>;
+			status = "disabled";
+
+			u2port0: usb-phy@0 {
+				reg = <0x0 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@700 {
+				reg = <0x700 0x900>;
+				clocks = <&topckgen
 CLK_TOP_USB3_PHY_SEL>;
+				clock-names = "ref";
+				#phy-cells = <1>;
+			};
+
+			u2port1: usb-phy@1000 {
+				reg = <0x1000 0x700>;
+				clocks = <&topckgen

CLK_TOP_DA_U2_REFSEL>,

arch/arm64/boot/dts/mediatek/mt7986a.dtsi +1 -0
+					 <&topckgen

CLK_TOP_DA_U2_CK_1P_SEL>;

arch/arm64/boot/dts/mediatek/mt7986a.dtsi +5 -0
+				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 +4 -0
index 2c7f1d4fb352..cdfc292002cf 100644
@@ -167,10 +167,18 @@ &spi1 {
 	status = "okay";
 };
 
+&ssusb {
+	status = "okay";
+};
+
 &uart0 {

arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts &spi1 { · line 184

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +4 -0
 	status = "okay";
 };
 
+&usb_phy {
+	status = "okay";
+};
+
 &wifi {
 	status = "okay";
 	pinctrl-names = "default", "dbdc";

Thanks a lot

maintainer Applied
#2 lore raw

Re: [PATCH v6 01/11] arm64: dts: mt7986: move wed_pcie node

In reply to Frank Wunderlich
Quoted 7 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Move the wed_pcie node to have node aligned by address.

Fixes 00b9903996b3 ("arm64: dts: mediatek: mt7986: add support for Wireless Ethernet Dispatch")

Applied, thanks!

Quoted 34 lines
---
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 12 ++++++------
  1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/mediatek/mt7986a.dtsi +6 -6
index a22e10e89ab9..afc01abfa99c 100644
@@ -112,6 +112,12 @@ infracfg: infracfg@10001000 {
  			#clock-cells = <1>;
  		};
 
+		wed_pcie: wed-pcie@10003000 {
+			compatible = "mediatek,mt7986-wed-pcie",
+				     "syscon";
+			reg = <0 0x10003000 0 0x10>;
+		};
+
  		topckgen: topckgen@1001b000 {
  			compatible = "mediatek,mt7986-topckgen", "syscon";
  			reg = <0 0x1001B000 0 0x1000>;
@@ -257,12 +263,6 @@ ethsys: syscon@15000000 {
  			 #reset-cells = <1>;
  		};
 
-		wed_pcie: wed-pcie@10003000 {
-			compatible = "mediatek,mt7986-wed-pcie",
-				     "syscon";
-			reg = <0 0x10003000 0 0x10>;
-		};
-
  		wed0: wed@15010000 {
  			compatible = "mediatek,mt7986-wed",
  				     "syscon";
maintainer Reviewed-by on v6 2/11
#4 lore raw

Re: [PATCH v6 02/11] dt-bindings: phy: mediatek,tphy: add support for mt7986

In reply to Frank Wunderlich
Quoted 8 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string for mt7986.

Quoted 16 lines
---
  Documentation/devicetree/bindings/phy/mediatek,tphy.yaml | 1 +
  1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/phy/mediatek,tphy.yaml +1 -0
index 5613cc5106e3..230a17f24966 100644
@@ -79,6 +79,7 @@ properties:
            - enum:
                - mediatek,mt2712-tphy
                - mediatek,mt7629-tphy
+              - mediatek,mt7986-tphy
                - mediatek,mt8183-tphy
                - mediatek,mt8186-tphy
                - mediatek,mt8192-tphy
maintainer Reviewed-by on v6 3/11
#6 lore raw

Re: [PATCH v6 03/11] dt-bindings: usb: mtk-xhci: add support for mt7986

In reply to Frank Wunderlich
Quoted 8 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string for mt7986.

Quoted 16 lines
---
  Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 +
  1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/usb/mediatek,mtk-xhci.yaml +1 -0
index 939623867a64..a3c37944c630 100644
@@ -28,6 +28,7 @@ properties:
            - mediatek,mt7622-xhci
            - mediatek,mt7623-xhci
            - mediatek,mt7629-xhci
+          - mediatek,mt7986-xhci
            - mediatek,mt8173-xhci
            - mediatek,mt8183-xhci
            - mediatek,mt8186-xhci
maintainer Reviewed-by on v6 4/11
#8 lore raw

Re: [PATCH v6 04/11] dt-bindings: PCI: mediatek-gen3: add SoC based clock config

In reply to Frank Wunderlich
Quoted 9 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

The PCIe driver covers different SOC which needing different clock configs. Define them based on compatible.

Quoted 83 lines

---
v2:
- fix typo in mediatek,mt8192-pcie
v3:
- remove contains to match only if compatible is no fallback tested with series "Add driver nodes for MT8195 SoC" and mt7986 pcie-nodes, dtbs_check is now clean

---
  .../bindings/pci/mediatek-pcie-gen3.yaml      | 47 ++++++++++++++-----
  1 file changed, 35 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml +35 -12
index c00be39af64e..5d7369debff2 100644
@@ -43,9 +43,6 @@ description: |+
    each set has its own address for MSI message, and supports 32 MSI vectors
    to generate interrupt.
 
-allOf:
-  - $ref: /schemas/pci/pci-bus.yaml#
-
  properties:
    compatible:
      oneOf:
@@ -84,15 +81,7 @@ properties:
      maxItems: 6
 
    clock-names:
-    items:
-      - const: pl_250m
-      - const: tl_26m
-      - const: tl_96m
-      - const: tl_32k
-      - const: peri_26m
-      - enum:
-          - top_133m        # for MT8192
-          - peri_mem        # for MT8188/MT8195
+    maxItems: 6
 
    assigned-clocks:
      maxItems: 1
@@ -138,6 +127,40 @@ required:
    - '#interrupt-cells'
    - interrupt-controller
 
+allOf:
+  - $ref: /schemas/pci/pci-bus.yaml#
+  - if:
+      properties:
+        compatible:
+          const: mediatek,mt8192-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: tl_96m
+            - const: tl_32k
+            - const: peri_26m
+            - const: top_133m
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - mediatek,mt8188-pcie
+              - mediatek,mt8195-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: tl_96m
+            - const: tl_32k
+            - const: peri_26m
+            - const: peri_mem
+
  unevaluatedProperties: false
 
  examples:
maintainer Reviewed-by on v6 5/11
#10 lore raw

Re: [PATCH v6 05/11] dt-bindings: PCI: mediatek-gen3: add support for mt7986

In reply to Frank Wunderlich
Quoted 8 lines · Frank Wunderlich

From: Frank Wunderlich <[email protected]>

Add compatible string and clock-definition for mt7986. It needs 4 clocks for PCIe, define them in binding.

Quoted 52 lines

---
v2:
- squashed patch 2+3 (compatible and clock definition)

---
  .../bindings/pci/mediatek-pcie-gen3.yaml        | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
Documentation/devicetree/bindings/pci/mediatek-pcie-gen3.yaml +17 -0
index 5d7369debff2..f7a02019daea 100644
@@ -48,6 +48,7 @@ properties:
      oneOf:
        - items:
            - enum:
+              - mediatek,mt7986-pcie
                - mediatek,mt8188-pcie
                - mediatek,mt8195-pcie
            - const: mediatek,mt8192-pcie
@@ -78,9 +79,11 @@ properties:
        - const: mac
 
    clocks:
+    minItems: 4
      maxItems: 6
 
    clock-names:
+    minItems: 4
      maxItems: 6
 
    assigned-clocks:
@@ -160,6 +163,20 @@ allOf:
              - const: tl_32k
              - const: peri_26m
              - const: peri_mem
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - mediatek,mt7986-pcie
+    then:
+      properties:
+        clock-names:
+          items:
+            - const: pl_250m
+            - const: tl_26m
+            - const: peri_26m
+            - const: top_133m
 
  unevaluatedProperties: false
 
maintainer Applied
#12 lore raw

Re: [PATCH v6 06/11] arm64: dts: mt7986: add spi related device nodes

In reply to Frank Wunderlich
Quoted 7 lines · Frank Wunderlich

From: Sam Shih <[email protected]>

This patch adds spi support for MT7986.

Applied, thanks!

Quoted 151 lines
---
  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 2f48cc3d3ddb..006878e3f2b2 100644
@@ -59,6 +59,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";
@@ -105,6 +119,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 afc01abfa99c..29da9b8ed753 100644
@@ -253,6 +253,34 @@ i2c0: i2c@11008000 {
  			status = "disabled";
  		};
 
+		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";
+		};
+
  		ethsys: syscon@15000000 {
  			 #address-cells = <1>;
  			 #size-cells = <1>;
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts +35 -0
index 79c5c78f7a14..2c7f1d4fb352 100644
@@ -100,6 +100,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";
@@ -132,6 +146,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";
  };
#26 lore raw

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

In reply to Rob Herring
Quoted 17 lines

Gesendet: Sonntag, 20. November 2022 um 17:12 Uhr
Von: "Rob Herring" <[email protected]>

Quoted 14 lines

Or should these overlays only duplicated and either include sd dts or emmc dts (but this creates again redundant code)?

Quoted 13 lines
Quoted 13 lines
Quoted 13 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Hi,

(removed most recipients to not spam all people with this)

have now locally changed sd+emmc to overlays too and renamed to dtso... tried also this way to (arch/arm64/boot/dts/mediatek/Makefile):

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtbo 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.dtbo

mt7986a-bananapi-bpi-r3-sd-nand.dtb := mt7986a-bananapi-bpi-r3.dtb mt7986a-bananapi-bpi-r3-sd.dtbo mt7986a-bananapi-bpi-r3-nand.dtbo dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd-nand.dtb

does not work:

make[3]: *** No rule to make target 'arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd-nand.dtb', needed by 'arch/arm64/boot/dts/mediatek/'. Stop.

any thoughts? but this way i will need all possible combinations, i guess best way it to leave the overlays themselves.

regards Frank

maintainer
#27 lore raw

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

Quoted 32 lines · Frank Wunderlich
Quoted 18 lines

Gesendet: Sonntag, 20. November 2022 um 17:12 Uhr
Von: "Rob Herring" <[email protected]>

Quoted 14 lines

Or should these overlays only duplicated and either include sd dts or emmc dts (but this creates again redundant code)?

Quoted 13 lines
Quoted 13 lines
Quoted 13 lines

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

Quoted 8 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

These need rules to apply them to the base dtb(s). You just need:

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Hi,

(removed most recipients to not spam all people with this)

have now locally changed sd+emmc to overlays too and renamed to dtso... tried also this way to (arch/arm64/boot/dts/mediatek/Makefile):

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtbo 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.dtbo

Quoted 8 lines

mt7986a-bananapi-bpi-r3-sd-nand.dtb := mt7986a-bananapi-bpi-r3.dtb mt7986a-bananapi-bpi-r3-sd.dtbo mt7986a-bananapi-bpi-r3-nand.dtbo dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd-nand.dtb

does not work:

make[3]: *** No rule to make target 'arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd-nand.dtb', needed by 'arch/arm64/boot/dts/mediatek/'. Stop.

any thoughts? but this way i will need all possible combinations, i guess best way it to leave the overlays themselves.

You missed my correction:

full-dtbs := base.dtb overlay.dtb
dtb-y += full.dtb

Rob

#28 lore raw

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

Quoted 28 lines

Gesendet: Samstag, 26. November 2022 um 23:49 Uhr
Von: "Rob Herring" <[email protected]>
An: "Frank Wunderlich" <[email protected]>
Cc: "Frank Wunderlich" <[email protected]>, [email protected]
Betreff: Re: Re: [PATCH v6 11/11] arm64: dts: mt7986: add BPI-R3 nand/nor overlays

Quoted 23 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines

These need rules to apply them to the base dtb(s). You just need:

full.dtb := base.dtb overlay.dtb
dtb-y += full.dtb

Hi,

(removed most recipients to not spam all people with this)

have now locally changed sd+emmc to overlays too and renamed to dtso... tried also this way to (arch/arm64/boot/dts/mediatek/Makefile):

dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3.dtb dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-emmc.dtbo 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.dtbo

mt7986a-bananapi-bpi-r3-sd-nand.dtb := mt7986a-bananapi-bpi-r3.dtb mt7986a-bananapi-bpi-r3-sd.dtbo mt7986a-bananapi-bpi-r3-nand.dtbo dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd-nand.dtb

does not work:

Quoted 8 lines
Quoted 3 lines

make[3]: *** No rule to make target 'arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd-nand.dtb', needed by 'arch/arm64/boot/dts/mediatek/'. Stop.

any thoughts? but this way i will need all possible combinations, i guess best way it to leave the overlays themselves.

You missed my correction:

full-dtbs := base.dtb overlay.dtb
dtb-y += full.dtb

Thanks,

using dash instead of dot and dtbs extension in full target works

mt7986a-bananapi-bpi-r3-sd-nand-dtbs := mt7986a-bananapi-bpi-r3.dtb mt7986a-bananapi-bpi-r3-sd.dtbo mt7986a-bananapi-bpi-r3-nand.dtbo dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986a-bananapi-bpi-r3-sd-nand.dtb

but i guess this is not the right way for mainline as this will add 5 more lines (10 in total for this single board) to makefile to compile all 4 combinations.

i would send base dts and 4 overlays like above in next version if this is the right way.

regards Frank