diff options
| author | Robby Cai <robby.cai@nxp.com> | 2016-05-24 17:29:48 +0800 |
|---|---|---|
| committer | Robby Cai <robby.cai@nxp.com> | 2016-05-24 18:13:01 +0800 |
| commit | b16029d054c690fe9ed95ba1ce74d3717d8b82de (patch) | |
| tree | b78c6961ec1f60e78908343e9214f3034e786ea1 /arch/arm/boot/dts/Makefile | |
| parent | f5450e04929406505daa7aba30fd718148d25146 (diff) | |
MLK-12849 ARM: dts: imx6ull-ddr3-arm2: add a new dts file for TSC
Since TSC has pin conflict with I2C1 which is used by PMIC and Camera,
we need to move TSC setting from LCDIF dts file into a separated one to
achieve the LCDIF and Camera feature in one DTS file. After the change,
we can get the supported features as follows.
-lcdif.dtb: lcd and camera, but no tsc
-tsc.dtb: lcd and tsc, but no camera
Signed-off-by: Robby Cai <robby.cai@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 64753f9dde42..5e1869aa7065 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -387,6 +387,7 @@ dtb-$(CONFIG_SOC_IMX6ULL) += \ imx6ull-14x14-ddr3-arm2-lcdif.dtb \ imx6ull-14x14-ddr3-arm2-ldo.dtb \ imx6ull-14x14-ddr3-arm2-qspi.dtb \ + imx6ull-14x14-ddr3-arm2-tsc.dtb \ imx6ull-14x14-ddr3-arm2-uart2.dtb \ imx6ull-14x14-ddr3-arm2-usb.dtb \ imx6ull-14x14-ddr3-arm2-wm8958.dtb |