michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nrf: Remove WDT dts.fixup defines and use aliases instead.

Browse source 
Changed driver to use defines from aliases instead of fixup.

Signed-off-by: Mieszko Mierunski <mieszko.mierunski@nordicsemi.no>
This commit is contained in:
Mieszko Mierunski 2018-10-04 12:52:00 +02:00 • committed by Carles Cufí
commit 94dc637c65
7 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/watchdog/wdt_nrfx.c
View file

@ -197,13 +197,14 @@ static int init_wdt(struct device *dev)
return -EBUSY; return -EBUSY;
} }
IRQ_CONNECT(DT_WDT_NRF_IRQ, DT_WDT_NRF_IRQ_PRI, IRQ_CONNECT(DT_NORDIC_NRF_WATCHDOG_WDT_0_IRQ,
DT_NORDIC_NRF_WATCHDOG_WDT_0_IRQ_PRIORITY,
nrfx_isr, nrfx_wdt_irq_handler, 0); nrfx_isr, nrfx_wdt_irq_handler, 0);
irq_enable(DT_WDT_NRF_IRQ); irq_enable(DT_NORDIC_NRF_WATCHDOG_WDT_0_IRQ);
return 0; return 0;
} }
DEVICE_AND_API_INIT(wdt_nrf, CONFIG_WDT_0_NAME, init_wdt, DEVICE_AND_API_INIT(wdt_nrf, DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL, init_wdt,
NULL, NULL, PRE_KERNEL_1, NULL, NULL, PRE_KERNEL_1,
CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_nrf_api); CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_nrf_api);

2
dts/arm/nordic/nrf51822.dtsi
View file

@ -45,6 +45,7 @@
adc-0 = &adc; adc-0 = &adc;
gpio-0 = &gpio0; gpio-0 = &gpio0;
gpiote-0 = &gpiote; gpiote-0 = &gpiote;
wdt-0 = &wdt;
}; };
soc { soc {
@ -135,7 +136,6 @@
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-watchdog";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 1>; interrupts = <16 1>;
interrupt-names = "wdt";
label = "WDT"; label = "WDT";
}; };
}; };

2
dts/arm/nordic/nrf52810.dtsi
View file

@ -42,6 +42,7 @@
adc-0 = &adc; adc-0 = &adc;
gpio-0 = &gpio0; gpio-0 = &gpio0;
gpiote-0 = &gpiote; gpiote-0 = &gpiote;
wdt-0 = &wdt;
}; };
soc { soc {
@ -112,7 +113,6 @@
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-watchdog";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 1>; interrupts = <16 1>;
interrupt-names = "wdt";
label = "WDT"; label = "WDT";
}; };
}; };

2
dts/arm/nordic/nrf52832.dtsi
View file

@ -46,6 +46,7 @@
adc-0 = &adc; adc-0 = &adc;
gpio-0 = &gpio0; gpio-0 = &gpio0;
gpiote-0 = &gpiote; gpiote-0 = &gpiote;
wdt-0 = &wdt;
}; };
soc { soc {
@ -148,7 +149,6 @@
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-watchdog";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 1>; interrupts = <16 1>;
interrupt-names = "wdt";
label = "WDT"; label = "WDT";
}; };
}; };

2
dts/arm/nordic/nrf52840.dtsi
View file

@ -49,6 +49,7 @@
gpio-0 = &gpio0; gpio-0 = &gpio0;
gpio-1 = &gpio1; gpio-1 = &gpio1;
gpiote-0 = &gpiote; gpiote-0 = &gpiote;
wdt-0 = &wdt;
}; };
soc { soc {
@ -193,7 +194,6 @@
compatible = "nordic,nrf-watchdog"; compatible = "nordic,nrf-watchdog";
reg = <0x40010000 0x1000>; reg = <0x40010000 0x1000>;
interrupts = <16 1>; interrupts = <16 1>;
interrupt-names = "wdt";
label = "WDT"; label = "WDT";
}; };

4
soc/arm/nordic_nrf/nrf51/dts_fixup.h
View file

@ -31,8 +31,6 @@
#define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL #define DT_SPI_0_NAME DT_NORDIC_NRF_SPI_SPI_0_LABEL
#define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL #define DT_SPI_1_NAME DT_NORDIC_NRF_SPI_SPI_1_LABEL
#define CONFIG_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_40010000_LABEL #define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
#define DT_WDT_NRF_IRQ DT_NORDIC_NRF_WATCHDOG_40010000_IRQ_WDT
#define DT_WDT_NRF_IRQ_PRI DT_NORDIC_NRF_WATCHDOG_40010000_IRQ_WDT_PRIORITY
/* End of SoC Level DTS fixup file */ /* End of SoC Level DTS fixup file */

4
soc/arm/nordic_nrf/nrf52/dts_fixup.h
View file

@ -44,9 +44,7 @@
#define DT_USBD_NRF_NUM_ISOOUT_EP DT_NORDIC_NRF_USBD_40027000_NUM_ISOOUT_ENDPOINTS #define DT_USBD_NRF_NUM_ISOOUT_EP DT_NORDIC_NRF_USBD_40027000_NUM_ISOOUT_ENDPOINTS
#define DT_USBD_NRF_NAME DT_NORDIC_NRF_USBD_40027000_LABEL #define DT_USBD_NRF_NAME DT_NORDIC_NRF_USBD_40027000_LABEL
#define CONFIG_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_40010000_LABEL #define DT_WDT_0_NAME DT_NORDIC_NRF_WATCHDOG_WDT_0_LABEL
#define DT_WDT_NRF_IRQ DT_NORDIC_NRF_WATCHDOG_40010000_IRQ_WDT
#define DT_WDT_NRF_IRQ_PRI DT_NORDIC_NRF_WATCHDOG_40010000_IRQ_WDT_PRIORITY
#if defined(DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS) #if defined(DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS)
#define DT_CC310_CTL_BASE_ADDR DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS #define DT_CC310_CTL_BASE_ADDR DT_NORDIC_NRF_CC310_5002A000_BASE_ADDRESS