diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 17:42:27 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-04-14 17:42:28 +0200 |
| commit | 8f09b5ec4177d52e9c6a32e930bc12256603c14b (patch) | |
| tree | 94dc94b10bef50320746df99688cb88633d5ec83 /arch/arm/boot/dts/Makefile | |
| parent | 58982e1d3c1ac0b47707d8bb12b0ebefe80fb246 (diff) | |
| parent | a140b18f0cc79f5c302ecedbde8364d49effa67f (diff) | |
Merge tag 'sunxi-dt-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
- added D1 crypto node
- enabled DVFS on OrangePi PC2 board
- added GPIO line names on Nezha D1 board
- added suniv USB nodes and enabled on licheepi-nano
- new suniv boards: PopStick v1.1 and Lctech Pi
- added Allwinner T113-s DTSI
- added MangoPi MQ-R T113-s board variant
- swapped DMA names for A23, A31, A33, D1, H3, H5, V3s
* tag 'sunxi-dt-for-6.4-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
riscv: dts: allwinner: d1: Switch dma-names order for snps,dw-apb-uart nodes
ARM: dts: sunxi: h3/h5: Switch dma-names order for snps,dw-apb-uart nodes
ARM: dts: sun8i: v3s: Switch dma-names order for snps,dw-apb-uart nodes
ARM: dts: sun8i: a23/a33: Switch dma-names order for snps,dw-apb-uart nodes
ARM: dts: sun6i: a31: Switch dma-names order for snps,dw-apb-uart nodes
ARM: dts: sunxi: add MangoPi MQ-R-T113 board
dt-bindings: arm: sunxi: document MangoPi MQ-R board names
ARM: dts: sunxi: add Allwinner T113-s SoC .dtsi
dts: add riscv include prefix link
ARM: dts: suniv: Add Lctech Pi F1C200s devicetree
ARM: dts: suniv: add device tree for PopStick v1.1
dt-binding: arm: sunxi: add two board compatible strings
dt-bindings: vendor-prefixes: add Source Parts and Lctech names
ARM: dts: suniv: licheepi-nano: enable USB
ARM: dts: suniv: add USB-related device nodes
riscv: dts: nezha-d1: add gpio-line-names
arm64: dts: allwinner: h5: OrangePi PC2: add OPP table to enable DVFS
riscv: dts: allwinner: d1: Add crypto engine node
Link: https://lore.kernel.org/r/20230408125156.GA17050@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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index eae9dcc2c138..59829fc90315 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1411,6 +1411,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-s3-elimo-initium.dtb \ sun8i-s3-lichee-zero-plus.dtb \ sun8i-s3-pinecube.dtb \ + sun8i-t113s-mangopi-mq-r-t113.dtb \ sun8i-t3-cqa3t-bv3.dtb \ sun8i-v3-sl631-imx179.dtb \ sun8i-v3s-licheepi-zero.dtb \ @@ -1420,7 +1421,9 @@ dtb-$(CONFIG_MACH_SUN9I) += \ sun9i-a80-optimus.dtb \ sun9i-a80-cubieboard4.dtb dtb-$(CONFIG_MACH_SUNIV) += \ - suniv-f1c100s-licheepi-nano.dtb + suniv-f1c100s-licheepi-nano.dtb \ + suniv-f1c200s-lctech-pi.dtb \ + suniv-f1c200s-popstick-v1.1.dtb dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ tegra20-acer-a500-picasso.dtb \ tegra20-asus-tf101.dtb \ |