Skip to contentSkip to conversation

arm64: dts: ti: am654: Enable additional nodes

PATCH In review Nishanth Menon 3 participants 6 messages Sep 5, 2018 – Sep 19, 2018

Subsystems (2)
lore
Share & tools
lore

Nishanth Menon

author maintainer
#0 lore raw

cover arm64: dts: ti: am654: Enable additional nodes

Hi,

Series based on: v4.19-rc1 + https://patchwork.kernel.org/patch/10588769/
For v4.20

Boot log: https://pastebin.ubuntu.com/p/c5XGVp85bs/ (MMC is pending). Boot log integrated with:

	https://patchwork.kernel.org/patch/10577731/ (uart Kconfig update)
	https://patchwork.kernel.org/patch/10577723/ (message manager Kconfig update)
	https://patchwork.kernel.org/patch/10577729/ (TISCI - in linux-next)
        https://patchwork.kernel.org/patch/10577727/ (TISCI - in linux-next)
	https://patchwork.kernel.org/patch/10577721/ (TISCI Clk Kconfig update)

Nishanth Menon (3):
arm64: dts: ti: am654: Add uart nodes
arm64: dts: ti: am654: Add secure proxy instance for main domain
arm64: dts: ti: k3-am6: Add Device Management Security Controller
support

 arch/arm64/boot/dts/ti/k3-am65-main.dtsi       | 41 +++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi        | 18 ++++++++++
 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi     | 46 ++++++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65.dtsi            | 10 ++++++
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts |  5 +++
 5 files changed, 120 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
Signature · 1 line
2.15.1
author maintainer
#1 lore raw

PATCH 1/3 arm64: dts: ti: am654: Add uart nodes

Add uart nodes for AM654 device tree components.

---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi       | 30 ++++++++++++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi        | 18 ++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi     | 18 ++++++++++++++++
 arch/arm64/boot/dts/ti/k3-am65.dtsi            | 10 +++++++++
 arch/arm64/boot/dts/ti/k3-am654-base-board.dts |  5 +++++
 5 files changed, 81 insertions(+)
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
 create mode 100644 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +30 -0
index faace3805c01..674a266066ca 100644
@@ -28,4 +28,34 @@
 			#msi-cells = <1>;
 		};
 	};
+
+	main_uart0: serial at 2800000 {
+		compatible = "ti,am654-uart";
+		reg = <0x00 0x02800000 0x00 0x100>;
+		reg-shift = <2>;
+		reg-io-width = <4>;
+		interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <48000000>;
+		current-speed = <115200>;
+	};
+
+	main_uart1: serial at 2810000 {
+		compatible = "ti,am654-uart";
+		reg = <0x00 0x02810000 0x00 0x100>;
+		reg-shift = <2>;
+		reg-io-width = <4>;
+		interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <48000000>;
+		current-speed = <115200>;
+	};
+
+	main_uart2: serial at 2820000 {
+		compatible = "ti,am654-uart";
+		reg = <0x00 0x02820000 0x00 0x100>;
+		reg-shift = <2>;
+		reg-io-width = <4>;
+		interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <48000000>;
+		current-speed = <115200>;
+	};
 };
arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi new file +18 -0
new file mode 100644
index 000000000000..8c611d16df44
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for AM6 SoC Family MCU Domain peripherals
+ *
+ * Copyright (C) 2016-2018 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+&cbass_mcu {
+	mcu_uart0: serial at 40a00000 {
+		compatible = "ti,am654-uart";
+			reg = <0x00 0x40a00000 0x00 0x100>;
+			reg-shift = <2>;
+			reg-io-width = <4>;
+			interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>;
+			clock-frequency = <96000000>;
+			current-speed = <115200>;
+	};
+};
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi new file +18 -0
new file mode 100644
index 000000000000..8b4378d4d0a3
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Device Tree Source for AM6 SoC Family Wakeup Domain peripherals
+ *
+ * Copyright (C) 2016-2018 Texas Instruments Incorporated - http://www.ti.com/
+ */
+
+&cbass_wakeup {
+	wkup_uart0: serial at 42300000 {
+		compatible = "ti,am654-uart";
+		reg = <0x00 0x42300000 0x00 0x100>;
+		reg-shift = <2>;
+		reg-io-width = <4>;
+		interrupts = <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>;
+		clock-frequency = <48000000>;
+		current-speed = <115200>;
+	};
+};
arch/arm64/boot/dts/ti/k3-am65.dtsi +10 -0
index ded364d20835..3d4bf369d030 100644
@@ -16,6 +16,14 @@
 	#address-cells = <2>;
 	#size-cells = <2>;
 
