michaelh/zephyr
1
0
Fork 0
Code Releases Activity

ieee802154: mcr20a: Convert to new DT_<COMPAT>_<INSTANCE> defines

Browse source 
Convert mcr20a 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-15 09:45:21 -06:00 • committed by Maureen Helm
commit 717b647c30
3 changed files with 24 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

10
boards/arm/frdm_k64f/dts_fixup.h
View file

@ -1,10 +0,0 @@
#define DT_IEEE802154_MCR20A_SPI_DRV_NAME DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_BUS_NAME
#define DT_IEEE802154_MCR20A_SPI_SLAVE DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_BASE_ADDRESS
#define DT_IEEE802154_MCR20A_SPI_FREQ DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_SPI_MAX_FREQUENCY
#define DT_IEEE802154_MCR20A_GPIO_SPI_CS_DRV_NAME DT_NXP_KINETIS_DSPI_4002C000_CS_GPIOS_CONTROLLER
#define DT_IEEE802154_MCR20A_GPIO_SPI_CS_PIN DT_NXP_KINETIS_DSPI_4002C000_CS_GPIOS_PIN
#define DT_MCR20A_GPIO_IRQ_B_NAME DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER
#define DT_MCR20A_GPIO_IRQ_B_PIN DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_IRQB_GPIOS_PIN
#define DT_MCR20A_GPIO_RESET_NAME DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER
#define DT_MCR20A_GPIO_RESET_PIN DT_NXP_KINETIS_DSPI_4002C000_NXP_MCR20A_0_RESET_GPIOS_PIN

45
drivers/ieee802154/ieee802154_mcr20a.c
View file

