.../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ .../devicetree/bindings/net/btusb.txt | 2 +- .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- 3 files changed, 80 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
Convert the existing text-based DT bindings for Marvell 8897/8997
(sd8897/sd8997) bluetooth devices controller to a DT schema.
While here, bindings for "usb1286,204e" (USB interface) are dropped from
the DT schema definition as these are currently documented in file [0].
[0] Documentation/devicetree/bindings/net/btusb.txt
Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
---
.../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++
.../devicetree/bindings/net/btusb.txt | 2 +-
.../bindings/net/marvell-bt-8xxx.txt | 83 -------------------
3 files changed, 80 insertions(+), 84 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml
delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
diff --git a/Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml b/Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml
new file mode 100644
index 0000000000000..a307c64cfa4d6
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml
@@ -0,0 +1,79 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/bluetooth/marvell,sd8897-bt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Marvell 8897/8997 (sd8897/sd8997) bluetooth devices (SDIO)
+
+maintainers:
+ - Ariel D'Alessandro <ariel.dalessandro@collabora.com>
+
+allOf:
+ - $ref: /schemas/net/bluetooth/bluetooth-controller.yaml#
+
+properties:
+ compatible:
+ enum:
+ - marvell,sd8897-bt
+ - marvell,sd8997-bt
+
+ reg:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+ marvell,cal-data:
+ $ref: /schemas/types.yaml#/definitions/uint8-array
+ description:
+ Calibration data downloaded to the device during initialization.
+ maxItems: 28
+
+ marvell,wakeup-pin:
+ $ref: /schemas/types.yaml#/definitions/uint16
+ description:
+ Wakeup pin number of the bluetooth chip. Used by firmware to wakeup host
+ system.
+
+ marvell,wakeup-gap-ms:
+ $ref: /schemas/types.yaml#/definitions/uint16
+ description:
+ Wakeup latency of the host platform. Required by the chip sleep feature.
+
+required:
+ - compatible
+ - reg
+ - interrupts
+
+additionalProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+
+ mmc {
+ vmmc-supply = <&wlan_en_reg>;
+ bus-width = <4>;
+ cap-power-off-card;
+ keep-power-in-suspend;
+
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ bluetooth@2 {
+ compatible = "marvell,sd8897-bt";
+ reg = <2>;
+ interrupt-parent = <&pio>;
+ interrupts = <119 IRQ_TYPE_LEVEL_LOW>;
+
+ marvell,cal-data = /bits/ 8 <
+ 0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
+ 0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
+ 0x00 0x00 0xf0 0x00>;
+ marvell,wakeup-pin = /bits/ 16 <0x0d>;
+ marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
+ };
+ };
+
+...
diff --git a/Documentation/devicetree/bindings/net/btusb.txt b/Documentation/devicetree/bindings/net/btusb.txt
index f546b1f7dd6d2..a68022a57c51e 100644
--- a/Documentation/devicetree/bindings/net/btusb.txt
+++ b/Documentation/devicetree/bindings/net/btusb.txt
@@ -14,7 +14,7 @@ Required properties:
Also, vendors that use btusb may have device additional properties, e.g:
-Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
+Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml
Optional properties:
diff --git a/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt b/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
deleted file mode 100644
index 957e5e5c2927c..0000000000000
--- a/Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-Marvell 8897/8997 (sd8897/sd8997) bluetooth devices (SDIO or USB based)
-------
-The 8997 devices supports multiple interfaces. When used on SDIO interfaces,
-the btmrvl driver is used and when used on USB interface, the btusb driver is
-used.
-
-Required properties:
-
- - compatible : should be one of the following:
- * "marvell,sd8897-bt" (for SDIO)
- * "marvell,sd8997-bt" (for SDIO)
- * "usb1286,204e" (for USB)
-
-Optional properties:
-
- - marvell,cal-data: Calibration data downloaded to the device during
- initialization. This is an array of 28 values(u8).
- This is only applicable to SDIO devices.
-
- - marvell,wakeup-pin: It represents wakeup pin number of the bluetooth chip.
- firmware will use the pin to wakeup host system (u16).
- - marvell,wakeup-gap-ms: wakeup gap represents wakeup latency of the host
- platform. The value will be configured to firmware. This
- is needed to work chip's sleep feature as expected (u16).
- - interrupt-names: Used only for USB based devices (See below)
- - interrupts : specifies the interrupt pin number to the cpu. For SDIO, the
- driver will use the first interrupt specified in the interrupt
- array. For USB based devices, the driver will use the interrupt
- named "wakeup" from the interrupt-names and interrupt arrays.
- The driver will request an irq based on this interrupt number.
- During system suspend, the irq will be enabled so that the
- bluetooth chip can wakeup host platform under certain
- conditions. During system resume, the irq will be disabled
- to make sure unnecessary interrupt is not received.
-
-Example:
-
-IRQ pin 119 is used as system wakeup source interrupt.
-wakeup pin 13 and gap 100ms are configured so that firmware can wakeup host
-using this device side pin and wakeup latency.
-
-Example for SDIO device follows (calibration data is also available in
-below example).
-
-&mmc3 {
- vmmc-supply = <&wlan_en_reg>;
- bus-width = <4>;
- cap-power-off-card;
- keep-power-in-suspend;
-
- #address-cells = <1>;
- #size-cells = <0>;
- btmrvl: bluetooth@2 {
- compatible = "marvell,sd8897-bt";
- reg = <2>;
- interrupt-parent = <&pio>;
- interrupts = <119 IRQ_TYPE_LEVEL_LOW>;
-
- marvell,cal-data = /bits/ 8 <
- 0x37 0x01 0x1c 0x00 0xff 0xff 0xff 0xff 0x01 0x7f 0x04 0x02
- 0x00 0x00 0xba 0xce 0xc0 0xc6 0x2d 0x00 0x00 0x00 0x00 0x00
- 0x00 0x00 0xf0 0x00>;
- marvell,wakeup-pin = /bits/ 16 <0x0d>;
- marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
- };
-};
-
-Example for USB device:
-
-&usb_host1_ohci {
- #address-cells = <1>;
- #size-cells = <0>;
-
- mvl_bt1: bt@1 {
- compatible = "usb1286,204e";
- reg = <1>;
- interrupt-parent = <&gpio0>;
- interrupt-names = "wakeup";
- interrupts = <119 IRQ_TYPE_LEVEL_LOW>;
- marvell,wakeup-pin = /bits/ 16 <0x0d>;
- marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
- };
-};
--
2.51.0On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > Convert the existing text-based DT bindings for Marvell 8897/8997 > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > the DT schema definition as these are currently documented in file [0]. > > [0] Documentation/devicetree/bindings/net/btusb.txt > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > --- > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > .../devicetree/bindings/net/btusb.txt | 2 +- > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > 3 files changed, 80 insertions(+), 84 deletions(-) > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> You'll probably have to resend this after rc1.
Hi, On Thu, Oct 2, 2025 at 3:14 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > > On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > > Convert the existing text-based DT bindings for Marvell 8897/8997 > > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > > the DT schema definition as these are currently documented in file [0]. > > > > [0] Documentation/devicetree/bindings/net/btusb.txt > > > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > > --- > > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > > .../devicetree/bindings/net/btusb.txt | 2 +- > > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > > 3 files changed, 80 insertions(+), 84 deletions(-) > > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > You'll probably have to resend this after rc1. In that case I'd like to have a Fixes tag so I can remember to send it as rc1 is tagged. -- Luiz Augusto von Dentz
On Thu, Oct 2, 2025 at 2:18 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi, > > On Thu, Oct 2, 2025 at 3:14 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > > > > > On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > > > Convert the existing text-based DT bindings for Marvell 8897/8997 > > > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > > > > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > > > the DT schema definition as these are currently documented in file [0]. > > > > > > [0] Documentation/devicetree/bindings/net/btusb.txt > > > > > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > > > --- > > > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > > > .../devicetree/bindings/net/btusb.txt | 2 +- > > > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > > > 3 files changed, 80 insertions(+), 84 deletions(-) > > > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > > > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > > > > > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > > > You'll probably have to resend this after rc1. > > In that case I'd like to have a Fixes tag so I can remember to send it > as rc1 is tagged. A Fixes tag is not appropriate for a conversion to DT schema. Rob
Hi Rob, On Fri, Oct 3, 2025 at 9:38 AM Rob Herring <robh@kernel.org> wrote: > > On Thu, Oct 2, 2025 at 2:18 PM Luiz Augusto von Dentz > <luiz.dentz@gmail.com> wrote: > > > > Hi, > > > > On Thu, Oct 2, 2025 at 3:14 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > > > > > > > > On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > > > > Convert the existing text-based DT bindings for Marvell 8897/8997 > > > > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > > > > > > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > > > > the DT schema definition as these are currently documented in file [0]. > > > > > > > > [0] Documentation/devicetree/bindings/net/btusb.txt > > > > > > > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > > > > --- > > > > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > > > > .../devicetree/bindings/net/btusb.txt | 2 +- > > > > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > > > > 3 files changed, 80 insertions(+), 84 deletions(-) > > > > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > > > > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > > > > > > > > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > > > > > You'll probably have to resend this after rc1. > > > > In that case I'd like to have a Fixes tag so I can remember to send it > > as rc1 is tagged. > > A Fixes tag is not appropriate for a conversion to DT schema. Ok, but then how do you justify merging it for an RC? Or I'm misunderstanding and that should just be merged to bluetooth-next and wait for the next merge window? In that case I can just merge it right away. > Rob -- Luiz Augusto von Dentz
On Fri, Oct 3, 2025 at 9:33 AM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Rob, > > On Fri, Oct 3, 2025 at 9:38 AM Rob Herring <robh@kernel.org> wrote: > > > > On Thu, Oct 2, 2025 at 2:18 PM Luiz Augusto von Dentz > > <luiz.dentz@gmail.com> wrote: > > > > > > Hi, > > > > > > On Thu, Oct 2, 2025 at 3:14 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > > > > > > > > > > > On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > > > > > Convert the existing text-based DT bindings for Marvell 8897/8997 > > > > > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > > > > > > > > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > > > > > the DT schema definition as these are currently documented in file [0]. > > > > > > > > > > [0] Documentation/devicetree/bindings/net/btusb.txt > > > > > > > > > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > > > > > --- > > > > > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > > > > > .../devicetree/bindings/net/btusb.txt | 2 +- > > > > > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > > > > > 3 files changed, 80 insertions(+), 84 deletions(-) > > > > > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > > > > > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > > > > > > > > > > > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > > > > > > > You'll probably have to resend this after rc1. > > > > > > In that case I'd like to have a Fixes tag so I can remember to send it > > > as rc1 is tagged. > > > > A Fixes tag is not appropriate for a conversion to DT schema. > > Ok, but then how do you justify merging it for an RC? I don't. > Or I'm > misunderstanding and that should just be merged to bluetooth-next and > wait for the next merge window? Yes, this is 6.19 material. > In that case I can just merge it right > away. That's up to you. Rob
On Wed, Oct 8, 2025 at 2:22 PM Rob Herring <robh@kernel.org> wrote: > > On Fri, Oct 3, 2025 at 9:33 AM Luiz Augusto von Dentz > <luiz.dentz@gmail.com> wrote: > > > > Hi Rob, > > > > On Fri, Oct 3, 2025 at 9:38 AM Rob Herring <robh@kernel.org> wrote: > > > > > > On Thu, Oct 2, 2025 at 2:18 PM Luiz Augusto von Dentz > > > <luiz.dentz@gmail.com> wrote: > > > > > > > > Hi, > > > > > > > > On Thu, Oct 2, 2025 at 3:14 PM Rob Herring (Arm) <robh@kernel.org> wrote: > > > > > > > > > > > > > > > On Wed, 01 Oct 2025 15:33:20 -0300, Ariel D'Alessandro wrote: > > > > > > Convert the existing text-based DT bindings for Marvell 8897/8997 > > > > > > (sd8897/sd8997) bluetooth devices controller to a DT schema. > > > > > > > > > > > > While here, bindings for "usb1286,204e" (USB interface) are dropped from > > > > > > the DT schema definition as these are currently documented in file [0]. > > > > > > > > > > > > [0] Documentation/devicetree/bindings/net/btusb.txt > > > > > > > > > > > > Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com> > > > > > > --- > > > > > > .../net/bluetooth/marvell,sd8897-bt.yaml | 79 ++++++++++++++++++ > > > > > > .../devicetree/bindings/net/btusb.txt | 2 +- > > > > > > .../bindings/net/marvell-bt-8xxx.txt | 83 ------------------- > > > > > > 3 files changed, 80 insertions(+), 84 deletions(-) > > > > > > create mode 100644 Documentation/devicetree/bindings/net/bluetooth/marvell,sd8897-bt.yaml > > > > > > delete mode 100644 Documentation/devicetree/bindings/net/marvell-bt-8xxx.txt > > > > > > > > > > > > > > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > > > > > > > > > You'll probably have to resend this after rc1. > > > > > > > > In that case I'd like to have a Fixes tag so I can remember to send it > > > > as rc1 is tagged. > > > > > > A Fixes tag is not appropriate for a conversion to DT schema. > > > > Ok, but then how do you justify merging it for an RC? > > I don't. > > > Or I'm > > misunderstanding and that should just be merged to bluetooth-next and > > wait for the next merge window? > > Yes, this is 6.19 material. > > > In that case I can just merge it right > > away. > > That's up to you. Luiz, Are you going to pick this up or do you want it resent? Rob
> > > > Reviewed-by: Rob Herring (Arm) <robh@kernel.org> > > > > > > > > You'll probably have to resend this after rc1. > > > > > > In that case I'd like to have a Fixes tag so I can remember to send it > > > as rc1 is tagged. > > > > A Fixes tag is not appropriate for a conversion to DT schema. > > Ok, but then how do you justify merging it for an RC? Or I'm > misunderstanding and that should just be merged to bluetooth-next and > wait for the next merge window? In that case I can just merge it right > away. Most subsystems don't accept new patches during the merge window because they will need to do a rebase when -rc1 is pushed. And rebasing of patches is frowned upon. By requesting the developers to repost after -rc1 is out, and the subsystem tree has been updated to -rc1, the Maintainers avoids the rebase, and pushes the work to the developer to rebase and retest, leaving the Maintainers to do more useful work. Andrew
© 2016 - 2026 Red Hat, Inc.