Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Stefan Wahren <wahrenst@gmx.net>
To:     Marcel Holtmann <marcel@holtmann.org>,
        Johan Hedberg <johan.hedberg@gmail.com>
Cc:     linux-bluetooth@vger.kernel.org, linux-kernel@vger.kernel.org,
        =?UTF-8?q?Ond=C5=99ej=20Jirman?= <megous@megous.com>,
        Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
        Stefan Wahren <wahrenst@gmx.net>
Subject: [PATCH] Bluetooth: hci_bcm: Drive RTS only for BCM43438
Date:   Wed,  1 Jan 2020 15:01:34 +0100
Message-Id: <1577887294-6089-1-git-send-email-wahrenst@gmx.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

The commit 3347a80965b3 ("Bluetooth: hci_bcm: Fix RTS handling during
startup") is causing at least a regression for AP6256 on Orange Pi 3.
So do the RTS line handing during startup only on the necessary platform.

Fixes: 3347a80965b3 ("Bluetooth: hci_bcm: Fix RTS handling during startup"=
)
Reported-by: Ond=C5=99ej Jirman <megous@megous.com>
Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
=2D--
 drivers/bluetooth/hci_bcm.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/bluetooth/hci_bcm.c b/drivers/bluetooth/hci_bcm.c
index bbfaf0c..769bb44 100644
=2D-- a/drivers/bluetooth/hci_bcm.c
+++ b/drivers/bluetooth/hci_bcm.c
@@ -53,6 +53,7 @@
  */
 struct bcm_device_data {
 	bool	no_early_set_baudrate;
+	bool	drive_rts_on_open;
 };

 /**
@@ -122,6 +123,7 @@ struct bcm_device {
 	bool			is_suspended;
 #endif
 	bool			no_early_set_baudrate;
+	bool			drive_rts_on_open;
 	u8			pcm_int_params[5];
 };

@@ -456,7 +458,9 @@ static int bcm_open(struct hci_uart *hu)

 out:
 	if (bcm->dev) {
-		hci_uart_set_flow_control(hu, true);
+		if (bcm->dev->drive_rts_on_open)
+			hci_uart_set_flow_control(hu, true);
+
 		hu->init_speed =3D bcm->dev->init_speed;

 		/* If oper_speed is set, ldisc/serdev will set the baudrate
@@ -466,7 +470,10 @@ static int bcm_open(struct hci_uart *hu)
 			hu->oper_speed =3D bcm->dev->oper_speed;

 		err =3D bcm_gpio_set_power(bcm->dev, true);
-		hci_uart_set_flow_control(hu, false);
+
+		if (bcm->dev->drive_rts_on_open)
+			hci_uart_set_flow_control(hu, false);
+
 		if (err)
 			goto err_unset_hu;
 	}
@@ -1447,8 +1454,10 @@ static int bcm_serdev_probe(struct serdev_device *s=
erdev)
 		dev_err(&serdev->dev, "Failed to power down\n");

 	data =3D device_get_match_data(bcmdev->dev);
-	if (data)
+	if (data) {
 		bcmdev->no_early_set_baudrate =3D data->no_early_set_baudrate;
+		bcmdev->drive_rts_on_open =3D data->drive_rts_on_open;
+	}

 	return hci_uart_register_device(&bcmdev->serdev_hu, &bcm_proto);
 }
@@ -1465,12 +1474,16 @@ static struct bcm_device_data bcm4354_device_data =
=3D {
 	.no_early_set_baudrate =3D true,
 };

+static struct bcm_device_data bcm43438_device_data =3D {
+	.drive_rts_on_open =3D true,
+};
+
 static const struct of_device_id bcm_bluetooth_of_match[] =3D {
 	{ .compatible =3D "brcm,bcm20702a1" },
 	{ .compatible =3D "brcm,bcm4329-bt" },
 	{ .compatible =3D "brcm,bcm4345c5" },
 	{ .compatible =3D "brcm,bcm4330-bt" },
-	{ .compatible =3D "brcm,bcm43438-bt" },
+	{ .compatible =3D "brcm,bcm43438-bt", .data =3D &bcm43438_device_data },
 	{ .compatible =3D "brcm,bcm43540-bt", .data =3D &bcm4354_device_data },
 	{ .compatible =3D "brcm,bcm4335a0" },
 	{ },
=2D-
2.7.4