Skip to contentSkip to conversation

Add basic SoC support for mediatek mt7986

PATCH Superseded Sam Shih 2 participants 10 messages Oct 18, 2021 – Nov 22, 2021

Subsystems (2)

v7 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Sam Shih

author
#0 lore raw

v7 cover Add basic SoC support for mediatek mt7986

This patch adds basic SoC support for Mediatek's new 4-core SoC, MT7986, which is mainly for wifi-router application.

---
v7: added memory node back to dts
v6: separate basic part into a single patch series

According to the maintainer’s suggestion, this patch splits the previous thread into independent patch series.
This patch include basic device support.

Original thread:
https://lore.kernel.org/all/[email protected]/
---

Sam Shih (3):
dt-bindings: arm64: dts: mediatek: Add mt7986 series
arm64: dts: mediatek: add basic mt7986a support
arm64: dts: mediatek: add basic mt7986b support

 .../devicetree/bindings/arm/mediatek.yaml     |   8 +
 arch/arm64/boot/dts/mediatek/Makefile         |   2 +
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts  |  38 +++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi     | 149 ++++++++++++++++++
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts  |  30 ++++
 arch/arm64/boot/dts/mediatek/mt7986b.dtsi     | 149 ++++++++++++++++++
 6 files changed, 376 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b.dtsi

--
2.29.2

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

author
#1 lore raw

PATCH v7 1/3 dt-bindings: arm64: dts: mediatek: Add mt7986 series

MT7986 series is Mediatek's new 4-core SoC, which is mainly for wifi-router application. The difference between mt7986a and mt7986b is that some pins do not exist on mt7986b.

---
v6: separate basic part into a single patch series

Original thread:
https://lore.kernel.org/all/[email protected]/

v3: changed 'MT7986' to 'MT7986 series' in the commit message
v2: added an Acked-by tag

---
 Documentation/devicetree/bindings/arm/mediatek.yaml | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/arm/mediatek.yaml +8 -0
index 80a05f6fee85..a9a778269684 100644
@@ -76,6 +76,14 @@ properties:
           - enum:
               - mediatek,mt7629-rfb
           - const: mediatek,mt7629
+      - items:
+          - enum:
+              - mediatek,mt7986a-rfb
+          - const: mediatek,mt7986a
+      - items:
+          - enum:
+              - mediatek,mt7986b-rfb
+          - const: mediatek,mt7986b
       - items:
           - enum:
               - mediatek,mt8127-moose
Signature · 7 lines
2.29.2


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
author
#2 lore raw

PATCH v7 2/3 arm64: dts: mediatek: add basic mt7986a support

In reply to Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved-memory node for ARM Trusted Firmware.

---
v7: added memory node back to dts
v6: removed clock and pinctrl node, to separate basic part into a single
patch series

Original thread:
https://lore.kernel.org/all/[email protected]/

v5: follow reviewr's comment: removed clock freqency node in timer due to
we have set CNTFRQ_EL0 in ATF firmware, and also corrected GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
 arch/arm64/boot/dts/mediatek/Makefile        |   1 +
 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  38 +++++
 arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 149 +++++++++++++++++++
 3 files changed, 188 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi
