From: Francesco Dolcini The Toradex Capacitive Touch Display 7" Parallel and Resistive Touch Display 7" Parallel are Toradex accessories, and the overlay names are their product names. A product name is unique only within its vendor: "panel-cap-touch-7inch-parallel" on its own reads as a generic panel description and could just as well name another vendor's display. Prefix the accessory with its vendor, "tdx", as is already done for third-party accessories on Toradex boards, e.g. "rpi" in k3-am625-verdin-rpi-display-2-7in.dtso. The combined DTBs are renamed accordingly. Link: https://lore.kernel.org/all/20261026111149.GA46946@francesco-nb/ Signed-off-by: Francesco Dolcini --- v2: new patch --- arch/arm/boot/dts/nxp/imx/Makefile | 30 +++++++++---------- ...p-touch-7inch-parallel-touch-adapter.dtso} | 0 ...c-tdx-panel-cap-touch-7inch-parallel.dtso} | 0 ...c-tdx-panel-res-touch-7inch-parallel.dtso} | 0 4 files changed, 15 insertions(+), 15 deletions(-) rename arch/arm/boot/dts/nxp/imx/{imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtso => imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtso} (100%) rename arch/arm/boot/dts/nxp/imx/{imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtso => imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtso} (100%) rename arch/arm/boot/dts/nxp/imx/{imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtso => imx7d-colibri-emmc-tdx-panel-res-touch-7inch-parallel.dtso} (100%) diff --git a/arch/arm/boot/dts/nxp/imx/Makefile b/arch/arm/boot/dts/nxp/imx/Makefile index f22abbd01434..c05cc9ff782d 100644 --- a/arch/arm/boot/dts/nxp/imx/Makefile +++ b/arch/arm/boot/dts/nxp/imx/Makefile @@ -424,21 +424,21 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ulz-14x14-evk.dtb \ imx6ulz-bsh-smm-m2.dtb -imx7d-colibri-emmc-aster-panel-cap-touch-7inch-parallel-dtbs := \ +imx7d-colibri-emmc-aster-tdx-panel-cap-touch-7inch-parallel-dtbs := \ imx7d-colibri-emmc-aster.dtb \ - imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtbo + imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtbo -imx7d-colibri-emmc-iris-v2-panel-cap-touch-7inch-parallel-dtbs := \ +imx7d-colibri-emmc-iris-v2-tdx-panel-cap-touch-7inch-parallel-dtbs := \ imx7d-colibri-emmc-iris-v2.dtb \ - imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtbo + imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtbo -imx7d-colibri-emmc-eval-v3-panel-cap-touch-7inch-parallel-touch-adapter-dtbs := \ +imx7d-colibri-emmc-eval-v3-tdx-panel-cap-touch-7inch-parallel-touch-adapter-dtbs := \ imx7d-colibri-emmc-eval-v3.dtb \ - imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtbo + imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtbo -imx7d-colibri-emmc-eval-v3-panel-res-touch-7inch-parallel-dtbs := \ +imx7d-colibri-emmc-eval-v3-tdx-panel-res-touch-7inch-parallel-dtbs := \ imx7d-colibri-emmc-eval-v3.dtb \ - imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtbo + imx7d-colibri-emmc-tdx-panel-res-touch-7inch-parallel.dtbo imx7d-colibri-emmc-aster-vga-dtbs := \ imx7d-colibri-emmc-aster.dtb \ @@ -460,20 +460,20 @@ dtb-$(CONFIG_SOC_IMX7D) += \ imx7d-cl-som-imx7.dtb \ imx7d-colibri-aster.dtb \ imx7d-colibri-emmc-aster.dtb \ - imx7d-colibri-emmc-aster-panel-cap-touch-7inch-parallel.dtb \ + imx7d-colibri-emmc-aster-tdx-panel-cap-touch-7inch-parallel.dtb \ imx7d-colibri-emmc-aster-vga.dtb \ imx7d-colibri-emmc-iris.dtb \ imx7d-colibri-emmc-iris-vga.dtb \ imx7d-colibri-emmc-iris-v2.dtb \ - imx7d-colibri-emmc-iris-v2-panel-cap-touch-7inch-parallel.dtb \ + imx7d-colibri-emmc-iris-v2-tdx-panel-cap-touch-7inch-parallel.dtb \ imx7d-colibri-emmc-iris-v2-vga.dtb \ imx7d-colibri-emmc-eval-v3.dtb \ - imx7d-colibri-emmc-eval-v3-panel-cap-touch-7inch-parallel-touch-adapter.dtb \ - imx7d-colibri-emmc-eval-v3-panel-res-touch-7inch-parallel.dtb \ + imx7d-colibri-emmc-eval-v3-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtb \ + imx7d-colibri-emmc-eval-v3-tdx-panel-res-touch-7inch-parallel.dtb \ imx7d-colibri-emmc-eval-v3-vga.dtb \ - imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtbo \ - imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtbo \ - imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtbo \ + imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtbo \ + imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtbo \ + imx7d-colibri-emmc-tdx-panel-res-touch-7inch-parallel.dtbo \ imx7d-colibri-emmc-vga.dtbo \ imx7d-colibri-eval-v3.dtb \ imx7d-colibri-iris.dtb \ diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtso b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtso similarity index 100% rename from arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtso rename to arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel-touch-adapter.dtso diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtso b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtso similarity index 100% rename from arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtso rename to arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-cap-touch-7inch-parallel.dtso diff --git a/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtso b/arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-res-touch-7inch-parallel.dtso similarity index 100% rename from arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtso rename to arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-tdx-panel-res-touch-7inch-parallel.dtso -- 2.47.3