diff mbox series

[v3,2/4] arm: dts: k3-am64: Add support for ESM device nodes

Message ID 20220309204231.18361-3-hnagalla@ti.com
State Accepted
Commit 3d64cffa91333f7bc5e7b9b8c88e1ad5eafd7a3f
Delegated to: Tom Rini
Headers show
Series Add ESM driver support for AM64x R5 SPL/U-boot | expand

Commit Message

Hari Nagalla March 9, 2022, 8:42 p.m. UTC
Enable access to ESM0 configuration space and add Main ESM0 and MCU ESM
nodes to the AM64 device tree.

Signed-off-by: Hari Nagalla <hnagalla@ti.com>
---
 arch/arm/dts/k3-am64.dtsi        |  1 +
 arch/arm/dts/k3-am642-r5-evm.dts | 19 +++++++++++++++++++
 arch/arm/dts/k3-am642-r5-sk.dts  | 19 +++++++++++++++++++
 3 files changed, 39 insertions(+)

Comments

Christian Gmeiner March 21, 2022, 12:46 p.m. UTC | #1
Am Mi., 9. März 2022 um 21:42 Uhr schrieb Hari Nagalla <hnagalla@ti.com>:
>
> Enable access to ESM0 configuration space and add Main ESM0 and MCU ESM
> nodes to the AM64 device tree.
>
> Signed-off-by: Hari Nagalla <hnagalla@ti.com>

Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>

> ---
>  arch/arm/dts/k3-am64.dtsi        |  1 +
>  arch/arm/dts/k3-am642-r5-evm.dts | 19 +++++++++++++++++++
>  arch/arm/dts/k3-am642-r5-sk.dts  | 19 +++++++++++++++++++
>  3 files changed, 39 insertions(+)
>
> diff --git a/arch/arm/dts/k3-am64.dtsi b/arch/arm/dts/k3-am64.dtsi
> index de6805b0c7..7aa94d5a6e 100644
> --- a/arch/arm/dts/k3-am64.dtsi
> +++ b/arch/arm/dts/k3-am64.dtsi
> @@ -64,6 +64,7 @@
>                 #address-cells = <2>;
>                 #size-cells = <2>;
>                 ranges = <0x00 0x000f4000 0x00 0x000f4000 0x00 0x000002d0>, /* PINCTRL */
> +                        <0x00 0x00420000 0x00 0x00420000 0x00 0x00001000>, /* ESM0 */
>                          <0x00 0x00600000 0x00 0x00600000 0x00 0x00001100>, /* GPIO */
>                          <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* Timesync router */
>                          <0x00 0x01000000 0x00 0x01000000 0x00 0x02330400>, /* First peripheral window */
> diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts
> index cc48fd4cb6..3ea6471e94 100644
> --- a/arch/arm/dts/k3-am642-r5-evm.dts
> +++ b/arch/arm/dts/k3-am642-r5-evm.dts
> @@ -82,6 +82,25 @@
>         };
>  };
>
> +&cbass_main {
> +       main_esm: esm@420000 {
> +               compatible = "ti,j721e-esm";
> +               reg = <0x0 0x420000 0x0 0x1000>;
> +               ti,esm-pins = <160>, <161>;
> +               u-boot,dm-spl;
> +       };
> +};
> +
> +&cbass_mcu {
> +       u-boot,dm-spl;
> +       mcu_esm: esm@4100000 {
> +               compatible = "ti,j721e-esm";
> +               reg = <0x0 0x4100000 0x0 0x1000>;
> +               ti,esm-pins = <0>, <1>;
> +               u-boot,dm-spl;
> +       };
> +};
> +
>  &main_pmx0 {
>         u-boot,dm-spl;
>         main_uart0_pins_default: main-uart0-pins-default {
> diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
> index 7d1cb85615..1f96e3fcac 100644
> --- a/arch/arm/dts/k3-am642-r5-sk.dts
> +++ b/arch/arm/dts/k3-am642-r5-sk.dts
> @@ -75,6 +75,25 @@
>         };
>  };
>
> +&cbass_main {
> +       main_esm: esm@420000 {
> +               compatible = "ti,j721e-esm";
> +               reg = <0x0 0x420000 0x0 0x1000>;
> +               ti,esm-pins = <160>, <161>;
> +               u-boot,dm-spl;
> +       };
> +};
> +
> +&cbass_mcu {
> +       u-boot,dm-spl;
> +       mcu_esm: esm@4100000 {
> +               compatible = "ti,j721e-esm";
> +               reg = <0x0 0x4100000 0x0 0x1000>;
> +               ti,esm-pins = <0>, <1>;
> +               u-boot,dm-spl;
> +       };
> +};
> +
>  &main_pmx0 {
>         u-boot,dm-spl;
>         main_uart0_pins_default: main-uart0-pins-default {
> --
> 2.17.1
>
Tom Rini April 5, 2022, 6 p.m. UTC | #2
On Wed, Mar 09, 2022 at 02:42:29PM -0600, Hari Nagalla wrote:

> Enable access to ESM0 configuration space and add Main ESM0 and MCU ESM
> nodes to the AM64 device tree.
> 
> Signed-off-by: Hari Nagalla <hnagalla@ti.com>
> Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/arch/arm/dts/k3-am64.dtsi b/arch/arm/dts/k3-am64.dtsi
index de6805b0c7..7aa94d5a6e 100644
--- a/arch/arm/dts/k3-am64.dtsi
+++ b/arch/arm/dts/k3-am64.dtsi
@@ -64,6 +64,7 @@ 
 		#address-cells = <2>;
 		#size-cells = <2>;
 		ranges = <0x00 0x000f4000 0x00 0x000f4000 0x00 0x000002d0>, /* PINCTRL */
+			 <0x00 0x00420000 0x00 0x00420000 0x00 0x00001000>, /* ESM0 */
 			 <0x00 0x00600000 0x00 0x00600000 0x00 0x00001100>, /* GPIO */
 			 <0x00 0x00a40000 0x00 0x00a40000 0x00 0x00000800>, /* Timesync router */
 			 <0x00 0x01000000 0x00 0x01000000 0x00 0x02330400>, /* First peripheral window */
diff --git a/arch/arm/dts/k3-am642-r5-evm.dts b/arch/arm/dts/k3-am642-r5-evm.dts
index cc48fd4cb6..3ea6471e94 100644
--- a/arch/arm/dts/k3-am642-r5-evm.dts
+++ b/arch/arm/dts/k3-am642-r5-evm.dts
@@ -82,6 +82,25 @@ 
 	};
 };
 
