diff options
author | Olof Johansson <olof@lixom.net> | 2017-01-29 21:09:19 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2017-01-29 21:09:19 -0800 |
commit | ac43d9e0e5647052d78ba1e8d939549262fc268e (patch) | |
tree | adb6d7994b8c4cda7c2209248d902b3845482a89 /arch/arm64/boot/dts/freescale/Makefile | |
parent | bb414fc1901c28fa05eea9e4446dfaaa2c23b371 (diff) | |
parent | 73447f68d7b2bc1df870da88b0e21d2bc1afc025 (diff) | |
download | op-kernel-dev-ac43d9e0e5647052d78ba1e8d939549262fc268e.zip op-kernel-dev-ac43d9e0e5647052d78ba1e8d939549262fc268e.tar.gz |
Merge tag 'imx-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt64
Freescale arm64 device tree updates for 4.11:
- Add support for LS1012A SoC which is an ARMv8 SoC with single
Cortex-A53 core, and the corresponding board support: FRDM, QDS
and RDB.
- Enable TMU (Thermal Monitoring Unit) support for LS1046A SoC.
- Enable PCA9547 device for ls2080a-rdb board by removing 'disabled'
status setting.
* tag 'imx-dt64-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
dt-bindings: clockgen: Add compatible string for LS1012A
Documentation: DT: add LS1012A compatible for SCFG and DCFG
Documentation: DT: Add entry for FSL LS1012A RDB, FRDM, QDS boards
arm64: dts: ls1046a: Add TMU device tree support
arm64: dts: Add support for FSL's LS1012A SoC
arm64: dts: ls2080a-rdb: remove disable status of pca9547
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/Makefile')
-rw-r--r-- | arch/arm64/boot/dts/freescale/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/freescale/Makefile b/arch/arm64/boot/dts/freescale/Makefile index 6602718..39db645 100644 --- a/arch/arm64/boot/dts/freescale/Makefile +++ b/arch/arm64/boot/dts/freescale/Makefile @@ -1,3 +1,6 @@ +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-frdm.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-qds.dtb +dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1012a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-qds.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1043a-rdb.dtb dtb-$(CONFIG_ARCH_LAYERSCAPE) += fsl-ls1046a-qds.dtb |