Skip to content

Commit 224cf2e

Browse files
committed
bluetooth
don't steal from gps
1 parent 2d910ca commit 224cf2e

3 files changed

Lines changed: 17 additions & 9 deletions

File tree

arch/arm64/boot/dts/qcom/comma_common.dtsi

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@
9090
status = "ok";
9191
};
9292

93+
/* Bluetooth UART */
94+
&qupv3_se6_4uart {
95+
status = "ok";
96+
};
97+
9398
/* regulators */
9499

95100
// IMU regulators

arch/arm64/boot/dts/qcom/sdm845.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
i2c0 = &qupv3_se10_i2c;
4949
i2c1 = &qupv3_se4_i2c;
5050
i2c2 = &qupv3_se5_i2c;
51-
hsuart0 = &qupv3_se6_4uart;
51+
hsuart0 = &qupv3_gps_uart;
52+
hsuart1 = &qupv3_se6_4uart;
5253
};
5354

5455
cpus {

arch/arm64/configs/tici_defconfig

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,13 +1147,13 @@ CONFIG_CAN_MCP25XXFD=n
11471147
# CONFIG_CAN_8DEV_USB is not set
11481148
# CONFIG_CAN_DEBUG_DEVICES is not set
11491149
# CONFIG_IRDA is not set
1150-
CONFIG_BT=n
1151-
CONFIG_BT_BREDR=n
1152-
# CONFIG_BT_RFCOMM is not set
1150+
CONFIG_BT=y
1151+
CONFIG_BT_BREDR=y
1152+
CONFIG_BT_RFCOMM=y
11531153
# CONFIG_BT_BNEP is not set
11541154
# CONFIG_BT_HIDP is not set
11551155
CONFIG_BT_HS=n
1156-
CONFIG_BT_LE=n
1156+
CONFIG_BT_LE=y
11571157
# CONFIG_BT_LEDS is not set
11581158
# CONFIG_BT_SELFTEST is not set
11591159
CONFIG_BT_DEBUGFS=n
@@ -1163,14 +1163,16 @@ CONFIG_BT_DEBUGFS=n
11631163
#
11641164
# CONFIG_BT_HCIBTUSB is not set
11651165
# CONFIG_BT_HCIBTSDIO is not set
1166-
# CONFIG_BT_HCIUART is not set
1166+
CONFIG_BT_HCIUART=y
1167+
CONFIG_BT_HCIUART_H4=y
1168+
CONFIG_BT_HCIUART_QCA=y
11671169
# CONFIG_BT_HCIBCM203X is not set
11681170
# CONFIG_BT_HCIBFUSB is not set
11691171
# CONFIG_BT_HCIVHCI is not set
11701172
# CONFIG_BT_MRVL is not set
1171-
CONFIG_MSM_BT_POWER=n
1172-
CONFIG_BTFM_SLIM=n
1173-
CONFIG_BTFM_SLIM_WCN3990=n
1173+
CONFIG_MSM_BT_POWER=y
1174+
CONFIG_BTFM_SLIM=y
1175+
CONFIG_BTFM_SLIM_WCN3990=y
11741176
# CONFIG_AF_RXRPC is not set
11751177
# CONFIG_AF_KCM is not set
11761178
# CONFIG_STREAM_PARSER is not set

0 commit comments

Comments
 (0)