michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: gsm_ppp: Use DTS

Browse source 
Convert the gsm_ppp driver to use DTS.

Signed-off-by: Yong Cong Sin <yongcong.sin@gmail.com>
This commit is contained in:
Yong Cong Sin 2021-04-25 01:09:30 +08:00 • committed by Anas Nashif
commit 9d2f8a1124
19 changed files with 87 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/modem/Kconfig.gsm
View file

@ -29,9 +29,6 @@ config MODEM_GSM_SIMCOM
endchoice
config MODEM_GSM_UART_NAME
string "UART device name the modem is connected to"
config MODEM_GSM_RX_STACK_SIZE
int "Size of the stack allocated for receiving data from modem"
default 512

16
drivers/modem/gsm_ppp.c
View file

@ -4,6 +4,8 @@
* SPDX-License-Identifier: Apache-2.0
*/
#define DT_DRV_COMPAT zephyr_gsm_ppp
#include <logging/log.h>
LOG_MODULE_REGISTER(modem_gsm, CONFIG_MODEM_LOG_LEVEL);
@ -24,6 +26,7 @@ LOG_MODULE_REGISTER(modem_gsm, CONFIG_MODEM_LOG_LEVEL);
#include <stdio.h>
#define GSM_UART_NODE DT_INST_BUS(0)
#define GSM_CMD_READ_BUF 128
#define GSM_CMD_AT_TIMEOUT K_SECONDS(2)
#define GSM_CMD_SETUP_TIMEOUT K_SECONDS(6)
@ -522,8 +525,7 @@ static struct net_if *ppp_net_if(void)
static void set_ppp_carrier_on(struct gsm_modem *gsm)
{
static const struct ppp_api *api;
const struct device *ppp_dev =
device_get_binding(CONFIG_NET_PPP_DRV_NAME);
const struct device *ppp_dev = DEVICE_DT_GET(DT_INST(0, zephyr_gsm_ppp));
struct net_if *iface = gsm->iface;
int ret;
@ -821,7 +823,7 @@ static void mux_setup(struct k_work *work)
{
struct gsm_modem *gsm = CONTAINER_OF(work, struct gsm_modem,
gsm_configure_work);
const struct device *uart = device_get_binding(CONFIG_MODEM_GSM_UART_NAME);
const struct device *uart = DEVICE_DT_GET(GSM_UART_NODE);
int ret;
/* We need to call this to reactivate mux ISR. Note: This is only called
@ -980,7 +982,7 @@ void gsm_ppp_start(const struct device *dev)
/* Re-init underlying UART comms */
int r = modem_iface_uart_init_dev(&gsm->context.iface,
device_get_binding(CONFIG_MODEM_GSM_UART_NAME));
DEVICE_DT_GET(GSM_UART_NODE));
if (r) {
LOG_ERR("modem_iface_uart_init returned %d", r);
return;
@ -1057,7 +1059,7 @@ static int gsm_init(const struct device *dev)
gsm->gsm_data.rx_rb_buf_len = sizeof(gsm->gsm_rx_rb_buf);
r = modem_iface_uart_init(&gsm->context.iface, &gsm->gsm_data,
device_get_binding(CONFIG_MODEM_GSM_UART_NAME));
DEVICE_DT_GET(GSM_UART_NODE));
if (r < 0) {
LOG_DBG("iface uart error %d", r);
return r;
@ -1091,5 +1093,5 @@ static int gsm_init(const struct device *dev)
return 0;
}
DEVICE_DEFINE(gsm_ppp, GSM_MODEM_DEVICE_NAME, gsm_init, NULL, &gsm, NULL,
POST_KERNEL, CONFIG_MODEM_GSM_INIT_PRIORITY, NULL);
DEVICE_DT_DEFINE(DT_INST(0, zephyr_gsm_ppp), gsm_init, NULL, &gsm, NULL,
POST_KERNEL, CONFIG_MODEM_GSM_INIT_PRIORITY, NULL);