Bluetooth: hci_bcm: Support pcm params in dts
authorAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Tue, 26 Nov 2019 07:17:32 +0000 (08:17 +0100)
committerSeung-Woo Kim <sw0312.kim@samsung.com>
Fri, 10 Jul 2020 08:48:18 +0000 (17:48 +0900)
commit eb762b94111b646b4f116ebfdbfcadbad14e12b3 upstream.

BCM chips may require configuration of PCM to operate correctly and
there is a vendor specific HCI command to do this. Add support in the
hci_bcm driver to parse this from devicetree and configure the chip.

Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
drivers/bluetooth/hci_bcm.c

index 84a32c5..4f21b60 100644 (file)
@@ -123,6 +123,7 @@ struct bcm_device {
        bool                    is_suspended;
 #endif
        bool                    no_early_set_baudrate;
+       u8                      pcm_int_params[5];
 };
 
 /* generic bcm uart resources */
@@ -597,6 +598,16 @@ static int bcm_setup(struct hci_uart *hu)
                        host_set_baudrate(hu, speed);
        }
 
+       /* PCM parameters if provided */
+       if (bcm->dev && bcm->dev->pcm_int_params[0] != 0xff) {
+               struct bcm_set_pcm_int_params params;
+
+               btbcm_read_pcm_int_params(hu->hdev, &params);
+
+               memcpy(&params, bcm->dev->pcm_int_params, 5);
+               btbcm_write_pcm_int_params(hu->hdev, &params);
+       }
+
 finalize:
        release_firmware(fw);
 
@@ -1134,6 +1145,8 @@ static int bcm_acpi_probe(struct bcm_device *dev)
 static int bcm_of_probe(struct bcm_device *bdev)
 {
        device_property_read_u32(bdev->dev, "max-speed", &bdev->oper_speed);
+       device_property_read_u8_array(bdev->dev, "brcm,bt-pcm-int-params",
+                                     bdev->pcm_int_params, 5);
        return 0;
 }
 
@@ -1149,6 +1162,9 @@ static int bcm_probe(struct platform_device *pdev)
        dev->dev = &pdev->dev;
        dev->irq = platform_get_irq(pdev, 0);
 
+       /* Initialize routing field to an unused value */
+       dev->pcm_int_params[0] = 0xff;
+
        if (has_acpi_companion(&pdev->dev)) {
                ret = bcm_acpi_probe(dev);
                if (ret)
@@ -1409,6 +1425,9 @@ static int bcm_serdev_probe(struct serdev_device *serdev)
        bcmdev->serdev_hu.serdev = serdev;
        serdev_device_set_drvdata(serdev, bcmdev);
 
+       /* Initialize routing field to an unused value */
+       bcmdev->pcm_int_params[0] = 0xff;
+
        if (has_acpi_companion(&serdev->dev))
                err = bcm_acpi_probe(bcmdev);
        else