[PATCH v2 1/3] dt-bindings: net: bluetooth: Add rtl8723bs-bluetooth

[PATCH v2 1/3] dt-bindings: net: bluetooth: Add rtl8723bs-bluetooth

[Alistair Francis]

From: Vasily Khoruzhick <anarsoul@gmail.com>

Add binding document for bluetooth part of RTL8723BS/RTL8723CS

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
v2:
 - Update bindings based on upstream feedback
 - Add RTL8822CS
 - Remove unused/unsupported fields
 - Remove firmware-postfix field
 - Small formatting changes

 .../bindings/net/realtek,rtl8723bs-bt.yaml    | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml

diff --git a/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml b/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml
new file mode 100644
index 000000000000..a03ce1bbc56f
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml
@@ -0,0 +1,55 @@
+# SPDX-License-Identifier: GPL-2.0
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/realtek,rtl8723bs-bt.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: RTL8723BS/RTL8723CS/RTL8822CS Bluetooth Device Tree Bindings
+
+maintainers:
+  - Vasily Khoruzhick <anarsoul@gmail.com>
+  - Alistair Francis <alistair@alistair23.me>
+
+description:
+  RTL8723CS/RTL8723CS/RTL8822CS is WiFi + BT chip. WiFi part is connected over
+  SDIO, while BT is connected over serial. It speaks H5 protocol with few
+  extra commands to upload firmware and change module speed.
+
+properties:
+  compatible:
+    oneOf:
+      - "realtek,rtl8723bs-bt"
+      - "realtek,rtl8723cs-bt"
+      - "realtek,rtl8822cs-bt"
+
+  device-wake-gpios:
+    maxItems: 1
+    description:
+      GPIO specifier, used to wakeup the BT module
+
+  enable-gpios:
+    maxItems: 1
+    description:
+      GPIO specifier, used to enable the BT module
+
+  host-wake-gpios:
+    maxItems: 1
+    desciption:
+      GPIO specifier, used to wakeup the host processor
+
+required:
+  - compatible
+
+examples:
+  - |
+    &uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+        uart-has-rtscts = <1>;
+
+        bluetooth {
+            compatible = "realtek,rtl8723bs-bt";
+            device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
+            host-wakeup-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+        };
+    };
-- 
2.25.1

[PATCH v2 2/3] Bluetooth: hci_h5: Add support for binding RTL8723BS with device tree

[Alistair Francis]

From: Vasily Khoruzhick <anarsoul@gmail.com>

RTL8723BS is often used in ARM boards, so add ability to bind it
using device tree.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 drivers/bluetooth/hci_h5.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
index 106c110efe56..b0e25a7ca850 100644
--- a/drivers/bluetooth/hci_h5.c
+++ b/drivers/bluetooth/hci_h5.c
@@ -1019,6 +1019,8 @@ static const struct of_device_id rtl_bluetooth_of_match[] = {
 	{ .compatible = "realtek,rtl8822cs-bt",
 	  .data = (const void *)&rtl_vnd },
 #endif
+	{ .compatible = "realtek,rtl8822bs-bt",
+	  .data = (const void *)&rtl_vnd },
 	{ },
 };
 MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
-- 
2.25.1

[PATCH v2 3/3] arm64: allwinner: Enable Bluetooth and WiFi on sopine baseboard

[Alistair Francis]

The sopine board has an optional RTL8723BS WiFi + BT module that can be
connected to UART1. Add this to the device tree so that it will work
for users if connected.

