diff mbox series

[kirkstone-next] meta-ti: conf: am6xx: Add display DT overlay support

Message ID 20230504062128.28222-1-a-bhatia1@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series [kirkstone-next] meta-ti: conf: am6xx: Add display DT overlay support | expand

Commit Message

Aradhya Bhatia May 4, 2023, 6:21 a.m. UTC
Add the Microtips OLDI Panel DT overlay for AM625-SK, AM62-LP SK and
Rocktech OLDI LCD DT overlay for AM654-EVM.

Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
---
 meta-ti-bsp/conf/machine/am62xx-evm.conf    | 1 +
 meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 +
 meta-ti-bsp/conf/machine/include/am65xx.inc | 1 +
 3 files changed, 3 insertions(+)

Comments

Ryan Eatmon May 4, 2023, 2:29 p.m. UTC | #1
On 5/4/2023 1:21, Aradhya Bhatia wrote:
> Add the Microtips OLDI Panel DT overlay for AM625-SK, AM62-LP SK and
> Rocktech OLDI LCD DT overlay for AM654-EVM.
> 
> Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
> ---
>   meta-ti-bsp/conf/machine/am62xx-evm.conf    | 1 +
>   meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 +
>   meta-ti-bsp/conf/machine/include/am65xx.inc | 1 +
>   3 files changed, 3 insertions(+)
> 
> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> index d54213d4cb7b..0c0170defbfb 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
> @@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>   
>   KERNEL_DEVICETREE = " \
>       ti/k3-am625-sk.dtb \
> +    ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
>   "

Starting in kirkstone, to support multiple kernels that might have 
differing sets of dtb overlays, we introduces the 
KERNEL_DEVICETREE_PREFIX variable to allow for pattern matches to pick 
the dtbs.

The only items that should appear in KERNEL_DEVICETREE are dtbs that are 
in the upstream kernel (latest and greatest).

Since the KERNEL_DEVICETREE_PREFIX covers what you are wanting to add, 
you do not need this change at all.

>   UBOOT_MACHINE = "am62x_evm_a53_defconfig"
> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> index ba1a12a7fdb7..9902987abc34 100644
> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
> @@ -11,6 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
>   
>   KERNEL_DEVICETREE = " \
>       ti/k3-am62x-lp-sk.dtb \
> +    ti/k3-am62-lp-sk-microtips-mf101hie-panel.dtbo \
>   "

In this case the KERNEL_DEVICETREE_PREFIX does not cover what you are 
adding, so you would need to change the PREFIX to:

KERNEL_DEVICETREE_PREFIX = " \
     ti/k3-am62x-lp \
     ti/k3-am62-lp \
     ti/k3-am625-sk \
"

>   SPL_BINARY = "tispl.bin_HS"
> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
> index 7dc234be671e..e0abad3e8f30 100644
> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
> @@ -9,6 +9,7 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
>   
>   KERNEL_DEVICETREE = " \
>       ti/k3-am654-base-board.dtb \
> +    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
>   "

Since the KERNEL_DEVICETREE_PREFIX covers what you are wanting to add, 
you do not need this change at all.


>   # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
Aradhya Bhatia May 5, 2023, 8:48 a.m. UTC | #2
Ryan,

Thank you for reviewing the patch.

