Skip to contentSkip to conversation

arm64: dts: mt8183-kukui: add scp node

PATCH Applied Pi-Hsun Shih 2 participants 4 messages Sep 9, 2020 – Sep 10, 2020

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

PATCH v2 1/1 arm64: dts: mt8183-kukui: add scp node

Add scp node to mt8183-kukui

Fixes 0d5e41709f76 ("arm64: dts: mt8183: add scp node")

---

Change since v1:
* Add Fixes tag.

---
 .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +30 -0
index f0a070535b34..85f7c33ba446 100644
@@ -90,6 +90,18 @@ pp3300_alw: regulator6 {
 		regulator-max-microvolt = <3300000>;
 	};
 
+	reserved_memory: reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		scp_mem_reserved: scp_mem_region {
+			compatible = "shared-dma-pool";
+			reg = <0 0x50000000 0 0x2900000>;
+			no-map;
+		};
+	};
+
 	max98357a: codec0 {
 		compatible = "maxim,max98357a";
 		sdmode-gpios = <&pio 175 0>;
@@ -524,6 +536,13 @@ pins_clk {
 		};
 	};
 
+	scp_pins: scp {
+		pins_scp_uart {
+			pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
+				 <PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
+		};
+	};
+
 	spi0_pins: spi0 {
 		pins_spi{
 			pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
@@ -651,6 +670,17 @@ pins_wifi_wakeup {
 	};
 };
 
+&scp {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&scp_pins>;
+
+	cros_ec {
+		compatible = "google,cros-ec-rpmsg";
+		mtk,rpmsg-name = "cros-ec-rpmsg";
+	};
+};
+
 &soc_data {
 	status = "okay";
 };
Signature · 1 line
2.28.0.526.ge36021eeef-goog
maintainer
#1 lore raw
Quoted 23 lines · Pi-Hsun Shih

Add scp node to mt8183-kukui

Fixes 0d5e41709f76 ("arm64: dts: mt8183: add scp node")

---

Change since v1:
* Add Fixes tag.

---
  .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 30 +++++++++++++++++++
  1 file changed, 30 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +2 -0
index f0a070535b34..85f7c33ba446 100644
@@ -90,6 +90,18 @@ pp3300_alw: regulator6 {
  		regulator-max-microvolt = <3300000>;
  	};
 
+	reserved_memory: reserved-memory {
+		#address-cells = <2>;

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi pp3300_alw: regulator6 { · line 104

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +10 -0
+		#size-cells = <2>;
+		ranges;
+
+		scp_mem_reserved: scp_mem_region {
+			compatible = "shared-dma-pool";
+			reg = <0 0x50000000 0 0x2900000>;
+			no-map;
+		};
+	};
+

Do we expect other boards to have a different memory reservation? I can see that EVB and Kukui uses the same. If not, we should add the node in mt8183.dtsi instead.

Regards,
Matthias

Quoted 36 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +18 -0
  	max98357a: codec0 {
  		compatible = "maxim,max98357a";
  		sdmode-gpios = <&pio 175 0>;
@@ -524,6 +536,13 @@ pins_clk {
  		};
  	};
 
+	scp_pins: scp {
+		pins_scp_uart {
+			pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
+				 <PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
+		};
+	};
+
  	spi0_pins: spi0 {
  		pins_spi{
  			pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
@@ -651,6 +670,17 @@ pins_wifi_wakeup {
  	};
  };
 
+&scp {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&scp_pins>;
+
+	cros_ec {
+		compatible = "google,cros-ec-rpmsg";
+		mtk,rpmsg-name = "cros-ec-rpmsg";
+	};
+};
+
  &soc_data {
  	status = "okay";
  };
#2 lore raw
Quoted 41 lines · Matthias Brugger
Quoted 23 lines · Pi-Hsun Shih

Add scp node to mt8183-kukui

Fixes 0d5e41709f76 ("arm64: dts: mt8183: add scp node")

---

Change since v1:
* Add Fixes tag.

---
  .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 30 +++++++++++++++++++
  1 file changed, 30 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +2 -0
index f0a070535b34..85f7c33ba446 100644
@@ -90,6 +90,18 @@ pp3300_alw: regulator6 {
              regulator-max-microvolt = <3300000>;
      };
 
+     reserved_memory: reserved-memory {
+             #address-cells = <2>;

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi pp3300_alw: regulator6 { · line 104

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +10 -0
+             #size-cells = <2>;
+             ranges;
+
+             scp_mem_reserved: scp_mem_region {
+                     compatible = "shared-dma-pool";
+                     reg = <0 0x50000000 0 0x2900000>;
+                     no-map;
+             };
+     };
+

Do we expect other boards to have a different memory reservation? I can see that EVB and Kukui uses the same. If not, we should add the node in mt8183.dtsi instead.

Quoted 2 lines

Regards,
Matthias

All our current boards use the same memory reservation, but it's still possible for future boards based on mt8183 to use different SCP memory size, so I feel this should still be left out of mt8183.dtsi.

Quoted 22 lines
Quoted 22 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +7 -0
      max98357a: codec0 {
              compatible = "maxim,max98357a";
              sdmode-gpios = <&pio 175 0>;
@@ -524,6 +536,13 @@ pins_clk {
              };
      };
 
+     scp_pins: scp {
+             pins_scp_uart {
+                     pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
+                              <PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
+             };
+     };
+
      spi0_pins: spi0 {
              pins_spi{
                      pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
@@ -651,6 +670,17 @@ pins_wifi_wakeup {
      };
  };
 
Quoted 15 lines
Quoted 5 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +4 -0
+&scp {
+     status = "okay";
+     pinctrl-names = "default";
+     pinctrl-0 = <&scp_pins>;

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi pins_wifi_wakeup { · line 686

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +7 -0
+
+     cros_ec {
+             compatible = "google,cros-ec-rpmsg";
+             mtk,rpmsg-name = "cros-ec-rpmsg";
+     };
+};
+
  &soc_data {
      status = "okay";
  };

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

maintainer Applied
#3 lore raw
In reply to Pi-Hsun Shih
Quoted 4 lines · Pi-Hsun Shih

Add scp node to mt8183-kukui

Fixes 0d5e41709f76 ("arm64: dts: mt8183: add scp node")

Applied to v5.9-next/dts64

I squashed this fix with the first patch to maintain bisectability.

Thanks!

Quoted 55 lines

---

Change since v1:
* Add Fixes tag.

---
  .../arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 30 +++++++++++++++++++
  1 file changed, 30 insertions(+)
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +23 -0
index f0a070535b34..85f7c33ba446 100644
@@ -90,6 +90,18 @@ pp3300_alw: regulator6 {
  		regulator-max-microvolt = <3300000>;
  	};
 
+	reserved_memory: reserved-memory {
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+
+		scp_mem_reserved: scp_mem_region {
+			compatible = "shared-dma-pool";
+			reg = <0 0x50000000 0 0x2900000>;
+			no-map;
+		};
+	};
+
  	max98357a: codec0 {
  		compatible = "maxim,max98357a";
  		sdmode-gpios = <&pio 175 0>;
@@ -524,6 +536,13 @@ pins_clk {
  		};
  	};
 
+	scp_pins: scp {
+		pins_scp_uart {
+			pinmux = <PINMUX_GPIO110__FUNC_TP_URXD1_AO>,
+				 <PINMUX_GPIO112__FUNC_TP_UTXD1_AO>;
+		};
+	};
+
  	spi0_pins: spi0 {
  		pins_spi{
  			pinmux = <PINMUX_GPIO85__FUNC_SPI0_MI>,
@@ -651,6 +670,17 @@ pins_wifi_wakeup {
  	};
  };
 
+&scp {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&scp_pins>;

arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi pins_wifi_wakeup { · line 686

Quoted 10 lines
arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +7 -0
+
+	cros_ec {
+		compatible = "google,cros-ec-rpmsg";
+		mtk,rpmsg-name = "cros-ec-rpmsg";
+	};
+};
+
  &soc_data {
  	status = "okay";
  };

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