From ab00f2abe68614438fbc3c213ddba5b8e27f3a52 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Sun, 11 Aug 2024 20:17:06 +0200 Subject: [PATCH] dt-bindings: bluetooth: move Bluetooth bindings to dedicated directory Some Bluetooth devices bindings are in net/ and some are in net/bluetooth/, so bring some consistency by putting everything in net/bluetooth. Rename few bindings to match preferred naming style: "vendor,device". Signed-off-by: Krzysztof Kozlowski Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/20240811-dt-bindings-serial-peripheral-props-v1-3-1dba258b7492@linaro.org Signed-off-by: Rob Herring (Arm) --- .../{broadcom-bluetooth.yaml => bluetooth/brcm,bluetooth.yaml} | 2 +- .../{marvell-bluetooth.yaml => bluetooth/marvell,88w8897.yaml} | 2 +- .../mediatek,bluetooth.txt} | 0 .../{nokia-bluetooth.txt => bluetooth/nokia,h4p-bluetooth.txt} | 0 .../realtek,bluetooth.yaml} | 2 +- .../devicetree/bindings/net/{ => bluetooth}/ti,bluetooth.yaml | 2 +- MAINTAINERS | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) rename Documentation/devicetree/bindings/net/{broadcom-bluetooth.yaml => bluetooth/brcm,bluetooth.yaml} (98%) rename Documentation/devicetree/bindings/net/{marvell-bluetooth.yaml => bluetooth/marvell,88w8897.yaml} (92%) rename Documentation/devicetree/bindings/net/{mediatek-bluetooth.txt => bluetooth/mediatek,bluetooth.txt} (100%) rename Documentation/devicetree/bindings/net/{nokia-bluetooth.txt => bluetooth/nokia,h4p-bluetooth.txt} (100%) rename Documentation/devicetree/bindings/net/{realtek-bluetooth.yaml => bluetooth/realtek,bluetooth.yaml} (95%) rename Documentation/devicetree/bindings/net/{ => bluetooth}/ti,bluetooth.yaml (96%) diff --git a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml similarity index 98% rename from Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml rename to Documentation/devicetree/bindings/net/bluetooth/brcm,bluetooth.yaml index 4a1bfc2b3584..e49e4146736f 100644 --- a/Documentation/devicetree/bindings/net/broadcom-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/brcm,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/broadcom-bluetooth.yaml# +$id: http://devicetree.org/schemas/net/bluetooth/brcm,bluetooth.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Broadcom Bluetooth Chips diff --git a/Documentation/devicetree/bindings/net/marvell-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/marvell,88w8897.yaml similarity index 92% rename from Documentation/devicetree/bindings/net/marvell-bluetooth.yaml rename to Documentation/devicetree/bindings/net/bluetooth/marvell,88w8897.yaml index 188a42ca6ceb..60b90cd62013 100644 --- a/Documentation/devicetree/bindings/net/marvell-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/marvell,88w8897.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/net/marvell-bluetooth.yaml# +$id: http://devicetree.org/schemas/net/bluetooth/marvell,88w8897.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Marvell Bluetooth chips diff --git a/Documentation/devicetree/bindings/net/mediatek-bluetooth.txt b/Documentation/devicetree/bindings/net/bluetooth/mediatek,bluetooth.txt similarity index 100% rename from Documentation/devicetree/bindings/net/mediatek-bluetooth.txt rename to Documentation/devicetree/bindings/net/bluetooth/mediatek,bluetooth.txt diff --git a/Documentation/devicetree/bindings/net/nokia-bluetooth.txt b/Documentation/devicetree/bindings/net/bluetooth/nokia,h4p-bluetooth.txt similarity index 100% rename from Documentation/devicetree/bindings/net/nokia-bluetooth.txt rename to Documentation/devicetree/bindings/net/bluetooth/nokia,h4p-bluetooth.txt diff --git a/Documentation/devicetree/bindings/net/realtek-bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/realtek,bluetooth.yaml similarity index 95% rename from Documentation/devicetree/bindings/net/realtek-bluetooth.yaml rename to Documentation/devicetree/bindings/net/bluetooth/realtek,bluetooth.yaml index 043e118c605c..993c607eaa49 100644 --- a/Documentation/devicetree/bindings/net/realtek-bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/realtek,bluetooth.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 %YAML 1.2 --- -$id: http://devicetree.org/schemas/net/realtek-bluetooth.yaml# +$id: http://devicetree.org/schemas/net/bluetooth/realtek,bluetooth.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: RTL8723BS/RTL8723CS/RTL8821CS/RTL8822CS Bluetooth diff --git a/Documentation/devicetree/bindings/net/ti,bluetooth.yaml b/Documentation/devicetree/bindings/net/bluetooth/ti,bluetooth.yaml similarity index 96% rename from Documentation/devicetree/bindings/net/ti,bluetooth.yaml rename to Documentation/devicetree/bindings/net/bluetooth/ti,bluetooth.yaml index 81616f9fb493..1f507ddccc3c 100644 --- a/Documentation/devicetree/bindings/net/ti,bluetooth.yaml +++ b/Documentation/devicetree/bindings/net/bluetooth/ti,bluetooth.yaml @@ -1,7 +1,7 @@ # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) %YAML 1.2 --- -$id: http://devicetree.org/schemas/net/ti,bluetooth.yaml# +$id: http://devicetree.org/schemas/net/bluetooth/ti,bluetooth.yaml# $schema: http://devicetree.org/meta-schemas/core.yaml# title: Texas Instruments Bluetooth Chips diff --git a/MAINTAINERS b/MAINTAINERS index 42decde38320..ca9e12cf81b1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -14210,8 +14210,8 @@ M: Sean Wang L: linux-bluetooth@vger.kernel.org L: linux-mediatek@lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/net/bluetooth/mediatek,bluetooth.txt F: Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml -F: Documentation/devicetree/bindings/net/mediatek-bluetooth.txt F: drivers/bluetooth/btmtkuart.c MEDIATEK BOARD LEVEL SHUTDOWN DRIVERS -- 2.50.1