[PATCH 0/2] J721E DTS Sync with Kernel v6.7-rc1

[PATCH 0/2] J721E DTS Sync with Kernel v6.7-rc1

[Neha Malcom Francis]

This series aims to sync kernel.org v6.7-rc1 DTS with that of U-Boot. It
also includes inclusion of an updated devicetree documentation for
ti,j721e-esm.

Boot logs:
https://gist.github.com/nehamalcom/0eef30308f1910eea5eafefe2c4b7bcf

Neha Malcom Francis (2):
  dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml
  arm: dts: k3-j721e-*: Sync with kernel v6.7-rc1

 arch/arm/dts/k3-j721e-main.dtsi               |  2 +-
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi         |  9 +++-
 doc/device-tree-bindings/misc/esm-k3.txt      | 25 ---------
 .../misc/ti,j721e-esm.yaml                    | 53 +++++++++++++++++++
 4 files changed, 62 insertions(+), 27 deletions(-)
 delete mode 100644 doc/device-tree-bindings/misc/esm-k3.txt
 create mode 100644 doc/device-tree-bindings/misc/ti,j721e-esm.yaml

-- 
2.34.1

[PATCH 1/2] dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml

[Neha Malcom Francis]

Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
documentation in kernel.

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
---
 doc/device-tree-bindings/misc/esm-k3.txt      | 25 ---------
 .../misc/ti,j721e-esm.yaml                    | 53 +++++++++++++++++++
 2 files changed, 53 insertions(+), 25 deletions(-)
 delete mode 100644 doc/device-tree-bindings/misc/esm-k3.txt
 create mode 100644 doc/device-tree-bindings/misc/ti,j721e-esm.yaml

diff --git a/doc/device-tree-bindings/misc/esm-k3.txt b/doc/device-tree-bindings/misc/esm-k3.txt
deleted file mode 100644
index 01c8b6b294..0000000000
--- a/doc/device-tree-bindings/misc/esm-k3.txt
+++ /dev/null
@@ -1,25 +0,0 @@
-Texas Instruments K3 ESM Binding
-======================
-
-ESM (Error Signaling Module) is an IP block on TI K3 devices that allows
-handling of safety events somewhat similar to what interrupt controller
-would do. The safety signals have their separate paths within the SoC,
-and they are handled by the ESM, which routes them to the proper
-destination, which can be system reset, interrupt controller, etc. In
-the simplest configuration the signals are just routed to reset the
-SoC.
-
-Required properties :
-- compatible	: "ti,j721e-esm"
-- ti,esm-pins	: integer array of esm events IDs to route to external event
-		  pin which can be used to reset the SoC. The array can
-		  have arbitrary amount of event IDs listed on it.
-
-Example
-=======
-
-	main_esm: esm@700000 {
-		compatible = "ti,j721e-esm";
-		reg = <0x0 0x700000 0x0 0x1000>;
-		ti,esm-pins = <344>, <345>;
-	};
diff --git a/doc/device-tree-bindings/misc/ti,j721e-esm.yaml b/doc/device-tree-bindings/misc/ti,j721e-esm.yaml
new file mode 100644
index 0000000000..0c9a844484
--- /dev/null
+++ b/doc/device-tree-bindings/misc/ti,j721e-esm.yaml
@@ -0,0 +1,53 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+# Copyright (C) 2022 Texas Instruments Incorporated
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/misc/ti,j721e-esm.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Texas Instruments K3 ESM
+
+maintainers:
+  - Neha Malcom Francis <n-francis@ti.com>
+
+description:
+  The ESM (Error Signaling Module) is an IP block on TI K3 devices
+  that allows handling of safety events somewhat similar to what interrupt
+  controller would do. The safety signals have their separate paths within
+  the SoC, and they are handled by the ESM, which routes them to the proper
+  destination, which can be system reset, interrupt controller, etc. In the
+  simplest configuration the signals are just routed to reset the SoC.
+
+properties:
+  compatible:
+    const: ti,j721e-esm
+
+  reg:
+    maxItems: 1
+
+  ti,esm-pins:
+    $ref: /schemas/types.yaml#/definitions/uint32-array
+    description:
+      integer array of ESM interrupt pins to route to external event pin
+      which can be used to reset the SoC.
+    minItems: 1
+    maxItems: 255
+
+required:
+  - compatible
+  - reg
+  - ti,esm-pins
+
+additionalProperties: false
+
+examples:
+  - |
+    bus {
+        #address-cells = <2>;
+        #size-cells = <2>;
+        esm@700000 {
+            compatible = "ti,j721e-esm";
+            reg = <0x0 0x700000 0x0 0x1000>;
+            ti,esm-pins = <344>, <345>;
+        };
+    };
-- 
2.34.1

