devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes
@ 2018-09-05 16:20 Nishanth Menon
  2018-09-05 16:20 ` [PATCH 1/3] arm64: dts: ti: am654: Add uart nodes Nishanth Menon
                   ` (3 more replies)
  0 siblings, 4 replies; 6+ messages in thread
From: Nishanth Menon @ 2018-09-05 16:20 UTC (permalink / raw)
  To: Tero Kristo
  Cc: Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Tony Lindgren, Vignesh R,
	Kishon Vijay Abraham I, Nishanth Menon

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

-- 
2.15.1

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/3] arm64: dts: ti: am654: Add uart nodes
  2018-09-05 16:20 [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Nishanth Menon
@ 2018-09-05 16:20 ` Nishanth Menon
  2018-09-05 16:20 ` [PATCH 2/3] arm64: dts: ti: am654: Add secure proxy instance for main domain Nishanth Menon
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2018-09-05 16:20 UTC (permalink / raw)
  To: Tero Kristo
  Cc: Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Tony Lindgren, Vignesh R,
	Kishon Vijay Abraham I, Nishanth Menon

Add uart nodes for AM654 device tree components.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 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

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index faace3805c01..674a266066ca 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -28,4 +28,34 @@
 			#msi-cells = <1>;
 		};
 	};
+
+	main_uart0: serial@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@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@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>;
+	};
 };
diff --git a/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
new file mode 100644
index 000000000000..8c611d16df44
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi
@@ -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@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>;
+	};
+};
diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
new file mode 100644
index 000000000000..8b4378d4d0a3
--- /dev/null
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -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@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>;
+	};
+};
diff --git a/arch/arm64/boot/dts/ti/k3-am65.dtsi b/arch/arm64/boot/dts/ti/k3-am65.dtsi
index ded364d20835..3d4bf369d030 100644
--- a/arch/arm64/boot/dts/ti/k3-am65.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65.dtsi
@@ -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"
diff --git a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
index af6956fdc13f..e146ac2ad781 100644
--- a/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
+++ b/arch/arm64/boot/dts/ti/k3-am654-base-board.dts
@@ -34,3 +34,8 @@
 		};
 	};
 };
+
+&wkup_uart0 {
+	/* Wakeup UART is used by System firmware */
+	status = "disabled";
+};
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] arm64: dts: ti: am654: Add secure proxy instance for main domain
  2018-09-05 16:20 [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Nishanth Menon
  2018-09-05 16:20 ` [PATCH 1/3] arm64: dts: ti: am654: Add uart nodes Nishanth Menon
@ 2018-09-05 16:20 ` Nishanth Menon
  2018-09-05 16:20 ` [PATCH 3/3] arm64: dts: ti: k3-am6: Add Device Management Security Controller support Nishanth Menon
  2018-09-05 20:33 ` [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Tony Lindgren
  3 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2018-09-05 16:20 UTC (permalink / raw)
  To: Tero Kristo
  Cc: Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Tony Lindgren, Vignesh R,
	Kishon Vijay Abraham I, Nishanth Menon

Add secure proxy instance for Main domain

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
index 674a266066ca..adcd6341e40c 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-main.dtsi
@@ -29,6 +29,17 @@
 		};
 	};
 
+	secure_proxy_main: mailbox@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@2800000 {
 		compatible = "ti,am654-uart";
 		reg = <0x00 0x02800000 0x00 0x100>;
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] arm64: dts: ti: k3-am6: Add Device Management Security Controller support
  2018-09-05 16:20 [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Nishanth Menon
  2018-09-05 16:20 ` [PATCH 1/3] arm64: dts: ti: am654: Add uart nodes Nishanth Menon
  2018-09-05 16:20 ` [PATCH 2/3] arm64: dts: ti: am654: Add secure proxy instance for main domain Nishanth Menon
@ 2018-09-05 16:20 ` Nishanth Menon
  2018-09-05 20:33 ` [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Tony Lindgren
  3 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2018-09-05 16:20 UTC (permalink / raw)
  To: Tero Kristo
  Cc: Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Tony Lindgren, Vignesh R,
	Kishon Vijay Abraham I, Nishanth Menon

Add TISCI compatible System controller for AM6 SoCs.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
index 8b4378d4d0a3..affc3c309353 100644
--- a/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am65-wakeup.dtsi
@@ -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@42300000 {
 		compatible = "ti,am654-uart";
 		reg = <0x00 0x42300000 0x00 0x100>;
-- 
2.15.1

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes
  2018-09-05 16:20 [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Nishanth Menon
                   ` (2 preceding siblings ...)
  2018-09-05 16:20 ` [PATCH 3/3] arm64: dts: ti: k3-am6: Add Device Management Security Controller support Nishanth Menon
@ 2018-09-05 20:33 ` Tony Lindgren
  2018-09-19 18:42   ` Tero Kristo
  3 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2018-09-05 20:33 UTC (permalink / raw)
  To: Nishanth Menon
  Cc: Tero Kristo, Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Vignesh R, Kishon Vijay Abraham I

* Nishanth Menon <nm@ti.com> [180905 16:24]:
> 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:

Acked-by: Tony Lindgren <tony@atomide.com>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes
  2018-09-05 20:33 ` [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Tony Lindgren
@ 2018-09-19 18:42   ` Tero Kristo
  0 siblings, 0 replies; 6+ messages in thread
From: Tero Kristo @ 2018-09-19 18:42 UTC (permalink / raw)
  To: Tony Lindgren, Nishanth Menon
  Cc: Mark Rutland, Rob Herring, linux-kernel, devicetree,
	linux-arm-kernel, Vignesh R, Kishon Vijay Abraham I

On 05/09/18 23:33, Tony Lindgren wrote:
> * Nishanth Menon <nm@ti.com> [180905 16:24]:
>> 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:
> 
> Acked-by: Tony Lindgren <tony@atomide.com>
> 

Queuing up for 4.20, thanks.

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

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-09-19 18:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-05 16:20 [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Nishanth Menon
2018-09-05 16:20 ` [PATCH 1/3] arm64: dts: ti: am654: Add uart nodes Nishanth Menon
2018-09-05 16:20 ` [PATCH 2/3] arm64: dts: ti: am654: Add secure proxy instance for main domain Nishanth Menon
2018-09-05 16:20 ` [PATCH 3/3] arm64: dts: ti: k3-am6: Add Device Management Security Controller support Nishanth Menon
2018-09-05 20:33 ` [PATCH 0/3] arm64: dts: ti: am654: Enable additional nodes Tony Lindgren
2018-09-19 18:42   ` Tero Kristo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).