diff options
author | 2023-10-13 22:51:29 +0200 | |
---|---|---|
committer | 2023-10-13 22:51:30 +0200 | |
commit | 37d01395d9c809a17c2fc79681a35cbfb704a8f3 (patch) | |
tree | c50927825aed79b444e9a6aee1c4b9b2b6e90e80 /arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | |
parent | Merge tag 'tegra-for-6.7-arm64-dt' of git://git.kernel.org/pub/scm/linux/kern... (diff) | |
parent | riscv: dts: allwinner: convert isa detection to new properties (diff) | |
download | linux-37d01395d9c809a17c2fc79681a35cbfb704a8f3.tar.gz linux-37d01395d9c809a17c2fc79681a35cbfb704a8f3.tar.bz2 linux-37d01395d9c809a17c2fc79681a35cbfb704a8f3.zip |
Merge tag 'sunxi-dt-for-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into soc/dt
- Added V3s nodes for PWM pinctrl, EHCI and OHCI
- RISC-V DT cleanups
- Added new ISA property and PMU node to Allwinner D1
- Added interconnect to R40 video codec node
- New boards: Anbernic RG-Nano, BigTreeTech Pi, BigTreeTech CB1 SOM
* tag 'sunxi-dt-for-6.7-1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
riscv: dts: allwinner: convert isa detection to new properties
ARM: dts: sun8i-r40: Add interconnect to video-codec
ARM: dts: sunxi: add support for Anbernic RG-Nano
dt-bindings: arm: sunxi: add Anbernic RG-Nano
ARM: dts: sun8i: v3s: add EHCI and OHCI to v3s dts
arm: dts: sun8i: V3s: Add pinctrl for pwm
riscv: dts: allwinner: d1: Add PMU event node
arm64: dts: allwinner: h616: Add BigTreeTech Pi support
arm64: dts: allwinner: h616: Add BigTreeTech CB1 SoM & boards support
dt-bindings: arm: sunxi: Add BigTreeTech boards
dt-bindings: vendor-prefixes: Add BigTreeTech
arm64: dts: allwinner: h616: Add SID controller node
dt-bindings: nvmem: SID: Add binding for H616 SID controller
riscv: dts: allwinner: remove address-cells from intc node
riscv: dts: use capital "OR" for multiple licenses in SPDX
Link: https://lore.kernel.org/r/20231013194203.GA2155816@jernej-laptop
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi')
-rw-r--r-- | arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi index 9b03fca2444c..ed7b12e65a10 100644 --- a/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi +++ b/arch/riscv/boot/dts/allwinner/sun20i-common-regulators.dtsi @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: (GPL-2.0+ or MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) // Copyright (C) 2021-2022 Samuel Holland <samuel@sholland.org> / { |