From patchwork Wed Aug 16 09:24:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9903357 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1006600CA for ; Wed, 16 Aug 2017 09:25:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D56E02899D for ; Wed, 16 Aug 2017 09:25:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA21D289A8; Wed, 16 Aug 2017 09:25:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB76B2899D for ; Wed, 16 Aug 2017 09:25:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=+pEvYJJSvcfUm9sZIqgzj0WgLxLUbj+QgrZTbMKObGQ=; b=pHX 93WvF9Yq8SszxnVJmsNwH4h8SgC0LU5ozr40f+eu7nQh0kEk7FlMnGuDnR+qJlCiOxpUctYrPptC/ whMETTAvRtAYBl+EW6GJ/FzVuqnDd9tqKJ6+ji+EVa3ZKmjLLa2BFVS+zTFraOpeeBz03AtV4Ds6d JpupSptkkxQy0vCKDrvaGCRnimnM8wjj4eEPucz8hQOG8rX49ccwn7Tn/YZ9NR2noLnpPE7BFTDl8 naWWTdmXIiTJt4zG38MFj3rzCCS4dLOBTzFGbwq000rL995tsCzJZInlDaL3i//rLEmsvcHbLkNpj IXVuOtKWVV4U8CkpNyrOtzWZswajMig==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dhuZw-0004lb-QT; Wed, 16 Aug 2017 09:25:32 +0000 Received: from regular1.263xmail.com ([211.150.99.134]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dhuZa-0003DE-K8; Wed, 16 Aug 2017 09:25:12 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.138]) by regular1.263xmail.com (Postfix) with ESMTP id E94A691AA; Wed, 16 Aug 2017 17:24:44 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 826E6399; Wed, 16 Aug 2017 17:24:39 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: <9faa78bcedc9e1e694a27caba990abec> X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 3710AGMN30; Wed, 16 Aug 2017 17:24:45 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org, hychao@chromium.org Subject: [PATCH] arm64: dts: rockchip: Assign mic irq to correct device for Gru Date: Wed, 16 Aug 2017 17:24:32 +0800 Message-Id: <20170816092432.23991-1-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170816_022511_138746_9CE315E1 X-CRM114-Status: UNSURE ( 5.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, briannorris@chromium.org, Heiko Stuebner , Catalin Marinas , Jeffy Chen , Will Deacon , dianders@chromium.org, Rob Herring , linux-rockchip@lists.infradead.org, Matthias Kaehlcke , Klaus Goger , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index d48e98b62d09..d7723a77ae03 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -612,12 +612,8 @@ 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; }; }; @@ -826,9 +822,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; }; };