diff options
| author | Olof Johansson <olof@lixom.net> | 2017-08-29 22:42:22 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-08-29 22:42:22 -0700 |
| commit | c338aa5deb2a0ea4d82ad9e6a21cc97973330bba (patch) | |
| tree | 5916a06d623099530a493d5bc630427f4bf3a3ac /arch/arm64/boot/dts/socionext/Makefile | |
| parent | 1df295087079e2c87cc52e8aa3c6c87c62e88895 (diff) | |
| parent | c28adcb536109f54ddf349ee2fd9beef084d4d88 (diff) | |
| download | linux-stable-c338aa5deb2a0ea4d82ad9e6a21cc97973330bba.tar.gz linux-stable-c338aa5deb2a0ea4d82ad9e6a21cc97973330bba.tar.bz2 linux-stable-c338aa5deb2a0ea4d82ad9e6a21cc97973330bba.zip | |
Merge tag 'uniphier-dt64-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt64
UniPhier ARM64 SoC DT updates for v4.14 (2nd)
- add reset controller node of analog amplifier
- add AIDET irqchip device nodes
- fix size of sdctrl node
- support new SoC PXs3 and its reference development board
* tag 'uniphier-dt64-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
arm64: dts: uniphier: add PXs3 SoC support
arm64: dts: uniphier: fix size of sdctrl node
arm64: dts: uniphier: add AIDET nodes
arm64: dts: uniphier: add reset controller node of analog amplifier
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/socionext/Makefile')
| -rw-r--r-- | arch/arm64/boot/dts/socionext/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/socionext/Makefile b/arch/arm64/boot/dts/socionext/Makefile index 4a13a3a97101..4bc091b365fd 100644 --- a/arch/arm64/boot/dts/socionext/Makefile +++ b/arch/arm64/boot/dts/socionext/Makefile @@ -2,7 +2,8 @@ dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-ld11-global.dtb \ uniphier-ld11-ref.dtb \ uniphier-ld20-global.dtb \ - uniphier-ld20-ref.dtb + uniphier-ld20-ref.dtb \ + uniphier-pxs3-ref.dtb always := $(dtb-y) clean-files := *.dtb |