Bluetooth controllers share the common local-bd-address property.
Add a generic YAML schema to replace bluetooth.txt for those.
Signed-off-by: Sven Peter <[email protected]>
---
changes from v2:
- added new bluetooth subdirectory and moved files there
- removed minItems from local-bd-address
- dropped [email protected], [email protected] and
[email protected] due to bouncing emails from the CC list
changes from v1:
- removed blueetooth.txt instead of just replacing it with a
deprecation note
- replaced references to bluetooth.txt
.../devicetree/bindings/net/bluetooth.txt | 5 ----
.../net/bluetooth/bluetooth-controller.yaml | 29 +++++++++++++++++++
.../{ => bluetooth}/qualcomm-bluetooth.yaml | 6 ++--
.../bindings/soc/qcom/qcom,wcnss.yaml | 8 ++---
4 files changed, 35 insertions(+), 13 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%)
diff --git a/Documentation/devicetree/bindings/net/bluetooth.txt b/Documentation/devicetree/bindings/net/bluetooth.txt
deleted file mode 100644
index 94797df751b8..000000000000
--- a/Documentation/devicetree/bindings/net/bluetooth.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The following properties are common to the Bluetooth controllers:
-
-- local-bd-address: array of 6 bytes, specifies the BD address that was
- uniquely assigned to the Bluetooth device, formatted with least significant
- byte first (little-endian).
diff --git a/Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml b/Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
new file mode 100644
index 000000000000..9309dc40f54f
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
@@ -0,0 +1,29 @@
+# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/bluetooth/bluetooth-controller.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Bluetooth Controller Generic Binding
+
+maintainers:
+ - Marcel Holtmann <[email protected]>
+ - Johan Hedberg <[email protected]>
+ - Luiz Augusto von Dentz <[email protected]>
+
+properties:
+ $nodename:
+ pattern: "^bluetooth(@.*)?$"
+
+ local-bd-address:
+ $ref: /schemas/types.yaml#/definitions/uint8-array
+ maxItems: 6
+ description:
+ Specifies the BD address that was uniquely assigned to the Bluetooth
+ device. Formatted with least significant byte first (little-endian), e.g.
+ in order to assign the address 00:11:22:33:44:55 this property must have
+ the value [55 44 33 22 11 00].
+
+additionalProperties: true
+
+...
diff --git a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml
similarity index 96%
rename from Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
rename to Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml
index f93c6e7a1b59..a6a6b0e4df7a 100644
--- a/Documentation/devicetree/bindings/net/qualcomm-bluetooth.yaml
+++ b/Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
%YAML 1.2
---
-$id: http://devicetree.org/schemas/net/qualcomm-bluetooth.yaml#
+$id: http://devicetree.org/schemas/net/bluetooth/qualcomm-bluetooth.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Bluetooth Chips
@@ -79,8 +79,7 @@ properties:
firmware-name:
description: specify the name of nvm firmware to load
- local-bd-address:
- description: see Documentation/devicetree/bindings/net/bluetooth.txt
+ local-bd-address: true
required:
@@ -89,6 +88,7 @@ required:
additionalProperties: false
allOf:
+ - $ref: bluetooth-controller.yaml#
- if:
properties:
compatible:
diff --git a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml
index 5320504bb5e0..0e6fd57d658d 100644
--- a/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml
+++ b/Documentation/devicetree/bindings/soc/qcom/qcom,wcnss.yaml
@@ -42,15 +42,13 @@ properties:
bluetooth:
type: object
additionalProperties: false
+ allOf:
+ - $ref: /schemas/net/bluetooth/bluetooth-controller.yaml#
properties:
compatible:
const: qcom,wcnss-bt
- local-bd-address:
- $ref: /schemas/types.yaml#/definitions/uint8-array
- maxItems: 6
- description:
- See Documentation/devicetree/bindings/net/bluetooth.txt
+ local-bd-address: true
required:
- compatible
--
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=678304
---Test result---
Test Summary:
CheckPatch FAIL 4.96 seconds
GitLint FAIL 0.94 seconds
SubjectPrefix FAIL 0.92 seconds
BuildKernel PASS 46.10 seconds
BuildKernel32 PASS 41.23 seconds
Incremental Build with patchesPASS 195.83 seconds
TestRunner: Setup PASS 684.65 seconds
TestRunner: l2cap-tester PASS 21.17 seconds
TestRunner: iso-tester PASS 21.91 seconds
TestRunner: bnep-tester PASS 8.38 seconds
TestRunner: mgmt-tester PASS 133.37 seconds
TestRunner: rfcomm-tester PASS 13.04 seconds
TestRunner: sco-tester PASS 12.12 seconds
TestRunner: smp-tester PASS 11.98 seconds
TestRunner: userchan-tester PASS 8.66 seconds
Details
##############################
Test: CheckPatch - FAIL - 4.96 seconds
Run checkpatch.pl script with rule in .checkpatch.conf
[v3,1/7] dt-bindings: net: Add generic Bluetooth controller\Traceback (most recent call last):
File "scripts/spdxcheck.py", line 6, in <module>
from ply import lex, yacc
ModuleNotFoundError: No module named 'ply'
WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#125:
.../{ => bluetooth}/qualcomm-bluetooth.yaml | 6 ++--
WARNING:DT_SPLIT_BINDING_PATCH: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.rst
WARNING:DT_SPLIT_BINDING_PATCH: DT binding docs and includes should be a separate patch. See: Documentation/devicetree/bindings/submitting-patches.rst
total: 0 errors, 3 warnings, 71 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12980751.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
[v3,3/7] arm64: dts: apple: t8103: Add Bluetooth controller\WARNING:UNDOCUMENTED_DT_STRING: DT compatible string vendor "pci14e4" appears un-documented -- check ./Documentation/devicetree/bindings/vendor-prefixes.yaml
#212: FILE: arch/arm64/boot/dts/apple/t8103-jxxx.dtsi:81:
+ compatible = "pci14e4,5f69";
total: 0 errors, 1 warnings, 68 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12980754.patch has style problems, please review.
NOTE: Ignored message types: UNKNOWN_COMMIT_ID
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
##############################
Test: GitLint - FAIL - 0.94 seconds
Run gitlint with rule in .gitlint
[v3,1/7] dt-bindings: net: Add generic Bluetooth controller
25: B1 Line exceeds max length (93>80): " create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml"
26: B1 Line exceeds max length (91>80): " rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%)"
[v3,2/7] dt-bindings: net: Add Broadcom BCM4377 family PCIe Bluetooth
25: B1 Line exceeds max length (95>80): " create mode 100644 Documentation/devicetree/bindings/net/bluetooth/brcm,bcm4377-bluetooth.yaml"
##############################
Test: SubjectPrefix - FAIL - 0.92 seconds
Check subject contains "Bluetooth" prefix
"Bluetooth: " is not specified in the subject
"Bluetooth: " is not specified in the subject
"Bluetooth: " is not specified in the subject
---
Regards,
Linux Bluetooth
On Mon, 19 Sep 2022 18:48:28 +0200, Sven Peter wrote:
> Bluetooth controllers share the common local-bd-address property.
> Add a generic YAML schema to replace bluetooth.txt for those.
>
> Signed-off-by: Sven Peter <[email protected]>
> ---
> changes from v2:
> - added new bluetooth subdirectory and moved files there
> - removed minItems from local-bd-address
> - dropped [email protected], [email protected] and
> [email protected] due to bouncing emails from the CC list
>
> changes from v1:
> - removed blueetooth.txt instead of just replacing it with a
> deprecation note
> - replaced references to bluetooth.txt
>
> .../devicetree/bindings/net/bluetooth.txt | 5 ----
> .../net/bluetooth/bluetooth-controller.yaml | 29 +++++++++++++++++++
> .../{ => bluetooth}/qualcomm-bluetooth.yaml | 6 ++--
> .../bindings/soc/qcom/qcom,wcnss.yaml | 8 ++---
> 4 files changed, 35 insertions(+), 13 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt
> create mode 100644 Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml
> rename Documentation/devicetree/bindings/net/{ => bluetooth}/qualcomm-bluetooth.yaml (96%)
>
Reviewed-by: Rob Herring <[email protected]>