michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modem: wncm14a2a: Convert to new DT_<COMPAT>_<INSTANCE> defines

Browse source 
Convert wncm14a2a driver to use new defines so we can remove the
dts_fixup.h code for it.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2019-01-29 09:39:33 -06:00 • committed by Kumar Gala
commit 3e8fc3c0c1
2 changed files with 16 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

32
drivers/modem/wncm14a2a.c
View file

@ -54,7 +54,7 @@ enum mdm_control_pins {
MDM_KEEP_AWAKE,
MDM_RESET,
SHLD_3V3_1V8_SIG_TRANS_ENA,
#ifdef DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN
#ifdef DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN
MDM_SEND_OK,
#endif
MAX_MDM_CONTROL_PINS,
@ -62,33 +62,33 @@ enum mdm_control_pins {
static const struct mdm_control_pinconfig pinconfig[] = {
/* MDM_BOOT_MODE_SEL */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_NAME,
DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_BOOT_MODE_SEL_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_BOOT_MODE_SEL_GPIOS_PIN),
/* MDM_POWER */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_POWER_NAME,
DT_WNCM14A2A_GPIO_MDM_POWER_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_POWER_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_POWER_GPIOS_PIN),
/* MDM_KEEP_AWAKE */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_NAME,
DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_KEEP_AWAKE_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_KEEP_AWAKE_GPIOS_PIN),
/* MDM_RESET */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_RESET_NAME,
DT_WNCM14A2A_GPIO_MDM_RESET_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_RESET_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_RESET_GPIOS_PIN),
/* SHLD_3V3_1V8_SIG_TRANS_ENA */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_NAME,
DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_SHLD_TRANS_ENA_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_SHLD_TRANS_ENA_GPIOS_PIN),
#ifdef DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN
#ifdef DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN
/* MDM_SEND_OK */
PINCONFIG(DT_WNCM14A2A_GPIO_MDM_SEND_OK_NAME,
DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN),
PINCONFIG(DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_CONTROLLER,
DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN),
#endif
};
#define MDM_UART_DEV_NAME DT_WNCM14A2A_UART_DRV_NAME
#define MDM_UART_DEV_NAME DT_WNC_M14A2A_0_BUS_NAME
#define MDM_BOOT_MODE_SPECIAL 0
#define MDM_BOOT_MODE_NORMAL 1
@ -1273,7 +1273,7 @@ static int modem_pin_init(void)
LOG_DBG("MDM_KEEP_AWAKE_PIN -> ENABLED");
gpio_pin_write(ictx.gpio_port_dev[MDM_KEEP_AWAKE],
pinconfig[MDM_KEEP_AWAKE].pin, MDM_KEEP_AWAKE_ENABLED);
#ifdef DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN
#ifdef DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN
LOG_DBG("MDM_SEND_OK_PIN -> ENABLED");
gpio_pin_write(ictx.gpio_port_dev[MDM_SEND_OK],
pinconfig[MDM_SEND_OK].pin, MDM_SEND_OK_ENABLED);

41
samples/net/lwm2m_client/dts_fixup.h
View file

@ -1,41 +0,0 @@
/*
* Copyright (c) 2018 Intel Corporation
*
* SPDX-License-Identifier: Apache-2.0
*/
#ifdef CONFIG_BOARD_FRDM_K64F
#define DT_WNCM14A2A_UART_DRV_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_BUS_NAME
#define DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_BOOT_MODE_SEL_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_BOOT_MODE_SEL_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_POWER_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_POWER_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_POWER_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_POWER_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_KEEP_AWAKE_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_KEEP_AWAKE_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_RESET_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_RESET_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_RESET_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_RESET_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_SHLD_TRANS_ENA_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_SHLD_TRANS_ENA_GPIOS_PIN
#ifdef DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_SEND_OK_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_SEND_OK_NAME DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_SEND_OK_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN DT_NXP_KINETIS_UART_4006C000_WNC_M14A2A_4006C000_WNCM14A2A_MDM_SEND_OK_GPIOS_PIN
#endif
#endif
#if defined(CONFIG_BOARD_NRF52840_PCA10056) || defined(CONFIG_BOARD_NRF52840_MDK)
#define DT_WNCM14A2A_UART_DRV_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_BUS_NAME
#define DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_BOOT_MODE_SEL_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_BOOT_MODE_SEL_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_BOOT_MODE_SEL_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_POWER_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_POWER_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_POWER_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_POWER_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_KEEP_AWAKE_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_KEEP_AWAKE_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_KEEP_AWAKE_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_RESET_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_RESET_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_RESET_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_RESET_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_SHLD_TRANS_ENA_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_SHLD_TRANS_ENA_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_SHLD_TRANS_ENA_GPIOS_PIN
#ifdef DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_SEND_OK_GPIOS_PIN
#define DT_WNCM14A2A_GPIO_MDM_SEND_OK_NAME DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_SEND_OK_GPIOS_CONTROLLER
#define DT_WNCM14A2A_GPIO_MDM_SEND_OK_PIN DT_NORDIC_NRF_UARTE_40028000_WNC_M14A2A_40028000_WNCM14A2A_MDM_SEND_OK_GPIOS_PIN
#endif
#endif