summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJai Luthra <j-luthra@ti.com>2023-10-27 20:58:36 +0530
committerRyan Eatmon <reatmon@ti.com>2023-10-27 15:02:09 -0500
commitf5851386dfdd0385652d56382ef0f29783aaa3e2 (patch)
tree51fc46a92d329c656569f158bc8eceeba43cf0cc
parent8a528676191468b0d5ca56ca791ce73267223702 (diff)
downloadmeta-ti-f5851386dfdd0385652d56382ef0f29783aaa3e2.tar.gz
conf: machine: am62*: Pick common overlays by prefix
SK boards of AM62 SoC family share peripheral expansions for camera and audio-over-HDMI. The HDMI bridge is common across all SK-AM62* boards. The CSI2 FFC camera connector is common across all except SK-AM62-LP which only has a B2B Samtec connector. As the kernel now uses the same prefix "k3-am62x-sk-" for the devicetree overlays for these peripherals, make sure we pick them by prefix for applicable boards. Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=b50ccab9e07c Link: https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/?&id=0432df3d2ae7 Signed-off-by: Jai Luthra <j-luthra@ti.com> Signed-off-by: Ryan Eatmon <reatmon@ti.com>
-rw-r--r--meta-ti-bsp/conf/machine/am62axx-evm.conf2
-rw-r--r--meta-ti-bsp/conf/machine/am62pxx-evm.conf6
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-evm.conf6
-rw-r--r--meta-ti-bsp/conf/machine/am62xx-lp-evm.conf1
-rw-r--r--meta-ti-bsp/conf/machine/am62xxsip-evm.conf6
5 files changed, 18 insertions, 3 deletions
diff --git a/meta-ti-bsp/conf/machine/am62axx-evm.conf b/meta-ti-bsp/conf/machine/am62axx-evm.conf
index d5d60718..ef60e9d1 100644
--- a/meta-ti-bsp/conf/machine/am62axx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62axx-evm.conf
@@ -6,6 +6,8 @@ require conf/machine/include/am62axx.inc
6 6
7KERNEL_DEVICETREE_PREFIX = " \ 7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-am62a7 \ 8 ti/k3-am62a7 \
9 ti/k3-am62x-sk-csi2 \
10 ti/k3-am62x-sk-hdmi \
9 ti/k3-fpdlink \ 11 ti/k3-fpdlink \
10" 12"
11 13
diff --git a/meta-ti-bsp/conf/machine/am62pxx-evm.conf b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
index c0c62592..931de953 100644
--- a/meta-ti-bsp/conf/machine/am62pxx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62pxx-evm.conf
@@ -4,7 +4,11 @@
4 4
5require conf/machine/include/am62pxx.inc 5require conf/machine/include/am62pxx.inc
6 6
7KERNEL_DEVICETREE_PREFIX = "ti/k3-am62p5" 7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-am62p5 \
9 ti/k3-am62x-sk-csi2 \
10 ti/k3-am62x-sk-hdmi \
11"
8 12
9KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
10 ti/k3-am62p5-sk.dtb \ 14 ti/k3-am62p5-sk.dtb \
diff --git a/meta-ti-bsp/conf/machine/am62xx-evm.conf b/meta-ti-bsp/conf/machine/am62xx-evm.conf
index 082a1ae7..b60ba156 100644
--- a/meta-ti-bsp/conf/machine/am62xx-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-evm.conf
@@ -5,7 +5,11 @@
5require conf/machine/include/am62xx.inc 5require conf/machine/include/am62xx.inc
6require conf/machine/include/ti-extras.inc 6require conf/machine/include/ti-extras.inc
7 7
8KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" 8KERNEL_DEVICETREE_PREFIX = " \
9 ti/k3-am625 \
10 ti/k3-am62x-sk-csi2 \
11 ti/k3-am62x-sk-hdmi \
12"
9 13
10KERNEL_DEVICETREE = " \ 14KERNEL_DEVICETREE = " \
11 ti/k3-am625-sk.dtb \ 15 ti/k3-am625-sk.dtb \
diff --git a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
index 5c235c29..0d2f89ca 100644
--- a/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xx-lp-evm.conf
@@ -7,6 +7,7 @@ require conf/machine/include/am62xx.inc
7KERNEL_DEVICETREE_PREFIX = " \ 7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-am62-lp \ 8 ti/k3-am62-lp \
9 ti/k3-am625-sk \ 9 ti/k3-am625-sk \
10 ti/k3-am62x-sk-hdmi \
10" 11"
11 12
12KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
diff --git a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
index dc4f3b77..b3bda44a 100644
--- a/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
+++ b/meta-ti-bsp/conf/machine/am62xxsip-evm.conf
@@ -4,7 +4,11 @@
4 4
5require conf/machine/include/am62xx.inc 5require conf/machine/include/am62xx.inc
6 6
7KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" 7KERNEL_DEVICETREE_PREFIX = " \
8 ti/k3-am625 \
9 ti/k3-am62x-sk-csi2 \
10 ti/k3-am62x-sk-hdmi \
11"
8 12
9KERNEL_DEVICETREE = " \ 13KERNEL_DEVICETREE = " \
10 ti/k3-am625-sk.dtb \ 14 ti/k3-am625-sk.dtb \