Signed-off-by: Alistair Francis <alistair@alistair23.me>
---
 .../allwinner/sun50i-a64-sopine-baseboard.dts | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 2f6ea9f3f6a2..f4be1bc56b07 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -103,6 +103,16 @@ ext_rgmii_phy: ethernet-phy@1 {
 	};
 };
 
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+	vmmc-supply = <&reg_dldo4>;
+	vqmmc-supply = <&reg_eldo1>;
+	non-removable;
+	bus-width = <4>;
+	status = "okay";
+};
+
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_pins>;
@@ -174,6 +184,19 @@ &uart0 {
 	status = "okay";
 };
 
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	uart-has-rtscts = <1>;
+	status = "okay";
+
+	bluetooth {
+		compatible = "realtek,rtl8723bs-bt";
+		device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
+		host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+	};
+};
+
 /* On Pi-2 connector */
 &uart2 {
 	pinctrl-names = "default";
-- 
2.25.1

Re: [PATCH v2 2/3] Bluetooth: hci_h5: Add support for binding RTL8723BS with device tree

[Vasily Khoruzhick]

On Mon, Apr 6, 2020 at 10:58 PM Alistair Francis <alistair@alistair23.me> wrote:
>
> From: Vasily Khoruzhick <anarsoul@gmail.com>
>
> RTL8723BS is often used in ARM boards, so add ability to bind it
> using device tree.
>
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
>  drivers/bluetooth/hci_h5.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
> index 106c110efe56..b0e25a7ca850 100644
> --- a/drivers/bluetooth/hci_h5.c
> +++ b/drivers/bluetooth/hci_h5.c
> @@ -1019,6 +1019,8 @@ static const struct of_device_id rtl_bluetooth_of_match[] = {
>         { .compatible = "realtek,rtl8822cs-bt",
>           .data = (const void *)&rtl_vnd },
>  #endif
> +       { .compatible = "realtek,rtl8822bs-bt",

Wrong compatible? Also you probably want to keep it over #endif.

> +         .data = (const void *)&rtl_vnd },
>         { },
>  };
>  MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
> --
> 2.25.1
>

Re: [PATCH v2 3/3] arm64: allwinner: Enable Bluetooth and WiFi on sopine baseboard

[Vasily Khoruzhick]

On Mon, Apr 6, 2020 at 10:58 PM Alistair Francis <alistair@alistair23.me> wrote:
>
> The sopine board has an optional RTL8723BS WiFi + BT module that can be
> connected to UART1. Add this to the device tree so that it will work
> for users if connected.

It's optional, so patch should have 'DO-NOT-MERGE' tag and appropriate
change should go into dt overlay.

> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
>  .../allwinner/sun50i-a64-sopine-baseboard.dts | 23 +++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> index 2f6ea9f3f6a2..f4be1bc56b07 100644
> --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> @@ -103,6 +103,16 @@ ext_rgmii_phy: ethernet-phy@1 {
>         };
>  };
>
> +&mmc1 {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&mmc1_pins>;
> +       vmmc-supply = <&reg_dldo4>;
> +       vqmmc-supply = <&reg_eldo1>;
> +       non-removable;
> +       bus-width = <4>;
> +       status = "okay";
> +};
> +
>  &mmc2 {
>         pinctrl-names = "default";
>         pinctrl-0 = <&mmc2_pins>;
> @@ -174,6 +184,19 @@ &uart0 {
>         status = "okay";
>  };
>
> +&uart1 {
> +       pinctrl-names = "default";
> +       pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
> +       uart-has-rtscts = <1>;
> +       status = "okay";
> +
> +       bluetooth {
> +               compatible = "realtek,rtl8723bs-bt";
> +               device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
> +               host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
> +       };
> +};
> +
>  /* On Pi-2 connector */
>  &uart2 {
>         pinctrl-names = "default";
> --
> 2.25.1
>

Re: [PATCH v2 2/3] Bluetooth: hci_h5: Add support for binding RTL8723BS with device tree

[Alistair Francis]

On Mon, Apr 6, 2020 at 11:51 PM Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>
> On Mon, Apr 6, 2020 at 10:58 PM Alistair Francis <alistair@alistair23.me> wrote:
> >
> > From: Vasily Khoruzhick <anarsoul@gmail.com>
> >
> > RTL8723BS is often used in ARM boards, so add ability to bind it
> > using device tree.
> >
> > Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  drivers/bluetooth/hci_h5.c | 2 ++
> >  1 file changed, 2 insertions(+)
> >
> > diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c
> > index 106c110efe56..b0e25a7ca850 100644
> > --- a/drivers/bluetooth/hci_h5.c
> > +++ b/drivers/bluetooth/hci_h5.c
> > @@ -1019,6 +1019,8 @@ static const struct of_device_id rtl_bluetooth_of_match[] = {
> >         { .compatible = "realtek,rtl8822cs-bt",
> >           .data = (const void *)&rtl_vnd },
> >  #endif
> > +       { .compatible = "realtek,rtl8822bs-bt",
>
> Wrong compatible? Also you probably want to keep it over #endif.

Fixed.

Alistair

>
> > +         .data = (const void *)&rtl_vnd },
> >         { },
> >  };
> >  MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
> > --
> > 2.25.1
> >

Re: [PATCH v2 3/3] arm64: allwinner: Enable Bluetooth and WiFi on sopine baseboard

[Alistair Francis]

On Mon, Apr 6, 2020 at 11:53 PM Vasily Khoruzhick <anarsoul@gmail.com> wrote:
>
> On Mon, Apr 6, 2020 at 10:58 PM Alistair Francis <alistair@alistair23.me> wrote:
> >
> > The sopine board has an optional RTL8723BS WiFi + BT module that can be
> > connected to UART1. Add this to the device tree so that it will work
> > for users if connected.
>
> It's optional, so patch should have 'DO-NOT-MERGE' tag and appropriate
> change should go into dt overlay.

I was hoping to enable WiFi/Bluetooth by default, even though it's an
optional add-on for the board.

Alistair

>
> > Signed-off-by: Alistair Francis <alistair@alistair23.me>
> > ---
> >  .../allwinner/sun50i-a64-sopine-baseboard.dts | 23 +++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > index 2f6ea9f3f6a2..f4be1bc56b07 100644
> > --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
> > @@ -103,6 +103,16 @@ ext_rgmii_phy: ethernet-phy@1 {
> >         };
> >  };
> >
> > +&mmc1 {
> > +       pinctrl-names = "default";
> > +       pinctrl-0 = <&mmc1_pins>;
> > +       vmmc-supply = <&reg_dldo4>;
> > +       vqmmc-supply = <&reg_eldo1>;
> > +       non-removable;
> > +       bus-width = <4>;
> > +       status = "okay";
> > +};
> > +
> >  &mmc2 {
> >         pinctrl-names = "default";
> >         pinctrl-0 = <&mmc2_pins>;
> > @@ -174,6 +184,19 @@ &uart0 {
> >         status = "okay";
> >  };
> >
> > +&uart1 {
> > +       pinctrl-names = "default";
> > +       pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
> > +       uart-has-rtscts = <1>;
> > +       status = "okay";
> > +
> > +       bluetooth {
> > +               compatible = "realtek,rtl8723bs-bt";
> > +               device-wake-gpios = <&r_pio 0 5 GPIO_ACTIVE_HIGH>; /* PL5 */
> > +               host-wake-gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
> > +       };
> > +};
> > +
> >  /* On Pi-2 connector */
> >  &uart2 {
> >         pinctrl-names = "default";
> > --
> > 2.25.1
> >

Re: [PATCH v2 1/3] dt-bindings: net: bluetooth: Add rtl8723bs-bluetooth

[Rob Herring]

On Mon,  6 Apr 2020 22:58:35 -0700, Alistair Francis wrote:
> From: Vasily Khoruzhick <anarsoul@gmail.com>
> 
> Add binding document for bluetooth part of RTL8723BS/RTL8723CS
> 
> Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
> Signed-off-by: Alistair Francis <alistair@alistair23.me>
> ---
> v2:
>  - Update bindings based on upstream feedback
>  - Add RTL8822CS
>  - Remove unused/unsupported fields
>  - Remove firmware-postfix field
>  - Small formatting changes
> 
>  .../bindings/net/realtek,rtl8723bs-bt.yaml    | 55 +++++++++++++++++++
>  1 file changed, 55 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml
> 

My bot found errors running 'make dt_binding_check' on your patch:

/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:compatible:oneOf:0: 'realtek,rtl8723bs-bt' is not of type 'object', 'boolean'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:compatible:oneOf:1: 'realtek,rtl8723cs-bt' is not of type 'object', 'boolean'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:compatible:oneOf:2: 'realtek,rtl8822cs-bt' is not of type 'object', 'boolean'
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:host-wake-gpios: Additional properties are not allowed ('desciption' was unexpected)
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:host-wake-gpios: 'desciption' is not one of ['$ref', 'additionalItems', 'additionalProperties', 'allOf', 'anyOf', 'const', 'contains', 'default', 'dependencies', 'deprecated', 'description', 'else', 'enum', 'exclusiveMaximum', 'exclusiveMinimum', 'items', 'if', 'minItems', 'minimum', 'maxItems', 'maximum', 'multipleOf', 'not', 'oneOf', 'pattern', 'patternProperties', 'properties', 'required', 'then', 'type', 'typeSize', 'unevaluatedProperties', 'uniqueItems']
/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:host-wake-gpios: {'maxItems': 1, 'desciption': 'GPIO specifier, used to wakeup the host processor'} is not valid under any of the given schemas (Possible causes of the failure):
	/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:host-wake-gpios: Additional properties are not allowed ('desciption' was unexpected)
	/builds/robherring/linux-dt-review/Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.yaml: properties:host-wake-gpios:maxItems: 1 is less than the minimum of 2

Documentation/devicetree/bindings/Makefile:12: recipe for target 'Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.example.dts' failed
make[1]: *** [Documentation/devicetree/bindings/net/realtek,rtl8723bs-bt.example.dts] Error 1
make[1]: *** Waiting for unfinished jobs....
Makefile:1262: recipe for target 'dt_binding_check' failed
make: *** [dt_binding_check] Error 2

See https://patchwork.ozlabs.org/patch/1267219

If you already ran 'make dt_binding_check' and didn't see the above
error(s), then make sure dt-schema is up to date:

pip3 install git+https://github.com/devicetree-org/dt-schema.git@master --upgrade

Please check and re-submit.

Re: [PATCH v2 2/3] Bluetooth: hci_h5: Add support for binding RTL8723BS with device tree

[kbuild test robot]

[-- Attachment #1: Type: text/plain, Size: 3422 bytes --]

Hi Alistair,

I love your patch! Yet something to improve:

[auto build test ERROR on net/master]
[also build test ERROR on net-next/master v5.7-rc2 next-20200420]
[cannot apply to bluetooth/master ipvs/master]
[if your patch is applied to the wrong git tree, please drop us a note to help
improve the system. BTW, we also suggest to use '--base' option to specify the
base tree in git format-patch, please see https://stackoverflow.com/a/37406982]

url:    https://github.com/0day-ci/linux/commits/Alistair-Francis/dt-bindings-net-bluetooth-Add-rtl8723bs-bluetooth/20200407-140111
base:   https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git aa81700cf2326e288c9ca1fe7b544039617f1fc2
config: arm64-randconfig-a001-20200421 (attached as .config)
compiler: clang version 11.0.0 (https://github.com/llvm/llvm-project a9b137f9ffba8cb25dfd7dd1fb613e8aac121b37)
reproduce:
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install arm64 cross compiling tool for clang build
        # apt-get install binutils-aarch64-linux-gnu
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=arm64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kbuild test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   drivers/bluetooth/hci_h5.c:1023:27: error: use of undeclared identifier 'rtl_vnd'
             .data = (const void *)&rtl_vnd },
                                    ^
>> drivers/bluetooth/hci_h5.c:1026:1: error: definition of variable with array type needs an explicit size or an initializer
   MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
   ^
   include/linux/module.h:240:21: note: expanded from macro 'MODULE_DEVICE_TABLE'
   extern typeof(name) __mod_##type##__##name##_device_table               \
                       ^
   <scratch space>:85:1: note: expanded from here
   __mod_of__rtl_bluetooth_of_match_device_table
   ^
   2 errors generated.

vim +1026 drivers/bluetooth/hci_h5.c

28a75e4c813c7ae Hans de Goede     2018-10-30  1016  
848fc6164158d69 Max Chou          2020-02-17  1017  static const struct of_device_id rtl_bluetooth_of_match[] = {
848fc6164158d69 Max Chou          2020-02-17  1018  #ifdef CONFIG_BT_HCIUART_RTL
848fc6164158d69 Max Chou          2020-02-17  1019  	{ .compatible = "realtek,rtl8822cs-bt",
848fc6164158d69 Max Chou          2020-02-17  1020  	  .data = (const void *)&rtl_vnd },
848fc6164158d69 Max Chou          2020-02-17  1021  #endif
025703659453391 Vasily Khoruzhick 2020-04-06  1022  	{ .compatible = "realtek,rtl8822bs-bt",
025703659453391 Vasily Khoruzhick 2020-04-06  1023  	  .data = (const void *)&rtl_vnd },
848fc6164158d69 Max Chou          2020-02-17  1024  	{ },
848fc6164158d69 Max Chou          2020-02-17  1025  };
848fc6164158d69 Max Chou          2020-02-17 @1026  MODULE_DEVICE_TABLE(of, rtl_bluetooth_of_match);
848fc6164158d69 Max Chou          2020-02-17  1027  

:::::: The code at line 1026 was first introduced by commit
:::::: 848fc6164158d697b70b390a2db5019663713f47 Bluetooth: hci_h5: btrtl: Add support for RTL8822C

:::::: TO: Max Chou <max.chou@realtek.com>
:::::: CC: Marcel Holtmann <marcel@holtmann.org>

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org

[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 40230 bytes --]