From patchwork Tue Aug 22 03:19:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeffy Chen X-Patchwork-Id: 9914141 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 D31B8603FF for ; Tue, 22 Aug 2017 03:23:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C76012883C for ; Tue, 22 Aug 2017 03:23:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA7BE28583; Tue, 22 Aug 2017 03:23:01 +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=-0.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW,URIBL_BLACK autolearn=no 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 2844E28583 for ; Tue, 22 Aug 2017 03:23:00 +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:References: In-Reply-To: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:List-Owner; bh=1bNpMhlUojwxck9o80JcBBaHNUNrZSwvDd3752mnz54=; b=HvBU6nLQ69YCHGl7XiywIq5ZsB rc9UFw6wLMLRiQt3cwoIZI4knQpDT/nYwoyWIXjcf2elM+1KOyKs2n/BATlZ9U3K0skjX008Q4HmY MPkUNNM44bEZGAkzHjev+iwGbUsiWaNsXVzoQocB6FCB3YRDBXqBcVxKkSS5Tv8Q3KrfZ1SSWSH2b m4av+SJ7SwTS25D2B+QEut8lbLmQBBpP0vuRS9xineRi3wj1cc9CpX32YRHAibWmz3sKeuy9En1wR xY/UEshjojBqwVVDm4CSgl5X5dCMYq6lqLTbRgJcQb03ad2B+mzc7WgXQgreZFE1k4AYeZMhW7TC8 4CJAicZw==; 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 1djzlX-0002Cp-KS; Tue, 22 Aug 2017 03:22:07 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1djzlK-00021X-Pl; Tue, 22 Aug 2017 03:21:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=Xx97xZ9UJ0B9GgbBHi5dgdpfv9pccjO49QybDcc7FXQ=; b=TndS6Qy/unBV7ZWvp2tvEEJ/M EZo5847XQcc6GQU56HprEurNF4nmiZrjUGjXEAMj0z8rLSqihL+CFn3EPD7SgKtquyvMtHAddwrxM SX3ManL+5kyPXM1DMrlrdCR16aozi/dCkYFdAUhXmuhV0Ort4+dGDgL8YFqeqj1fI+0E0Wsguchtx nEKKbTeLZkzg1qAlCCBJ5Iv46ekhxiN/J4A+b645ZWA+6BrgHnp4I+LYpPyJiR2ScCdwas4baWbmU IFz2+QfvuyE5yrY5NcB0ZSTF/t1mGhm/T/v3lzf5BmsIkIr2sLQfvkDVyAiLKIFO82ik/SvG9tdh4 pHQWmMrww==; Received: from regular1.263xmail.com ([211.150.99.136]) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1djzlG-0006Rg-OT; Tue, 22 Aug 2017 03:21:53 +0000 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.236]) by regular1.263xmail.com (Postfix) with ESMTP id B8E836B; Tue, 22 Aug 2017 11:21:25 +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 DF038389; Tue, 22 Aug 2017 11:20:25 +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: <907113864b6f94497ed17d83659c2a59> 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 3495FL0MBU; Tue, 22 Aug 2017 11:21:05 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org, bhelgaas@google.com Subject: [PATCH v4 4/4] arm64: dts: rockchip: Handle pcie wake in pcie driver for Gru Date: Tue, 22 Aug 2017 11:19:34 +0800 Message-Id: <20170822031934.8675-5-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170822031934.8675-1-jeffy.chen@rock-chips.com> References: <20170822031934.8675-1-jeffy.chen@rock-chips.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170822_042151_506628_A21BBF29 X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Jeffy Chen , Heiko Stuebner , Catalin Marinas , shawn.lin@rock-chips.com, briannorris@chromium.org, Will Deacon , dianders@chromium.org, Rob Herring , linux-rockchip@lists.infradead.org, Matthias Kaehlcke , Klaus Goger , linux-arm-kernel@lists.infradead.org, Caesar Wang MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Currently we are handling pcie wake irq in mrvl wifi driver. Move it to rockchip pcie driver for Gru boards. Signed-off-by: Jeffy Chen --- Changes in v4: None Changes in v3: None Changes in v2: None arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 15 +++++++++------ 1 file changed, 9 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..42158512e979 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -712,7 +712,15 @@ ap_i2c_audio: &i2c8 { ep-gpios = <&gpio2 27 GPIO_ACTIVE_HIGH>; pinctrl-names = "default"; - pinctrl-0 = <&pcie_clkreqn_cpm>, <&wifi_perst_l>; + pinctrl-0 = <&pcie_clkreqn_cpm>, <&wlan_host_wake_l>, <&wifi_perst_l>; + + interrupts-extended = <&gic GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH 0>, + <&gic GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH 0>, + <&gic GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH 0>, + <&gpio0 8 IRQ_TYPE_LEVEL_LOW>; + interrupt-names = "sys", "legacy", "client", "wake"; + /delete-property/ interrupts; + vpcie3v3-supply = <&pp3300_wifi_bt>; vpcie1v8-supply = <&wlan_pd_n>; /* HACK: see &wlan_pd_n */ vpcie0v9-supply = <&pp900_pcie>; @@ -727,11 +735,6 @@ ap_i2c_audio: &i2c8 { compatible = "pci1b4b,2b42"; reg = <0x83010000 0x0 0x00000000 0x0 0x00100000 0x83010000 0x0 0x00100000 0x0 0x00100000>; - interrupt-parent = <&gpio0>; - interrupts = <8 IRQ_TYPE_LEVEL_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&wlan_host_wake_l>; - wakeup-source; }; }; };