Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[mirror_ubuntu-focal-kernel.git] / arch / arm64 / boot / dts / rockchip / rk3399-gru.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
index d48e98b62d09bf42c3cae8d36f4da613264e7546..199a5118b20dab39f744dfc21814b1a9dafb166f 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
@@ -612,12 +612,7 @@ ap_i2c_mic: &i2c1 {
        headsetcodec: rt5514@57 {
                compatible = "realtek,rt5514";
                reg = <0x57>;
-               interrupt-parent = <&gpio1>;
-               interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
-               pinctrl-names = "default";
-               pinctrl-0 = <&mic_int>;
-               realtek,dmic-init-delay = <20>;
-               wakeup-source;
+               realtek,dmic-init-delay-ms = <20>;
        };
 };
 
@@ -826,9 +821,13 @@ ap_i2c_audio: &i2c8 {
        wacky_spi_audio: spi2@0 {
                compatible = "realtek,rt5514";
                reg = <0>;
-
+               interrupt-parent = <&gpio1>;
+               interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
+               pinctrl-names = "default";
+               pinctrl-0 = <&mic_int>;
                /* May run faster once verified. */
                spi-max-frequency = <10000000>;
+               wakeup-source;
        };
 };