Merge tag 'io_uring-5.10-2020-10-24' of git://git.kernel.dk/linux-block

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / sun8i-a33.dtsi

diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index a2c37adacf773fb0c897343be1db220dc7af5551..c458f5fb124fb248b385a99589febaa9b1c3d352 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -189,8 +189,8 @@
                simple-audio-card,mclk-fs = <128>;
                simple-audio-card,aux-devs = <&codec_analog>;
                simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right";
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR";
                status = "disabled";
 
                simple-audio-card,cpu {
@@ -372,8 +372,6 @@
                      "ram", "sat";
        resets = <&ccu RST_BUS_DE_BE>, <&ccu RST_BUS_SAT>;
        reset-names = "be", "sat";
-       assigned-clocks = <&ccu CLK_DE_BE>;
-       assigned-clock-rates = <300000000>;
 };
 
 &ccu {