diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 21:49:53 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-03-25 21:49:53 +0100 |
| commit | 6eda13907218f99aa883721162d375799f66c042 (patch) | |
| tree | 80c6b3c5b67f7c536397bb61c418a88fc25cbb6d /arch/arm/boot/dts/Makefile | |
| parent | 19a71cf494edd730d3433fc676a92a1101655e1e (diff) | |
| parent | 2118c8fd9889a5e76fe91547dcaa6f16ef165172 (diff) | |
Merge tag 'ux500-dts-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt
Ux500 DTS updates for the v5.7 kernel:
- Fix some DSI nodes
- Add GT-S7710 DTS file
* tag 'ux500-dts-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: dts: Add devicetree for Samsung GT-S7710
ARM: dts: ux500: Fix up DSI controller nodes
Link: https://lore.kernel.org/r/CACRpkdb8T9CZYvYEFYnQTOMoXGsn43N8TgKfvoJZjTwRHW6zhQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a3812a042339..94bee1bbc27d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1205,7 +1205,8 @@ dtb-$(CONFIG_ARCH_U8500) += \ ste-hrefv60plus-stuib.dtb \ ste-hrefv60plus-tvk.dtb \ ste-href520-tvk.dtb \ - ste-ux500-samsung-golden.dtb + ste-ux500-samsung-golden.dtb \ + ste-ux500-samsung-skomer.dtb dtb-$(CONFIG_ARCH_UNIPHIER) += \ uniphier-ld4-ref.dtb \ uniphier-ld6b-ref.dtb \ |