diff mbox series

arm64: dts: ti: k3-j721s2-evm-gesi: Specify base dtb for overlay file

Message ID 20230911052158.89185-1-s-vadapalli@ti.com (mailing list archive)
State New, archived
Headers show
Series arm64: dts: ti: k3-j721s2-evm-gesi: Specify base dtb for overlay file | expand

Commit Message

Siddharth Vadapalli Sept. 11, 2023, 5:21 a.m. UTC
Specify the base dtb file k3-j721s2-common-proc-board.dtb on which the
k3-j721s2-evm-gesi-exp-board.dtbo overlay has to be applied. Name the
resulting dtb as k3-j721s2-evm.dtb.

Fixes: cac04e27f093 ("arm64: dts: ti: k3-j721s2: Add overlay to enable main CPSW2G with GESI")
Reported-by: Rob Herring <robh+dt@kernel.org>
Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
---

Note: This patch is based on linux-next tagged next-20230911.

 arch/arm64/boot/dts/ti/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Rob Herring (Arm) Sept. 11, 2023, 4:56 p.m. UTC | #1
On Mon, Sep 11, 2023 at 10:51:58AM +0530, Siddharth Vadapalli wrote:
> Specify the base dtb file k3-j721s2-common-proc-board.dtb on which the
> k3-j721s2-evm-gesi-exp-board.dtbo overlay has to be applied. Name the
> resulting dtb as k3-j721s2-evm.dtb.
> 
> Fixes: cac04e27f093 ("arm64: dts: ti: k3-j721s2: Add overlay to enable main CPSW2G with GESI")
> Reported-by: Rob Herring <robh+dt@kernel.org>
> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
> ---
> 
> Note: This patch is based on linux-next tagged next-20230911.
> 
>  arch/arm64/boot/dts/ti/Makefile | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
> index e7b8e2e7f083..ef8ca50fbb36 100644
> --- a/arch/arm64/boot/dts/ti/Makefile
> +++ b/arch/arm64/boot/dts/ti/Makefile
> @@ -63,9 +63,9 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
>  dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
>  
>  # Boards with J721s2 SoC
> +k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo

Move this next to the "dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb" line.

>  dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo

I think dropping these will cause them to not get installed (by 
dtbs_install). Presumably you want them.

> +dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
>  
>  # Boards with J784s4 SoC
>  dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
> -- 
> 2.34.1
>
Siddharth Vadapalli Sept. 12, 2023, 4:01 a.m. UTC | #2
Rob,

Thank you for reviewing the patch.

On 11/09/23 22:26, Rob Herring wrote:
> On Mon, Sep 11, 2023 at 10:51:58AM +0530, Siddharth Vadapalli wrote:
>> Specify the base dtb file k3-j721s2-common-proc-board.dtb on which the
>> k3-j721s2-evm-gesi-exp-board.dtbo overlay has to be applied. Name the
>> resulting dtb as k3-j721s2-evm.dtb.
>>
>> Fixes: cac04e27f093 ("arm64: dts: ti: k3-j721s2: Add overlay to enable main CPSW2G with GESI")
>> Reported-by: Rob Herring <robh+dt@kernel.org>
>> Signed-off-by: Siddharth Vadapalli <s-vadapalli@ti.com>
>> ---
>>
>> Note: This patch is based on linux-next tagged next-20230911.
>>
>>  arch/arm64/boot/dts/ti/Makefile | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
>> index e7b8e2e7f083..ef8ca50fbb36 100644
>> --- a/arch/arm64/boot/dts/ti/Makefile
>> +++ b/arch/arm64/boot/dts/ti/Makefile
>> @@ -63,9 +63,9 @@ dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
>>  dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
>>  
>>  # Boards with J721s2 SoC
>> +k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo
> 
> Move this next to the "dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb" line.

Sure, I will place it above the k3-j721s2-evm.dtb line.

> 
>>  dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
>> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
>> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
> 
> I think dropping these will cause them to not get installed (by 
> dtbs_install). Presumably you want them.

I will undo the above deletions in the v2 patch.

> 
>> +dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
>>  
>>  # Boards with J784s4 SoC
>>  dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
>> -- 
>> 2.34.1
>>
Siddharth Vadapalli Sept. 12, 2023, 4:36 a.m. UTC | #3
On 12/09/23 09:31, Siddharth Vadapalli wrote:
> Rob,
> 
> Thank you for reviewing the patch.
> 
> On 11/09/23 22:26, Rob Herring wrote:

...
>> Move this next to the "dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb" line.
> 
> Sure, I will place it above the k3-j721s2-evm.dtb line.
> 
>>
>>>  dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
>>> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
>>> -dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
>>
>> I think dropping these will cause them to not get installed (by 
>> dtbs_install). Presumably you want them.
> 
> I will undo the above deletions in the v2 patch.

I have addressed the feedback and have posted the v2 patch at:
https://lore.kernel.org/r/20230912043308.20629-1-s-vadapalli@ti.com/

> 
>>
>>> +dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
>>>  
>>>  # Boards with J784s4 SoC
>>>  dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb
>>> -- 
>>> 2.34.1
>>>
>
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/ti/Makefile b/arch/arm64/boot/dts/ti/Makefile
index e7b8e2e7f083..ef8ca50fbb36 100644
--- a/arch/arm64/boot/dts/ti/Makefile
+++ b/arch/arm64/boot/dts/ti/Makefile
@@ -63,9 +63,9 @@  dtb-$(CONFIG_ARCH_K3) += k3-j721e-evm-gesi-exp-board.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-j721e-sk.dtb
 
 # Boards with J721s2 SoC
+k3-j721s2-evm-dtbs := k3-j721s2-common-proc-board.dtb k3-j721s2-evm-gesi-exp-board.dtbo
 dtb-$(CONFIG_ARCH_K3) += k3-am68-sk-base-board.dtb
-dtb-$(CONFIG_ARCH_K3) += k3-j721s2-common-proc-board.dtb
-dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm-gesi-exp-board.dtbo
+dtb-$(CONFIG_ARCH_K3) += k3-j721s2-evm.dtb
 
 # Boards with J784s4 SoC
 dtb-$(CONFIG_ARCH_K3) += k3-am69-sk.dtb