ARM: dts: sync amlogic G12A/G12B/SM1 DT from Linux 5.8-rc1

[platform/kernel/u-boot.git] / arch / arm / dts / meson-g12-common.dtsi

diff --git a/arch/arm/dts/meson-g12-common.dtsi b/arch/arm/dts/meson-g12-common.dtsi
index 0882ea2..593a006 100644 (file)
--- a/arch/arm/dts/meson-g12-common.dtsi
+++ b/arch/arm/dts/meson-g12-common.dtsi
@@ -250,6 +250,17 @@
                                };
                        };
 
+                       acodec: audio-controller@32000 {
+                               compatible = "amlogic,t9015";
+                               reg = <0x0 0x32000 0x0 0x14>;
+                               #sound-dai-cells = <0>;
+                               sound-name-prefix = "ACODEC";
+                               clocks = <&clkc CLKID_AUDIO_CODEC>;
+                               clock-names = "pclk";
+                               resets = <&reset RESET_AUDIO_CODEC>;
+                               status = "disabled";
+                       };
+
                        periphs: bus@34400 {
                                compatible = "simple-bus";
                                reg = <0x0 0x34400 0x0 0x400>;
@@ -2319,7 +2330,7 @@
                                reg = <0x0 0xff400000 0x0 0x40000>;
                                interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
-                               clock-names = "ddr";
+                               clock-names = "otg";
                                phys = <&usb2_phy1>;
                                phy-names = "usb2-phy";
                                dr_mode = "peripheral";