arch/arm64/boot/dts/mediatek/Makefile +1 -0
index 4f68ebed2e31..e6c3a73b9e4a 100644
@@ -7,6 +7,7 @@ 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-rfb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +38 -0
new file mode 100644
index 000000000000..ca074cf8e578
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986a.dtsi"
+
+/ {
+	model = "MediaTek MT7986a RFB";
+	compatible = "mediatek,mt7986a-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +149 -0

149 lines not on this page · raw message

Signature · 7 lines
2.29.2


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
maintainer
#3 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Hi,

Quoted 6 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved-memory node for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right now, it's only the compatible, for that it makes no sense to split them.

It would be good to see what the exact differences are, so that we can see if it makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi which has add-ons.

Quoted 51 lines

---
v7: added memory node back to dts
v6: removed clock and pinctrl node, to separate basic part into a single
patch series

Original thread:
https://lore.kernel.org/all/[email protected]/

v5: follow reviewr's comment: removed clock freqency node in timer due to
we have set CNTFRQ_EL0 in ATF firmware, and also corrected GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
  arch/arm64/boot/dts/mediatek/Makefile        |   1 +
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  38 +++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 149 +++++++++++++++++++
  3 files changed, 188 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi

arch/arm64/boot/dts/mediatek/Makefile +1 -0
index 4f68ebed2e31..e6c3a73b9e4a 100644
@@ -7,6 +7,7 @@ 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-rfb.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +10 -0
new file mode 100644
index 000000000000..ca074cf8e578
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986a.dtsi"
+
+/ {

arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts line 20

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +10 -0
+	model = "MediaTek MT7986a RFB";
+	compatible = "mediatek,mt7986a-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";

We normally don't add earlycon parameter to the normal bootargs, as it's only for debugging. Also what do we need the swiotlb? Are there any limitation in the HW that makes us need it?

Regards,
Matthias

Quoted 174 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +18 -0
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +149 -0
new file mode 100644
index 000000000000..75912bcf6c9c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "mediatek,mt7986a";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	system_clk: dummy40m {
+		compatible = "fixed-clock";
+		clock-frequency = <40000000>;
+		#clock-cells = <0>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x0>;
+			#cooling-cells = <2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x1>;
+			#cooling-cells = <2>;
+		};
+
+		cpu2: cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x2>;
+			#cooling-cells = <2>;
+		};
+
+		cpu3: cpu@3 {
+			device_type = "cpu";
+			enable-method = "psci";
+			compatible = "arm,cortex-a53";
+			reg = <0x3>;
+			#cooling-cells = <2>;
+		};
+	};
+
+	psci {
+		compatible  = "arm,psci-0.2";
+		method      = "smc";
+	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved: secmon@43000000 {
+			reg = <0 0x43000000 0 0x30000>;
+			no-map;
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+	};
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+
+		gic: interrupt-controller@c000000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			interrupt-controller;
+			reg = <0 0x0c000000 0 0x10000>,  /* GICD */
+			      <0 0x0c080000 0 0x80000>,  /* GICR */
+			      <0 0x0c400000 0 0x2000>,   /* GICC */
+			      <0 0x0c410000 0 0x1000>,   /* GICH */
+			      <0 0x0c420000 0 0x2000>;   /* GICV */
+			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
+		watchdog: watchdog@1001c000 {
+			compatible = "mediatek,mt7986-wdt",
+				     "mediatek,mt6589-wdt";
+			reg = <0 0x1001c000 0 0x1000>;
+			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+			#reset-cells = <1>;
+			status = "disabled";
+		};
+
+		trng: trng@1020f000 {
+			compatible = "mediatek,mt7986-rng",
+				     "mediatek,mt7623-rng";
+			reg = <0 0x1020f000 0 0x100>;
+			clocks = <&system_clk>;
+			clock-names = "rng";
+			status = "disabled";
+		};
+
+		uart0: serial@11002000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11002000 0 0x400>;
+			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart1: serial@11003000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11003000 0 0x400>;
+			interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart2: serial@11004000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11004000 0 0x400>;
+			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+	};
+
+};
author
#4 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Hi,

Quoted 6 lines · Matthias Brugger

Hi,

Quoted 3 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Quoted 8 lines
Quoted 3 lines

Add cpu node, timer node, gic node, psci and reserved-memory node for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right now, it's only
the compatible, for that it makes no sense to split them.

The difference between mt7986a and mt7986b is pinout which described in our pinctrl patch series
https://lore.kernel.org/all/[email protected]/

You are right, in this "basic SoC support" patch series, only show compatible differences

Quoted 8 lines

It would be good to see what the exact differences are, so that we can see if it
makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi which has
add-ons.

In this case, can we use solution (1) to create a generic mt7986.dtsi in this patch series, and add mt7986[a,b].dtsi to the dts part of the pinctrl patch series to separate the difference nodes?

Quoted 10 lines
Quoted 10 lines

---
v7: added memory node back to dts
v6: removed clock and pinctrl node, to separate basic part into a single
patch series

Original thread:

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!xCEW0lwTKx4k272sWASoi90y_yRyQdAx0oNJC-jSAIWnIEkprJD-gAc1ugCvo0ex$

Quoted 57 lines
Quoted 57 lines

v5: follow reviewr's comment: removed clock freqency node in timer due to
we have set CNTFRQ_EL0 in ATF firmware, and also corrected
GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
  arch/arm64/boot/dts/mediatek/Makefile        |   1 +
  arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  38 +++++
  arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 149
+++++++++++++++++++
  3 files changed, 188 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi

arch/arm64/boot/dts/mediatek/Makefile +1 -0
index 4f68ebed2e31..e6c3a73b9e4a 100644
@@ -7,6 +7,7 @@ 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-rfb.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
  dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +19 -0