[PATCH 2/2] arm: dts: k3-j721e-*: Sync with kernel v6.7-rc1

[Neha Malcom Francis]

Sync the U-Boot DTS files with those of Kernel v6.7-rc1.

Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
---
 arch/arm/dts/k3-j721e-main.dtsi       | 2 +-
 arch/arm/dts/k3-j721e-mcu-wakeup.dtsi | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/dts/k3-j721e-main.dtsi b/arch/arm/dts/k3-j721e-main.dtsi
index f6c7e16145..746b9f8b1c 100644
--- a/arch/arm/dts/k3-j721e-main.dtsi
+++ b/arch/arm/dts/k3-j721e-main.dtsi
@@ -181,7 +181,7 @@
 	};
 
 	main_navss: bus@30000000 {
-		compatible = "simple-mfd";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges = <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>;
diff --git a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
index 05d6ef127b..f7ab7719fc 100644
--- a/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
+++ b/arch/arm/dts/k3-j721e-mcu-wakeup.dtsi
@@ -440,7 +440,7 @@
 	};
 
 	mcu_navss: bus@28380000 {
-		compatible = "simple-mfd";
+		compatible = "simple-bus";
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>;
@@ -671,4 +671,11 @@
 		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>;
 		#thermal-sensor-cells = <1>;
 	};
+
+	mcu_esm: esm@40800000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x00 0x40800000 0x00 0x1000>;
+		ti,esm-pins = <95>;
+		bootph-pre-ram;
+	};
 };
-- 
2.34.1

Re: [PATCH 1/2] dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml

[Nishanth Menon]

On 10:00-20231113, Neha Malcom Francis wrote:
> Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
> documentation in kernel.
> 
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> ---
>  doc/device-tree-bindings/misc/esm-k3.txt      | 25 ---------
>  .../misc/ti,j721e-esm.yaml                    | 53 +++++++++++++++++++

What is the rule here?
https://tgit.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/misc/ti,j721e-esm.yaml
we have the binding in upstream kernel.

-- 
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3  1A34 DDB5 849D 1736 249D

Re: [PATCH 1/2] dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 331 bytes --]

On Mon, Nov 13, 2023 at 10:00:22AM +0530, Neha Malcom Francis wrote:

> Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
> documentation in kernel.
> 
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>

I assume this is also from v6.7-rc1 and:

Reviewed-by: Tom Rini <trini@konsulko.com>

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 1/2] dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 1285 bytes --]

On Mon, Nov 13, 2023 at 01:52:16PM -0600, Nishanth Menon wrote:
> On 10:00-20231113, Neha Malcom Francis wrote:
> > Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
> > documentation in kernel.
> > 
> > Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> > ---
> >  doc/device-tree-bindings/misc/esm-k3.txt      | 25 ---------
> >  .../misc/ti,j721e-esm.yaml                    | 53 +++++++++++++++++++
> 
> What is the rule here?
> https://tgit.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/devicetree/bindings/misc/ti,j721e-esm.yaml
> we have the binding in upstream kernel.

Not to cause anyone undue worry but part of me wants to just
submodule/subtree
https://github.com/devicetree-org/dt-schema/tree/main/dtschema/schemas
as that looks like Rob syncs it with the kernel periodically and since
in turn we're working with Rob to upstream our unique bindings there
here and not there list should be shrinking, not growing. Since we say
"use the kernel device trees" and we don't have the validation make
targets, the content of the copies of the schema in our trees is more of
a promise that it's true than used anywhere. So perhaps it would be
better if something was written down to that effect.

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 1/2] dt-bindings: misc: Move esm-k3.txt to ti,j721e-esm.yaml

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

On Mon, Nov 13, 2023 at 10:00:22AM +0530, Neha Malcom Francis wrote:

> Move esm-k3.txt to ti,j721e-esm.yaml in line with the devicetree
> documentation in kernel.
> 
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]

Re: [PATCH 2/2] arm: dts: k3-j721e-*: Sync with kernel v6.7-rc1

[Tom Rini]

[-- Attachment #1: Type: text/plain, Size: 240 bytes --]

On Mon, Nov 13, 2023 at 10:00:23AM +0530, Neha Malcom Francis wrote:

> Sync the U-Boot DTS files with those of Kernel v6.7-rc1.
> 
> Signed-off-by: Neha Malcom Francis <n-francis@ti.com>

Applied to u-boot/next, thanks!

-- 
Tom

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]