michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: modem: ublox-sara-r4: convert to DT_INST defines

Browse source 
Convert driver to use DT_INST_ defines.  The preferred defines for
drivers are DT_INST_.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-02-13 06:11:24 -06:00 • committed by Kumar Gala
commit 4a7c2921f8
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/modem/ublox-sara-r4.c
View file

@ -32,7 +32,7 @@ LOG_MODULE_REGISTER(modem_ublox_sara_r4, CONFIG_MODEM_LOG_LEVEL);
enum mdm_control_pins { enum mdm_control_pins {
MDM_POWER = 0, MDM_POWER = 0,
MDM_RESET, MDM_RESET,
#if defined(DT_UBLOX_SARA_R4_0_MDM_VINT_GPIOS_CONTROLLER) #if defined(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER)
MDM_VINT, MDM_VINT,
#endif #endif
}; };
@ -48,7 +48,7 @@ static struct modem_pin modem_pins[] = {
DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_PIN, DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_PIN,
DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_FLAGS | GPIO_OUTPUT), DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_FLAGS | GPIO_OUTPUT),
#if defined(DT_UBLOX_SARA_R4_0_MDM_VINT_GPIOS_CONTROLLER) #if defined(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER)
/* MDM_VINT */ /* MDM_VINT */
MODEM_PIN(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER, MODEM_PIN(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER,
DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_PIN, DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_PIN,
@ -62,7 +62,7 @@ static struct modem_pin modem_pins[] = {
#define MDM_POWER_DISABLE 0 #define MDM_POWER_DISABLE 0
#define MDM_RESET_NOT_ASSERTED 1 #define MDM_RESET_NOT_ASSERTED 1
#define MDM_RESET_ASSERTED 0 #define MDM_RESET_ASSERTED 0
#if defined(DT_UBLOX_SARA_R4_0_MDM_VINT_GPIOS_CONTROLLER) #if defined(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER)
#define MDM_VINT_ENABLE 1 #define MDM_VINT_ENABLE 1
#define MDM_VINT_DISABLE 0 #define MDM_VINT_DISABLE 0
#endif #endif
@ -637,7 +637,7 @@ static int pin_init(void)
k_sleep(K_SECONDS(1)); k_sleep(K_SECONDS(1));
/* make sure module is powered off */ /* make sure module is powered off */
#if defined(DT_UBLOX_SARA_R4_0_MDM_VINT_GPIOS_CONTROLLER) #if defined(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER)
LOG_DBG("Waiting for MDM_VINT_PIN = 0"); LOG_DBG("Waiting for MDM_VINT_PIN = 0");
while (modem_pin_read(&mctx, MDM_VINT) != MDM_VINT_DISABLE) { while (modem_pin_read(&mctx, MDM_VINT) != MDM_VINT_DISABLE) {
@ -671,7 +671,7 @@ static int pin_init(void)
LOG_DBG("MDM_POWER_PIN -> ENABLE"); LOG_DBG("MDM_POWER_PIN -> ENABLE");
#if defined(DT_UBLOX_SARA_R4_0_MDM_VINT_GPIOS_CONTROLLER) #if defined(DT_INST_0_UBLOX_SARA_R4_MDM_VINT_GPIOS_CONTROLLER)
LOG_DBG("Waiting for MDM_VINT_PIN = 1"); LOG_DBG("Waiting for MDM_VINT_PIN = 1");
do { do {
k_sleep(K_MSEC(100)); k_sleep(K_MSEC(100));