michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: dma: dma_dw: 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 07:44:41 -06:00 • committed by Kumar Gala
commit f91b4dbe94
2 changed files with 21 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

36
drivers/dma/dma_dw.c
View file

@ -363,9 +363,11 @@ static struct device DEVICE_NAME_GET(dw_dma0);
static void dw_dma0_irq_config(void) static void dw_dma0_irq_config(void)
{ {
IRQ_CONNECT(DT_DMA_DW_0_IRQ, DT_DMA_DW_0_IRQ_PRI, dw_dma_isr, IRQ_CONNECT(DT_INST_0_SNPS_DESIGNWARE_DMA_IRQ_0,
DEVICE_GET(dw_dma0), DT_DMA_DW_0_IRQ_FLAGS); DT_INST_0_SNPS_DESIGNWARE_DMA_IRQ_0_PRIORITY, dw_dma_isr,
irq_enable(DT_DMA_DW_0_IRQ); DEVICE_GET(dw_dma0),
DT_INST_0_SNPS_DESIGNWARE_DMA_IRQ_0_SENSE);
irq_enable(DT_INST_0_SNPS_DESIGNWARE_DMA_IRQ_0);
} }
static struct dw_drv_plat_data dmac0 = { static struct dw_drv_plat_data dmac0 = {
@ -404,7 +406,7 @@ static struct dw_drv_plat_data dmac0 = {
}; };
static const struct dw_dma_dev_cfg dw_dma0_config = { static const struct dw_dma_dev_cfg dw_dma0_config = {
.base = DT_DMA_DW_0_BASE_ADDR, .base = DT_INST_0_SNPS_DESIGNWARE_DMA_BASE_ADDRESS,
.irq_config = dw_dma0_irq_config .irq_config = dw_dma0_irq_config
}; };
@ -412,7 +414,7 @@ static struct dw_dma_dev_data dw_dma0_data = {
.channel_data = &dmac0, .channel_data = &dmac0,
}; };
DEVICE_AND_API_INIT(dw_dma0, DT_DMA_DW_0_NAME, &dw_dma_init, DEVICE_AND_API_INIT(dw_dma0, DT_INST_0_SNPS_DESIGNWARE_DMA_LABEL, &dw_dma_init,
&dw_dma0_data, &dw_dma0_config, POST_KERNEL, &dw_dma0_data, &dw_dma0_config, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api);
#endif /* DT_INST_0_SNPS_DESIGNWARE_DMA */ #endif /* DT_INST_0_SNPS_DESIGNWARE_DMA */
@ -424,9 +426,11 @@ static struct device DEVICE_NAME_GET(dw_dma2);
static void dw_dma1_irq_config(void) static void dw_dma1_irq_config(void)
{ {
IRQ_CONNECT(DT_DMA_DW_1_IRQ, DT_DMA_DW_1_IRQ_PRI, dw_dma_isr, IRQ_CONNECT(DT_INST_1_SNPS_DESIGNWARE_DMA_IRQ_0,
DEVICE_GET(dw_dma0), DT_DMA_DW_1_IRQ_FLAGS); DT_INST_1_SNPS_DESIGNWARE_DMA_IRQ_0_PRIORITY, dw_dma_isr,
irq_enable(DT_DMA_DW_1_IRQ); DEVICE_GET(dw_dma0),
DT_INST_1_SNPS_DESIGNWARE_DMA_IRQ_0_SENSE);
irq_enable(DT_INST_1_SNPS_DESIGNWARE_DMA_IRQ_0);
} }
static struct dw_drv_plat_data dmac1 = { static struct dw_drv_plat_data dmac1 = {
@ -465,7 +469,7 @@ static struct dw_drv_plat_data dmac1 = {
}; };
static const struct dw_dma_dev_cfg dw_dma1_config = { static const struct dw_dma_dev_cfg dw_dma1_config = {
.base = DT_DMA_DW_1_BASE_ADDR, .base = DT_INST_1_SNPS_DESIGNWARE_DMA_BASE_ADDRESS,
.irq_config = dw_dma1_irq_config .irq_config = dw_dma1_irq_config
}; };
@ -473,7 +477,7 @@ static struct dw_dma_dev_data dw_dma1_data = {
.channel_data = &dmac1, .channel_data = &dmac1,
}; };
DEVICE_AND_API_INIT(dw_dma1, DT_DMA_DW_1_NAME, &dw_dma_init, DEVICE_AND_API_INIT(dw_dma1, DT_INST_1_SNPS_DESIGNWARE_DMA_LABEL, &dw_dma_init,
&dw_dma1_data, &dw_dma1_config, POST_KERNEL, &dw_dma1_data, &dw_dma1_config, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api);
#endif /* DT_INST_1_SNPS_DESIGNWARE_DMA */ #endif /* DT_INST_1_SNPS_DESIGNWARE_DMA */
@ -484,9 +488,11 @@ static struct device DEVICE_NAME_GET(dw_dma2);
static void dw_dma2_irq_config(void) static void dw_dma2_irq_config(void)
{ {
IRQ_CONNECT(DT_DMA_DW_2_IRQ, DT_DMA_DW_2_IRQ_PRI, dw_dma_isr, IRQ_CONNECT(DT_INST_2_SNPS_DESIGNWARE_DMA_IRQ_0,
DEVICE_GET(dw_dma0), DT_DMA_DW_2_IRQ_FLAGS); DT_INST_2_SNPS_DESIGNWARE_DMA_IRQ_0_PRIORITY, dw_dma_isr,
irq_enable(DT_DMA_DW_2_IRQ); DEVICE_GET(dw_dma0),
DT_INST_2_SNPS_DESIGNWARE_DMA_IRQ_0_SENSE);
irq_enable(DT_INST_2_SNPS_DESIGNWARE_DMA_IRQ_0);
} }
static struct dw_drv_plat_data dmac2 = { static struct dw_drv_plat_data dmac2 = {
@ -525,7 +531,7 @@ static struct dw_drv_plat_data dmac2 = {
}; };
static const struct dw_dma_dev_cfg dw_dma2_config = { static const struct dw_dma_dev_cfg dw_dma2_config = {
.base = DT_DMA_DW_2_BASE_ADDR, .base = DT_INST_2_SNPS_DESIGNWARE_DMA_BASE_ADDRESS,
.irq_config = dw_dma2_irq_config .irq_config = dw_dma2_irq_config
}; };
@ -533,7 +539,7 @@ static struct dw_dma_dev_data dw_dma2_data = {
.channel_data = &dmac2, .channel_data = &dmac2,
}; };
DEVICE_AND_API_INIT(dw_dma2, DT_DMA_DW_2_NAME, &dw_dma_init, DEVICE_AND_API_INIT(dw_dma2, DT_INST_2_SNPS_DESIGNWARE_DMA_LABEL, &dw_dma_init,
&dw_dma2_data, &dw_dma2_config, POST_KERNEL, &dw_dma2_data, &dw_dma2_config, POST_KERNEL,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &dw_dma_driver_api);
#endif /* DT_INST_2_SNPS_DESIGNWARE_DMA */ #endif /* DT_INST_2_SNPS_DESIGNWARE_DMA */

27
soc/xtensa/intel_s1000/dts_fixup.h
View file

@ -75,33 +75,6 @@
#define DT_PINMUX_CTRL_REG_COUNT \ #define DT_PINMUX_CTRL_REG_COUNT \
(DT_INTEL_S1000_PINMUX_81C30_SIZE / 4) (DT_INTEL_S1000_PINMUX_81C30_SIZE / 4)
#define DT_DMA_DW_0_NAME DT_SNPS_DESIGNWARE_DMA_7C000_LABEL
#define DT_DMA_DW_0_BASE_ADDR \
DT_SNPS_DESIGNWARE_DMA_7C000_BASE_ADDRESS
#define DT_DMA_DW_0_IRQ DT_SNPS_DESIGNWARE_DMA_7C000_IRQ_0
#define DT_DMA_DW_0_IRQ_PRI \
DT_SNPS_DESIGNWARE_DMA_7C000_IRQ_0_PRIORITY
#define DT_DMA_DW_0_IRQ_FLAGS \
DT_SNPS_DESIGNWARE_DMA_7C000_IRQ_0_SENSE
#define DT_DMA_DW_1_NAME DT_SNPS_DESIGNWARE_DMA_7D000_LABEL
#define DT_DMA_DW_1_BASE_ADDR \
DT_SNPS_DESIGNWARE_DMA_7D000_BASE_ADDRESS
#define DT_DMA_DW_1_IRQ DT_SNPS_DESIGNWARE_DMA_7D000_IRQ_0
#define DT_DMA_DW_1_IRQ_PRI \
DT_SNPS_DESIGNWARE_DMA_7D000_IRQ_0_PRIORITY
#define DT_DMA_DW_1_IRQ_FLAGS \
DT_SNPS_DESIGNWARE_DMA_7D000_IRQ_0_SENSE
#define DT_DMA_DW_2_NAME DT_SNPS_DESIGNWARE_DMA_7E000_LABEL
#define DT_DMA_DW_2_BASE_ADDR \
DT_SNPS_DESIGNWARE_DMA_7E000_BASE_ADDRESS
#define DT_DMA_DW_2_IRQ DT_SNPS_DESIGNWARE_DMA_7E000_IRQ_0
#define DT_DMA_DW_2_IRQ_PRI \
DT_SNPS_DESIGNWARE_DMA_7E000_IRQ_0_PRIORITY
#define DT_DMA_DW_2_IRQ_FLAGS \
DT_SNPS_DESIGNWARE_DMA_7E000_IRQ_0_SENSE
/* /*
* USB configuration * USB configuration
*/ */