new file mode 100644
index 000000000000..ca074cf8e578
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986a.dtsi"
+
+/ {
+	model = "MediaTek MT7986a RFB";
+	compatible = "mediatek,mt7986a-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
Quoted 9 lines
Quoted 2 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +1 -0
+		bootargs = "earlycon=uart8250,mmio32,0x11002000

swiotlb=512";

We normally don't add earlycon parameter to the normal bootargs, as it's only
for debugging. Also what do we need the swiotlb? Are there any limitation in the
HW that makes us need it?

Thank you for your suggestion, as far as I know, it should not have hardware limitations. This bootargs is just inherent from mt7622- rfb.dts, I will delete it and test again on our development board.

Quoted 170 lines

Regards,
Matthias

Quoted 167 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +18 -0
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +142 -0
new file mode 100644
index 000000000000..75912bcf6c9c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "mediatek,mt7986a";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	system_clk: dummy40m {
+		compatible = "fixed-clock";
+		clock-frequency = <40000000>;
+		#clock-cells = <0>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x0>;
+			#cooling-cells = <2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x1>;
+			#cooling-cells = <2>;
+		};
+
+		cpu2: cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x2>;
+			#cooling-cells = <2>;
+		};
+
+		cpu3: cpu@3 {
+			device_type = "cpu";
+			enable-method = "psci";
+			compatible = "arm,cortex-a53";
+			reg = <0x3>;
+			#cooling-cells = <2>;
+		};
+	};
+
+	psci {
+		compatible  = "arm,psci-0.2";
+		method      = "smc";
+	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved: secmon@43000000 {
+			reg = <0 0x43000000 0 0x30000>;
+			no-map;
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+	};
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+
+		gic: interrupt-controller@c000000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			interrupt-controller;
+			reg = <0 0x0c000000 0 0x10000>,  /* GICD */
+			      <0 0x0c080000 0 0x80000>,  /* GICR */
+			      <0 0x0c400000 0 0x2000>,   /* GICC */
+			      <0 0x0c410000 0 0x1000>,   /* GICH */
+			      <0 0x0c420000 0 0x2000>;   /* GICV */
+			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
+		watchdog: watchdog@1001c000 {
+			compatible = "mediatek,mt7986-wdt",
+				     "mediatek,mt6589-wdt";
+			reg = <0 0x1001c000 0 0x1000>;
+			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+			#reset-cells = <1>;
+			status = "disabled";
+		};
+
+		trng: trng@1020f000 {
+			compatible = "mediatek,mt7986-rng",
+				     "mediatek,mt7623-rng";
+			reg = <0 0x1020f000 0 0x100>;
+			clocks = <&system_clk>;
+			clock-names = "rng";
+			status = "disabled";
+		};
+
+		uart0: serial@11002000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11002000 0 0x400>;
+			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart1: serial@11003000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11003000 0 0x400>;
+			interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart2: serial@11004000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11004000 0 0x400>;
+			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
Quoted 8 lines

arch/arm64/boot/dts/mediatek/mt7986a.dtsi line 136

Quoted 8 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +7 -0
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+	};
+
+};

Regards,
Sam

_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek

maintainer
#5 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Quoted 34 lines · Sam Shih

Hi,

Quoted 6 lines · Matthias Brugger

Hi,

Quoted 3 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Quoted 8 lines
Quoted 3 lines

Add cpu node, timer node, gic node, psci and reserved-memory node for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right now, it's only
the compatible, for that it makes no sense to split them.

The difference between mt7986a and mt7986b is pinout which described in our pinctrl patch series
https://lore.kernel.org/all/[email protected]/

You are right, in this "basic SoC support" patch series, only show compatible differences

Quoted 8 lines

It would be good to see what the exact differences are, so that we can see if it
makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi which has
add-ons.

Quoted 4 lines

In this case, can we use solution (1) to create a generic mt7986.dtsi in this patch series, and add mt7986[a,b].dtsi to the dts part of the pinctrl patch series to separate the difference nodes?

If the only difference is the GPIO controller then why not go with solution 2. Create a mt7986.dtsi which holds e.g. the node for pincontroller mt7986a and then create a mt7986b.dtsi that just changes compatible and gpio-ranges:

