[PATCH 2/3] arm64: dts: ti: k3-j7*: Add additional regs for DMA components

Jai Luthra j-luthra at ti.com
Wed Dec 13 01:55:47 PST 2023


Hi Manorit/Vignesh,

Please recheck the addresses match each SoCs TRM.

On Dec 12, 2023 at 16:46:33 +0530, Vignesh Raghavendra wrote:
> From: Manorit Chawdhry <m-chawdhry at ti.com>
> 
> Add additional reg properties for UDMA and RingAcc nodes which are
> mostly used by bootloader components before Device Manager firmware
> services are available, in order to setup DMA transfers.
> 
> Signed-off-by: Manorit Chawdhry <m-chawdhry at ti.com>
> Signed-off-by: Vignesh Raghavendra <vigneshr at ti.com>
> ---
>  arch/arm64/boot/dts/ti/k3-j7200-main.dtsi        | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi  | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j721e-main.dtsi        | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi  | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi       | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi       | 8 ++++++--
>  arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 8 ++++++--
>  8 files changed, 48 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> index 264913f83287..97b90f4d09dd 100644
> --- a/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j7200-main.dtsi
> @@ -281,8 +281,12 @@ main_udmap: dma-controller at 31150000 {
>  			compatible = "ti,j721e-navss-main-udmap";
>  			reg = <0x00 0x31150000 0x00 0x100>,
>  			      <0x00 0x34000000 0x00 0x100000>,
> -			      <0x00 0x35000000 0x00 0x100000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x00 0x35000000 0x00 0x100000>,
> +			      <0x00 0x30b00000 0x00 0x20000>,
> +			      <0x00 0x30c00000 0x00 0x8000>,
> +			      <0x00 0x30d00000 0x00 0x4000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
> index 3fc588b848c6..576ed7494521 100644
> --- a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
> @@ -346,8 +346,12 @@ mcu_udmap: dma-controller at 285c0000 {
>  			compatible = "ti,j721e-navss-mcu-udmap";
>  			reg = <0x00 0x285c0000 0x00 0x100>,
>  			      <0x00 0x2a800000 0x00 0x40000>,
> -			      <0x00 0x2aa00000 0x00 0x40000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x00 0x2aa00000 0x00 0x40000>,
> +			      <0x00 0x284a0000 0x00 0x4000>,
> +			      <0x00 0x284c0000 0x00 0x4000>,
> +			      <0x00 0x28400000 0x00 0x2000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> index 746b9f8b1c64..f1e995d12d74 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-main.dtsi
> @@ -382,8 +382,12 @@ main_udmap: dma-controller at 31150000 {
>  			compatible = "ti,j721e-navss-main-udmap";
>  			reg = <0x0 0x31150000 0x0 0x100>,
>  			      <0x0 0x34000000 0x0 0x100000>,
> -			      <0x0 0x35000000 0x0 0x100000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x0 0x35000000 0x0 0x100000>,
> +			      <0x0 0x30b00000 0x0 0x20000>,
> +			      <0x0 0x30c00000 0x0 0x8000>,

Above don't match J721E TRM, which says TCHAN has size 0x10000.

> +			      <0x00 0x30d00000 0x00 0x4000>;

Same here, TRM says 0x8000.
I did not check J7200/J721S2 TRMs, please do.

> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> index f7ab7719fc07..011d93e32238 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi
> @@ -468,8 +468,12 @@ mcu_udmap: dma-controller at 285c0000 {
>  			compatible = "ti,j721e-navss-mcu-udmap";
>  			reg = <0x0 0x285c0000 0x0 0x100>,
>  			      <0x0 0x2a800000 0x0 0x40000>,
> -			      <0x0 0x2aa00000 0x0 0x40000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x0 0x2aa00000 0x0 0x40000>,
> +			      <0x0 0x284a0000 0x0 0x4000>,
> +			      <0x0 0x284c0000 0x0 0x4000>,
> +			      <0x0 0x28400000 0x0 0x2000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> index b03731b53a26..2ed469d36f1d 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
> @@ -1086,8 +1086,12 @@ main_udmap: dma-controller at 31150000 {
>  			compatible = "ti,j721e-navss-main-udmap";
>  			reg = <0x0 0x31150000 0x0 0x100>,
>  			      <0x0 0x34000000 0x0 0x80000>,
> -			      <0x0 0x35000000 0x0 0x200000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x0 0x35000000 0x0 0x200000>,
> +			      <0x0 0x30b00000 0x0 0x8000>,
> +			      <0x0 0x30c00000 0x0 0x20000>,
> +			      <0x0 0x30d00000 0x0 0x4000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> index 7254f3bd3634..75c6931480dd 100644
> --- a/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
> @@ -471,8 +471,12 @@ mcu_udmap: dma-controller at 285c0000 {
>  			compatible = "ti,j721e-navss-mcu-udmap";
>  			reg = <0x0 0x285c0000 0x0 0x100>,
>  			      <0x0 0x2a800000 0x0 0x40000>,
> -			      <0x0 0x2aa00000 0x0 0x40000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x0 0x2aa00000 0x0 0x40000>,
> +			      <0x0 0x284a0000 0x0 0x4000>,
> +			      <0x0 0x284c0000 0x0 0x4000>,
> +			      <0x0 0x28400000 0x0 0x2000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
> index d89bcddcfe3d..827328450f96 100644
> --- a/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi
> @@ -1188,8 +1188,12 @@ main_udmap: dma-controller at 31150000 {
>  			compatible = "ti,j721e-navss-main-udmap";
>  			reg = <0x00 0x31150000 0x00 0x100>,
>  			      <0x00 0x34000000 0x00 0x80000>,
> -			      <0x00 0x35000000 0x00 0x200000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x00 0x35000000 0x00 0x200000>,
> +			      <0x00 0x30b00000 0x00 0x20000>,
> +			      <0x00 0x30c00000 0x00 0x8000>,
> +			      <0x00 0x30d00000 0x00 0x4000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> diff --git a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
> index adb5ea6b9732..0eebb92e6a72 100644
> --- a/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
> @@ -478,8 +478,12 @@ mcu_udmap: dma-controller at 285c0000 {
>  			compatible = "ti,j721e-navss-mcu-udmap";
>  			reg = <0x00 0x285c0000 0x00 0x100>,
>  			      <0x00 0x2a800000 0x00 0x40000>,
> -			      <0x00 0x2aa00000 0x00 0x40000>;
> -			reg-names = "gcfg", "rchanrt", "tchanrt";
> +			      <0x00 0x2aa00000 0x00 0x40000>,
> +			      <0x00 0x284a0000 0x00 0x4000>,
> +			      <0x00 0x284c0000 0x00 0x4000>,
> +			      <0x00 0x28400000 0x00 0x2000>;
> +			reg-names = "gcfg", "rchanrt", "tchanrt",
> +				    "tchan", "rchan", "rflow";
>  			msi-parent = <&main_udmass_inta>;
>  			#dma-cells = <1>;
>  
> -- 
> 2.43.0
> 
> 

-- 
Thanks,
Jai

GPG Fingerprint: 4DE0 D818 E5D5 75E8 D45A AFC5 43DE 91F9 249A 7145
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20231213/03835135/attachment.sig>


More information about the linux-arm-kernel mailing list