From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F3126C433EF for ; Fri, 20 May 2022 15:35:17 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1AF1483E8E; Fri, 20 May 2022 17:35:16 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 0B20B83ED5; Fri, 20 May 2022 17:35:14 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by phobos.denx.de (Postfix) with ESMTP id ED3A883E9A for ; Fri, 20 May 2022 17:35:02 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=andre.przywara@arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EF95B1477; Fri, 20 May 2022 08:35:01 -0700 (PDT) Received: from donnerap.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4D3F73F73D; Fri, 20 May 2022 08:35:01 -0700 (PDT) Date: Fri, 20 May 2022 15:14:07 +0100 From: Andre Przywara To: Samuel Holland Cc: u-boot@lists.denx.de, Jagan Teki , Tom Rini Subject: Re: [PATCH 12/12] ARM: dts: sun50i: H6: Sync from Linux v5.18-rc1 Message-ID: <20220520151407.6cef0ea4@donnerap.cambridge.arm.com> In-Reply-To: <20220427203132.47271-13-samuel@sholland.org> References: <20220427203132.47271-1-samuel@sholland.org> <20220427203132.47271-13-samuel@sholland.org> Organization: ARM X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.32; aarch64-unknown-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On Wed, 27 Apr 2022 15:31:31 -0500 Samuel Holland wrote: > Copy the devicetree source for the H6 SoC and all existing boards > from the Linux v5.18-rc1 tag. >=20 > To maintain ABI compatibility with existing LTS kernels, one change > moving some IP blocks to the r_intc interrupt controller is excluded. > This effectively reverts Linux commits 189bef235dd3 and 73088dfee635. >=20 > This commit also adds the following new board devicetrees: > - sun50i-h6-pine-h64-model-b.dts > - sun50i-h6-tanix-tx6-mini.dts >=20 > This update should not impact any existing U-Boot functionality. >=20 > Signed-off-by: Samuel Holland Compared against the Linux kernel, apart from the r_intc changes they are the same. The changes look innocent, and shouldn't affect U-Boot or Linux kernel compatibility. Reviewed-by: Andre Przywara Cheers, Andre > --- >=20 > arch/arm/dts/Makefile | 4 +- > arch/arm/dts/sun50i-h6-beelink-gs1.dts | 38 ++-- > arch/arm/dts/sun50i-h6-cpu-opp.dtsi | 2 +- > arch/arm/dts/sun50i-h6-orangepi-3.dts | 14 +- > arch/arm/dts/sun50i-h6-orangepi.dtsi | 22 +-- > arch/arm/dts/sun50i-h6-pine-h64-model-b.dts | 51 ++++++ > arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts | 15 ++ > arch/arm/dts/sun50i-h6-tanix-tx6.dts | 115 ++---------- > arch/arm/dts/sun50i-h6-tanix.dtsi | 189 ++++++++++++++++++++ > arch/arm/dts/sun50i-h6.dtsi | 26 ++- > 10 files changed, 328 insertions(+), 148 deletions(-) > create mode 100644 arch/arm/dts/sun50i-h6-pine-h64-model-b.dts > create mode 100644 arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts > create mode 100644 arch/arm/dts/sun50i-h6-tanix.dtsi >=20 > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 95909ef037..85e731aec9 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -695,7 +695,9 @@ dtb-$(CONFIG_MACH_SUN50I_H6) +=3D \ > sun50i-h6-orangepi-lite2.dtb \ > sun50i-h6-orangepi-one-plus.dtb \ > sun50i-h6-pine-h64.dtb \ > - sun50i-h6-tanix-tx6.dtb > + sun50i-h6-pine-h64-model-b.dtb \ > + sun50i-h6-tanix-tx6.dtb \ > + sun50i-h6-tanix-tx6-mini.dtb > dtb-$(CONFIG_MACH_SUN50I_H616) +=3D \ > sun50i-h616-orangepi-zero2.dtb > dtb-$(CONFIG_MACH_SUN50I) +=3D \ > diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i= -h6-beelink-gs1.dts > index b5808047d6..649b146dff 100644 > --- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts > +++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts > @@ -150,12 +150,28 @@ > vcc-pg-supply =3D <®_aldo1>; > }; > =20 > -&r_i2c { > +&r_ir { > + linux,rc-map-name =3D "rc-beelink-gs1"; > + status =3D "okay"; > +}; > + > +&r_pio { > + /* > + * FIXME: We can't add that supply for now since it would > + * create a circular dependency between pinctrl, the regulator > + * and the RSB Bus. > + * > + * vcc-pl-supply =3D <®_aldo1>; > + */ > + vcc-pm-supply =3D <®_aldo1>; > +}; > + > +&r_rsb { > status =3D "okay"; > =20 > - axp805: pmic@36 { > + axp805: pmic@745 { > compatible =3D "x-powers,axp805", "x-powers,axp806"; > - reg =3D <0x36>; > + reg =3D <0x745>; > interrupt-parent =3D <&r_intc>; > interrupts =3D <0 IRQ_TYPE_LEVEL_LOW>; > interrupt-controller; > @@ -273,22 +289,6 @@ > }; > }; > =20 > -&r_ir { > - linux,rc-map-name =3D "rc-beelink-gs1"; > - status =3D "okay"; > -}; > - > -&r_pio { > - /* > - * PL0 and PL1 are used for PMIC I2C > - * don't enable the pl-supply else > - * it will fail at boot > - * > - * vcc-pl-supply =3D <®_aldo1>; > - */ > - vcc-pm-supply =3D <®_aldo1>; > -}; > - > &spdif { > status =3D "okay"; > }; > diff --git a/arch/arm/dts/sun50i-h6-cpu-opp.dtsi b/arch/arm/dts/sun50i-h6= -cpu-opp.dtsi > index 8c6e8536b6..0baf0f8e4d 100644 > --- a/arch/arm/dts/sun50i-h6-cpu-opp.dtsi > +++ b/arch/arm/dts/sun50i-h6-cpu-opp.dtsi > @@ -3,7 +3,7 @@ > // Copyright (C) 2020 Cl=C3=A9ment P=C3=A9ron > =20 > / { > - cpu_opp_table: cpu-opp-table { > + cpu_opp_table: opp-table-cpu { > compatible =3D "allwinner,sun50i-h6-operating-points"; > nvmem-cells =3D <&cpu_speed_grade>; > opp-shared; > diff --git a/arch/arm/dts/sun50i-h6-orangepi-3.dts b/arch/arm/dts/sun50i-= h6-orangepi-3.dts > index 7e83f6146f..9f12c05e21 100644 > --- a/arch/arm/dts/sun50i-h6-orangepi-3.dts > +++ b/arch/arm/dts/sun50i-h6-orangepi-3.dts > @@ -175,12 +175,16 @@ > vcc-pg-supply =3D <®_vcc_wifi_io>; > }; > =20 > -&r_i2c { > +&r_ir { > + status =3D "okay"; > +}; > + > +&r_rsb { > status =3D "okay"; > =20 > - axp805: pmic@36 { > + axp805: pmic@745 { > compatible =3D "x-powers,axp805", "x-powers,axp806"; > - reg =3D <0x36>; > + reg =3D <0x745>; > interrupt-parent =3D <&r_intc>; > interrupts =3D <0 IRQ_TYPE_LEVEL_LOW>; > interrupt-controller; > @@ -291,10 +295,6 @@ > }; > }; > =20 > -&r_ir { > - status =3D "okay"; > -}; > - > &rtc { > clocks =3D <&ext_osc32k>; > }; > diff --git a/arch/arm/dts/sun50i-h6-orangepi.dtsi b/arch/arm/dts/sun50i-h= 6-orangepi.dtsi > index da0875bd38..a5811d55bb 100644 > --- a/arch/arm/dts/sun50i-h6-orangepi.dtsi > +++ b/arch/arm/dts/sun50i-h6-orangepi.dtsi > @@ -112,12 +112,20 @@ > vcc-pg-supply =3D <®_aldo1>; > }; > =20 > -&r_i2c { > +&r_ir { > + status =3D "okay"; > +}; > + > +&r_pio { > + vcc-pm-supply =3D <®_bldo3>; > +}; > + > +&r_rsb { > status =3D "okay"; > =20 > - axp805: pmic@36 { > + axp805: pmic@745 { > compatible =3D "x-powers,axp805", "x-powers,axp806"; > - reg =3D <0x36>; > + reg =3D <0x745>; > interrupt-parent =3D <&r_intc>; > interrupts =3D <0 IRQ_TYPE_LEVEL_LOW>; > interrupt-controller; > @@ -232,14 +240,6 @@ > }; > }; > =20 > -&r_ir { > - status =3D "okay"; > -}; > - > -&r_pio { > - vcc-pm-supply =3D <®_bldo3>; > -}; > - > &rtc { > clocks =3D <&ext_osc32k>; > }; > diff --git a/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts b/arch/arm/dts/s= un50i-h6-pine-h64-model-b.dts > new file mode 100644 > index 0000000000..686f58e770 > --- /dev/null > +++ b/arch/arm/dts/sun50i-h6-pine-h64-model-b.dts > @@ -0,0 +1,51 @@ > +// SPDX-License-Identifier: (GPL-2.0+ or MIT) > +/* > + * Copyright (C) 2019 Corentin LABBE > + */ > + > +#include "sun50i-h6-pine-h64.dts" > + > +/ { > + model =3D "Pine H64 model B"; > + compatible =3D "pine64,pine-h64-model-b", "allwinner,sun50i-h6"; > + > + /delete-node/ reg_gmac_3v3; > + > + wifi_pwrseq: wifi_pwrseq { > + compatible =3D "mmc-pwrseq-simple"; > + reset-gpios =3D <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ > + post-power-on-delay-ms =3D <200>; > + }; > +}; > + > +&hdmi_connector { > + /delete-property/ ddc-en-gpios; > +}; > + > +&emac { > + phy-supply =3D <®_aldo2>; > +}; > + > +&mmc1 { > + vmmc-supply =3D <®_cldo3>; > + vqmmc-supply =3D <®_aldo1>; > + mmc-pwrseq =3D <&wifi_pwrseq>; > + bus-width =3D <4>; > + non-removable; > + status =3D "okay"; > +}; > + > +&uart1 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&uart1_pins>, <&uart1_rts_cts_pins>; > + uart-has-rtscts; > + status =3D "okay"; > + > + bluetooth { > + compatible =3D "realtek,rtl8723bs-bt"; > + device-wake-gpios =3D <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */ > + host-wake-gpios =3D <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */ > + enable-gpios =3D <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */ > + max-speed =3D <1500000>; > + }; > +}; > diff --git a/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts b/arch/arm/dts/sun= 50i-h6-tanix-tx6-mini.dts > new file mode 100644 > index 0000000000..08d84160d8 > --- /dev/null > +++ b/arch/arm/dts/sun50i-h6-tanix-tx6-mini.dts > @@ -0,0 +1,15 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +// Copyright (c) 2021 Jernej Skrabec > + > +/dts-v1/; > + > +#include "sun50i-h6-tanix.dtsi" > + > +/ { > + model =3D "Tanix TX6 mini"; > + compatible =3D "oranth,tanix-tx6-mini", "allwinner,sun50i-h6"; > +}; > + > +&r_ir { > + linux,rc-map-name =3D "rc-tanix-tx3mini"; > +}; > diff --git a/arch/arm/dts/sun50i-h6-tanix-tx6.dts b/arch/arm/dts/sun50i-h= 6-tanix-tx6.dts > index be81330db1..9a38ff9b3f 100644 > --- a/arch/arm/dts/sun50i-h6-tanix-tx6.dts > +++ b/arch/arm/dts/sun50i-h6-tanix-tx6.dts > @@ -3,122 +3,27 @@ > =20 > /dts-v1/; > =20 > -#include "sun50i-h6.dtsi" > -#include "sun50i-h6-cpu-opp.dtsi" > - > -#include > +#include "sun50i-h6-tanix.dtsi" > =20 > / { > model =3D "Tanix TX6"; > compatible =3D "oranth,tanix-tx6", "allwinner,sun50i-h6"; > - > - aliases { > - serial0 =3D &uart0; > - }; > - > - chosen { > - stdout-path =3D "serial0:115200n8"; > - }; > - > - connector { > - compatible =3D "hdmi-connector"; > - ddc-en-gpios =3D <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ > - type =3D "a"; > - > - port { > - hdmi_con_in: endpoint { > - remote-endpoint =3D <&hdmi_out_con>; > - }; > - }; > - }; > - > - reg_vcc3v3: vcc3v3 { > - compatible =3D "regulator-fixed"; > - regulator-name =3D "vcc3v3"; > - regulator-min-microvolt =3D <3300000>; > - regulator-max-microvolt =3D <3300000>; > - }; > - > - reg_vdd_cpu_gpu: vdd-cpu-gpu { > - compatible =3D "regulator-fixed"; > - regulator-name =3D "vdd-cpu-gpu"; > - regulator-min-microvolt =3D <1135000>; > - regulator-max-microvolt =3D <1135000>; > - }; > -}; > - > -&cpu0 { > - cpu-supply =3D <®_vdd_cpu_gpu>; > -}; > - > -&de { > - status =3D "okay"; > -}; > - > -&dwc3 { > - status =3D "okay"; > -}; > - > -&ehci0 { > - status =3D "okay"; > -}; > - > -&ehci3 { > - status =3D "okay"; > -}; > - > -&gpu { > - mali-supply =3D <®_vdd_cpu_gpu>; > - status =3D "okay"; > -}; > - > -&hdmi { > - status =3D "okay"; > -}; > - > -&hdmi_out { > - hdmi_out_con: endpoint { > - remote-endpoint =3D <&hdmi_con_in>; > - }; > -}; > - > -&mmc0 { > - pinctrl-names =3D "default"; > - pinctrl-0 =3D <&mmc0_pins>; > - vmmc-supply =3D <®_vcc3v3>; > - cd-gpios =3D <&pio 5 6 GPIO_ACTIVE_LOW>; > - bus-width =3D <4>; > - status =3D "okay"; > -}; > - > -&ohci0 { > - status =3D "okay"; > -}; > - > -&ohci3 { > - status =3D "okay"; > }; > =20 > &r_ir { > linux,rc-map-name =3D "rc-tanix-tx5max"; > - status =3D "okay"; > }; > =20 > -&uart0 { > +&uart1 { > pinctrl-names =3D "default"; > - pinctrl-0 =3D <&uart0_ph_pins>; > + pinctrl-0 =3D <&uart1_pins>, <&uart1_rts_cts_pins>; > + uart-has-rtscts; > status =3D "okay"; > -}; > =20 > -&usb2otg { > - dr_mode =3D "host"; > - status =3D "okay"; > -}; > - > -&usb2phy { > - status =3D "okay"; > -}; > - > -&usb3phy { > - status =3D "okay"; > + bluetooth { > + compatible =3D "realtek,rtl8822cs-bt"; > + device-wake-gpios =3D <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */ > + host-wake-gpios =3D <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */ > + enable-gpios =3D <&r_pio 1 4 GPIO_ACTIVE_HIGH>; /* PM4 */ > + }; > }; > diff --git a/arch/arm/dts/sun50i-h6-tanix.dtsi b/arch/arm/dts/sun50i-h6-t= anix.dtsi > new file mode 100644 > index 0000000000..edb71e4a03 > --- /dev/null > +++ b/arch/arm/dts/sun50i-h6-tanix.dtsi > @@ -0,0 +1,189 @@ > +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) > +// Copyright (c) 2019 Jernej Skrabec > + > +/dts-v1/; > + > +#include "sun50i-h6.dtsi" > +#include "sun50i-h6-cpu-opp.dtsi" > + > +#include > + > +/ { > + aliases { > + serial0 =3D &uart0; > + }; > + > + chosen { > + stdout-path =3D "serial0:115200n8"; > + }; > + > + connector { > + compatible =3D "hdmi-connector"; > + ddc-en-gpios =3D <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */ > + type =3D "a"; > + > + port { > + hdmi_con_in: endpoint { > + remote-endpoint =3D <&hdmi_out_con>; > + }; > + }; > + }; > + > + /* used for FD650 LED display driver */ > + i2c { > + compatible =3D "i2c-gpio"; > + sda-gpios =3D <&pio 7 6 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PH6 */ > + scl-gpios =3D <&pio 7 5 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; /* PH5 */ > + i2c-gpio,delay-us =3D <5>; > + }; > + > + reg_vcc1v8: regulator-vcc1v8 { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "vcc1v8"; > + regulator-min-microvolt =3D <1800000>; > + regulator-max-microvolt =3D <1800000>; > + }; > + > + reg_vcc3v3: regulator-vcc3v3 { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "vcc3v3"; > + regulator-min-microvolt =3D <3300000>; > + regulator-max-microvolt =3D <3300000>; > + }; > + > + reg_vdd_cpu_gpu: regulator-vdd-cpu-gpu { > + compatible =3D "regulator-fixed"; > + regulator-name =3D "vdd-cpu-gpu"; > + regulator-min-microvolt =3D <1135000>; > + regulator-max-microvolt =3D <1135000>; > + }; > + > + sound-spdif { > + compatible =3D "simple-audio-card"; > + simple-audio-card,name =3D "sun50i-h6-spdif"; > + > + simple-audio-card,cpu { > + sound-dai =3D <&spdif>; > + }; > + > + simple-audio-card,codec { > + sound-dai =3D <&spdif_out>; > + }; > + }; > + > + spdif_out: spdif-out { > + #sound-dai-cells =3D <0>; > + compatible =3D "linux,spdif-dit"; > + }; > + > + wifi_pwrseq: wifi-pwrseq { > + compatible =3D "mmc-pwrseq-simple"; > + clocks =3D <&rtc 1>; > + clock-names =3D "ext_clock"; > + reset-gpios =3D <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */ > + }; > +}; > + > +&cpu0 { > + cpu-supply =3D <®_vdd_cpu_gpu>; > +}; > + > +&de { > + status =3D "okay"; > +}; > + > +&dwc3 { > + status =3D "okay"; > +}; > + > +&ehci0 { > + status =3D "okay"; > +}; > + > +&ehci3 { > + status =3D "okay"; > +}; > + > +&gpu { > + mali-supply =3D <®_vdd_cpu_gpu>; > + status =3D "okay"; > +}; > + > +&hdmi { > + status =3D "okay"; > +}; > + > +&hdmi_out { > + hdmi_out_con: endpoint { > + remote-endpoint =3D <&hdmi_con_in>; > + }; > +}; > + > +&mmc0 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&mmc0_pins>; > + vmmc-supply =3D <®_vcc3v3>; > + cd-gpios =3D <&pio 5 6 GPIO_ACTIVE_LOW>; > + bus-width =3D <4>; > + status =3D "okay"; > +}; > + > +&mmc1 { > + vmmc-supply =3D <®_vcc3v3>; > + vqmmc-supply =3D <®_vcc1v8>; > + mmc-pwrseq =3D <&wifi_pwrseq>; > + bus-width =3D <4>; > + non-removable; > + status =3D "okay"; > +}; > + > +&mmc2 { > + vmmc-supply =3D <®_vcc3v3>; > + vqmmc-supply =3D <®_vcc1v8>; > + bus-width =3D <8>; > + non-removable; > + cap-mmc-hw-reset; > + mmc-hs200-1_8v; > + status =3D "okay"; > +}; > + > +&ohci0 { > + status =3D "okay"; > +}; > + > +&ohci3 { > + status =3D "okay"; > +}; > + > +&pio { > + vcc-pc-supply =3D <®_vcc1v8>; > + vcc-pd-supply =3D <®_vcc3v3>; > + vcc-pg-supply =3D <®_vcc1v8>; > +}; > + > +&r_ir { > + status =3D "okay"; > +}; > + > +&spdif { > + status =3D "okay"; > +}; > + > +&uart0 { > + pinctrl-names =3D "default"; > + pinctrl-0 =3D <&uart0_ph_pins>; > + status =3D "okay"; > +}; > + > +&usb2otg { > + dr_mode =3D "host"; > + status =3D "okay"; > +}; > + > +&usb2phy { > + status =3D "okay"; > +}; > + > +&usb3phy { > + status =3D "okay"; > +}; > diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi > index af8b7d0ef7..71a45a624d 100644 > --- a/arch/arm/dts/sun50i-h6.dtsi > +++ b/arch/arm/dts/sun50i-h6.dtsi > @@ -119,10 +119,10 @@ > display_clocks: clock@0 { > compatible =3D "allwinner,sun50i-h6-de3-clk"; > reg =3D <0x0 0x10000>; > - clocks =3D <&ccu CLK_DE>, > - <&ccu CLK_BUS_DE>; > - clock-names =3D "mod", > - "bus"; > + clocks =3D <&ccu CLK_BUS_DE>, > + <&ccu CLK_DE>; > + clock-names =3D "bus", > + "mod"; > resets =3D <&ccu RST_BUS_DE>; > #clock-cells =3D <1>; > #reset-cells =3D <1>; > @@ -153,6 +153,15 @@ > }; > }; > =20 > + video-codec-g2@1c00000 { > + compatible =3D "allwinner,sun50i-h6-vpu-g2"; > + reg =3D <0x01c00000 0x1000>; > + interrupts =3D ; > + clocks =3D <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>; > + clock-names =3D "bus", "mod"; > + resets =3D <&ccu RST_BUS_VP9>; > + }; > + > video-codec@1c0e000 { > compatible =3D "allwinner,sun50i-h6-video-engine"; > reg =3D <0x01c0e000 0x2000>; > @@ -271,6 +280,15 @@ > }; > }; > =20 > + timer@3009000 { > + compatible =3D "allwinner,sun50i-h6-timer", > + "allwinner,sun8i-a23-timer"; > + reg =3D <0x03009000 0xa0>; > + interrupts =3D , > + ; > + clocks =3D <&osc24M>; > + }; > + > watchdog: watchdog@30090a0 { > compatible =3D "allwinner,sun50i-h6-wdt", > "allwinner,sun6i-a31-wdt";