mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic
@ 2025-09-25 10:49 stefan.prisacariu
  2025-09-25 22:21 ` Frank Li
  0 siblings, 1 reply; 4+ messages in thread
From: stefan.prisacariu @ 2025-09-25 10:49 UTC (permalink / raw)
  To: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
	Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, devicetree,
	imx, linux-arm-kernel, linux-kernel
  Cc: Stefan Prisacariu

From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>

Make SoM .dtsi SoC-agnostic by moving SoC include to board level

imx6qdl-var-som.dtsi currently includes imx6q.dtsi, which makes this SoM
description Quad/Dual specific and prevents reuse from i.MX6DL boards.

Move the SoC selection to the board level:
 - Drop the imx6q.dtsi include from the SoM .dtsi.
 - Add imx6q.dtsi include to imx6q-var-mx6customboard.dts.

This keeps the SoM .dtsi SoC-agnostic (it already relies on imx6qdl.dtsi
for family-common parts) and allows boards using the DualLite or Solo to
include imx6dl.dtsi instead.

Why this is needed:
I need to reuse imx6qdl-var-som.dtsi for a board based on i.MX6DL
(VAR-SOM SoM + custom carrier). Without this change, the SoM .dtsi
forces imx6q.dtsi, which is incorrect for DL and breaks the layering
model used upstream.

Verification:
The DTB for imx6q-var-mx6customboard was rebuilt before and after this
change. Both the binary DTB and the decompiled DTS
(via dtc -I dtb -O dts -s) are identical, confirming no functional change
for the existing board.

Alignment:
This also aligns the layering with how it is already done for
imx6q-var-dt6customboard.dts, where the SoC include is handled at the
board level.

No functional changes for imx6q-var-mx6customboard are intended.

Files were introduced in:
commit e5c810848d2a ("ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6
SoM support")
commit a5b59a3f41bd ("ARM: dts: imx6q: Add Variscite MX6 Custom board
support")

Signed-off-by: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
---
 arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 +
 arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi         | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
index 18a620832a2a..a55644529c67 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
@@ -8,6 +8,7 @@
 
 /dts-v1/;
 
+#include "imx6q.dtsi"
 #include "imx6qdl-var-som.dtsi"
 #include <dt-bindings/pwm/pwm.h>
 
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
index 59833e8d11d8..51bcaf04546b 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
@@ -9,9 +9,6 @@
  * Copyright 2022 Bootlin
  */
 
-/dts-v1/;
-
-#include "imx6q.dtsi"
 #include <dt-bindings/clock/imx6qdl-clock.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/sound/fsl-imx-audmux.h>

base-commit: 8f5ff9784f3262e6e85c68d86f8b7931827f2983
-- 
2.49.1


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

* Re: [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic
  2025-09-25 10:49 [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic stefan.prisacariu
@ 2025-09-25 22:21 ` Frank Li
  2025-09-26  9:31   ` Stefan Prisacariu
  0 siblings, 1 reply; 4+ messages in thread
From: Frank Li @ 2025-09-25 22:21 UTC (permalink / raw)
  To: stefan.prisacariu
  Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
	Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, devicetree,
	imx, linux-arm-kernel, linux-kernel

On Thu, Sep 25, 2025 at 12:49:40PM +0200, stefan.prisacariu@prevas.dk wrote:
> From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
>
> Make SoM .dtsi SoC-agnostic by moving SoC include to board level
>
> imx6qdl-var-som.dtsi currently includes imx6q.dtsi, which makes this SoM
> description Quad/Dual specific and prevents reuse from i.MX6DL boards.
>
> Move the SoC selection to the board level:
>  - Drop the imx6q.dtsi include from the SoM .dtsi.
>  - Add imx6q.dtsi include to imx6q-var-mx6customboard.dts.

move imx6q.dtsi from imx6qdl-var-som.dtsi to imx6q-var-mx6customboard.dts.

>
> This keeps the SoM .dtsi SoC-agnostic (it already relies on imx6qdl.dtsi
> for family-common parts) and allows boards using the DualLite or Solo to
> include imx6dl.dtsi instead.
>
> Why this is needed:
> I need to reuse imx6qdl-var-som.dtsi for a board based on i.MX6DL
> (VAR-SOM SoM + custom carrier). Without this change, the SoM .dtsi
> forces imx6q.dtsi, which is incorrect for DL and breaks the layering
> model used upstream.

Can use simple words

To reuse imx6qdl-var-som.dtsi on i.MX6DL board.

>
> Verification:
> The DTB for imx6q-var-mx6customboard was rebuilt before and after this
> change. Both the binary DTB and the decompiled DTS
> (via dtc -I dtb -O dts -s) are identical, confirming no functional change
> for the existing board.

Needn't this section (good place for these informaiton is cover letter).

>
> Alignment:
> This also aligns the layering with how it is already done for
> imx6q-var-dt6customboard.dts, where the SoC include is handled at the
> board level.

Needn't this section

>
> No functional changes for imx6q-var-mx6customboard are intended.

good

>
> Files were introduced in:
> commit e5c810848d2a ("ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6
> SoM support")
> commit a5b59a3f41bd ("ARM: dts: imx6q: Add Variscite MX6 Custom board
> support")

Needn't this section.

>
> Signed-off-by: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
> ---
>  arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 +
>  arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi         | 3 ---
>  2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
> index 18a620832a2a..a55644529c67 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
> +++ b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
> @@ -8,6 +8,7 @@
>
>  /dts-v1/;
>
> +#include "imx6q.dtsi"
>  #include "imx6qdl-var-som.dtsi"
>  #include <dt-bindings/pwm/pwm.h>
>
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
> index 59833e8d11d8..51bcaf04546b 100644
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
> @@ -9,9 +9,6 @@
>   * Copyright 2022 Bootlin
>   */
>
> -/dts-v1/;

why drop this line.

Frank
> -
> -#include "imx6q.dtsi"
>  #include <dt-bindings/clock/imx6qdl-clock.h>
>  #include <dt-bindings/gpio/gpio.h>
>  #include <dt-bindings/sound/fsl-imx-audmux.h>
>
> base-commit: 8f5ff9784f3262e6e85c68d86f8b7931827f2983
> --
> 2.49.1
>

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

* Re: [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic
  2025-09-25 22:21 ` Frank Li
