summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJagan Teki <jagan@amarulasolutions.com>2017-06-16 09:04:39 +0200
committerShawn Guo <shawnguo@kernel.org>2017-07-16 03:42:13 +0200
commit182de5ebce71e469cfa686fcdf08c9cbe11ece97 (patch)
tree75bfd3856f0fa04fd2e3d8da3d07fa23e2205416
parentARM: dts: imx6ul-geam: Drop imx6ul-geam.dtsi (diff)
downloadlinux-182de5ebce71e469cfa686fcdf08c9cbe11ece97.tar.xz
linux-182de5ebce71e469cfa686fcdf08c9cbe11ece97.zip
ARM: dts: imx6ul-geam: Skip suffix -kit from dts name
Engicam SOM's with mounted on starter kits like icorem6(rqs), isiot usually not explicitly named with -kit in dts file names and instead Model has mentioned 'Starter kit' So apply the same rule for geam SOM as well. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-rw-r--r--arch/arm/boot/dts/Makefile2
-rw-r--r--arch/arm/boot/dts/imx6ul-geam.dts (renamed from arch/arm/boot/dts/imx6ul-geam-kit.dts)2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 4b17f35dc9a7..d6007a95dad7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -466,7 +466,7 @@ dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-udoo-neo-full.dtb
dtb-$(CONFIG_SOC_IMX6UL) += \
imx6ul-14x14-evk.dtb \
- imx6ul-geam-kit.dtb \
+ imx6ul-geam.dtb \
imx6ul-isiot-emmc.dtb \
imx6ul-isiot-nand.dtb \
imx6ul-liteboard.dtb \
diff --git a/arch/arm/boot/dts/imx6ul-geam-kit.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index d7092522d95b..e251ad29fb29 100644
--- a/arch/arm/boot/dts/imx6ul-geam-kit.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -47,7 +47,7 @@
#include "imx6ul.dtsi"
/ {
- model = "Engicam GEAM6UL";
+ model = "Engicam GEAM6UL Starter Kit";
compatible = "engicam,imx6ul-geam", "fsl,imx6ul";
memory {