openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: s5pv210: Correct BCM4329 bluetooth node 

There are several issues with the bluetooth node - the wrong
compatible was used (because the bcm4329 compatible didn't exist
when the node was added), the max rate was incorrect (due to
limitations in the samsung TTY driver which have now been fixed),
the clocks were not assigned properly so some rates didn't work,
and the some pinctrl settings weren't explicitly set.  Fix all
of the above issues.

While we're at it, update from the deprecated host-wakeup-gpios
property to the host-wake interrupt.

Signed-off-by: Jonathan Bakker <xc-racer2@live.ca>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
This commit is contained in:
Jonathan Bakker 2020-06-13 11:44:27 -07:00 committed by Krzysztof Kozlowski
parent c713a4e3e8
commit 1c65b61844
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm/boot/dts/s5pv210-aries.dtsi
View File

@ -629,6 +629,13 @@ &mfc {
};
&pinctrl0 {
bt_reset: bt-reset {
samsung,pins = "gpb-3";
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS4_PIN_DRV_LV1>;
};
wlan_bt_en: wlan-bt-en {
samsung,pins = "gpb-5";
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
@ -654,6 +661,12 @@ wlan_gpio_rst: wlan-gpio-rst {
samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
};
bt_wake: bt-wake {
samsung,pins = "gpg3-4";
samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>;
samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
};
gp2a_irq: gp2a-irq {
samsung,pins = "gph0-2";
samsung,pin-function = <EXYNOS_PIN_FUNC_F>;
@ -845,16 +858,23 @@ &sdhci2 {
};
&uart0 {
assigned-clocks = <&clocks MOUT_UART0>, <&clocks SCLK_UART0>;
assigned-clock-rates = <0>, <111166667>;
assigned-clock-parents = <&clocks MOUT_MPLL>;
status = "okay";
bluetooth {
compatible = "brcm,bcm43438-bt";
max-speed = <115200>;
compatible = "brcm,bcm4329-bt";
max-speed = <3000000>;
pinctrl-names = "default";
pinctrl-0 = <&uart0_data &uart0_fctl &bt_host_wake>;
pinctrl-0 = <&uart0_data &uart0_fctl &bt_host_wake
&bt_reset &bt_wake>;
shutdown-gpios = <&gpb 3 GPIO_ACTIVE_HIGH>;
device-wakeup-gpios = <&gpg3 4 GPIO_ACTIVE_HIGH>;
host-wakeup-gpios = <&gph2 5 GPIO_ACTIVE_HIGH>;
interrupt-parent = <&gph2>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "host-wake";
};
};