| Message ID | 20191112004700.185304-1-abhishekpandit@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: rockchip: Add brcm bluetooth for rk3288-veyron | expand |
Hi, Am Dienstag, 12. November 2019, 01:47:00 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> looks good to me @dianders: does this look ok to you too? Just to confirm, I guess mickey and brain do not have the suspend_l pin settings? [They only seem to get the default pinctrl state but not the sleep state in @pinctrl] Thanks Heiko > --- > > This patch enables using the Broadcom HCI UART driver with the > BCM43540 Wi-Fi + Bluetooth chip. This chip is used on a RK3288 based > board (Veyron) and these changes have been tested on the Minnie variant > of the board (i.e. rk3288-veyron-minnie.dts). > > The changes are applicable to the minnie, mickey, speedy and brain > variants (all of which use the Broadcom chips). The bt-activity node was > removed for all Veyron boards and shouldn't affect the boards using > Marvell chips since they aren't using this out-of-band wakeup gpio. > > A previous portion of this series adding the compatible string to the > hci_bcm driver has already been merged into bluetooth-next: > https://lore.kernel.org/r/4680AA6A-599F-4D5E-9A96-0655569BAE94@holtmann.org > > There is also an ongoing series to fix up the baudrate settings and > configure the PCM parameters on bluetooth-next: > https://lore.kernel.org/linux-bluetooth/20191112001949.136377-1-abhishekpandit@chromium.org/ > > > arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 +++ > .../dts/rk3288-veyron-broadcom-bluetooth.dtsi | 26 ++++++++ > .../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, 159 insertions(+), 75 deletions(-) > create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi > > 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..ffa14049c3b5 > --- /dev/null > +++ b/arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi > @@ -0,0 +1,26 @@ > +// 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-sco-routing = [01]; > + brcm,pcm-interface-rate = [02]; > + brcm,pcm-sync-mode = [01]; > + brcm,pcm-clock-mode = [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 { >
Hi, On Thu, Nov 14, 2019 at 5:45 AM Heiko Stuebner <heiko@sntech.de> wrote: > > Hi, > > Am Dienstag, 12. November 2019, 01:47:00 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> > > looks good to me > @dianders: does this look ok to you too? Yes, but it's not ready to land yet. Specifically the bindings are still being discussed [1]. Abhishek: you should probably add information about the fact that the bindings need to land first to your Commit-notes. When the bindings land I'm happy to add my Reviewed-by. For history, +Matthias and I both did an early review of this [2]. Compared to that version the only diffs here (other than merge conflicts) are: - pcm-parameters = [01 02 00 01 01 00 00 00 00 00]; + + brcm,bt-sco-routing = [01]; + brcm,pcm-interface-rate = [02]; + brcm,pcm-sync-mode = [01]; + brcm,pcm-clock-mode = [01]; > Just to confirm, I guess mickey and brain do not have the suspend_l pin > settings? [They only seem to get the default pinctrl state but not the > sleep state in @pinctrl] The suspend_l pin just goes to the EC and lets the EC know that we're in suspend. I know for sure mickey has no EC. I'd believe the same to be true of brain, though perhaps you and +Alexandru are the only two people with working brains? I know I don't have one, as can be evidenced by some of the stupid things I do. :-P I would also note that this CL doesn't change whether or not mickey/brain control suspend_l. They used to inherit from 'rk3288-veyron.dtsi' which didn't define it. [1] https://lore.kernel.org/r/20191112230944.48716-5-abhishekpandit@chromium.org [2] https://crrev.com/c/1772261 -Doug
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..ffa14049c3b5 --- /dev/null +++ b/arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi @@ -0,0 +1,26 @@ +// 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-sco-routing = [01]; + brcm,pcm-interface-rate = [02]; + brcm,pcm-sync-mode = [01]; + brcm,pcm-clock-mode = [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> --- This patch enables using the Broadcom HCI UART driver with the BCM43540 Wi-Fi + Bluetooth chip. This chip is used on a RK3288 based board (Veyron) and these changes have been tested on the Minnie variant of the board (i.e. rk3288-veyron-minnie.dts). The changes are applicable to the minnie, mickey, speedy and brain variants (all of which use the Broadcom chips). The bt-activity node was removed for all Veyron boards and shouldn't affect the boards using Marvell chips since they aren't using this out-of-band wakeup gpio. A previous portion of this series adding the compatible string to the hci_bcm driver has already been merged into bluetooth-next: https://lore.kernel.org/r/4680AA6A-599F-4D5E-9A96-0655569BAE94@holtmann.org There is also an ongoing series to fix up the baudrate settings and configure the PCM parameters on bluetooth-next: https://lore.kernel.org/linux-bluetooth/20191112001949.136377-1-abhishekpandit@chromium.org/ arch/arm/boot/dts/rk3288-veyron-brain.dts | 9 +++ .../dts/rk3288-veyron-broadcom-bluetooth.dtsi | 26 ++++++++ .../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, 159 insertions(+), 75 deletions(-) create mode 100644 arch/arm/boot/dts/rk3288-veyron-broadcom-bluetooth.dtsi