mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00:00
c6ddf8d502
Many changes were done in drivers/pinctrl/bcm/pinctrl-bcm2835.c between
5.4.171 and 5.4.179.
The following 3 patches do not apply any more:
* target/linux/bcm27xx/patches-5.4/950-0316-pinctrl-bcm2835-Add-support-for-BCM2711-pull-up-func.patch
This was already integrated in kernel v5.4-rc1, it was never needed.
* target/linux/bcm27xx/patches-5.4/950-0328-Revert-pinctrl-bcm2835-Pass-irqchip-when-adding-gpio.patch
* target/linux/bcm27xx/patches-5.4/950-0362-pinctrl-bcm2835-Change-init-order-for-gpio-hogs.patch
I think these were done to fix the problem which was really fixed in
commit 75278f1aff5e ("pinctrl: bcm2835: Change init order for gpio
hogs") from v5.4.175
target/linux/generic/backport-5.4/716-v5.5-net-sfp-move-fwnode-parsing-into-sfp-bus-layer.patch
Move fwnode_device_is_available to the same position as in kernel 5.10.
target/linux/layerscape/patches-5.4/302-dts-0083-arm64-ls1028a-qds-correct-bus-of-rtc.patch
Applied in commit 65816c1034769e714edb70f59a33bc5472d9e55f ("arm64: dts:
ls1028a-qds: move rtc node to the correct i2c bus")
Compile-tested: lantiq/xrx200, bcm27xx/bcm2710
Run-tested: lantiq/xrx200
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
75 lines
2.3 KiB
Diff
75 lines
2.3 KiB
Diff
From 8b4d7321625cc8403a9ce7f050bd8d1b4ef7446d Mon Sep 17 00:00:00 2001
|
|
From: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
|
|
Date: Tue, 26 Nov 2019 08:17:32 +0100
|
|
Subject: [PATCH] Bluetooth: hci_bcm: Support pcm params in dts
|
|
|
|
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 | 19 +++++++++++++++++++
|
|
1 file changed, 19 insertions(+)
|
|
|
|
--- a/drivers/bluetooth/hci_bcm.c
|
|
+++ b/drivers/bluetooth/hci_bcm.c
|
|
@@ -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, ¶ms);
|
|
+
|
|
+ memcpy(¶ms, bcm->dev->pcm_int_params, 5);
|
|
+ btbcm_write_pcm_int_params(hu->hdev, ¶ms);
|
|
+ }
|
|
+
|
|
finalize:
|
|
release_firmware(fw);
|
|
|
|
@@ -1134,6 +1145,8 @@ static int bcm_acpi_probe(struct bcm_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;
|
|
}
|
|
|
|
@@ -1154,6 +1167,9 @@ static int bcm_probe(struct platform_dev
|
|
|
|
dev->irq = ret;
|
|
|
|
+ /* 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)
|
|
@@ -1414,6 +1430,9 @@ static int bcm_serdev_probe(struct serde
|
|
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
|