patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 7 Packages Projects Releases Wiki Activity

modem: quectel-bg9x: use 'gpio_dt_spec' instead of 'modem_pin'

Browse source 
Move away from 'modem_pin' abstraction as it has not obvious value compared
to generic 'gpio_dt_spec'.

Signed-off-by: Marcin Niestroj <m.niestroj@emb.dev>
This commit is contained in:
Marcin Niestroj 2022-05-13 19:02:12 +02:00 committed by Carles Cufí
parent 9ec661b206
commit 10ebfb3877
3 changed files with 42 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
drivers/modem/quectel-bg9x.c
View file

@ -21,6 +21,15 @@ static K_KERNEL_STACK_DEFINE(modem_rx_stack, CONFIG_MODEM_QUECTEL_BG9X_RX_STACK_
static K_KERNEL_STACK_DEFINE(modem_workq_stack, CONFIG_MODEM_QUECTEL_BG9X_RX_WORKQ_STACK_SIZE);
NET_BUF_POOL_DEFINE(mdm_recv_pool, MDM_RECV_MAX_BUF, MDM_RECV_BUF_SIZE, 0, NULL);
static const struct gpio_dt_spec power_gpio = GPIO_DT_SPEC_INST_GET(0, mdm_power_gpios);
static const struct gpio_dt_spec reset_gpio = GPIO_DT_SPEC_INST_GET(0, mdm_reset_gpios);
#if DT_INST_NODE_HAS_PROP(0, mdm_dtr_gpios)
static const struct gpio_dt_spec dtr_gpio = GPIO_DT_SPEC_INST_GET(0, mdm_dtr_gpios);
#endif
#if DT_INST_NODE_HAS_PROP(0, mdm_wdisable_gpios)
static const struct gpio_dt_spec wdisable_gpio = GPIO_DT_SPEC_INST_GET(0, mdm_wdisable_gpios);
#endif
static inline int digits(int n)
{
int count = 0;
@ -876,7 +885,7 @@ static void pin_init(void)
#if DT_INST_NODE_HAS_PROP(0, mdm_wdisable_gpios)
LOG_INF("Deactivate W Disable");
modem_pin_write(&mctx, MDM_WDISABLE, 0);
gpio_pin_set_dt(&wdisable_gpio, 0);
k_sleep(K_MSEC(250));
#endif
@ -885,13 +894,13 @@ static void pin_init(void)
*/
/* MDM_POWER -> 1 for 500-1000 msec. */
modem_pin_write(&mctx, MDM_POWER, 1);
gpio_pin_set_dt(&power_gpio, 1);
k_sleep(K_MSEC(750));
/* MDM_POWER -> 0 and wait for ~2secs as UART remains in "inactive" state
* for some time after the power signal is enabled.
*/
modem_pin_write(&mctx, MDM_POWER, 0);
gpio_pin_set_dt(&power_gpio, 0);
k_sleep(K_SECONDS(2));
LOG_INF("... Done!");
@ -1177,8 +1186,35 @@ static int modem_init(const struct device *dev)
mctx.data_rssi = &mdata.mdm_rssi;
/* pin setup */
mctx.pins = modem_pins;
mctx.pins_len = ARRAY_SIZE(modem_pins);
ret = gpio_pin_configure_dt(&power_gpio, GPIO_OUTPUT_LOW);
if (ret < 0) {
LOG_ERR("Failed to configure %s pin", "power");
goto error;
}
ret = gpio_pin_configure_dt(&reset_gpio, GPIO_OUTPUT_LOW);
if (ret < 0) {
LOG_ERR("Failed to configure %s pin", "reset");
goto error;
}
#if DT_INST_NODE_HAS_PROP(0, mdm_dtr_gpios)
ret = gpio_pin_configure_dt(&dtr_gpio, GPIO_OUTPUT_LOW);
if (ret < 0) {
LOG_ERR("Failed to configure %s pin", "dtr");
goto error;
}
#endif
#if DT_INST_NODE_HAS_PROP(0, mdm_wdisable_gpios)
ret = gpio_pin_configure_dt(&wdisable_gpio, GPIO_OUTPUT_LOW);
if (ret < 0) {
LOG_ERR("Failed to configure %s pin", "wdisable");
goto error;
}
#endif
/* modem context setup */
mctx.driver_data = &mdata;
ret = modem_context_register(&mctx);

26
drivers/modem/quectel-bg9x.h
View file

@ -122,30 +122,4 @@ struct socket_read_data {
uint16_t recv_read_len;
};
/* Modem pins - Power, Reset & others. */
static struct modem_pin modem_pins[] = {
/* MDM_POWER */
MODEM_PIN(DT_INST_GPIO_LABEL(0, mdm_power_gpios),
DT_INST_GPIO_PIN(0, mdm_power_gpios),
DT_INST_GPIO_FLAGS(0, mdm_power_gpios) | GPIO_OUTPUT_LOW),
/* MDM_RESET */
MODEM_PIN(DT_INST_GPIO_LABEL(0, mdm_reset_gpios),
DT_INST_GPIO_PIN(0, mdm_reset_gpios),
DT_INST_GPIO_FLAGS(0, mdm_reset_gpios) | GPIO_OUTPUT_LOW),
#if DT_INST_NODE_HAS_PROP(0, mdm_dtr_gpios)
/* MDM_DTR */
MODEM_PIN(DT_INST_GPIO_LABEL(0, mdm_dtr_gpios),
DT_INST_GPIO_PIN(0, mdm_dtr_gpios),
DT_INST_GPIO_FLAGS(0, mdm_dtr_gpios) | GPIO_OUTPUT_LOW),
#endif
#if DT_INST_NODE_HAS_PROP(0, mdm_wdisable_gpios)
/* MDM_WDISABLE */
MODEM_PIN(DT_INST_GPIO_LABEL(0, mdm_wdisable_gpios),
DT_INST_GPIO_PIN(0, mdm_wdisable_gpios),
DT_INST_GPIO_FLAGS(0, mdm_wdisable_gpios) | GPIO_OUTPUT_LOW),
#endif
};
#endif /* QUECTEL_BG9X_H */

1
tests/drivers/build_all/modem/modem_quectel_bg9x.conf
View file

@ -1,6 +1,7 @@
CONFIG_TEST=y
CONFIG_TEST_RANDOM_GENERATOR=y
CONFIG_SERIAL=y
CONFIG_GPIO=y
CONFIG_NETWORKING=y
CONFIG_NET_SOCKETS=y
CONFIG_MODEM=y