&pio {
compatible = "mediatek,mt7986b-pinctrl";
gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

What do you think?

Regards,
Matthias

Quoted 264 lines
Quoted 10 lines
Quoted 10 lines

---
v7: added memory node back to dts
v6: removed clock and pinctrl node, to separate basic part into a single
patch series

Original thread:

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!xCEW0lwTKx4k272sWASoi90y_yRyQdAx0oNJC-jSAIWnIEkprJD-gAc1ugCvo0ex$

Quoted 57 lines
Quoted 57 lines

v5: follow reviewr's comment: removed clock freqency node in timer due to
we have set CNTFRQ_EL0 in ATF firmware, and also corrected
GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
   arch/arm64/boot/dts/mediatek/Makefile        |   1 +
   arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  38 +++++
   arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 149
+++++++++++++++++++
   3 files changed, 188 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi

arch/arm64/boot/dts/mediatek/Makefile +1 -0
index 4f68ebed2e31..e6c3a73b9e4a 100644
@@ -7,6 +7,7 @@ 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-rfb.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +19 -0
new file mode 100644
index 000000000000..ca074cf8e578
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986a.dtsi"
+
+/ {
+	model = "MediaTek MT7986a RFB";
+	compatible = "mediatek,mt7986a-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
Quoted 9 lines
Quoted 2 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +1 -0
+		bootargs = "earlycon=uart8250,mmio32,0x11002000

swiotlb=512";

We normally don't add earlycon parameter to the normal bootargs, as it's only
for debugging. Also what do we need the swiotlb? Are there any limitation in the
HW that makes us need it?

Thank you for your suggestion, as far as I know, it should not have hardware limitations. This bootargs is just inherent from mt7622- rfb.dts, I will delete it and test again on our development board.

Quoted 170 lines

Regards,
Matthias

Quoted 167 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +18 -0
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +142 -0
new file mode 100644
index 000000000000..75912bcf6c9c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "mediatek,mt7986a";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	system_clk: dummy40m {
+		compatible = "fixed-clock";
+		clock-frequency = <40000000>;
+		#clock-cells = <0>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x0>;
+			#cooling-cells = <2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x1>;
+			#cooling-cells = <2>;
+		};
+
+		cpu2: cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x2>;
+			#cooling-cells = <2>;
+		};
+
+		cpu3: cpu@3 {
+			device_type = "cpu";
+			enable-method = "psci";
+			compatible = "arm,cortex-a53";
+			reg = <0x3>;
+			#cooling-cells = <2>;
+		};
+	};
+
+	psci {
+		compatible  = "arm,psci-0.2";
+		method      = "smc";
+	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		/* 192 KiB reserved for ARM Trusted Firmware (BL31) */
+		secmon_reserved: secmon@43000000 {
+			reg = <0 0x43000000 0 0x30000>;
+			no-map;
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+	};
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+
+		gic: interrupt-controller@c000000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			interrupt-controller;
+			reg = <0 0x0c000000 0 0x10000>,  /* GICD */
+			      <0 0x0c080000 0 0x80000>,  /* GICR */
+			      <0 0x0c400000 0 0x2000>,   /* GICC */
+			      <0 0x0c410000 0 0x1000>,   /* GICH */
+			      <0 0x0c420000 0 0x2000>;   /* GICV */
+			interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
+		};
+
+		watchdog: watchdog@1001c000 {
+			compatible = "mediatek,mt7986-wdt",
+				     "mediatek,mt6589-wdt";
+			reg = <0 0x1001c000 0 0x1000>;
+			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>;
+			#reset-cells = <1>;
+			status = "disabled";
+		};
+
+		trng: trng@1020f000 {
+			compatible = "mediatek,mt7986-rng",
+				     "mediatek,mt7623-rng";
+			reg = <0 0x1020f000 0 0x100>;
+			clocks = <&system_clk>;
+			clock-names = "rng";
+			status = "disabled";
+		};
+
+		uart0: serial@11002000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11002000 0 0x400>;
+			interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart1: serial@11003000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11003000 0 0x400>;
+			interrupts = <GIC_SPI 124 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart2: serial@11004000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11004000 0 0x400>;
+			interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
Quoted 8 lines

arch/arm64/boot/dts/mediatek/mt7986a.dtsi line 136

Quoted 8 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +7 -0
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+	};
+
+};

Regards,
Sam

author
#6 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Hi

Quoted 22 lines · Matthias Brugger
Quoted 20 lines · Sam Shih

Hi,

Quoted 16 lines · Matthias Brugger

Hi,

Quoted 7 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved-memory node
for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right now,
it's only
the compatible, for that it makes no sense to split them.

Quoted 4 lines
Quoted 4 lines

The difference between mt7986a and mt7986b is pinout which described
in our pinctrl patch series

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!0kseU8x1KnHHXDErh6Yj6MKqecufPEfGyeumtTBism47e99UFO2Gs-HfWjL1_jUv$

