| Message ID | 20231027152836.2985618-1-j-luthra@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Ryan Eatmon |
| Headers | show |
| Series | [master/kirkstone] conf: machine: am62*: Pick common overlays by prefix | expand |
On 27-Oct-23 20:58, Jai Luthra wrote: > 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> Reviewed-by: Aradhya Bhatia <a-bhatia1@ti.com> Regards Aradhya > --- > meta-ti-bsp/conf/machine/am62axx-evm.conf | 2 ++ > meta-ti-bsp/conf/machine/am62pxx-evm.conf | 6 +++++- > meta-ti-bsp/conf/machine/am62xx-evm.conf | 6 +++++- > meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 + > meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 6 +++++- > 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 > > KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-am62a7 \ > + ti/k3-am62x-sk-csi2 \ > + ti/k3-am62x-sk-hdmi \ > ti/k3-fpdlink \ > " > > 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 @@ > > require conf/machine/include/am62pxx.inc > > -KERNEL_DEVICETREE_PREFIX = "ti/k3-am62p5" > +KERNEL_DEVICETREE_PREFIX = " \ > + ti/k3-am62p5 \ > + ti/k3-am62x-sk-csi2 \ > + ti/k3-am62x-sk-hdmi \ > +" > > KERNEL_DEVICETREE = " \ > 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 @@ > require conf/machine/include/am62xx.inc > require conf/machine/include/ti-extras.inc > > -KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" > +KERNEL_DEVICETREE_PREFIX = " \ > + ti/k3-am625 \ > + ti/k3-am62x-sk-csi2 \ > + ti/k3-am62x-sk-hdmi \ > +" > > KERNEL_DEVICETREE = " \ > 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 > KERNEL_DEVICETREE_PREFIX = " \ > ti/k3-am62-lp \ > ti/k3-am625-sk \ > + ti/k3-am62x-sk-hdmi \ > " > > KERNEL_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 @@ > > require conf/machine/include/am62xx.inc > > -KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" > +KERNEL_DEVICETREE_PREFIX = " \ > + ti/k3-am625 \ > + ti/k3-am62x-sk-csi2 \ > + ti/k3-am62x-sk-hdmi \ > +" > > KERNEL_DEVICETREE = " \ > ti/k3-am625-sk.dtb \
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 KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62a7 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ ti/k3-fpdlink \ " 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 @@ require conf/machine/include/am62pxx.inc -KERNEL_DEVICETREE_PREFIX = "ti/k3-am62p5" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am62p5 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ +" KERNEL_DEVICETREE = " \ 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 @@ require conf/machine/include/am62xx.inc require conf/machine/include/ti-extras.inc -KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ +" KERNEL_DEVICETREE = " \ 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 KERNEL_DEVICETREE_PREFIX = " \ ti/k3-am62-lp \ ti/k3-am625-sk \ + ti/k3-am62x-sk-hdmi \ " KERNEL_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 @@ require conf/machine/include/am62xx.inc -KERNEL_DEVICETREE_PREFIX = "ti/k3-am625" +KERNEL_DEVICETREE_PREFIX = " \ + ti/k3-am625 \ + ti/k3-am62x-sk-csi2 \ + ti/k3-am62x-sk-hdmi \ +" KERNEL_DEVICETREE = " \ ti/k3-am625-sk.dtb \
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> --- meta-ti-bsp/conf/machine/am62axx-evm.conf | 2 ++ meta-ti-bsp/conf/machine/am62pxx-evm.conf | 6 +++++- meta-ti-bsp/conf/machine/am62xx-evm.conf | 6 +++++- meta-ti-bsp/conf/machine/am62xx-lp-evm.conf | 1 + meta-ti-bsp/conf/machine/am62xxsip-evm.conf | 6 +++++- 5 files changed, 18 insertions(+), 3 deletions(-)