From 4d4d71ac634d5179fbd664b069d2899feab52d55 Mon Sep 17 00:00:00 2001 From: Praneeth Bajjuri Date: Wed, 8 Nov 2023 10:04:37 -0600 Subject: conf: machine: am62*: extend picking common overlays by prefix commit f5851386 ("conf: machine: am62*: Pick common overlays by prefix") picks common HDMI and CSI overlays for am62 platform variants. Adding capability to extend the same prefix for common overlays for applicable am62 platforms in more generic way to include new mcan overlays added [1] [1]: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?&id=3b01c392627f given the differences in SK-AM62-LP containing B2B HDMI Samtec connector, just added the kernel prefix to pick common mcan overlay. for am62pxx: It has 4 MCANs vs all other am62xx devices have 3 MCANs, hence keeping this prefix seperate for am62pxx to pick right overlay. Signed-off-by: Praneeth Bajjuri Reviewed-by: Jai Luthra Reviewed-by: Judith Mendez Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/am62axx-evm.conf | 3 +-- meta-ti-bsp/conf/machine/am62xx-evm.conf | 3 +-- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 + meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 3 +-- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf index ef60e9d1..22f61401 100644 --- a/meta-ti-bsp/conf/machine/am62axx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf @@ -6,8 +6,7 @@ require conf/machine/include/am62axx.inc KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62a7 \ - ti/k3-am62x-sk-csi2 \ - ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk \ ti/k3-fpdlink \ " diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf index b60ba156..fadbc6f4 100644 --- a/meta-ti-bsp/conf/machine/am62xx-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf @@ -7,8 +7,7 @@ require conf/machine/include/ti-extras.inc KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ - ti/k3-am62x-sk-csi2 \ - ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk \ " KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf index 0d2f89ca..afa5e061 100644 --- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf @@ -8,6 +8,7 @@ KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62-lp \ ti/k3-am625-sk \ ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk-mcan \ " KERNEL_DEVICETREE = " \ diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf index b3bda44a..b5dd18f1 100644 --- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf +++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf @@ -6,8 +6,7 @@ require conf/machine/include/am62xx.inc KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am625 \ - ti/k3-am62x-sk-csi2 \ - ti/k3-am62x-sk-hdmi \ + ti/k3-am62x-sk \ " KERNEL_DEVICETREE = " \ -- cgit v1.2.3-54-g00ecf