Quoted 31 lines
Quoted 17 lines

You are right, in this "basic SoC support" patch series, only show compatible differences

Quoted 11 lines

It would be good to see what the exact differences are, so that we
can see if it
makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi
which has
add-ons.

Quoted 6 lines

In this case, can we use solution (1) to create a generic mt7986.dtsi
in this patch series, and add mt7986[a,b].dtsi to the dts part of the
pinctrl patch series to separate the difference nodes?

If the only difference is the GPIO controller then why not go with solution 2.
Create a mt7986.dtsi which holds e.g. the node for pincontroller mt7986a and
then create a mt7986b.dtsi that just changes compatible and gpio- ranges:

Quoted 6 lines
&pio {
    compatible = "mediatek,mt7986b-pinctrl";
    gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

What do you think?

Ok,

For this basic patch series DTS, I will send the next version:
- Use "mt7986.dtsi" instead of "mt7986[a,b].dtsi",
And make"mt7986.dtsi" get included by "mt7986[a,b]-rfb.dts" (No dedicated uart1/uart2 pinout for mt7986b-rfb, status of dts node
shoud be set to "disabled")

For the pinctrl patch series DTS, I will send th next version:
- Add "mt7986b.dtsi" according to your suggestion, the new include
chain will be:
mt7986a-rfb.dts <-- mt7986.dtsi (mt7986a pinctrl)

mt7986b-rfb.dts <-- mt7986b.dtsi (mt7986b pinctrl) <-- mt7986.dtsi (mt7986a pinctrl)

Do you agree above proposal?

Regards,
Sam

Quoted 17 lines

Regards,
Matthias

Quoted 13 lines
Quoted 11 lines
Quoted 11 lines

---
v7: added memory node back to dts
v6: removed clock and pinctrl node, to separate basic part into a
single
patch series

Original thread:

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!xCEW0lwTKx4k272sWASoi90y_yRyQdAx0oNJC-jSAIWnIEkprJD-gAc1ugCvo0ex$

Quoted 268 lines
Quoted 268 lines
Quoted 61 lines
Quoted 61 lines

v5: follow reviewr's comment: removed clock freqency node in timer
due to
we have set CNTFRQ_EL0 in ATF firmware, and also
corrected
GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
   arch/arm64/boot/dts/mediatek/Makefile        |   1 +
   arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts |  38 +++++
   arch/arm64/boot/dts/mediatek/mt7986a.dtsi    | 149
+++++++++++++++++++
   3 files changed, 188 insertions(+)

create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-
rfb.dts
create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a.dtsi

arch/arm64/boot/dts/mediatek/Makefile +1 -0
index 4f68ebed2e31..e6c3a73b9e4a 100644
@@ -7,6 +7,7 @@ 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-rfb.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
   dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +20 -0
new file mode 100644
index 000000000000..ca074cf8e578
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986a.dtsi"
+
+/ {
+	model = "MediaTek MT7986a RFB";
+	compatible = "mediatek,mt7986a-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000
Quoted 9 lines
Quoted 1 line

swiotlb=512";

We normally don't add earlycon parameter to the normal bootargs, as
it's only
for debugging. Also what do we need the swiotlb? Are there any limitation in the
HW that makes us need it?

Thank you for your suggestion, as far as I know, it should not have hardware limitations. This bootargs is just inherent from mt7622- rfb.dts, I will delete it and test again on our development board.

Quoted 181 lines

Regards,
Matthias

Quoted 178 lines
arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts new file +18 -0
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x40000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
+
+&uart1 {
+	status = "okay";
+};
+
+&uart2 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +67 -0
new file mode 100644
index 000000000000..75912bcf6c9c
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	compatible = "mediatek,mt7986a";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	system_clk: dummy40m {
+		compatible = "fixed-clock";
+		clock-frequency = <40000000>;
+		#clock-cells = <0>;
+	};
+
+	cpus {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x0>;
+			#cooling-cells = <2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x1>;
+			#cooling-cells = <2>;
+		};
+
+		cpu2: cpu@2 {
+			device_type = "cpu";
+			compatible = "arm,cortex-a53";
+			enable-method = "psci";
+			reg = <0x2>;
+			#cooling-cells = <2>;
+		};
+
+		cpu3: cpu@3 {
+			device_type = "cpu";
+			enable-method = "psci";
+			compatible = "arm,cortex-a53";
+			reg = <0x3>;
+			#cooling-cells = <2>;
+		};
+	};
+
+	psci {
+		compatible  = "arm,psci-0.2";
+		method      = "smc";
+	};
+
+	reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		/* 192 KiB reserved for ARM Trusted Firmware

(BL31) */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +27 -0
+		secmon_reserved: secmon@43000000 {
+			reg = <0 0x43000000 0 0x30000>;
+			no-map;
+		};
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupt-parent = <&gic>;
+		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>;
+	};
+
+	soc {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		compatible = "simple-bus";
+		ranges;
+
+		gic: interrupt-controller@c000000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-parent = <&gic>;
+			interrupt-controller;
+			reg = <0 0x0c000000 0 0x10000>,  /*

GICD */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +1 -0
+			      <0 0x0c080000 0 0x80000>,  /*

GICR */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +1 -0
+			      <0 0x0c400000 0 0x2000>,   /*

GICC */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +1 -0
+			      <0 0x0c410000 0 0x1000>,   /*

GICH */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +1 -0
+			      <0 0x0c420000 0 0x2000>;   /*

GICV */

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +1 -0
+			interrupts = <GIC_PPI 9

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +7 -0
+		};
+
+		watchdog: watchdog@1001c000 {
+			compatible = "mediatek,mt7986-wdt",
+				     "mediatek,mt6589-wdt";
+			reg = <0 0x1001c000 0 0x1000>;
+			interrupts = <GIC_SPI 110

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +18 -0
+			#reset-cells = <1>;
+			status = "disabled";
+		};
+
+		trng: trng@1020f000 {
+			compatible = "mediatek,mt7986-rng",
+				     "mediatek,mt7623-rng";
+			reg = <0 0x1020f000 0 0x100>;
+			clocks = <&system_clk>;
+			clock-names = "rng";
+			status = "disabled";
+		};
+
+		uart0: serial@11002000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11002000 0 0x400>;
+			interrupts = <GIC_SPI 123

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +9 -0
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart1: serial@11003000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11003000 0 0x400>;
+			interrupts = <GIC_SPI 124