On 04-May-23 19:59, Ryan Eatmon wrote:
> 
> 
> On 5/4/2023 1:21, Aradhya Bhatia wrote:
>> Add the Microtips OLDI Panel DT overlay for AM625-SK, AM62-LP SK and
>> Rocktech OLDI LCD DT overlay for AM654-EVM.
>>
>> Signed-off-by: Aradhya Bhatia <a-bhatia1@ti.com>
>> ---
>>   meta-ti-bsp/conf/machine/am62xx-evm.conf    | 1 +
>>   meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 +
>>   meta-ti-bsp/conf/machine/include/am65xx.inc | 1 +
>>   3 files changed, 3 insertions(+)
>>
>> diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> b/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> index d54213d4cb7b..0c0170defbfb 100644
>> --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
>> @@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
>>     KERNEL_DEVICETREE = " \
>>       ti/k3-am625-sk.dtb \
>> +    ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
>>   "
> 
> Starting in kirkstone, to support multiple kernels that might have
> differing sets of dtb overlays, we introduces the
> KERNEL_DEVICETREE_PREFIX variable to allow for pattern matches to pick
> the dtbs.
> 
> The only items that should appear in KERNEL_DEVICETREE are dtbs that are
> in the upstream kernel (latest and greatest).
> 
> Since the KERNEL_DEVICETREE_PREFIX covers what you are wanting to add,
> you do not need this change at all.
> 
>>   UBOOT_MACHINE = "am62x_evm_a53_defconfig"
>> diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
>> b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
>> index ba1a12a7fdb7..9902987abc34 100644
>> --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
>> +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
>> @@ -11,6 +11,7 @@ KERNEL_DEVICETREE_PREFIX = " \
>>     KERNEL_DEVICETREE = " \
>>       ti/k3-am62x-lp-sk.dtb \
>> +    ti/k3-am62-lp-sk-microtips-mf101hie-panel.dtbo \
>>   "
> 
> In this case the KERNEL_DEVICETREE_PREFIX does not cover what you are
> adding, so you would need to change the PREFIX to:
> 
> KERNEL_DEVICETREE_PREFIX = " \
>     ti/k3-am62x-lp \
>     ti/k3-am62-lp \
>     ti/k3-am625-sk \
> "
"ti/k3-am62-lp" should be supported instead of "ti/k3-am62x-lp" as the
name of the AM62-LP SK DT as been finalized to k3-am62-lp-sk.dts in the
kernel.[1]

I have sent the fix.

Regards
Aradhya

[1]:
https://lore.kernel.org/all/06cbcd7d-bc83-bfeb-0821-72c7caf9a5e7@linaro.org/

> 
>>   SPL_BINARY = "tispl.bin_HS"
>> diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc
>> b/meta-ti-bsp/conf/machine/include/am65xx.inc
>> index 7dc234be671e..e0abad3e8f30 100644
>> --- a/meta-ti-bsp/conf/machine/include/am65xx.inc
>> +++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
>> @@ -9,6 +9,7 @@ KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
>>     KERNEL_DEVICETREE = " \
>>       ti/k3-am654-base-board.dtb \
>> +    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
>>   "
> 
> Since the KERNEL_DEVICETREE_PREFIX covers what you are wanting to add,
> you do not need this change at all.
> 
> 
>>   # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw
>
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index d54213d4cb7b..0c0170defbfb 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -8,6 +8,7 @@  KERNEL_DEVICETREE_PREFIX = "ti/k3-am625"
 
 KERNEL_DEVICETREE = " \
     ti/k3-am625-sk.dtb \
+    ti/k3-am625-sk-microtips-mf101hie-panel.dtbo \
 "
 
 UBOOT_MACHINE = "am62x_evm_a53_defconfig"
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index ba1a12a7fdb7..9902987abc34 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -11,6 +11,7 @@  KERNEL_DEVICETREE_PREFIX = " \
 
 KERNEL_DEVICETREE = " \
     ti/k3-am62x-lp-sk.dtb \
+    ti/k3-am62-lp-sk-microtips-mf101hie-panel.dtbo \
 "
 
 SPL_BINARY = "tispl.bin_HS"
diff --git a/meta-ti-bsp/conf/machine/include/am65xx.inc b/meta-ti-bsp/conf/machine/include/am65xx.inc
index 7dc234be671e..e0abad3e8f30 100644
--- a/meta-ti-bsp/conf/machine/include/am65xx.inc
+++ b/meta-ti-bsp/conf/machine/include/am65xx.inc
@@ -9,6 +9,7 @@  KERNEL_DEVICETREE_PREFIX = "ti/k3-am654"
 
 KERNEL_DEVICETREE = " \
     ti/k3-am654-base-board.dtb \
+    ti/k3-am654-evm-oldi-lcd1evm.dtbo \
 "
 
 # On AM65x the file tiboot3.bin comes from the bootloader not ti-sci-fw