Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

enable ap6275s bleutooth on armsom sige1 and sige3 #271

Merged
merged 3 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 27 additions & 19 deletions arch/arm64/boot/dts/rockchip/rk3528-armsom-sige1.dts
Original file line number Diff line number Diff line change
Expand Up @@ -257,19 +257,6 @@
reset-gpios = <&gpio1 RK_PA6 GPIO_ACTIVE_LOW>;
};

wireless_bluetooth: wireless-bluetooth {
compatible = "bluetooth-platdata";
//wifi-bt-power-toggle;
uart_rts_gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart2m1_rtsn>;
pinctrl-1 = <&uart2m1_rts_gpio>;
BT,power_gpio = <&gpio1 RK_PC1 GPIO_ACTIVE_HIGH>;
//BT,reset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>;
//BT,wake_host_irq = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
status = "okay";
};

wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
Expand Down Expand Up @@ -497,7 +484,18 @@
&uart2 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart2m1_xfer &uart2m1_ctsn>;
pinctrl-0 = <&uart2m1_xfer &uart2m1_ctsn &uart2m1_rtsn>;
uart-has-rtscts;
bluetooth {
compatible = "brcm,bcm43438-bt";
device-wakeup-gpios = <&gpio3 RK_PC3 0>;
host-wakeup-gpios = <&gpio1 RK_PC2 0>;
shutdown-gpios = <&gpio1 RK_PC1 0>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
vbat-supply = <&vcc_3v3_s3>;
vddio-supply = <&vdd_1v8_s3>;
};
};

&gmac1 {
Expand Down Expand Up @@ -560,6 +558,20 @@


&pinctrl {
bt {
bt_enable: bt-enable {
rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};

bt_host_wake: bt-host-wake {
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
};

bt_wake: bt-wake {
rockchip,pins = <3 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

sdio-pwrseq {
wifi_enable_h: wifi-enable-h {
rockchip,pins = <1 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
Expand All @@ -572,16 +584,12 @@
};
};

wireless-bluetooth {
uart2m1_rts_gpio: uart2m1-rts-gpio {
rockchip,pins = <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
hym8563 {
hym8563_int: hym8563-int {
rockchip,pins = <4 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

usb {
usb_host1_pwren: usb-host1-pwren {
rockchip,pins = <4 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
Expand Down
43 changes: 25 additions & 18 deletions arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -246,18 +246,6 @@
pinctrl-0 = <&vcc5v0_otg_en>;
};

wireless_bluetooth: wireless-bluetooth {
compatible = "bluetooth-platdata";
//wifi-bt-power-toggle;
uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart1m0_rtsn>;
pinctrl-1 = <&uart1m0_rts_gpio>;
BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
//BT,reset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_HIGH>;
//BT,wake_host_irq = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
};

wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
Expand Down Expand Up @@ -759,6 +747,19 @@
};

&pinctrl {
bt {
bt_enable: bt-enable {
rockchip,pins = <2 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>;
};

bt_host_wake: bt-host-wake {
rockchip,pins = <2 RK_PC0 RK_FUNC_GPIO &pcfg_pull_down>;
};

bt_wake: bt-wake {
rockchip,pins = <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

headphone {
hp_det: hp-det {
Expand Down Expand Up @@ -828,12 +829,6 @@
rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
};
};

wireless-bluetooth {
uart1m0_rts_gpio: uart1m0-rts-gpio {
rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
};

/*
Expand Down Expand Up @@ -1013,6 +1008,18 @@
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn &uart1m0_rtsn>;
uart-has-rtscts;
bluetooth {
compatible = "brcm,bcm43438-bt";
device-wakeup-gpios = <&gpio2 RK_PC1 0>;
host-wakeup-gpios = <&gpio2 RK_PC0 0>;
shutdown-gpios = <&gpio2 RK_PB7 0>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
vbat-supply = <&vcc3v3_sys>;
vddio-supply = <&vcc_1v8>;
};
};

&usb2phy0 {
Expand Down
45 changes: 26 additions & 19 deletions arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts
Original file line number Diff line number Diff line change
Expand Up @@ -330,18 +330,6 @@
gpio = <&gpio2 RK_PB1 GPIO_ACTIVE_HIGH>;
};

wireless_bluetooth: wireless-bluetooth {
compatible = "bluetooth-platdata";
//wifi-bt-power-toggle;
uart_rts_gpios = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart4m1_rtsn>;
pinctrl-1 = <&uart4m1_rts_gpio>;
BT,power_gpio = <&gpio1 RK_PC7 GPIO_ACTIVE_HIGH>;
//BT,reset_gpio = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
//BT,wake_host_irq = <&gpio1 RK_PC2 GPIO_ACTIVE_HIGH>;
};

wireless_wlan: wireless-wlan {
compatible = "wlan-platdata";
wifi_chip_type = "rtl8852bs";
Expand Down Expand Up @@ -841,6 +829,20 @@
};

&pinctrl {
bt {
bt_enable: bt-enable {
rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
};

bt_host_wake: bt-host-wake {
rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>;
};

bt_wake: bt-wake {
rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

cam {
mipicsi0_pwr: mipicsi0-pwr {
rockchip,pins =
Expand Down Expand Up @@ -900,12 +902,6 @@
};
};

wireless-bluetooth {
uart4m1_rts_gpio: uart4m1-rts-gpio {
rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
};
};

wireless-wlan {
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
Expand Down Expand Up @@ -1108,7 +1104,18 @@
&uart4 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart4m1_xfer &uart4m1_ctsn>;
pinctrl-0 = <&uart4m1_xfer &uart4m1_ctsn &uart4m1_rtsn>;
uart-has-rtscts;
bluetooth {
compatible = "brcm,bcm43438-bt";
device-wakeup-gpios = <&gpio1 RK_PD4 0>;
host-wakeup-gpios = <&gpio0 RK_PB1 0>;
shutdown-gpios = <&gpio1 RK_PC7 0>;
pinctrl-names = "default";
pinctrl-0 = <&bt_host_wake &bt_wake &bt_enable>;
vbat-supply = <&vcc_3v3_s3>;
vddio-supply = <&vcc_1v8_s3>;
};
};

&ufs {
Expand Down