IRQ_TYPE_LEVEL_HIGH>;

arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +9 -0
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+		uart2: serial@11004000 {
+			compatible = "mediatek,mt7986-uart",
+				     "mediatek,mt6577-uart";
+			reg = <0 0x11004000 0 0x400>;
+			interrupts = <GIC_SPI 125

IRQ_TYPE_LEVEL_HIGH>;

Quoted 8 lines

arch/arm64/boot/dts/mediatek/mt7986a.dtsi line 136

Quoted 8 lines
arch/arm64/boot/dts/mediatek/mt7986a.dtsi new file +7 -0
+			clocks = <&system_clk>;
+			status = "disabled";
+		};
+
+	};
+
+};

Regards,
Sam

maintainer
#7 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Quoted 81 lines · Sam Shih

Hi

Quoted 22 lines · Matthias Brugger
Quoted 20 lines · Sam Shih

Hi,

Quoted 16 lines · Matthias Brugger

Hi,

Quoted 7 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved-memory node
for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right now,
it's only
the compatible, for that it makes no sense to split them.

Quoted 4 lines
Quoted 4 lines

The difference between mt7986a and mt7986b is pinout which described
in our pinctrl patch series

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!0kseU8x1KnHHXDErh6Yj6MKqecufPEfGyeumtTBism47e99UFO2Gs-HfWjL1_jUv$

Quoted 31 lines
Quoted 17 lines

You are right, in this "basic SoC support" patch series, only show compatible differences

Quoted 11 lines

It would be good to see what the exact differences are, so that we
can see if it
makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi
which has
add-ons.

Quoted 6 lines

In this case, can we use solution (1) to create a generic mt7986.dtsi
in this patch series, and add mt7986[a,b].dtsi to the dts part of the
pinctrl patch series to separate the difference nodes?

If the only difference is the GPIO controller then why not go with solution 2.
Create a mt7986.dtsi which holds e.g. the node for pincontroller mt7986a and
then create a mt7986b.dtsi that just changes compatible and gpio- ranges:

