Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / allwinner / sun50i-a64.dtsi

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index 5b30e6c..6ddb717 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -131,12 +131,10 @@
        };
 
        sound: sound {
+               #address-cells = <1>;
+               #size-cells = <0>;
                compatible = "simple-audio-card";
                simple-audio-card,name = "sun50i-a64-audio";
-               simple-audio-card,format = "i2s";
-               simple-audio-card,frame-master = <&cpudai>;
-               simple-audio-card,bitclock-master = <&cpudai>;
-               simple-audio-card,mclk-fs = <128>;
                simple-audio-card,aux-devs = <&codec_analog>;
                simple-audio-card,routing =
                                "Left DAC", "DACL",
@@ -145,12 +143,19 @@
                                "ADCR", "Right ADC";
                status = "disabled";
 
-               cpudai: simple-audio-card,cpu {
-                       sound-dai = <&dai>;
-               };
+               simple-audio-card,dai-link@0 {
+                       format = "i2s";
+                       frame-master = <&link0_cpu>;
+                       bitclock-master = <&link0_cpu>;
+                       mclk-fs = <128>;
+
+                       link0_cpu: cpu {
+                               sound-dai = <&dai>;
+                       };
 
-               link_codec: simple-audio-card,codec {
-                       sound-dai = <&codec>;
+                       link0_codec: codec {
+                               sound-dai = <&codec 0>;
+                       };
                };
        };
 
@@ -659,6 +664,18 @@
                        interrupt-controller;
                        #interrupt-cells = <3>;
 
+                       /omit-if-no-ref/
+                       aif2_pins: aif2-pins {
+                               pins = "PB4", "PB5", "PB6", "PB7";
+                               function = "aif2";
+                       };
+
+                       /omit-if-no-ref/
+                       aif3_pins: aif3-pins {
+                               pins = "PG10", "PG11", "PG12", "PG13";
+                               function = "aif3";
+                       };
+
                        csi_pins: csi-pins {
                                pins = "PE0", "PE2", "PE3", "PE4", "PE5", "PE6",
                                       "PE7", "PE8", "PE9", "PE10", "PE11";
@@ -799,6 +816,23 @@
                        };
                };
 
+               timer@1c20c00 {
+                       compatible = "allwinner,sun50i-a64-timer",
+                                    "allwinner,sun8i-a23-timer";
+                       reg = <0x01c20c00 0xa0>;
+                       interrupts = <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
+                                    <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&osc24M>;
+               };
+
+               wdt0: watchdog@1c20ca0 {
+                       compatible = "allwinner,sun50i-a64-wdt",
+                                    "allwinner,sun6i-a31-wdt";
+                       reg = <0x01c20ca0 0x20>;
+                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&osc24M>;
+               };
+
                spdif: spdif@1c21000 {
                        #sound-dai-cells = <0>;
                        compatible = "allwinner,sun50i-a64-spdif",
@@ -880,7 +914,7 @@
                };
 
                codec: codec@1c22e00 {
-                       #sound-dai-cells = <0>;
+                       #sound-dai-cells = <1>;
                        compatible = "allwinner,sun50i-a64-codec",
                                     "allwinner,sun8i-a33-codec";
                        reg = <0x01c22e00 0x600>;
@@ -1325,13 +1359,5 @@
                        #address-cells = <1>;
                        #size-cells = <0>;
                };
-
-               wdt0: watchdog@1c20ca0 {
-                       compatible = "allwinner,sun50i-a64-wdt",
-                                    "allwinner,sun6i-a31-wdt";
-                       reg = <0x01c20ca0 0x20>;
-                       interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&osc24M>;
-               };
        };
 };