| Message ID | 20191127223909.253873-2-abhishekpandit@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: rockchip: Add brcm bluetooth for rk3288-veyron | expand |
Hi Abhishek, > This enables the Broadcom uart bluetooth driver on uart0 and gives it > ownership of its gpios. In order to use this, you must enable the > following kconfig options: > - CONFIG_BT_HCIUART_BCM > - CONFIG_SERIAL_DEV > > This is applicable to rk3288-veyron series boards that use the bcm43540 > wifi+bt chips. > > As part of this change, also refactor the pinctrl across the various > boards. All the boards using broadcom bluetooth shouldn't touch the > bt_dev_wake pin. so have these changes being merged? Regards Marcel
Am Montag, 9. Dezember 2019, 00:48:31 CET schrieb Marcel Holtmann: > > This enables the Broadcom uart bluetooth driver on uart0 and gives it > > ownership of its gpios. In order to use this, you must enable the > > following kconfig options: > > - CONFIG_BT_HCIUART_BCM > > - CONFIG_SERIAL_DEV > > > > This is applicable to rk3288-veyron series boards that use the bcm43540 > > wifi+bt chips. > > > > As part of this change, also refactor the pinctrl across the various > > boards. All the boards using broadcom bluetooth shouldn't touch the > > bt_dev_wake pin. > > so have these changes being merged? not yet Doug wanted to give a Reviewed-by, once the underlying bluetooth changes got merged - not sure what the status is though. Heiko
Hi, On Sun, Dec 8, 2019 at 4:03 PM Heiko Stübner <heiko@sntech.de> wrote: > > Am Montag, 9. Dezember 2019, 00:48:31 CET schrieb Marcel Holtmann: > > > This enables the Broadcom uart bluetooth driver on uart0 and gives it > > > ownership of its gpios. In order to use this, you must enable the > > > following kconfig options: > > > - CONFIG_BT_HCIUART_BCM > > > - CONFIG_SERIAL_DEV > > > > > > This is applicable to rk3288-veyron series boards that use the bcm43540 > > > wifi+bt chips. > > > > > > As part of this change, also refactor the pinctrl across the various > > > boards. All the boards using broadcom bluetooth shouldn't touch the > > > bt_dev_wake pin. > > > > so have these changes being merged? > > not yet > > Doug wanted to give a Reviewed-by, once the underlying bluetooth > changes got merged - not sure what the status is though. I have been out for the last week and am a bit backlogged. I notice that this landed in our 4.19 kernel with +Matthias's Reviewed-by at <https://crrev.com/c/1772261>. I don't feel any need to re-review this myself if Matthias has taken a final look on it, so unless he knows a reason why it shouldn't land then I'd say go ahead and land it. -Doug
On Mon, Dec 09, 2019 at 03:56:14PM -0800, Doug Anderson wrote: > Hi, > > On Sun, Dec 8, 2019 at 4:03 PM Heiko Stübner <heiko@sntech.de> wrote: > > > > Am Montag, 9. Dezember 2019, 00:48:31 CET schrieb Marcel Holtmann: > > > > This enables the Broadcom uart bluetooth driver on uart0 and gives it > > > > ownership of its gpios. In order to use this, you must enable the > > > > following kconfig options: > > > > - CONFIG_BT_HCIUART_BCM > > > > - CONFIG_SERIAL_DEV > > > > > > > > This is applicable to rk3288-veyron series boards that use the bcm43540 > > > > wifi+bt chips. > > > > > > > > As part of this change, also refactor the pinctrl across the various > > > > boards. All the boards using broadcom bluetooth shouldn't touch the > > > > bt_dev_wake pin. > > > > > > so have these changes being merged? > > > > not yet > > > > Doug wanted to give a Reviewed-by, once the underlying bluetooth > > changes got merged - not sure what the status is though. > > I have been out for the last week and am a bit backlogged. > > I notice that this landed in our 4.19 kernel with +Matthias's > Reviewed-by at <https://crrev.com/c/1772261>. I don't feel any need > to re-review this myself if Matthias has taken a final look on it, so > unless he knows a reason why it shouldn't land then I'd say go ahead > and land it. Sorry, should have replied here in the first place. The changes look good to me. Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Hi Heiko, >>> This enables the Broadcom uart bluetooth driver on uart0 and gives it >>> ownership of its gpios. In order to use this, you must enable the >>> following kconfig options: >>> - CONFIG_BT_HCIUART_BCM >>> - CONFIG_SERIAL_DEV >>> >>> This is applicable to rk3288-veyron series boards that use the bcm43540 >>> wifi+bt chips. >>> >>> As part of this change, also refactor the pinctrl across the various >>> boards. All the boards using broadcom bluetooth shouldn't touch the >>> bt_dev_wake pin. >> >> so have these changes being merged? > > not yet > > Doug wanted to give a Reviewed-by, once the underlying bluetooth > changes got merged - not sure what the status is though. the Bluetooth changes have been merged into net-next. Regards Marcel
Am Mittwoch, 27. November 2019, 23:39:09 CET schrieb Abhishek Pandit-Subedi: > This enables the Broadcom uart bluetooth driver on uart0 and gives it > ownership of its gpios. In order to use this, you must enable the > following kconfig options: > - CONFIG_BT_HCIUART_BCM > - CONFIG_SERIAL_DEV > > This is applicable to rk3288-veyron series boards that use the bcm43540 > wifi+bt chips. > > As part of this change, also refactor the pinctrl across the various > boards. All the boards using broadcom bluetooth shouldn't touch the > bt_dev_wake pin. > > Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> applied for 5.6 with Matthias' Rb. Thanks Heiko
Sorry, I was out last week and didn't get a chance to respond. Thanks for following up on this. Happy to see this merged. :) On Tue, Dec 10, 2019 at 2:32 PM Heiko Stuebner <heiko@sntech.de> wrote: > > Am Mittwoch, 27. November 2019, 23:39:09 CET schrieb Abhishek Pandit-Subedi: > > This enables the Broadcom uart bluetooth driver on uart0 and gives it > > ownership of its gpios. In order to use this, you must enable the > > following kconfig options: > > - CONFIG_BT_HCIUART_BCM > > - CONFIG_SERIAL_DEV > > > > This is applicable to rk3288-veyron series boards that use the bcm43540 > > wifi+bt chips. > > > > As part of this change, also refactor the pinctrl across the various > > boards. All the boards using broadcom bluetooth shouldn't touch the > > bt_dev_wake pin. > > > > Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> > > applied for 5.6 with Matthias' Rb. > > Thanks > Heiko > >
diff --git a/arch/arm/boot/dts/rk3288-veyron-brain.dts b/arch/arm/boot/dts/rk3288-veyron-brain.dts index 406146cbff29..aa33d09184ad 100644 --- a/arch/arm/boot/dts/rk3288-veyron-brain.dts +++ b/arch/arm/boot/dts/rk3288-veyron-brain.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3288-veyron.dtsi" +#include "rk3288-veyron-broadcom-bluetooth.dtsi" / { model = "Google Brain"; @@ -40,6 +41,14 @@ }; &pinctrl { + pinctrl-names = "default"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + >; + hdmi { vcc50_hdmi_en: vcc50-hdmi-en { rockchip,pins = <7 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi b/arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi new file mode 100644 index 000000000000..a10d25ac8f7b --- /dev/null +++ b/arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Veyron (and derivatives) fragment for the Broadcom 43450 bluetooth + * chip. + * + * Copyright 2019 Google, Inc + */ + +&uart0 { + bluetooth { + pinctrl-names = "default"; + pinctrl-0 = <&bt_host_wake_l>, <&bt_enable_l>, + <&bt_dev_wake>; + + compatible = "brcm,bcm43540-bt"; + host-wakeup-gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>; + shutdown-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>; + device-wakeup-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; + max-speed = <3000000>; + brcm,bt-pcm-int-params = [01 02 00 01 01]; + }; +}; diff --git a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi index ffb60f880b39..05112c25176d 100644 --- a/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi @@ -136,27 +136,6 @@ }; &pinctrl { - pinctrl-0 = < - /* Common for sleep and wake, but no owners */ - &ddr0_retention - &ddrio_pwroff - &global_pwroff - - /* Wake only */ - &suspend_l_wake - &bt_dev_wake_awake - >; - pinctrl-1 = < - /* Common for sleep and wake, but no owners */ - &ddr0_retention - &ddrio_pwroff - &global_pwroff - - /* Sleep only */ - &suspend_l_sleep - &bt_dev_wake_sleep - >; - buttons { ap_lid_int_l: ap-lid-int-l { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>; diff --git a/arch/arm/boot/dts/rk3288-veyron-fievel.dts b/arch/arm/boot/dts/rk3288-veyron-fievel.dts index 9a0f55085839..7e7ef8e06b8d 100644 --- a/arch/arm/boot/dts/rk3288-veyron-fievel.dts +++ b/arch/arm/boot/dts/rk3288-veyron-fievel.dts @@ -18,8 +18,6 @@ "google,veyron-fievel-rev0", "google,veyron-fievel", "google,veyron", "rockchip,rk3288"; - /delete-node/ bt-activity; - vccsys: vccsys { compatible = "regulator-fixed"; regulator-name = "vccsys"; diff --git a/arch/arm/boot/dts/rk3288-veyron-jaq.dts b/arch/arm/boot/dts/rk3288-veyron-jaq.dts index a4966e505a2f..171ba6185b6d 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jaq.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jaq.dts @@ -273,6 +273,28 @@ }; &pinctrl { + pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Wake only */ + &suspend_l_wake + &bt_dev_wake_awake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + &bt_dev_wake_sleep + >; + buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts index a6ee44f0fe13..66f00d28801a 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts @@ -418,6 +418,28 @@ }; &pinctrl { + pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Wake only */ + &suspend_l_wake + &bt_dev_wake_awake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + &bt_dev_wake_sleep + >; + buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts index 06a6a9554c48..ffd1121d19be 100644 --- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts +++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3288-veyron.dtsi" +#include "rk3288-veyron-broadcom-bluetooth.dtsi" / { model = "Google Mickey"; @@ -411,6 +412,14 @@ }; &pinctrl { + pinctrl-names = "default"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + >; + hdmi { power_hdmi_on: power-hdmi-on { rockchip,pins = <7 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts index c833716dbe48..39f76e02875f 100644 --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3288-veyron-chromebook.dtsi" +#include "rk3288-veyron-broadcom-bluetooth.dtsi" / { model = "Google Minnie"; @@ -344,6 +345,26 @@ }; &pinctrl { + pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Wake only */ + &suspend_l_wake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + >; + buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts index f420499f300a..71e6629cc208 100644 --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts @@ -64,6 +64,28 @@ }; &pinctrl { + pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Wake only */ + &suspend_l_wake + &bt_dev_wake_awake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + &bt_dev_wake_sleep + >; + /delete-node/ lcd; backlight { diff --git a/arch/arm/boot/dts/rk3288-veyron-speedy.dts b/arch/arm/boot/dts/rk3288-veyron-speedy.dts index 2f2989bc3f9c..e354c61a45e7 100644 --- a/arch/arm/boot/dts/rk3288-veyron-speedy.dts +++ b/arch/arm/boot/dts/rk3288-veyron-speedy.dts @@ -7,6 +7,7 @@ /dts-v1/; #include "rk3288-veyron-chromebook.dtsi" +#include "rk3288-veyron-broadcom-bluetooth.dtsi" #include "cros-ec-sbs.dtsi" / { @@ -279,6 +280,26 @@ }; &pinctrl { + pinctrl-names = "default", "sleep"; + pinctrl-0 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Wake only */ + &suspend_l_wake + >; + pinctrl-1 = < + /* Common for sleep and wake, but no owners */ + &ddr0_retention + &ddrio_pwroff + &global_pwroff + + /* Sleep only */ + &suspend_l_sleep + >; + buck-5v { drv_5v: drv-5v { rockchip,pins = <7 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>; diff --git a/arch/arm/boot/dts/rk3288-veyron.dtsi b/arch/arm/boot/dts/rk3288-veyron.dtsi index 7525e3dd1fc1..54a6838d73f5 100644 --- a/arch/arm/boot/dts/rk3288-veyron.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron.dtsi @@ -23,30 +23,6 @@ reg = <0x0 0x0 0x0 0x80000000>; }; - bt_activity: bt-activity { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&bt_host_wake>; - - /* - * HACK: until we have an LPM driver, we'll use an - * ugly GPIO key to allow Bluetooth to wake from S3. - * This is expected to only be used by BT modules that - * use UART for comms. For BT modules that talk over - * SDIO we should use a wakeup mechanism related to SDIO. - * - * Use KEY_RESERVED here since that will work as a wakeup but - * doesn't get reported to higher levels (so doesn't confuse - * Chrome). - */ - bt-wake { - label = "BT Wakeup"; - gpios = <&gpio4 RK_PD7 GPIO_ACTIVE_HIGH>; - linux,code = <KEY_RESERVED>; - wakeup-source; - }; - - }; power_button: power-button { compatible = "gpio-keys"; @@ -82,22 +58,17 @@ clocks = <&rk808 RK808_CLKOUT1>; clock-names = "ext_clock"; pinctrl-names = "default"; - pinctrl-0 = <&bt_enable_l>, <&wifi_enable_h>; + pinctrl-0 = <&wifi_enable_h>; /* - * Depending on the actual card populated GPIO4 D4 and D5 + * Depending on the actual card populated GPIO4 D4 * correspond to one of these signals on the module: * * D4: * - SDIO_RESET_L_WL_REG_ON * - PDN (power down when low) - * - * D5: - * - BT_I2S_WS_BT_RFDISABLE_L - * - No connect */ - reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>, - <&gpio4 RK_PD5 GPIO_ACTIVE_LOW>; + reset-gpios = <&gpio4 RK_PD4 GPIO_ACTIVE_LOW>; }; vcc_5v: vcc-5v { @@ -481,26 +452,6 @@ }; &pinctrl { - pinctrl-names = "default", "sleep"; - pinctrl-0 = < - /* Common for sleep and wake, but no owners */ - &ddr0_retention - &ddrio_pwroff - &global_pwroff - - /* Wake only */ - &bt_dev_wake_awake - >; - pinctrl-1 = < - /* Common for sleep and wake, but no owners */ - &ddr0_retention - &ddrio_pwroff - &global_pwroff - - /* Sleep only */ - &bt_dev_wake_sleep - >; - pcfg_pull_none_drv_8ma: pcfg-pull-none-drv-8ma { bias-disable; drive-strength = <8>; @@ -622,6 +573,10 @@ bt_dev_wake_awake: bt-dev-wake-awake { rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_output_high>; }; + + bt_dev_wake: bt-dev-wake { + rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>; + }; }; tpm {
This enables the Broadcom uart bluetooth driver on uart0 and gives it ownership of its gpios. In order to use this, you must enable the following kconfig options: - CONFIG_BT_HCIUART_BCM - CONFIG_SERIAL_DEV This is applicable to rk3288-veyron series boards that use the bcm43540 wifi+bt chips. As part of this change, also refactor the pinctrl across the various boards. All the boards using broadcom bluetooth shouldn't touch the bt_dev_wake pin. Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org> --- Changes in v2: - Changed sco routing params to brcm,bt-pcm-int-params arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 +++ .../dts/rk3288-veyron-broadcom-bluetooth.dtsi | 22 +++++++ .../boot/dts/rk3288-veyron-chromebook.dtsi | 21 ------- arch/arm/boot/dts/rk3288-veyron-fievel.dts | 2 - arch/arm/boot/dts/rk3288-veyron-jaq.dts | 22 +++++++ arch/arm/boot/dts/rk3288-veyron-jerry.dts | 22 +++++++ arch/arm/boot/dts/rk3288-veyron-mickey.dts | 9 +++ arch/arm/boot/dts/rk3288-veyron-minnie.dts | 21 +++++++ arch/arm/boot/dts/rk3288-veyron-pinky.dts | 22 +++++++ arch/arm/boot/dts/rk3288-veyron-speedy.dts | 21 +++++++ arch/arm/boot/dts/rk3288-veyron.dtsi | 59 +++---------------- 11 files changed, 155 insertions(+), 75 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi