From patchwork Fri Feb 22 00:34:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10825027 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D1862922 for ; Fri, 22 Feb 2019 00:34:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BE75F30592 for ; Fri, 22 Feb 2019 00:34:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B01EE305F8; Fri, 22 Feb 2019 00:34:24 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 64E4030592 for ; Fri, 22 Feb 2019 00:34:24 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=Nril7iCiunAdu6RtO/TeOTv12W+4Uw0KpURbZJSJeTg=; b=VyzUd8EJ5YMZ/l AupuY/2vR6wXjvMTzszXUeES/bMscNa25CPV+4ZiVsXujR/j2L1mFgjabfOWX5WwHGGXP+XM0BvS/ e86xhVWB7BMCYfddcHQUBl2wTO+54MHTVRhrZcqeXLkI3UGyoUuuDZvSuanH0seelrNzNQ17JJT4m tUMJdMML+riwcqQLfanjI/oXgEvIfc+ie5KU54nohON1+7RHIqNObByO44wFetSoXmblDdZU68b2X SlfI9KnzgnbE+QNf7yMxf/nV/lFwcE7Eak+KaZj93hC4rkamScAo/CiqO7UqYEyUhv3Ua5pWAIbYY L6XWD/Jwu1Cf3WSUqXhQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwynC-00077O-6y; Fri, 22 Feb 2019 00:34:18 +0000 Received: from mail-pl1-x643.google.com ([2607:f8b0:4864:20::643]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwyn9-00075a-FP for linux-rockchip@lists.infradead.org; Fri, 22 Feb 2019 00:34:17 +0000 Received: by mail-pl1-x643.google.com with SMTP id y5so230492plk.8 for ; Thu, 21 Feb 2019 16:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zY2jb25QAq1g/TE6DFipzC1VS/FPvRjbhYIqEGjdavA=; b=CZMR79TEp6okgbitRKUrx/zE6k1bvOTpS/MJdf4JgULsf7t8svMY7HCb5syEO4GOEw B/zo7Iztup8iB5CN2rh/IeFUIjF94xXCHiJVPZ7+6sLxqxhqVkbWUE/bEz6fM2aU+ZSv UuOkwX3OYX5UmrWRhNAdIBt1Zuq2nko3J0gts= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=zY2jb25QAq1g/TE6DFipzC1VS/FPvRjbhYIqEGjdavA=; b=SwbazWKlKPdFBRnI0OdrfiXgUTN8n27y+O4LlnycJWlQAOQiNqOA+636cvHSVrlsXG qNHAy0BRsE0jQWagohvyNa0q2jfUEbvGlhwC0Jg53GVHwRYeTW9bt9cIpZt340F0xExD Fk/5DiEQ/KxmAdWP5UMvBdxKGatxTreqxmPtrmBkRndK+kXf0dVSfhu5KcdGvhyQCy4P nI+tgMzzBB+M33gQFeaqw8X1zwELjGrBdQffIiyihEAG4zumfZyReTja+wi/KTcEVhrQ fJhNCwVq52PyP54zHoDUkBqJBlx9C9ab2D5E3b8NC0Rd8pRn+zt309WSTa+wXE9Ktokp Grpg== X-Gm-Message-State: AHQUAuagF3HB7DOsyTda3VBt/h15vh+eed2OWYDrXgd2joruX6RVCbN5 KFtF6+Ng9QACarJGIRN7Rk0T2Q== X-Google-Smtp-Source: AHgI3Ib0CD3XpdWcv9QpJUjgdjW+aFVX0c54CH4gaJNQ02kxILdUJXAW0fFC8DTGWsMsGfuPCO2ylg== X-Received: by 2002:a17:902:33c1:: with SMTP id b59mr1345131plc.220.1550795650564; Thu, 21 Feb 2019 16:34:10 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id c3sm269830pfg.53.2019.02.21.16.34.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 16:34:09 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Marcel Holtmann , Johan Hedberg Subject: [PATCH 1/3] Bluetooth: btusb: add QCA6174A compatible properties Date: Thu, 21 Feb 2019 16:34:01 -0800 Message-Id: <20190222003403.128243-1-briannorris@chromium.org> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190221_163415_520532_F3703FE8 X-CRM114-Status: UNSURE ( 8.08 ) 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: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org, Brian Norris , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Enric Balletbo i Serra , Rajat Jain , Matthias Kaehlcke , linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP We may need to specify a GPIO wake pin for this device, so add a compatible property for it. There are at least to USB PID/VID variations of this chip: one with a Lite-On ID and one with an Atheros ID. Signed-off-by: Brian Norris Reviewed-by: Matthias Kaehlcke --- drivers/bluetooth/btusb.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 470ee68555d9..380e6f38c607 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2862,6 +2862,8 @@ static irqreturn_t btusb_oob_wake_handler(int irq, void *priv) static const struct of_device_id btusb_match_table[] = { { .compatible = "usb1286,204e" }, + { .compatible = "usb0cf3,e300" }, /* QCA6174A */ + { .compatible = "usb04ca,301a" }, /* QCA6174A (Lite-On) */ { } }; MODULE_DEVICE_TABLE(of, btusb_match_table); From patchwork Fri Feb 22 00:34:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10825029 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BEB3B922 for ; Fri, 22 Feb 2019 00:34:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ACAB93068A for ; Fri, 22 Feb 2019 00:34:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A0BE0305FF; Fri, 22 Feb 2019 00:34:32 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 55B57305FF for ; Fri, 22 Feb 2019 00:34:32 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=xC3qJk3kA+1wew8vllonXiTS2aifwgNN8gUFSa8wvqo=; b=dzNLpTGY8r+KMO FslQhuRsojYhBvUT6btunOtfXAneudWRcCDcxPaFUEO9NJqxniIrETPkcNGv3aKC6HiPu1dA56Tz4 +C+ktsWCyFZ9hRXp6vl/xuV5ZBNoLOwhFe94XYQG4/8KLWRlc2dSaMW+82FKDlFawG19xD0HHw+CW MhwJ5E7KEjvxgbmJP8wTH3/b6z2a1Xv0eta75gzg6e7c0oDRhyEibSjBv8CeJvvTh+XToP/y/oFEZ o9PAzKdAPS8n7BVZlnbFmP1udHVSI/D3mo98VqWH1Sy04SDlHHIPaINo/nl1jSqYMPcJCq1gxs0GO HRfZG8c9Qx9hfYbbbfNg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwynJ-0007Gt-JM; Fri, 22 Feb 2019 00:34:25 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwyn9-00075X-UM for linux-rockchip@lists.infradead.org; Fri, 22 Feb 2019 00:34:18 +0000 Received: by mail-pf1-x444.google.com with SMTP id n74so230744pfi.9 for ; Thu, 21 Feb 2019 16:34:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=OBVnoqXuO6HFOZ085kg+BDnfHXIhy9OmFMZxP4tCxpw=; b=EfnqGPOXB+Uhq1/DNgFMPxIVt3T3GMCie9YVOIrnCRIlVx3XOSiSvyj2HCPFtVOlQP 1mh9XqgjQnMQTy3kMk4IR4CbmdabuKi3QUub2B4kB9rowmtLAYzKjXJLn8Oqx7b0AYyE yMntsAzKhhAdRDaEuFyxnJQ8w8oN/QDj0rXqk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OBVnoqXuO6HFOZ085kg+BDnfHXIhy9OmFMZxP4tCxpw=; b=eOv6XINjuFaXLP15+FuiYIijoR40tjQkyXzZ0Yk05HZeYzrcxdsiyz4tvE0fEuSkvd 6Hxiexzcau4x41J/xdzTUwTWXko8IRQeTaMGVSqAtLfqiixNodylCZHkO4l89h3+OVXj LLjdll1RC44+uewBHpGv0dn1UYxIH90GzZMOr3qJArvGbiHodRv6HoUQF26Kbg9AvOpN 92ivlASY02AJCbf/M9LBAtoMmBhDNYntUmyH9bYDblWPqu/qz1tpjYyZC+3QeDyQnSwG e0Wrwsz1eY0NMk7wBnTEySZ04sov431IM7LeBftnbMdIvpIy5DyKZXaB+BTwlrBsbXM0 3VdA== X-Gm-Message-State: AHQUAua6xqdsuvkO8xRJDLumsDignuAJ1NnZCqsDuo6xitiq5F5EF3ho M/lYxAYqH0D21SWmK65qnij8og== X-Google-Smtp-Source: AHgI3IbGOJeo1tMct7+tFWXD7jLSXbSNtxVZdnkGfxrjSW81ok1QIOiXQPjcBYhWfdhBjDo0Ual3WA== X-Received: by 2002:a62:7086:: with SMTP id l128mr1333899pfc.68.1550795652021; Thu, 21 Feb 2019 16:34:12 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id c3sm269830pfg.53.2019.02.21.16.34.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 16:34:11 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Marcel Holtmann , Johan Hedberg Subject: [PATCH 2/3] dt-bindings: net: btusb: add QCA6174A IDs Date: Thu, 21 Feb 2019 16:34:02 -0800 Message-Id: <20190222003403.128243-2-briannorris@chromium.org> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog In-Reply-To: <20190222003403.128243-1-briannorris@chromium.org> References: <20190222003403.128243-1-briannorris@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190221_163416_103280_9D1DDCA7 X-CRM114-Status: UNSURE ( 8.69 ) 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: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org, Brian Norris , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Enric Balletbo i Serra , Rajat Jain , Matthias Kaehlcke , linux-arm-kernel@lists.infradead.org Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP There are two USB PID/VID variations I've seen for this chip, and I want to utilize the 'interrupts' property defined here already. Signed-off-by: Brian Norris Reviewed-by: Matthias Kaehlcke --- Documentation/devicetree/bindings/net/btusb.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt index 37d67926dd6d..43c96c3380a6 100644 --- a/Documentation/devicetree/bindings/net/btusb.txt +++ b/Documentation/devicetree/bindings/net/btusb.txt @@ -9,6 +9,9 @@ Required properties: (more may be added later) are: "usb1286,204e" (Marvell 8997) + "usb0cf3,e300" (Qualcomm QCA6174A) + "usb04ca,301a" (Qualcomm QCA6174A (Lite-On)) + Also, vendors that use btusb may have device additional properties, e.g: Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt From patchwork Fri Feb 22 00:34:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 10825033 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C8EA922 for ; Fri, 22 Feb 2019 00:34:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 85CE4305FF for ; Fri, 22 Feb 2019 00:34:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 776BC306AA; Fri, 22 Feb 2019 00:34:46 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.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 D9B1D305FF for ; Fri, 22 Feb 2019 00:34:45 +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:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version: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=TJlOsq3xrh5i2jPPbVeouJ6ydzCF/E/ohg1jRgxBL9M=; b=HJqD2ixClyK8Iu YqeaEU5zud3regH4gSRl+uOC8wYcdP5NBnO29BhR3KABTmD9y4g6xZ3JTgMXupNmauXh8GS2lFFG5 jGeePXoAMnnNENggSCxXcyG36KydmX6YDVii2boBLwd7MKvz5Ez/doPOe10ToEktnI9Fjqv5c9bD3 jLxBEAY4sIq+vHkjS0Xq3KhC8Zqkix4th/CBiW5k4z64SS5k1ReaIJ5lQfuZis4Rw6XamD4eZ4bKv OMIdMaOWMDCIcgNXj4c6eG5QUJCmR+RIwZOQ6g44xuzO7IIiS9ETdhj9fngQ2TVJCPv+uR7MA2MWP sehDef7DVMxUrJf+kErw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwynZ-0007al-QV; Fri, 22 Feb 2019 00:34:41 +0000 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gwyn9-00075c-GJ for linux-rockchip@lists.infradead.org; Fri, 22 Feb 2019 00:34:19 +0000 Received: by mail-pf1-x442.google.com with SMTP id v21so220778pfm.12 for ; Thu, 21 Feb 2019 16:34:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=RR7eeTc5evmNysGncoSTvgraRGvki7PHizg2IrrqAno=; b=lNiHCA9jEGDfOnBWLjteJsSGpKbT9OoEUAQ/tUgxTgvzm2xQsZDCGyGv19fdPOGCQQ KH/ce28Lu26d6ScU7Sgy+r0Z+3wz4qWjYKMDH9Shu+06vPfccRuITkW5PT50IgZM4xd2 73FUTUUX14iiOaazpXJmd8Osg1ZdhuaFAZltI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RR7eeTc5evmNysGncoSTvgraRGvki7PHizg2IrrqAno=; b=fUq0/7MUndTmICinSfjhqN+EckkMLnQDhsPC2s5NsH2cOaEuOjZXcdF0w1xnIp6rp8 A6dDBMY+IwhQ6wnsnyIOAigzjZ+ZnpxHUZGSb6xyPpbzuAgIpXJbmWDTFpWJIOh547TV oY9DYtp+kinA2J4IiBa7dJTzYsRUhztxnvcLhqlTpjR01U1GFMKXfkh1a1ISwm/q+TJs HzQK6ga6rhBbY6T4ALzxVLDnlsQfrja20MKODEpH/I/e2D5dnls1E7oPd0SV3rNlVPeY yqLPkewA4rZ5AiMYg5gEzeJYqLj0oQ/gKNBKR3dQpnmATTUVB/nQ9AhoilIrN/ORJJHU uG6A== X-Gm-Message-State: AHQUAuaHiCjtQqkwbr72ox6uEG9FgmRMjmAqtCN8aoc4AA4FF0NdALhL GAWHL09TUaFTXWgyFdYqGMbjtA== X-Google-Smtp-Source: AHgI3IbCtnM2qcA6AOxb+Ppo9HLPiQkuBDM0wJ6iE8J31zCdd5IcDff5ZHPf/002z3h3kfbvW7tEVQ== X-Received: by 2002:a62:ee13:: with SMTP id e19mr1315978pfi.224.1550795653788; Thu, 21 Feb 2019 16:34:13 -0800 (PST) Received: from smtp.gmail.com ([2620:15c:202:1:534:b7c0:a63c:460c]) by smtp.gmail.com with ESMTPSA id c3sm269830pfg.53.2019.02.21.16.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 16:34:12 -0800 (PST) From: Brian Norris To: Heiko Stuebner , Marcel Holtmann , Johan Hedberg Subject: [PATCH 3/3] arm64: dts: rockchip: move QCA6174A wakeup pin into its USB node Date: Thu, 21 Feb 2019 16:34:03 -0800 Message-Id: <20190222003403.128243-3-briannorris@chromium.org> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog In-Reply-To: <20190222003403.128243-1-briannorris@chromium.org> References: <20190222003403.128243-1-briannorris@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190221_163415_550446_CF8C4C9D X-CRM114-Status: GOOD ( 15.81 ) 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: devicetree@vger.kernel.org, linux-bluetooth@vger.kernel.org, Brian Norris , Douglas Anderson , linux-kernel@vger.kernel.org, linux-rockchip@lists.infradead.org, Rob Herring , Enric Balletbo i Serra , Rajat Jain , Matthias Kaehlcke , linux-arm-kernel@lists.infradead.org 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 don't coordinate BT USB activity with our handling of the BT out-of-band wake pin, and instead just use gpio-keys. That causes problems because we have no way of distinguishing wake activity due to a BT device (e.g., mouse) vs. the BT controller (e.g., re-configuring wake mask before suspend). This can cause spurious wake events just because we, for instance, try to reconfigure the host controller's event mask before suspending. We can avoid these synchronization problems by handling the BT wake pin directly in the btusb driver -- for all activity up until BT controller suspend(), we simply listen to normal USB activity (e.g., to know the difference between device and host activity); once we're really ready to suspend the host controller, there should be no more host activity, and only *then* do we unmask the GPIO interrupt. This is already supported by btusb; we just need to describe the wake pin in the right node. We list 2 compatible properties, since both PID/VID pairs show up on Scarlet devices, and they're both essentially identical QCA6174A-based modules. Also note that the polarity was wrong before: Qualcomm implemented WAKE as active high, not active low. We only got away with this because gpio-keys always reconfigured us as bi-directional edge-triggered. Finally, we have an external pull-up and a level-shifter on this line (we didn't notice Qualcomm's polarity in the initial design), so we can't do pull-down. Switch to pull-none. Signed-off-by: Brian Norris Reviewed-by: Matthias Kaehlcke Reviewed-by: Rajat Jain --- This patch is also required to make this stable, but since it's not really tied to the device tree, and it's an existing bug, I sent it separately: https://lore.kernel.org/patchwork/patch/1044896/ Subject: Bluetooth: btusb: request wake pin with NOAUTOEN .../dts/rockchip/rk3399-gru-chromebook.dtsi | 13 ++++++ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 46 ++++++++++++------- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 13 ------ 3 files changed, 42 insertions(+), 30 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index c400be64170e..931640e9aed4 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -200,6 +200,19 @@ pinctrl-0 = <&bl_en>; pwm-delay-us = <10000>; }; + + gpio_keys: gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l>; + + wake_on_bt: wake-on-bt { + label = "Wake-on-Bluetooth"; + gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; + linux,code = ; + wakeup-source; + }; + }; }; &ppvar_bigcpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi index fc50b3ef758c..3e2196c08473 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi @@ -175,6 +175,21 @@ pinctrl-0 = <&dmic_en>; wakeup-delay-ms = <250>; }; + + gpio_keys: gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pen_eject_odl>; + + pen-insert { + label = "Pen Insert"; + /* Insert = low, eject = high */ + gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; + linux,code = ; + linux,input-type = ; + wakeup-source; + }; + }; }; /* pp900_s0 aliases */ @@ -328,20 +343,6 @@ camera: &i2c7 { <400000000>; }; -&gpio_keys { - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake_l>, <&pen_eject_odl>; - - pen-insert { - label = "Pen Insert"; - /* Insert = low, eject = high */ - gpios = <&gpio1 1 GPIO_ACTIVE_LOW>; - linux,code = ; - linux,input-type = ; - wakeup-source; - }; -}; - &i2c_tunnel { google,remote-bus = <0>; }; @@ -437,8 +438,19 @@ camera: &i2c7 { status = "okay"; }; -&wake_on_bt { - gpios = <&gpio1 2 GPIO_ACTIVE_LOW>; +&usb_host0_ohci { + #address-cells = <1>; + #size-cells = <0>; + + qca_bt: bt@1 { + compatible = "usb0cf3,e300", "usb04ca,301a"; + reg = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l>; + interrupt-parent = <&gpio1>; + interrupts = <2 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "wakeup"; + }; }; /* PINCTRL OVERRIDES */ @@ -455,7 +467,7 @@ camera: &i2c7 { }; &bt_host_wake_l { - rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <1 2 RK_FUNC_GPIO &pcfg_pull_none>; }; &ec_ap_int_l { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index ea607a601a86..da03fa9c5662 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -269,19 +269,6 @@ #clock-cells = <0>; }; - gpio_keys: gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake_l>; - - wake_on_bt: wake-on-bt { - label = "Wake-on-Bluetooth"; - gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; - linux,code = ; - wakeup-source; - }; - }; - max98357a: max98357a { compatible = "maxim,max98357a"; pinctrl-names = "default";