diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-20 22:36:26 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-20 22:36:27 +0200 |
| commit | 52d38cff94f8d601493774dfe0b161de1adba7e1 (patch) | |
| tree | 555915866700ec9561756decf1f72cbe796948a5 /arch/arm/boot/dts/Makefile | |
| parent | a9c7f8d0cfb79dd96958d6845b6f0b3c4b57dd07 (diff) | |
| parent | 09d199b6dcb6bd94a1f00cfbfa1ee7d3841444b0 (diff) | |
Merge tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
- fix DCLK clock names
- new board ICnova A20 ADB4006
- add D1 SPI node
- add bluetooth node for chip board
- add extra mmc2 pinmux to sun5i
- add axp209 iio-hwmon node
* tag 'sunxi-dt-for-6.5-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: axp209: Add iio-hwmon node for internal temperature
ARM: dts: sun5i: Add port E pinmux settings for mmc2
ARM: dts: sun5i: chip: Enable bluetooth
riscv: dts: allwinner: d1: Add SPI controllers node
arm: dts: sunxi: Add ICnova A20 ADB4006 board
dt-bindings: arm: sunxi: add ICnova A20 ADB4006 binding
ARM: dts: sunxi: rename tcon's clock output
Link: https://lore.kernel.org/r/20230609210452.GA17638@jernej-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 fa60e9291480..6e430becee80 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1337,6 +1337,7 @@ dtb-$(CONFIG_MACH_SUN7I) += \ sun7i-a20-hummingbird.dtb \ sun7i-a20-itead-ibox.dtb \ sun7i-a20-i12-tvbox.dtb \ + sun7i-a20-icnova-a20-adb4006.dtb \ sun7i-a20-icnova-swac.dtb \ sun7i-a20-lamobo-r1.dtb \ sun7i-a20-linutronix-testbox-v2.dtb \ |