From patchwork Fri Mar 5 13:23:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12118451 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D2228C433E0 for ; Fri, 5 Mar 2021 13:24:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9AB5264FE4 for ; Fri, 5 Mar 2021 13:24:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229737AbhCENXz (ORCPT ); Fri, 5 Mar 2021 08:23:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48472 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229714AbhCENXy (ORCPT ); Fri, 5 Mar 2021 08:23:54 -0500 Received: from mail-lj1-x232.google.com (mail-lj1-x232.google.com [IPv6:2a00:1450:4864:20::232]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9419EC061756 for ; Fri, 5 Mar 2021 05:23:53 -0800 (PST) Received: by mail-lj1-x232.google.com with SMTP id 2so2712781ljr.5 for ; Fri, 05 Mar 2021 05:23:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=PPJSM/MVU+EIeUzdeZ0OH1Y9gGkhi9PwxkOqz+xt+XI=; b=NznEWDYTz2RuXsPvJrP+Shu7L6ZRXJ+JW7nqVgW5w+YYBkKRawEATdgWyP+3XnxFhI XGy+FxuPbGjJ3zxlnpKsWwCOK+9lTCmDgykTkOSc/A8TJa2K5x2EpjShDoIE7U3h+8I2 HwFKPyNUAG4TDK3PYlVG9r4uE0UXdvmGwWLV93ssuEUim18fZMM/12DQ2w0VcTYy/iP9 tgNPxx2CZOnIp9u1854ZG/fv+Jc9M3iif33cJRkldvqDr6oZULOGxQ+tp3nFrN2aAGdX GhldROo5wOkfHxJuupNB6OZ6QEXO8QhiutMPMIaRulqHAYzRVCAoKx2gJ58sCTI3k72n puzg== 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=PPJSM/MVU+EIeUzdeZ0OH1Y9gGkhi9PwxkOqz+xt+XI=; b=KmF1X5vH0rh00WHXDQkK5oQnyjwJpgZHnS20o3To3Ru7JvBc6B7VCt0gdz6MZ9i1JH +MmPUTDvQ4MzdzXGndJzN187UfzEZVRQzIVw6BvTbeF0O2BhiAZPOxiE+tzppNPJ9ovJ FhhYOFkBorfox15MHIdZYnXgOk6Hhu63PikCjPtr9sgPTRmVzjDbBeSdVWRohktRHt12 AWD2xfRlzRq/p9I5wzAEM8imCmqzu7M4Mz5Jf6kKab+3LqRTNo7jdJ9dkfHLd7ArtYlW UqTIpGfPtipxv7CfonNdQSuFVfeuruXjya6He3Q3lLYj7LJQi06f32yHoRW17+bD6LKy aDMw== X-Gm-Message-State: AOAM533dwrkvxXBwnJFPnP3ngzWrZyQKoAVEhuIlXJzOaN26eTIGr6/e h5TinB8UCbbEB8AatgMDltTfFA== X-Google-Smtp-Source: ABdhPJwHdqJ4rzZVVm0rbGIuhhxMzRg/jHQq1mrin7BBdrUJpfoErI95FcW+fYYfW82zg9+wIhyhzg== X-Received: by 2002:a2e:7403:: with SMTP id p3mr5086835ljc.239.1614950631842; Fri, 05 Mar 2021 05:23:51 -0800 (PST) Received: from localhost.localdomain (c-d7cb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.203.215]) by smtp.gmail.com with ESMTPSA id v28sm298420ljv.66.2021.03.05.05.23.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 05:23:51 -0800 (PST) From: Linus Walleij To: Marcel Holtmann , Johan Hedberg Cc: linux-bluetooth@vger.kernel.org, Linus Walleij , devicetree@vger.kernel.org Subject: [PATCH 1/2 v2] Bluetooth: btbcm: Rewrite bindings in YAML and add reset Date: Fri, 5 Mar 2021 14:23:42 +0100 Message-Id: <20210305132343.2070583-1-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org This rewrites the Broadcom bluetooth bindings in YAML and adds a GPIO handle for the BT_RST_N line as used on some platforms. The Ingenic UART binding was using this binding in its example DTS fragment, however mistakenly using "vcc-supply" for what is called "vbat-supply". The proper DTS files and the code in the kernel all use "vbat-supply" so fix up the example in this patch so we ge a clean check. Cc: devicetree@vger.kernel.org Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Fix the error in the Ingenic UART binding example as part of adding this patch. --- .../bindings/net/broadcom-bluetooth.txt | 56 --------- .../bindings/net/broadcom-bluetooth.yaml | 117 ++++++++++++++++++ 2 files changed, 117 insertions(+), 56 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt b/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt deleted file mode 100644 index a7d57ba5f2ac..000000000000 --- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.txt +++ /dev/null @@ -1,56 +0,0 @@ -Broadcom Bluetooth Chips ---------------------- - -This documents the binding structure and common properties for serial -attached Broadcom devices. - -Serial attached Broadcom devices shall be a child node of the host UART -device the slave device is attached to. - -Required properties: - - - compatible: should contain one of the following: - * "brcm,bcm20702a1" - * "brcm,bcm4329-bt" - * "brcm,bcm4330-bt" - * "brcm,bcm43438-bt" - * "brcm,bcm4345c5" - * "brcm,bcm43540-bt" - * "brcm,bcm4335a0" - -Optional properties: - - - max-speed: see Documentation/devicetree/bindings/serial/serial.yaml - - shutdown-gpios: GPIO specifier, used to enable the BT module - - device-wakeup-gpios: GPIO specifier, used to wakeup the controller - - host-wakeup-gpios: GPIO specifier, used to wakeup the host processor. - deprecated, replaced by interrupts and - "host-wakeup" interrupt-names - - clocks: 1 or 2 clocks as defined in clock-names below, in that order - - clock-names: names for clock inputs, matching the clocks given - - "extclk": deprecated, replaced by "txco" - - "txco": external reference clock (not a standalone crystal) - - "lpo": external low power 32.768 kHz clock - - vbat-supply: phandle to regulator supply for VBAT - - vddio-supply: phandle to regulator supply for VDDIO - - brcm,bt-pcm-int-params: configure PCM parameters via a 5-byte array - - sco-routing: 0 = PCM, 1 = Transport, 2 = Codec, 3 = I2S - - pcm-interface-rate: 128KBps, 256KBps, 512KBps, 1024KBps, 2048KBps - - pcm-frame-type: short, long - - pcm-sync-mode: slave, master - - pcm-clock-mode: slave, master - - interrupts: must be one, used to wakeup the host processor - - interrupt-names: must be "host-wakeup" - -Example: - -&uart2 { - pinctrl-names = "default"; - pinctrl-0 = <&uart2_pins>; - - bluetooth { - compatible = "brcm,bcm43438-bt"; - max-speed = <921600>; - brcm,bt-pcm-int-params = [01 02 00 01 01]; - }; -}; diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml new file mode 100644 index 000000000000..bdd6ca617e23 --- /dev/null +++ b/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml @@ -0,0 +1,117 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/broadcom-bluetooth.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Broadcom Bluetooth Chips + +maintainers: + - Linus Walleij + +description: + This binding describes Broadcom UART-attached bluetooth chips. + +properties: + compatible: + enum: + - brcm,bcm20702a1 + - brcm,bcm4329-bt + - brcm,bcm4330-bt + - brcm,bcm43438-bt + - brcm,bcm4345c5 + - brcm,bcm43540-bt + - brcm,bcm4335a0 + + shutdown-gpios: + maxItems: 1 + description: GPIO specifier for the line BT_REG_ON used to + power on the BT module + + reset-gpios: + maxItems: 1 + description: GPIO specifier for the line BT_RST_N used to + reset the BT module. This should be marked as + GPIO_ACTIVE_LOW. + + device-wakeup-gpios: + maxItems: 1 + description: GPIO specifier for the line BT_WAKE used to + wakeup the controller. This is using the BT_GPIO_0 + pin on the chip when in use. + + host-wakeup-gpios: + maxItems: 1 + deprecated: true + description: GPIO specifier for the line HOST_WAKE used + to wakeup the host processor. This is using he BT_GPIO_1 + pin on the chip when in use. This is deprecated and replaced + by interrupts and "host-wakeup" interrupt-names + + clocks: + maxItems: 2 + description: 1 or 2 clocks as defined in clock-names below, + in that order + + clock-names: + description: Names of the 1 to 2 supplied clocks + items: + - const: txco + - const: lpo + - const: extclk + + vbat-supply: + description: phandle to regulator supply for VBAT + + vddio-supply: + description: phandle to regulator supply for VDDIO + + brcm,bt-pcm-int-params: + $ref: /schemas/types.yaml#/definitions/uint8-array + minItems: 5 + maxItems: 5 + description: |- + configure PCM parameters via a 5-byte array: + sco-routing: 0 = PCM, 1 = Transport, 2 = Codec, 3 = I2S + pcm-interface-rate: 128KBps, 256KBps, 512KBps, 1024KBps, 2048KBps + pcm-frame-type: short, long + pcm-sync-mode: slave, master + pcm-clock-mode: slave, master + + interrupts: + items: + - description: Handle to the line HOST_WAKE used to wake + up the host processor. This uses the BT_GPIO_1 pin on + the chip when in use. + + interrupt-names: + items: + - const: host-wakeup + + max-speed: true + current-speed: true + +required: + - compatible + +additionalProperties: false + +examples: + - | + #include + #include + + uart { + uart-has-rtscts; + + bluetooth { + compatible = "brcm,bcm4330-bt"; + max-speed = <921600>; + brcm,bt-pcm-int-params = [01 02 00 01 01]; + shutdown-gpios = <&gpio 30 GPIO_ACTIVE_HIGH>; + device-wakeup-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>; + reset-gpios = <&gpio 9 GPIO_ACTIVE_LOW>; + interrupt-parent = <&gpio>; + interrupts = <8 IRQ_TYPE_EDGE_FALLING>; + }; + }; From patchwork Fri Mar 5 13:23:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 12118453 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B0C2C433DB for ; Fri, 5 Mar 2021 13:25:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0F4AB64FDF for ; Fri, 5 Mar 2021 13:25:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbhCENY2 (ORCPT ); Fri, 5 Mar 2021 08:24:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229711AbhCENXz (ORCPT ); Fri, 5 Mar 2021 08:23:55 -0500 Received: from mail-lj1-x236.google.com (mail-lj1-x236.google.com [IPv6:2a00:1450:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A56AC061574 for ; Fri, 5 Mar 2021 05:23:55 -0800 (PST) Received: by mail-lj1-x236.google.com with SMTP id u4so2712521ljh.6 for ; Fri, 05 Mar 2021 05:23:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3vCJ3Xj+RPjkG+Npaaa9CXbJBl9rcKiVLGtrcCJP0y8=; b=u1fnfNZ6noTJgFwnSHh18/uYtGYQAT7bm3WhDp4Eqdm1IiUNuKHrFk/j9Fn8NFT3QF +u5FRhwAyfE9pzsgHAUo4zjG44b/5XQ70TTJKTObAVnSAnB/Y0Iu2S/C6YbHhiSqUKM8 E6S4MYCgeKIfhbmirpRh+YH6ZHDSrrgaspxdV9D6Bo5p6sZUhvpqNEjWj/SbMKmMxqgz 0AuF3FfPZ5YKo8swO8VjicH4WW+RApRhXCc8m/v9fg/ZLKbQmr5R/rIDi+uA7TOoII4C tCfryje/0RhiXu3ObQFan2aiOsDUuq4tys693t+g8ZTiEttHcFIkT5LwDwF9B+q/ERGN AB5w== 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=3vCJ3Xj+RPjkG+Npaaa9CXbJBl9rcKiVLGtrcCJP0y8=; b=MKYUTtKNyieajZRY9PMjhNb/AaF1vOonAAuhIIZCXtLpqBl+p6v5rgheyJxdPnEriX n/EgFV+g1vn6k3xnsgU3P7cYhFkwR46eYXt40eY70ZYN5LWAOBs7akJwMhrxOHb4tErd YpAlt6JrXVOOQN1SvjdhkFJQe7frVxQ2e4uGcbZuKVlHEdVyBtl5YFtf6pTTpSVs8nVN MzYr9Of6mLxiRJlWBElDZglsIqeUFdZeQmpaf6TfDMPpmrdGPGCyqUr5d4yTtaV87REH jgbCrwdHxzRO/mMzgE4IQxmwYnQ/hMUpEwA0AF+sNT0bwRIiu+u8z4D4oxjWOI3jToxH YBow== X-Gm-Message-State: AOAM53346eqP/aMTg1Cw87UPLHW2ZN0d39u8Jop8Hc9/CdxgG1tGwOjl eXM9Z3YkTcFSx+IUt2/h3G5seg== X-Google-Smtp-Source: ABdhPJxfd/m1mRgrZUMbE++FCLc0W4a1oEddRr5wTCImBFJOsjGSDTLoNIS0/HvzIRarSsbk8kuf5A== X-Received: by 2002:a2e:9195:: with SMTP id f21mr5136619ljg.340.1614950633916; Fri, 05 Mar 2021 05:23:53 -0800 (PST) Received: from localhost.localdomain (c-d7cb225c.014-348-6c756e10.bbcust.telenor.se. [92.34.203.215]) by smtp.gmail.com with ESMTPSA id v28sm298420ljv.66.2021.03.05.05.23.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 05:23:53 -0800 (PST) From: Linus Walleij To: Marcel Holtmann , Johan Hedberg Cc: linux-bluetooth@vger.kernel.org, Linus Walleij Subject: [PATCH 2/2 v2] Bluetooth: btbcm: Obtain and handle reset GPIO Date: Fri, 5 Mar 2021 14:23:43 +0100 Message-Id: <20210305132343.2070583-2-linus.walleij@linaro.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210305132343.2070583-1-linus.walleij@linaro.org> References: <20210305132343.2070583-1-linus.walleij@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Obtain and drive the optional reset GPIO line if this is not hardwired in the platform. This is needed on the Samsung GT-I9070 mobile phone. The invers of power is used, this should be OK to apply simultaneously as the power signal according to figures 47-51 on pages 159-161 in the BCM4330 datasheet. Signed-off-by: Linus Walleij --- ChangeLog v1->v2: - Rebase on v5.12-rc1 --- drivers/bluetooth/hci_bcm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c index 3764ceb6fa0d..93a4c03a8787 100644 --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -68,6 +68,8 @@ struct bcm_device_data { * deassert = Bluetooth device may sleep when sleep criteria are met * @shutdown: BT_REG_ON pin, * power up or power down Bluetooth device internal regulators + * @reset: BT_RST_N pin, + * active low resets the Bluetooth logic core * @set_device_wakeup: callback to toggle BT_WAKE pin * either by accessing @device_wakeup or by calling @btlp * @set_shutdown: callback to toggle BT_REG_ON pin @@ -101,6 +103,7 @@ struct bcm_device { const char *name; struct gpio_desc *device_wakeup; struct gpio_desc *shutdown; + struct gpio_desc *reset; int (*set_device_wakeup)(struct bcm_device *, bool); int (*set_shutdown)(struct bcm_device *, bool); #ifdef CONFIG_ACPI @@ -985,6 +988,15 @@ static int bcm_gpio_set_device_wakeup(struct bcm_device *dev, bool awake) static int bcm_gpio_set_shutdown(struct bcm_device *dev, bool powered) { gpiod_set_value_cansleep(dev->shutdown, powered); + if (dev->reset) + /* + * The reset line is asserted on powerdown and deasserted + * on poweron so the inverse of powered is used. Notice + * that the GPIO line BT_RST_N needs to be specified as + * active low in the device tree or similar system + * description. + */ + gpiod_set_value_cansleep(dev->reset, !powered); return 0; } @@ -1050,6 +1062,11 @@ static int bcm_get_resources(struct bcm_device *dev) if (IS_ERR(dev->shutdown)) return PTR_ERR(dev->shutdown); + dev->reset = devm_gpiod_get_optional(dev->dev, "reset", + GPIOD_OUT_LOW); + if (IS_ERR(dev->reset)) + return PTR_ERR(dev->reset); + dev->set_device_wakeup = bcm_gpio_set_device_wakeup; dev->set_shutdown = bcm_gpio_set_shutdown;