diff --git a/boards/rakwireless/rak5010/rak5010_nrf52840.dts b/boards/rakwireless/rak5010/rak5010_nrf52840.dts index 22d95ed90ba86..5ac6986113526 100644 --- a/boards/rakwireless/rak5010/rak5010_nrf52840.dts +++ b/boards/rakwireless/rak5010/rak5010_nrf52840.dts @@ -63,7 +63,7 @@ pinctrl-1 = <&uart0_sleep>; pinctrl-names = "default", "sleep"; modem: modem { - compatible = "quectel,bg95"; + compatible = "quectel,bg9x"; mdm-power-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; status = "okay"; }; diff --git a/drivers/modem/Kconfig.cellular b/drivers/modem/Kconfig.cellular index b4be5b69d808e..08f0c3a162fc7 100644 --- a/drivers/modem/Kconfig.cellular +++ b/drivers/modem/Kconfig.cellular @@ -14,7 +14,7 @@ config MODEM_CELLULAR select NET_L2_PPP_OPTION_MRU select NET_L2_PPP_PAP select NET_L2_PPP_MGMT - depends on (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_SIMCOM_A76XX_ENABLED || \ + depends on (DT_HAS_QUECTEL_BG9X_ENABLED || DT_HAS_SIMCOM_A76XX_ENABLED || \ DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \ DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \ DT_HAS_TELIT_ME910G1_ENABLED || DT_HAS_TELIT_ME310G1_ENABLED || \ @@ -22,7 +22,7 @@ config MODEM_CELLULAR DT_HAS_SQN_GM02S_ENABLED || DT_HAS_U_BLOX_LARA_R6_ENABLED || \ DT_HAS_QUECTEL_EG800Q_ENABLED) select MODEM_CMUX_DEFAULT_MTU_127 if \ - (DT_HAS_QUECTEL_BG95_ENABLED || DT_HAS_QUECTEL_EG25_G_ENABLED || \ + (DT_HAS_QUECTEL_BG9X_ENABLED || DT_HAS_QUECTEL_EG25_G_ENABLED || \ DT_HAS_SIMCOM_SIM7080_ENABLED || DT_HAS_U_BLOX_SARA_R4_ENABLED || \ DT_HAS_U_BLOX_SARA_R5_ENABLED || DT_HAS_SWIR_HL7800_ENABLED || \ DT_HAS_TELIT_ME910G1_ENABLED || DT_HAS_TELIT_ME310G1_ENABLED || \ diff --git a/drivers/modem/Kconfig.quectel-bg9x b/drivers/modem/Kconfig.quectel-bg9x index ec6a3efa20d8d..9a74bc1f4c85f 100644 --- a/drivers/modem/Kconfig.quectel-bg9x +++ b/drivers/modem/Kconfig.quectel-bg9x @@ -4,12 +4,13 @@ # SPDX-License-Identifier: Apache-2.0 config MODEM_QUECTEL_BG9X - bool "Quectel modem driver" + bool "Quectel modem driver [ DEPRECATED ]" select MODEM_CONTEXT select MODEM_CMD_HANDLER select MODEM_IFACE_UART select MODEM_SOCKET select NET_SOCKETS_OFFLOAD + select DEPRECATED help Choose this setting to enable quectel BG9x LTE-CatM1/NB-IoT modem driver. diff --git a/drivers/modem/modem_cellular.c b/drivers/modem/modem_cellular.c index 91454acbad17f..806e1940fded6 100644 --- a/drivers/modem/modem_cellular.c +++ b/drivers/modem/modem_cellular.c @@ -540,7 +540,7 @@ MODEM_CHAT_MATCHES_DEFINE(dial_abort_matches, #if DT_HAS_COMPAT_STATUS_OKAY(swir_hl7800) || DT_HAS_COMPAT_STATUS_OKAY(sqn_gm02s) || \ DT_HAS_COMPAT_STATUS_OKAY(quectel_eg800q) || DT_HAS_COMPAT_STATUS_OKAY(quectel_eg25_g) || \ - DT_HAS_COMPAT_STATUS_OKAY(quectel_bg95) || DT_HAS_COMPAT_STATUS_OKAY(simcom_a76xx) + DT_HAS_COMPAT_STATUS_OKAY(quectel_bg9x) || DT_HAS_COMPAT_STATUS_OKAY(simcom_a76xx) MODEM_CHAT_MATCH_DEFINE(connect_match, "CONNECT", "", NULL); #endif @@ -1957,8 +1957,8 @@ static int modem_cellular_init(const struct device *dev) * dial out and put the DLCI channel into data mode. */ -#if DT_HAS_COMPAT_STATUS_OKAY(quectel_bg95) -MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_init_chat_script_cmds, +#if DT_HAS_COMPAT_STATUS_OKAY(quectel_bg9x) +MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_init_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP("ATE0", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP("AT+CFUN=4", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP("AT+CMEE=1", ok_match), @@ -1982,10 +1982,10 @@ MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_init_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP("", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP_NONE("AT+CMUX=0,0,5,127", 300)); -MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_init_chat_script, quectel_bg95_init_chat_script_cmds, +MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_init_chat_script, quectel_bg9x_init_chat_script_cmds, abort_matches, modem_cellular_chat_callback_handler, 10); -MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_dial_chat_script_cmds, +MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_dial_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP_MULT("AT+CGACT=0,1", allow_match), MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGDCONT=1,\"IP\"," "\""CONFIG_MODEM_CELLULAR_APN"\"", @@ -1993,23 +1993,23 @@ MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_dial_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP("AT+CFUN=1", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP("ATD*99***1#", connect_match)); -MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_dial_chat_script, quectel_bg95_dial_chat_script_cmds, +MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_dial_chat_script, quectel_bg9x_dial_chat_script_cmds, dial_abort_matches, modem_cellular_chat_callback_handler, 10); -MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_periodic_chat_script_cmds, +MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_periodic_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP("AT+CREG?", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP("AT+CEREG?", ok_match), MODEM_CHAT_SCRIPT_CMD_RESP("AT+CGREG?", ok_match)); -MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_periodic_chat_script, - quectel_bg95_periodic_chat_script_cmds, abort_matches, +MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_periodic_chat_script, + quectel_bg9x_periodic_chat_script_cmds, abort_matches, modem_cellular_chat_callback_handler, 4); -MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg95_shutdown_chat_script_cmds, +MODEM_CHAT_SCRIPT_CMDS_DEFINE(quectel_bg9x_shutdown_chat_script_cmds, MODEM_CHAT_SCRIPT_CMD_RESP("AT+QPOWD=1", ok_match)); -MODEM_CHAT_SCRIPT_DEFINE(quectel_bg95_shutdown_chat_script, - quectel_bg95_shutdown_chat_script_cmds, abort_matches, +MODEM_CHAT_SCRIPT_DEFINE(quectel_bg9x_shutdown_chat_script, + quectel_bg9x_shutdown_chat_script_cmds, abort_matches, modem_cellular_chat_callback_handler, 10); #endif @@ -2677,7 +2677,7 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script, &MODEM_CELLULAR_INST_NAME(config, inst), POST_KERNEL, 99, \ &modem_cellular_api); -#define MODEM_CELLULAR_DEVICE_QUECTEL_BG95(inst) \ +#define MODEM_CELLULAR_DEVICE_QUECTEL_BG9X(inst) \ MODEM_PPP_DEFINE(MODEM_CELLULAR_INST_NAME(ppp, inst), NULL, 98, 1500, 64); \ \ static struct modem_cellular_data MODEM_CELLULAR_INST_NAME(data, inst) = { \ @@ -2692,10 +2692,10 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script, \ MODEM_CELLULAR_DEFINE_INSTANCE(inst, 1500, 100, 10000, 5000, false, \ NULL, \ - &quectel_bg95_init_chat_script, \ - &quectel_bg95_dial_chat_script, \ - &quectel_bg95_periodic_chat_script, \ - &quectel_bg95_shutdown_chat_script) + &quectel_bg9x_init_chat_script, \ + &quectel_bg9x_dial_chat_script, \ + &quectel_bg9x_periodic_chat_script, \ + &quectel_bg9x_shutdown_chat_script) #define MODEM_CELLULAR_DEVICE_QUECTEL_EG25_G(inst) \ MODEM_PPP_DEFINE(MODEM_CELLULAR_INST_NAME(ppp, inst), NULL, 98, 1500, 64); \ @@ -2925,8 +2925,8 @@ MODEM_CHAT_SCRIPT_DEFINE(sqn_gm02s_periodic_chat_script, &sqn_gm02s_dial_chat_script, \ &sqn_gm02s_periodic_chat_script, NULL) -#define DT_DRV_COMPAT quectel_bg95 -DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_BG95) +#define DT_DRV_COMPAT quectel_bg9x +DT_INST_FOREACH_STATUS_OKAY(MODEM_CELLULAR_DEVICE_QUECTEL_BG9X) #undef DT_DRV_COMPAT #define DT_DRV_COMPAT quectel_eg25_g diff --git a/dts/bindings/modem/quectel,bg95.yaml b/dts/bindings/modem/quectel,bg95.yaml deleted file mode 100644 index 9b1f6c734be41..0000000000000 --- a/dts/bindings/modem/quectel,bg95.yaml +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2023 Bjarki Arge Andreasen -# SPDX-License-Identifier: Apache-2.0 - -description: Quectel BG95 modem - -compatible: "quectel,bg95" - -include: uart-device.yaml - -properties: - mdm-power-gpios: - type: phandle-array - - autostarts: - type: boolean - description: | - Set for modem variants or carrier boards that start the module - automatically when supply voltage is applied—that is, the modem - asserts PWRKEY internally and does not require an external PWRKEY - pulse. diff --git a/dts/bindings/modem/quectel,bg9x.yaml b/dts/bindings/modem/quectel,bg9x.yaml index 836df0ba36e56..c487e134e039b 100644 --- a/dts/bindings/modem/quectel,bg9x.yaml +++ b/dts/bindings/modem/quectel,bg9x.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Analog Life LLC +# Copyright (c) 2023 Bjarki Arge Andreasen # SPDX-License-Identifier: Apache-2.0 description: quectel BG9x modem @@ -10,7 +10,6 @@ include: uart-device.yaml properties: mdm-power-gpios: type: phandle-array - required: true mdm-reset-gpios: type: phandle-array @@ -20,3 +19,11 @@ properties: mdm-wdisable-gpios: type: phandle-array + + autostarts: + type: boolean + description: | + Set for modem variants or carrier boards that start the module + automatically when supply voltage is applied—that is, the modem + asserts PWRKEY internally and does not require an external PWRKEY + pulse. diff --git a/samples/net/cellular_modem/boards/b_u585i_iot02a.overlay b/samples/net/cellular_modem/boards/b_u585i_iot02a.overlay index 69e23bf4ead5d..f621acc4a9b00 100644 --- a/samples/net/cellular_modem/boards/b_u585i_iot02a.overlay +++ b/samples/net/cellular_modem/boards/b_u585i_iot02a.overlay @@ -31,7 +31,7 @@ status = "okay"; modem: modem { - compatible = "quectel,bg95"; + compatible = "quectel,bg9x"; mdm-power-gpios = <&gpioe 2 GPIO_ACTIVE_HIGH>; status = "okay"; };