@ 2025-09-26  9:31   ` Stefan Prisacariu
  2025-09-29  8:39     ` Stefan Prisacariu
  0 siblings, 1 reply; 4+ messages in thread
From: Stefan Prisacariu @ 2025-09-26  9:31 UTC (permalink / raw)
  To: Frank Li
  Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
	Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, devicetree,
	imx, linux-arm-kernel, linux-kernel


On 26/09/2025 00.21, Frank Li wrote:
> On Thu, Sep 25, 2025 at 12:49:40PM +0200, stefan.prisacariu@prevas.dk wrote:
>> From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
>>
>> Make SoM .dtsi SoC-agnostic by moving SoC include to board level
>>
>> imx6qdl-var-som.dtsi currently includes imx6q.dtsi, which makes this SoM
>> description Quad/Dual specific and prevents reuse from i.MX6DL boards.
>>
>> Move the SoC selection to the board level:
>>   - Drop the imx6q.dtsi include from the SoM .dtsi.
>>   - Add imx6q.dtsi include to imx6q-var-mx6customboard.dts.
> move imx6q.dtsi from imx6qdl-var-som.dtsi to imx6q-var-mx6customboard.dts.
>
>> This keeps the SoM .dtsi SoC-agnostic (it already relies on imx6qdl.dtsi
>> for family-common parts) and allows boards using the DualLite or Solo to
>> include imx6dl.dtsi instead.
>>
>> Why this is needed:
>> I need to reuse imx6qdl-var-som.dtsi for a board based on i.MX6DL
>> (VAR-SOM SoM + custom carrier). Without this change, the SoM .dtsi
>> forces imx6q.dtsi, which is incorrect for DL and breaks the layering
>> model used upstream.
> Can use simple words
>
> To reuse imx6qdl-var-som.dtsi on i.MX6DL board.
>
>> Verification:
>> The DTB for imx6q-var-mx6customboard was rebuilt before and after this
>> change. Both the binary DTB and the decompiled DTS
>> (via dtc -I dtb -O dts -s) are identical, confirming no functional change
>> for the existing board.
> Needn't this section (good place for these informaiton is cover letter).
>
>> Alignment:
>> This also aligns the layering with how it is already done for
>> imx6q-var-dt6customboard.dts, where the SoC include is handled at the
>> board level.
> Needn't this section
>
>> No functional changes for imx6q-var-mx6customboard are intended.
> good
>
>> Files were introduced in:
>> commit e5c810848d2a ("ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6
>> SoM support")
>> commit a5b59a3f41bd ("ARM: dts: imx6q: Add Variscite MX6 Custom board
>> support")
> Needn't this section.
>
>> Signed-off-by: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
>> ---
>>   arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 +
>>   arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi         | 3 ---
>>   2 files changed, 1 insertion(+), 3 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>> index 18a620832a2a..a55644529c67 100644
>> --- a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>> +++ b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>> @@ -8,6 +8,7 @@
>>
>>   /dts-v1/;
>>
>> +#include "imx6q.dtsi"
>>   #include "imx6qdl-var-som.dtsi"
>>   #include <dt-bindings/pwm/pwm.h>
>>
>> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>> index 59833e8d11d8..51bcaf04546b 100644
>> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>> @@ -9,9 +9,6 @@
>>    * Copyright 2022 Bootlin
>>    */
>>
>> -/dts-v1/;
> why drop this line.

As far as I know this line should be present in the dts not dtsi files,
also this will remove the requirement to have this dtsi file first 
included in
the dts files

Stefan

>
> Frank
>> -
>> -#include "imx6q.dtsi"
>>   #include <dt-bindings/clock/imx6qdl-clock.h>
>>   #include <dt-bindings/gpio/gpio.h>
>>   #include <dt-bindings/sound/fsl-imx-audmux.h>
>>
>> base-commit: 8f5ff9784f3262e6e85c68d86f8b7931827f2983
>> --
>> 2.49.1
>>

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

* Re: [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic
  2025-09-26  9:31   ` Stefan Prisacariu
@ 2025-09-29  8:39     ` Stefan Prisacariu
  0 siblings, 0 replies; 4+ messages in thread
From: Stefan Prisacariu @ 2025-09-29  8:39 UTC (permalink / raw)
  To: Frank Li
  Cc: Rob Herring, Krzysztof Kozlowski, Conor Dooley, Shawn Guo,
	Sascha Hauer, Pengutronix Kernel Team, Fabio Estevam, devicetree,
	imx, linux-arm-kernel, linux-kernel

Hi Frank,

Please let me know if you want me to sent again this patch:

- with the simpler commit message

- add a cover letter to move the extra information

- keep the /dts-v1/; inside the .dtsi


Thank you,

Stefan


On 26/09/2025 11.31, Stefan Prisacariu wrote:
>
> On 26/09/2025 00.21, Frank Li wrote:
>> On Thu, Sep 25, 2025 at 12:49:40PM +0200, stefan.prisacariu@prevas.dk 
>> wrote:
>>> From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
>>>
>>> Make SoM .dtsi SoC-agnostic by moving SoC include to board level
>>>
>>> imx6qdl-var-som.dtsi currently includes imx6q.dtsi, which makes this 
>>> SoM
>>> description Quad/Dual specific and prevents reuse from i.MX6DL boards.
>>>
>>> Move the SoC selection to the board level:
>>>   - Drop the imx6q.dtsi include from the SoM .dtsi.
>>>   - Add imx6q.dtsi include to imx6q-var-mx6customboard.dts.
>> move imx6q.dtsi from imx6qdl-var-som.dtsi to 
>> imx6q-var-mx6customboard.dts.
>>
>>> This keeps the SoM .dtsi SoC-agnostic (it already relies on 
>>> imx6qdl.dtsi
>>> for family-common parts) and allows boards using the DualLite or 
>>> Solo to
>>> include imx6dl.dtsi instead.
>>>
>>> Why this is needed:
>>> I need to reuse imx6qdl-var-som.dtsi for a board based on i.MX6DL
>>> (VAR-SOM SoM + custom carrier). Without this change, the SoM .dtsi
>>> forces imx6q.dtsi, which is incorrect for DL and breaks the layering
>>> model used upstream.
>> Can use simple words
>>
>> To reuse imx6qdl-var-som.dtsi on i.MX6DL board.
>>
>>> Verification:
>>> The DTB for imx6q-var-mx6customboard was rebuilt before and after this
>>> change. Both the binary DTB and the decompiled DTS
>>> (via dtc -I dtb -O dts -s) are identical, confirming no functional 
>>> change
>>> for the existing board.
>> Needn't this section (good place for these informaiton is cover letter).
>>
>>> Alignment:
>>> This also aligns the layering with how it is already done for
>>> imx6q-var-dt6customboard.dts, where the SoC include is handled at the
>>> board level.
>> Needn't this section
>>
>>> No functional changes for imx6q-var-mx6customboard are intended.
>> good
>>
>>> Files were introduced in:
>>> commit e5c810848d2a ("ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6
>>> SoM support")
>>> commit a5b59a3f41bd ("ARM: dts: imx6q: Add Variscite MX6 Custom board
>>> support")
>> Needn't this section.
>>
>>> Signed-off-by: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
>>> ---
>>>   arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 +
>>>   arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi         | 3 ---
>>>   2 files changed, 1 insertion(+), 3 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts 
>>> b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>>> index 18a620832a2a..a55644529c67 100644
>>> --- a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>>> +++ b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
>>> @@ -8,6 +8,7 @@
>>>
>>>   /dts-v1/;
>>>
>>> +#include "imx6q.dtsi"
>>>   #include "imx6qdl-var-som.dtsi"
>>>   #include <dt-bindings/pwm/pwm.h>
>>>
>>> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi 
>>> b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>>> index 59833e8d11d8..51bcaf04546b 100644
>>> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>>> +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi
>>> @@ -9,9 +9,6 @@
>>>    * Copyright 2022 Bootlin
>>>    */
>>>
>>> -/dts-v1/;
>> why drop this line.
>
> As far as I know this line should be present in the dts not dtsi files,
> also this will remove the requirement to have this dtsi file first 
> included in
> the dts files
>
> Stefan
>
>>
>> Frank
>>> -
>>> -#include "imx6q.dtsi"
>>>   #include <dt-bindings/clock/imx6qdl-clock.h>
>>>   #include <dt-bindings/gpio/gpio.h>
>>>   #include <dt-bindings/sound/fsl-imx-audmux.h>
>>>
>>> base-commit: 8f5ff9784f3262e6e85c68d86f8b7931827f2983
>>> -- 
>>> 2.49.1
>>>

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

end of thread, other threads:[~2025-09-29  8:40 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-09-25 10:49 [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic stefan.prisacariu
2025-09-25 22:21 ` Frank Li
2025-09-26  9:31   ` Stefan Prisacariu
2025-09-29  8:39     ` Stefan Prisacariu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®