+&cbass_main {
+	main_esm: esm@420000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x420000 0x0 0x1000>;
+		ti,esm-pins = <160>, <161>;
+		u-boot,dm-spl;
+	};
+};
+
+&cbass_mcu {
+	u-boot,dm-spl;
+	mcu_esm: esm@4100000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x4100000 0x0 0x1000>;
+		ti,esm-pins = <0>, <1>;
+		u-boot,dm-spl;
+	};
+};
+
 &main_pmx0 {
 	u-boot,dm-spl;
 	main_uart0_pins_default: main-uart0-pins-default {
diff --git a/arch/arm/dts/k3-am642-r5-sk.dts b/arch/arm/dts/k3-am642-r5-sk.dts
index 7d1cb85615..1f96e3fcac 100644
--- a/arch/arm/dts/k3-am642-r5-sk.dts
+++ b/arch/arm/dts/k3-am642-r5-sk.dts
@@ -75,6 +75,25 @@ 
 	};
 };
 
+&cbass_main {
+	main_esm: esm@420000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x420000 0x0 0x1000>;
+		ti,esm-pins = <160>, <161>;
+		u-boot,dm-spl;
+	};
+};
+
+&cbass_mcu {
+	u-boot,dm-spl;
+	mcu_esm: esm@4100000 {
+		compatible = "ti,j721e-esm";
+		reg = <0x0 0x4100000 0x0 0x1000>;
+		ti,esm-pins = <0>, <1>;
+		u-boot,dm-spl;
+	};
+};
+
 &main_pmx0 {
 	u-boot,dm-spl;
 	main_uart0_pins_default: main-uart0-pins-default {