Commit cd9b6f47 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'for-net-next-2024-07-15' of... 

Merge tag 'for-net-next-2024-07-15' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next

Luiz Augusto von Dentz says:

====================
bluetooth-next pull request for net-next:

 - qca: use the power sequencer for QCA6390
 - btusb: mediatek: add ISO data transmission functions
 - hci_bcm4377: Add BCM4388 support
 - btintel: Add support for BlazarU core
 - btintel: Add support for Whale Peak2
 - btnxpuart: Add support for AW693 A1 chipset
 - btnxpuart: Add support for IW615 chipset
 - btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591

* tag 'for-net-next-2024-07-15' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next: (71 commits)
  Bluetooth: btmtk: Mark all stub functions as inline
  Bluetooth: hci_qca: Fix build error
  Bluetooth: hci_qca: use the power sequencer for wcn7850 and wcn6855
  Bluetooth: hci_qca: make pwrseq calls the default if available
  Bluetooth: hci_qca: unduplicate calls to hci_uart_register_device()
  Bluetooth: hci_qca: schedule a devm action for disabling the clock
  dt-bindings: bluetooth: qualcomm: describe the inputs from PMU for wcn7850
  Bluetooth: btnxpuart: Fix warnings for suspend and resume functions
  Bluetooth: btnxpuart: Add system suspend and resume handlers
  Bluetooth: btnxpuart: Add support for IW615 chipset
  Bluetooth: btnxpuart: Add support for AW693 A1 chipset
  Bluetooth: btintel: Add support for Whale Peak2
  Bluetooth: btintel: Add support for BlazarU core
  Bluetooth: btusb: mediatek: add ISO data transmission functions
  Bluetooth: btmtk: move btusb_recv_acl_mtk to btmtk.c
  Bluetooth: btmtk: move btusb_mtk_[setup, shutdown] to btmtk.c
  Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c
  Bluetooth: btusb: add callback function in btusb suspend/resume
  Bluetooth: btmtk: rename btmediatek_data
  Bluetooth: btusb: mediatek: return error for failed reg access
  ...
====================

Link: https://patch.msgid.link/20240715142543.303944-1-luiz.dentz@gmail.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 30b35600 23e88450

Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7622-bluetooth.yaml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause

%YAML 1.2

---

$id: http://devicetree.org/schemas/net/bluetooth/mediatek,mt7622-bluetooth.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: MediaTek SoC built-in Bluetooth



description:

  This device is a serial attached device to BTIF device and thus it must be a

  child node of the serial node with BTIF. The dt-bindings details for BTIF

  device can be known via Documentation/devicetree/bindings/serial/8250.yaml.



maintainers:

  - Sean Wang <sean.wang@mediatek.com>



allOf:

  - $ref: bluetooth-controller.yaml#



properties:

  compatible:

    const: mediatek,mt7622-bluetooth



  clocks:

    maxItems: 1



  clock-names:

    const: ref



  power-domains:

    maxItems: 1



required:

  - clocks

  - clock-names

  - power-domains



unevaluatedProperties: false



examples:

  - |

    #include <dt-bindings/power/mt7622-power.h>



    serial {

        bluetooth {

            compatible = "mediatek,mt7622-bluetooth";

            power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;

            clocks = <&clk25m>;

            clock-names = "ref";

        };

    };

Documentation/devicetree/bindings/net/bluetooth/nxp,88w8987-bt.yaml

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ properties: 
      This property depends on the module vendor's

      configuration.



  firmware-name:

    maxItems: 1



required:

  - compatible
@@ -42,5 +45,6 @@ examples: 
        bluetooth {

            compatible = "nxp,88w8987-bt";

            fw-init-baudrate = <3000000>;

            firmware-name = "uartuart8987_bt_v0.bin";

        };

    };

Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

+30 −5
Original line number Diff line number Diff line
@@ -62,6 +62,9 @@ properties: 
  vdddig-supply:

    description: VDD_DIG supply regulator handle



  vddbtcmx-supply:

    description: VDD_BT_CMX supply regulator handle



  vddbtcxmx-supply:

    description: VDD_BT_CXMX supply regulator handle
@@ -74,6 +77,9 @@ properties: 
  vddrfa1p7-supply:

    description: VDD_RFA_1P7 supply regulator handle



  vddrfa1p8-supply:

    description: VDD_RFA_1P8 supply regulator handle



  vddrfa1p2-supply:

    description: VDD_RFA_1P2 supply regulator handle
@@ -86,6 +92,12 @@ properties: 
  vddasd-supply:

    description: VDD_ASD supply regulator handle



  vddwlcx-supply:

    description: VDD_WLCX supply regulator handle



  vddwlmx-supply:

    description: VDD_WLMX supply regulator handle



  max-speed:

    description: see Documentation/devicetree/bindings/serial/serial.yaml
@@ -176,14 +188,27 @@ allOf: 
              - qcom,wcn7850-bt

    then:

      required:

        - enable-gpios

        - swctrl-gpios

        - vddio-supply

        - vddrfacmn-supply

        - vddaon-supply

        - vdddig-supply

        - vddwlcx-supply

        - vddwlmx-supply

        - vddrfa0p8-supply

        - vddrfa1p2-supply

        - vddrfa1p9-supply

        - vddrfa1p8-supply

  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,qca6390-bt

    then:

      required:

        - vddrfacmn-supply

        - vddaon-supply

        - vddbtcmx-supply

        - vddrfa0p8-supply

        - vddrfa1p2-supply

        - vddrfa1p7-supply



examples:

  - |

Documentation/devicetree/bindings/net/mediatek-bluetooth.txt

+0 −36
Original line number Diff line number Diff line 
MediaTek SoC built-in Bluetooth Devices

==================================



This device is a serial attached device to BTIF device and thus it must be a

child node of the serial node with BTIF. The dt-bindings details for BTIF

device can be known via Documentation/devicetree/bindings/serial/8250.yaml.



Required properties:



- compatible:	Must be

		  "mediatek,mt7622-bluetooth": for MT7622 SoC

- clocks:	Should be the clock specifiers corresponding to the entry in

		clock-names property.

- clock-names:	Should contain "ref" entries.

- power-domains: Phandle to the power domain that the device is part of



Example:



	btif: serial@1100c000 {

		compatible = "mediatek,mt7622-btif",

			     "mediatek,mtk-btif";

		reg = <0 0x1100c000 0 0x1000>;

		interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_LOW>;

		clocks = <&pericfg CLK_PERI_BTIF_PD>;

		clock-names = "main";

		reg-shift = <2>;

		reg-io-width = <4>;



		bluetooth {

			compatible = "mediatek,mt7622-bluetooth";

			power-domains = <&scpsys MT7622_POWER_DOMAIN_WB>;

			clocks = <&clk25m>;

			clock-names = "ref";

		};

	};



MediaTek UART based Bluetooth Devices

==================================

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -17908,6 +17908,14 @@ F: include/linux/pm_* 
F:	include/linux/powercap.h

F:	kernel/configs/nopm.config









POWER SEQUENCING









M:	Bartosz Golaszewski <brgl@bgdev.pl>









L:	linux-pm@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git









F:	drivers/power/sequencing/









F:	include/linux/pwrseq/

















POWER STATE COORDINATION INTERFACE (PSCI)









M:	Mark Rutland <mark.rutland@arm.com>









M:	Lorenzo Pieralisi <lpieralisi@kernel.org>