@ -803,7 +803,7 @@ static inline void set_reset(struct device *dev, u32_t value)
struct mcr20a_context *mcr20a = dev->driver_data; struct mcr20a_context *mcr20a = dev->driver_data;
gpio_pin_write(mcr20a->reset_gpio, gpio_pin_write(mcr20a->reset_gpio,
DT_MCR20A_GPIO_RESET_PIN, value); DT_NXP_MCR20A_0_RESET_GPIOS_PIN, value);
} }
static void enable_irqb_interrupt(struct mcr20a_context *mcr20a, static void enable_irqb_interrupt(struct mcr20a_context *mcr20a,
@ -811,10 +811,10 @@ static void enable_irqb_interrupt(struct mcr20a_context *mcr20a,
{ {
if (enable) { if (enable) {
gpio_pin_enable_callback(mcr20a->irq_gpio, gpio_pin_enable_callback(mcr20a->irq_gpio,
DT_MCR20A_GPIO_IRQ_B_PIN); DT_NXP_MCR20A_0_IRQB_GPIOS_PIN);
} else { } else {
gpio_pin_disable_callback(mcr20a->irq_gpio, gpio_pin_disable_callback(mcr20a->irq_gpio,
DT_MCR20A_GPIO_IRQ_B_PIN); DT_NXP_MCR20A_0_IRQB_GPIOS_PIN);
} }
} }
@ -822,7 +822,7 @@ static inline void setup_gpio_callbacks(struct mcr20a_context *mcr20a)
{ {
gpio_init_callback(&mcr20a->irqb_cb, gpio_init_callback(&mcr20a->irqb_cb,
irqb_int_handler, irqb_int_handler,
BIT(DT_MCR20A_GPIO_IRQ_B_PIN)); BIT(DT_NXP_MCR20A_0_IRQB_GPIOS_PIN));
gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb); gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb);
} }
@ -1287,7 +1287,7 @@ static int power_on_and_setup(struct device *dev)
_usleep(50); _usleep(50);
timeout--; timeout--;
gpio_pin_read(mcr20a->irq_gpio, gpio_pin_read(mcr20a->irq_gpio,
DT_MCR20A_GPIO_IRQ_B_PIN, &status); DT_NXP_MCR20A_0_IRQB_GPIOS_PIN, &status);
} while (status && timeout); } while (status && timeout);
if (status) { if (status) {
@ -1340,30 +1340,33 @@ static inline int configure_gpios(struct device *dev)
struct mcr20a_context *mcr20a = dev->driver_data; struct mcr20a_context *mcr20a = dev->driver_data;
/* setup gpio for the modem interrupt */ /* setup gpio for the modem interrupt */
mcr20a->irq_gpio = device_get_binding(DT_MCR20A_GPIO_IRQ_B_NAME); mcr20a->irq_gpio =
device_get_binding(DT_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER);
if (mcr20a->irq_gpio == NULL) { if (mcr20a->irq_gpio == NULL) {
LOG_ERR("Failed to get pointer to %s device", LOG_ERR("Failed to get pointer to %s device",
DT_MCR20A_GPIO_IRQ_B_NAME); DT_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER);
return -EINVAL; return -EINVAL;
} }
gpio_pin_configure(mcr20a->irq_gpio, gpio_pin_configure(mcr20a->irq_gpio,
DT_MCR20A_GPIO_IRQ_B_PIN, DT_NXP_MCR20A_0_IRQB_GPIOS_PIN,
GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE |
GPIO_PUD_PULL_UP | GPIO_PUD_PULL_UP |
GPIO_INT_ACTIVE_LOW); GPIO_INT_ACTIVE_LOW);
if (!PART_OF_KW2XD_SIP) { if (!PART_OF_KW2XD_SIP) {
/* setup gpio for the modems reset */ /* setup gpio for the modems reset */
mcr20a->reset_gpio = device_get_binding( mcr20a->reset_gpio =
DT_MCR20A_GPIO_RESET_NAME); device_get_binding(
DT_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER);
if (mcr20a->reset_gpio == NULL) { if (mcr20a->reset_gpio == NULL) {
LOG_ERR("Failed to get pointer to %s device", LOG_ERR("Failed to get pointer to %s device",
DT_MCR20A_GPIO_RESET_NAME); DT_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER);
return -EINVAL; return -EINVAL;
} }
gpio_pin_configure(mcr20a->reset_gpio, DT_MCR20A_GPIO_RESET_PIN, gpio_pin_configure(mcr20a->reset_gpio,
DT_NXP_MCR20A_0_RESET_GPIOS_PIN,
GPIO_DIR_OUT); GPIO_DIR_OUT);
set_reset(dev, 0); set_reset(dev, 0);
} }
@ -1375,7 +1378,7 @@ static inline int configure_spi(struct device *dev)
{ {
struct mcr20a_context *mcr20a = dev->driver_data; struct mcr20a_context *mcr20a = dev->driver_data;
mcr20a->spi = device_get_binding(DT_IEEE802154_MCR20A_SPI_DRV_NAME); mcr20a->spi = device_get_binding(DT_NXP_MCR20A_0_BUS_NAME);
if (!mcr20a->spi) { if (!mcr20a->spi) {
LOG_ERR("Unable to get SPI device"); LOG_ERR("Unable to get SPI device");
return -ENODEV; return -ENODEV;
@ -1383,29 +1386,29 @@ static inline int configure_spi(struct device *dev)
#if defined(CONFIG_IEEE802154_MCR20A_GPIO_SPI_CS) #if defined(CONFIG_IEEE802154_MCR20A_GPIO_SPI_CS)
mcr20a->cs_ctrl.gpio_dev = device_get_binding( mcr20a->cs_ctrl.gpio_dev = device_get_binding(
DT_IEEE802154_MCR20A_GPIO_SPI_CS_DRV_NAME); DT_NXP_MCR20A_0_GPIO_SPI_CS_DRV_NAME);
if (!mcr20a->cs_ctrl.gpio_dev) { if (!mcr20a->cs_ctrl.gpio_dev) {
LOG_ERR("Unable to get GPIO SPI CS device"); LOG_ERR("Unable to get GPIO SPI CS device");
return -ENODEV; return -ENODEV;
} }
mcr20a->cs_ctrl.gpio_pin = DT_IEEE802154_MCR20A_GPIO_SPI_CS_PIN; mcr20a->cs_ctrl.gpio_pin = DT_NXP_MCR20A_0_GPIO_SPI_CS_PIN;
mcr20a->cs_ctrl.delay = 0; mcr20a->cs_ctrl.delay = 0;
mcr20a->spi_cfg.cs = &mcr20a->cs_ctrl; mcr20a->spi_cfg.cs = &mcr20a->cs_ctrl;
LOG_DBG("SPI GPIO CS configured on %s:%u", LOG_DBG("SPI GPIO CS configured on %s:%u",
DT_IEEE802154_MCR20A_GPIO_SPI_CS_DRV_NAME, DT_NXP_MCR20A_0_GPIO_SPI_CS_DRV_NAME,
DT_IEEE802154_MCR20A_GPIO_SPI_CS_PIN); DT_NXP_MCR20A_0_GPIO_SPI_CS_PIN);
#endif /* CONFIG_IEEE802154_MCR20A_GPIO_SPI_CS */ #endif /* CONFIG_IEEE802154_MCR20A_GPIO_SPI_CS */
mcr20a->spi_cfg.frequency = DT_IEEE802154_MCR20A_SPI_FREQ; mcr20a->spi_cfg.frequency = DT_NXP_MCR20A_0_SPI_MAX_FREQUENCY;
mcr20a->spi_cfg.operation = SPI_WORD_SET(8); mcr20a->spi_cfg.operation = SPI_WORD_SET(8);
mcr20a->spi_cfg.slave = DT_IEEE802154_MCR20A_SPI_SLAVE; mcr20a->spi_cfg.slave = DT_NXP_MCR20A_0_BASE_ADDRESS;
LOG_DBG("SPI configured %s, %d", LOG_DBG("SPI configured %s, %d",
DT_IEEE802154_MCR20A_SPI_DRV_NAME, DT_NXP_MCR20A_0_BUS_NAME,
DT_IEEE802154_MCR20A_SPI_SLAVE); DT_NXP_MCR20A_0_BASE_ADDRESS);
return 0; return 0;
} }

10
soc/arm/nxp_kinetis/kwx/dts_fixup.h
View file

@ -95,16 +95,6 @@
#define DT_SPI_1_CLOCK_NAME DT_NXP_KINETIS_DSPI_4002D000_CLOCK_CONTROLLER #define DT_SPI_1_CLOCK_NAME DT_NXP_KINETIS_DSPI_4002D000_CLOCK_CONTROLLER
#define DT_SPI_1_CLOCK_SUBSYS DT_NXP_KINETIS_DSPI_4002D000_CLOCK_NAME #define DT_SPI_1_CLOCK_SUBSYS DT_NXP_KINETIS_DSPI_4002D000_CLOCK_NAME
#define DT_IEEE802154_MCR20A_SPI_DRV_NAME DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_BUS_NAME
#define DT_IEEE802154_MCR20A_SPI_SLAVE DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_BASE_ADDRESS
#define DT_IEEE802154_MCR20A_SPI_FREQ DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_SPI_MAX_FREQUENCY
#define DT_IEEE802154_MCR20A_GPIO_SPI_CS_DRV_NAME DT_NXP_KINETIS_DSPI_4002D000_CS_GPIOS_CONTROLLER
#define DT_IEEE802154_MCR20A_GPIO_SPI_CS_PIN DT_NXP_KINETIS_DSPI_4002D000_CS_GPIOS_PIN
#define DT_MCR20A_GPIO_IRQ_B_NAME DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER
#define DT_MCR20A_GPIO_IRQ_B_PIN DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_IRQB_GPIOS_PIN
#define DT_MCR20A_GPIO_RESET_NAME DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER
#define DT_MCR20A_GPIO_RESET_PIN DT_NXP_KINETIS_DSPI_4002D000_NXP_MCR20A_0_RESET_GPIOS_PIN
#define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL #define DT_USBD_KINETIS_NAME DT_NXP_KINETIS_USBD_40072000_LABEL
#define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG #define DT_USBD_KINETIS_IRQ DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG
#define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY #define DT_USBD_KINETIS_IRQ_PRI DT_NXP_KINETIS_USBD_40072000_IRQ_USB_OTG_PRIORITY