diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2018-02-08 08:07:37 +0100 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2018-02-12 14:13:21 +0100 |
| commit | 7d77b8505aa941f326fc2df519f15437f0b0a85b (patch) | |
| tree | cc45ae5859dcb5455ab2770dd1eb301cce6f1560 /arch/arm/boot/dts/imx6ull-14x14-evk.dts | |
| parent | ARM: dts: imx6q-bx50v3: Enable secure-reg-access (diff) | |
| download | linux-7d77b8505aa941f326fc2df519f15437f0b0a85b.tar.xz linux-7d77b8505aa941f326fc2df519f15437f0b0a85b.zip | |
ARM: dts: imx6ull: fix the imx6ull-14x14-evk configuration
imx6ull-14x14-evk.dts currently includes the imx6ul.dtsi file for an
i.MX6ULL SoC which is plain wrong.
Rename the current imx6ul-14x14-evk.dts to .dtsi and include it from
imx6ul-14x14-evk.dts and imx6ull-14x14-evk.dts, so that both can
include the appropriate SoC specific (imx6ul.dtsi/imx6ull.dtsi) file.
Signed-off-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-14x14-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-evk.dts | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6ull-14x14-evk.dts b/arch/arm/boot/dts/imx6ull-14x14-evk.dts index 4741871434dd..30ef60344af3 100644 --- a/arch/arm/boot/dts/imx6ull-14x14-evk.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-evk.dts @@ -39,7 +39,10 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "imx6ul-14x14-evk.dts" +/dts-v1/; + +#include "imx6ull.dtsi" +#include "imx6ul-14x14-evk.dtsi" / { model = "Freescale i.MX6 UlltraLite 14x14 EVK Board"; |