Quoted 6 lines
&pio {
     compatible = "mediatek,mt7986b-pinctrl";
     gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

What do you think?

Ok,

For this basic patch series DTS, I will send the next version:
- Use "mt7986.dtsi" instead of "mt7986[a,b].dtsi",
And make"mt7986.dtsi" get included by "mt7986[a,b]-rfb.dts" (No dedicated uart1/uart2 pinout for mt7986b-rfb, status of dts node
shoud be set to "disabled")

For the pinctrl patch series DTS, I will send th next version:
- Add "mt7986b.dtsi" according to your suggestion, the new include
chain will be:

Quoted 7 lines
   mt7986a-rfb.dts <-- mt7986.dtsi (mt7986a pinctrl)

mt7986b-rfb.dts <-- mt7986b.dtsi (mt7986b pinctrl) <-- mt7986.dtsi (mt7986a pinctrl)

Do you agree above proposal?

I mean something like this:
mt7986a.dtsi:

pio: pinctrl@1001f000 {
	compatible = "mediatek,mt7986a-pinctrl";
	reg = <0 0x1001f000 0 0x1000>,
	      <0 0x11c30000 0 0x1000>,
	      <0 0x11c40000 0 0x1000>,
	      <0 0x11e20000 0 0x1000>,
	      <0 0x11e30000 0 0x1000>,
	      <0 0x11f00000 0 0x1000>,
	      <0 0x11f10000 0 0x1000>,
	      <0 0x1000b000 0 0x1000>;
	reg-names = "gpio", "iocfg_rt", "iocfg_rb", "iocfg_lt",
		    "iocfg_lb", "iocfg_tr", "iocfg_tl", "eint";
	gpio-controller;
	#gpio-cells = <2>;
	gpio-ranges = <&pio 0 0 100>;
	interrupt-controller;
	interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
	interrupt-parent = <&gic>;
	#interrupt-cells = <2>;
};

mt7986b.dtsi:
#include "mt7986a.dtsi"

&pio {
     compatible = "mediatek,mt7986b-pinctrl";
     gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

mt7986b-rfb.dts:
#include "mt7986b.dtsi"

&pio {
	uart1_pins: uart1-pins {
		mux { [...]

mt7986a-rfb.dts:
#include "mt7986a.dtsi"

&pio {
	uart1_pins: uart1-pins {
		mux { [...]

Makes sense?

Regards,
Matthias

author
#8 lore raw

Re: [PATCH v7 2/3] arm64: dts: mediatek: add basic mt7986a support

Hi,

Quoted 30 lines · Matthias Brugger
Quoted 27 lines · Sam Shih

Hi

Quoted 24 lines · Matthias Brugger
Quoted 22 lines · Sam Shih

Hi,

Quoted 18 lines · Matthias Brugger

Hi,

Quoted 8 lines · Sam Shih

Add basic chip support for Mediatek mt7986a, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved- memory
node
for ARM Trusted Firmware.

What is the exact difference between mt7986a and mt7986b? Right
now,
it's only
the compatible, for that it makes no sense to split them.

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

The difference between mt7986a and mt7986b is pinout which described
in our pinctrl patch series

https://urldefense.com/v3/__https://lore.kernel.org/all/[email protected]/__;!!CTRNKA9wMg0ARbw!0kseU8x1KnHHXDErh6Yj6MKqecufPEfGyeumtTBism47e99UFO2Gs-HfWjL1_jUv$

Quoted 106 lines
Quoted 56 lines
Quoted 35 lines
Quoted 19 lines

You are right, in this "basic SoC support" patch series, only show
compatible differences

Quoted 12 lines

It would be good to see what the exact differences are, so that
we
can see if it
makes sense to have one of the alternatives:
1) use a common mt7986.dtsi which get included by mt7986[a,b].dtsi
2) Use on mt7986.dtsi and only add one mt7986a.dtsi or mt7986b.dtsi
which has
add-ons.

Quoted 7 lines

In this case, can we use solution (1) to create a generic mt7986.dtsi
in this patch series, and add mt7986[a,b].dtsi to the dts part of
the
pinctrl patch series to separate the difference nodes?

If the only difference is the GPIO controller then why not go with
solution 2.
Create a mt7986.dtsi which holds e.g. the node for pincontroller mt7986a and
then create a mt7986b.dtsi that just changes compatible and gpio- ranges:

Quoted 6 lines
&pio {
     compatible = "mediatek,mt7986b-pinctrl";
     gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

What do you think?

Ok,

For this basic patch series DTS, I will send the next version:
- Use "mt7986.dtsi" instead of "mt7986[a,b].dtsi",
And make"mt7986.dtsi" get included by "mt7986[a,b]-rfb.dts" (No dedicated uart1/uart2 pinout for mt7986b-rfb, status of dts
node
shoud be set to "disabled")

For the pinctrl patch series DTS, I will send th next version:
- Add "mt7986b.dtsi" according to your suggestion, the new include
chain will be:

Quoted 7 lines
   mt7986a-rfb.dts <-- mt7986.dtsi (mt7986a pinctrl)

mt7986b-rfb.dts <-- mt7986b.dtsi (mt7986b pinctrl) <-- mt7986.dtsi (mt7986a pinctrl)

Do you agree above proposal?

I mean something like this:
mt7986a.dtsi:

pio: pinctrl@1001f000 {
	compatible = "mediatek,mt7986a-pinctrl";
	reg = <0 0x1001f000 0 0x1000>,
	      <0 0x11c30000 0 0x1000>,
	      <0 0x11c40000 0 0x1000>,
	      <0 0x11e20000 0 0x1000>,
	      <0 0x11e30000 0 0x1000>,
	      <0 0x11f00000 0 0x1000>,
	      <0 0x11f10000 0 0x1000>,
	      <0 0x1000b000 0 0x1000>;
	reg-names = "gpio", "iocfg_rt", "iocfg_rb", "iocfg_lt",
		    "iocfg_lb", "iocfg_tr", "iocfg_tl", "eint";
	gpio-controller;
	#gpio-cells = <2>;
	gpio-ranges = <&pio 0 0 100>;
	interrupt-controller;
	interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
	interrupt-parent = <&gic>;
	#interrupt-cells = <2>;
};

mt7986b.dtsi:
#include "mt7986a.dtsi"

&pio {
      compatible = "mediatek,mt7986b-pinctrl";
      gpio-ranges = <&pio 0 0 41>, <&pio 66 66 35>;
}

mt7986b-rfb.dts:
#include "mt7986b.dtsi"

&pio {
	uart1_pins: uart1-pins {
		mux { [...]

mt7986a-rfb.dts:
#include "mt7986a.dtsi"

Quoted 7 lines
&pio {
	uart1_pins: uart1-pins {
		mux { [...]

Makes sense?

Okay,

I have sent new patch set based on your suggestion,

Basic Part:

https://lore.kernel.org/all/[email protected]/

Pinctrl:

https://lore.kernel.org/all/[email protected]/

Please take a look at those patches when you are free.

Regards,
Sam

Quoted 3 lines

Regards,
Matthias

author
#9 lore raw

PATCH v7 3/3 arm64: dts: mediatek: add basic mt7986b support

In reply to Sam Shih

Add basic chip support for Mediatek mt7986b, include basic uart nodes, rng node and watchdog node.

Add cpu node, timer node, gic node, psci and reserved-memory node for ARM Trusted Firmware.

---
v7: added memory node back to dts
v6: separate basic part into a single patch series
v5: follow reviewr's comment: removed clock freqency node in timer due to
we have set CNTFRQ_EL0 in ATF firmware, and also corrected GICD range
v4: added missing gic register bases, and fixed range of GICR
v3: used the stdout-path instead of console=ttyS0
v2: modified clock and uart node due to clock driver updated

---
 arch/arm64/boot/dts/mediatek/Makefile        |   1 +
 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts |  30 ++++
 arch/arm64/boot/dts/mediatek/mt7986b.dtsi    | 149 +++++++++++++++++++
 3 files changed, 180 insertions(+)
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
 create mode 100644 arch/arm64/boot/dts/mediatek/mt7986b.dtsi
arch/arm64/boot/dts/mediatek/Makefile +1 -0
index e6c3a73b9e4a..d555e43d1ccc 100644
@@ -8,6 +8,7 @@ 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-rfb.dtb
+dtb-$(CONFIG_ARCH_MEDIATEK) += mt7986b-rfb.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8167-pumpkin.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm.dtb
 dtb-$(CONFIG_ARCH_MEDIATEK) += mt8173-elm-hana.dtb
arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts new file +30 -0
new file mode 100644
index 000000000000..0f2f337bef4e
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Copyright (C) 2021 MediaTek Inc.
+ * Author: Sam.Shih <[email protected]>
+ */
+
+/dts-v1/;
+#include "mt7986b.dtsi"
+
+/ {
+	model = "MediaTek MT7986b RFB";
+	compatible = "mediatek,mt7986b-rfb";
+
+	aliases {
+		serial0 = &uart0;
+	};
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
+	};
+
+	memory {
+		reg = <0 0x40000000 0 0x10000000>;
+	};
+};
+
+&uart0 {
+	status = "okay";
+};
arch/arm64/boot/dts/mediatek/mt7986b.dtsi new file +149 -0

149 lines not on this page · raw message

Signature · 7 lines
2.29.2


_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek