]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm64: dts: rockchip: Assign mic irq to correct device for Gru
authorJeffy Chen <jeffy.chen@rock-chips.com>
Wed, 16 Aug 2017 09:24:32 +0000 (17:24 +0800)
committerHeiko Stuebner <heiko@sntech.de>
Fri, 18 Aug 2017 23:16:38 +0000 (01:16 +0200)
Currently we are assigning mic irq to rt5514 i2c driver, which is wrong.
Assign it to rt5514 spi driver instead.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi

index 968ab64a04eb7e6302295295ed105823710c7ec9..199a5118b20dab39f744dfc21814b1a9dafb166f 100644 (file)
@@ -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-ms = <20>;
-               wakeup-source;
        };
 };
 
@@ -826,9 +821,13 @@ &spi2 {
        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;
        };
 };