diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-20 23:36:26 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-20 23:36:27 +0300 |
| commit | 52d38cff94f8d601493774dfe0b161de1adba7e1 (patch) | |
| tree | 555915866700ec9561756decf1f72cbe796948a5 /arch/arm64/boot/dts/allwinner | |
| parent | a9c7f8d0cfb79dd96958d6845b6f0b3c4b57dd07 (diff) | |
| parent | 09d199b6dcb6bd94a1f00cfbfa1ee7d3841444b0 (diff) | |
| download | linux-52d38cff94f8d601493774dfe0b161de1adba7e1.tar.xz | |
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/arm64/boot/dts/allwinner')
| -rw-r--r-- | arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi index a9c7f82c2c66..57ac18738c99 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi @@ -408,7 +408,7 @@ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>; clock-names = "ahb", "tcon-ch0"; - clock-output-names = "tcon-pixel-clock"; + clock-output-names = "tcon-data-clock"; #clock-cells = <0>; resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>; reset-names = "lcd", "lvds"; |