+	aliases {
+		serial0 = &wkup_uart0;
+		serial1 = &mcu_uart0;
+		serial2 = &main_uart0;
+		serial3 = &main_uart1;
+		serial4 = &main_uart2;
+	};
+
 	chosen { };
 
 	firmware {
@@ -85,3 +93,5 @@
 
 /* Now include the peripherals for each bus segments */
 #include "k3-am65-main.dtsi"
+#include "k3-am65-mcu.dtsi"
+#include "k3-am65-wakeup.dtsi"
arch/arm64/boot/dts/ti/k3-am654-base-board.dts +5 -0
index af6956fdc13f..e146ac2ad781 100644
@@ -34,3 +34,8 @@
 		};
 	};
 };
+
+&wkup_uart0 {
+	/* Wakeup UART is used by System firmware */
+	status = "disabled";
+};
Signature · 1 line
2.15.1
author maintainer
#2 lore raw

PATCH 2/3 arm64: dts: ti: am654: Add secure proxy instance for main domain

In reply to Nishanth Menon

Add secure proxy instance for Main domain

---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
arch/arm64/boot/dts/ti/k3-am65-main.dtsi +11 -0
index 674a266066ca..adcd6341e40c 100644
@@ -29,6 +29,17 @@
 		};
 	};
 
+	secure_proxy_main: mailbox at 32c00000 {
+		compatible = "ti,am654-secure-proxy";
+		#mbox-cells = <1>;
+		reg-names = "target_data", "rt", "scfg";
+		reg = <0x00 0x32c00000 0x00 0x100000>,
+		      <0x00 0x32400000 0x00 0x100000>,
+		      <0x00 0x32800000 0x00 0x100000>;
+		interrupt-names = "rx_011";
+		interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
 	main_uart0: serial at 2800000 {
 		compatible = "ti,am654-uart";
 		reg = <0x00 0x02800000 0x00 0x100>;
Signature · 1 line
2.15.1
author maintainer
#3 lore raw

PATCH 3/3 arm64: dts: ti: k3-am6: Add Device Management Security Controller support

In reply to Nishanth Menon

Add TISCI compatible System controller for AM6 SoCs.

---
 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi +28 -0
index 8b4378d4d0a3..affc3c309353 100644
@@ -6,6 +6,34 @@
  */
 
 &cbass_wakeup {
+	dmsc: dmsc {
+		compatible = "ti,k2g-sci";
+		ti,host-id = <12>;
+		#address-cells = <1>;
+		#size-cells = <1>;
+		ranges;
+
+		mbox-names = "rx", "tx";
+
+		mboxes= <&secure_proxy_main 11>,
+			<&secure_proxy_main 13>;
+
+		k3_pds: power-controller {
+			compatible = "ti,sci-pm-domain";
+			#power-domain-cells = <1>;
+		};
+
+		k3_clks: clocks {
+			compatible = "ti,k2g-sci-clk";
+			#clock-cells = <2>;
+		};
+
+		k3_reset: reset-controller {
+			compatible = "ti,sci-reset";
+			#reset-cells = <2>;
+		};
+	};
+
 	wkup_uart0: serial at 42300000 {
 		compatible = "ti,am654-uart";
 		reg = <0x00 0x42300000 0x00 0x100>;
Signature · 1 line
2.15.1
#5 lore raw
Quoted 11 lines · Tony Lindgren
Quoted 5 lines · Nishanth Menon

Nishanth Menon (3):
arm64: dts: ti: am654: Add uart nodes
arm64: dts: ti: am654: Add secure proxy instance for main domain
arm64: dts: ti: k3-am6: Add Device Management Security Controller
support

All look good to me:

Queuing up for 4.20, thanks.

-Tero
--
Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki