Commit 491469a8 authored by Kumar Gala's avatar Kumar Gala Committed by Kumar Gala
Browse files

soc: nrf: Cleanup dts_fixup.h 



Remove dts_fixup.h files that are needed anymore, remove defines that
are used, and replace defines with new DT macros.

Signed-off-by: default avatarKumar Gala <kumar.gala@linaro.org>
parent e7da82ce

soc/arm/nordic_nrf/nrf51/dts_fixup.h

+4 −9
Original line number Diff line number Diff line
@@ -2,16 +2,11 @@ 


/* SoC level DTS fixup file */



#define DT_ADC_0_NAME			DT_NORDIC_NRF_ADC_ADC_0_LABEL

#define DT_ADC_0_NAME			DT_LABEL(DT_NODELABEL(adc))



#define DT_UART_0_NAME			DT_NORDIC_NRF_UART_UART_0_LABEL

#define DT_UART_0_NAME			DT_LABEL(DT_NODELABEL(uart0))



#define DT_FLASH_DEV_NAME		DT_LABEL(DT_INST(0, nordic_nrf51_flash_controller))



#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_RTC_0_NAME			DT_NORDIC_NRF_RTC_RTC_0_LABEL

#define DT_RTC_1_NAME			DT_NORDIC_NRF_RTC_RTC_1_LABEL

#define DT_RTC_0_NAME			DT_LABEL(DT_NODELABEL(rtc0))

#define DT_RTC_1_NAME			DT_LABEL(DT_NODELABEL(rtc1))



/* End of SoC Level DTS fixup file */

soc/arm/nordic_nrf/nrf52/dts_fixup.h

+6 −33
Original line number Diff line number Diff line
@@ -2,40 +2,13 @@ 


/* SoC level DTS fixup file */



#define DT_ADC_0_NAME			DT_NORDIC_NRF_SAADC_ADC_0_LABEL

#define DT_ADC_0_NAME			DT_LABEL(DT_NODELABEL(adc))



#ifdef DT_NORDIC_NRF_UART_UART_0_LABEL

#define DT_UART_0_NAME			DT_NORDIC_NRF_UART_UART_0_LABEL

#else

#define DT_UART_0_NAME			DT_NORDIC_NRF_UARTE_UART_0_LABEL

#endif

#define DT_UART_0_NAME			DT_LABEL(DT_NODELABEL(uart0))

#define DT_UART_1_NAME			DT_LABEL(DT_NODELABEL(uart1))



#define DT_UART_1_NAME			DT_NORDIC_NRF_UARTE_UART_1_LABEL



#define DT_FLASH_DEV_NAME		DT_LABEL(DT_INST(0, nordic_nrf52_flash_controller))



#if defined(DT_NORDIC_NRF_SPIM_SPI_0_LABEL)

#define DT_SPI_0_NAME			DT_NORDIC_NRF_SPIM_SPI_0_LABEL

#else

#define DT_SPI_0_NAME			DT_NORDIC_NRF_SPI_SPI_0_LABEL

#endif



#if defined(DT_NORDIC_NRF_SPIM_SPI_1_LABEL)

#define DT_SPI_1_NAME			DT_NORDIC_NRF_SPIM_SPI_1_LABEL

#else

#define DT_SPI_1_NAME			DT_NORDIC_NRF_SPI_SPI_1_LABEL

#endif



#if defined(DT_NORDIC_NRF_SPIM_SPI_2_LABEL)

#define DT_SPI_2_NAME			DT_NORDIC_NRF_SPIM_SPI_2_LABEL

#else

#define DT_SPI_2_NAME			DT_NORDIC_NRF_SPI_SPI_2_LABEL

#endif



#define DT_SPI_3_NAME			DT_NORDIC_NRF_SPIM_SPI_3_LABEL



#define DT_RTC_0_NAME			DT_NORDIC_NRF_RTC_RTC_0_LABEL

#define DT_RTC_1_NAME			DT_NORDIC_NRF_RTC_RTC_1_LABEL

#define DT_RTC_2_NAME			DT_NORDIC_NRF_RTC_RTC_2_LABEL

#define DT_RTC_0_NAME			DT_LABEL(DT_NODELABEL(rtc0))

#define DT_RTC_1_NAME			DT_LABEL(DT_NODELABEL(rtc1))

#define DT_RTC_2_NAME			DT_LABEL(DT_NODELABEL(rtc2))



/* End of SoC Level DTS fixup file */

soc/arm/nordic_nrf/nrf53/dts_fixup.h

+5 −15
Original line number Diff line number Diff line
@@ -6,22 +6,12 @@ 


/* SoC level DTS fixup file */



#define DT_ADC_0_NAME			DT_NORDIC_NRF_SAADC_ADC_0_LABEL

#define DT_ADC_0_NAME			DT_LABEL(DT_NODELABEL(adc))



#define DT_UART_0_NAME			DT_NORDIC_NRF_UARTE_UART_0_LABEL

#define DT_UART_1_NAME			DT_NORDIC_NRF_UARTE_UART_1_LABEL

#define DT_UART_0_NAME			DT_LABEL(DT_NODELABEL(uart0))

#define DT_UART_1_NAME			DT_LABEL(DT_NODELABEL(uart1))



#define DT_FLASH_DEV_NAME		DT_LABEL(DT_INST(0, nordic_nrf53_flash_controller))



#define DT_SPI_0_NAME			DT_NORDIC_NRF_SPIM_SPI_0_LABEL

#define DT_SPI_1_NAME			DT_NORDIC_NRF_SPIM_SPI_1_LABEL

#define DT_SPI_2_NAME			DT_NORDIC_NRF_SPIM_SPI_2_LABEL



#define DT_TIMER_0_NAME			DT_NORDIC_NRF_TIMER_TIMER_0_LABEL

#define DT_TIMER_1_NAME			DT_NORDIC_NRF_TIMER_TIMER_1_LABEL

#define DT_TIMER_2_NAME			DT_NORDIC_NRF_TIMER_TIMER_2_LABEL



#define DT_RTC_0_NAME			DT_NORDIC_NRF_RTC_RTC_0_LABEL

#define DT_RTC_1_NAME			DT_NORDIC_NRF_RTC_RTC_1_LABEL

#define DT_RTC_0_NAME			DT_LABEL(DT_NODELABEL(rtc0))

#define DT_RTC_1_NAME			DT_LABEL(DT_NODELABEL(rtc1))



/* End of SoC Level DTS fixup file */

soc/arm/nordic_nrf/nrf91/dts_fixup.h

+7 −18
Original line number Diff line number Diff line
@@ -6,25 +6,14 @@ 


/* SoC level DTS fixup file */



#define DT_ADC_0_NAME			DT_NORDIC_NRF_SAADC_ADC_0_LABEL

#define DT_ADC_0_NAME			DT_LABEL(DT_NODELABEL(adc))



#define DT_UART_0_NAME			DT_NORDIC_NRF_UARTE_UART_0_LABEL

#define DT_UART_1_NAME			DT_NORDIC_NRF_UARTE_UART_1_LABEL

#define DT_UART_2_NAME			DT_NORDIC_NRF_UARTE_UART_2_LABEL

#define DT_UART_3_NAME			DT_NORDIC_NRF_UARTE_UART_3_LABEL

#define DT_UART_0_NAME			DT_LABEL(DT_NODELABEL(uart0))

#define DT_UART_1_NAME			DT_LABEL(DT_NODELABEL(uart1))

#define DT_UART_2_NAME			DT_LABEL(DT_NODELABEL(uart2))

#define DT_UART_3_NAME			DT_LABEL(DT_NODELABEL(uart3))



#define DT_FLASH_DEV_NAME		DT_LABEL(DT_INST(0, nordic_nrf91_flash_controller))



#define DT_SPI_0_NAME			DT_NORDIC_NRF_SPIM_SPI_0_LABEL

#define DT_SPI_1_NAME			DT_NORDIC_NRF_SPIM_SPI_1_LABEL

#define DT_SPI_2_NAME			DT_NORDIC_NRF_SPIM_SPI_2_LABEL

#define DT_SPI_3_NAME			DT_NORDIC_NRF_SPIM_SPI_3_LABEL



#define DT_TIMER_0_NAME			DT_NORDIC_NRF_TIMER_TIMER_0_LABEL

#define DT_TIMER_1_NAME			DT_NORDIC_NRF_TIMER_TIMER_1_LABEL

#define DT_TIMER_2_NAME			DT_NORDIC_NRF_TIMER_TIMER_2_LABEL



#define DT_RTC_0_NAME			DT_NORDIC_NRF_RTC_RTC_0_LABEL

#define DT_RTC_1_NAME			DT_NORDIC_NRF_RTC_RTC_1_LABEL

#define DT_RTC_0_NAME			DT_LABEL(DT_NODELABEL(rtc0))

#define DT_RTC_1_NAME			DT_LABEL(DT_NODELABEL(rtc1))



/* End of SoC Level DTS fixup file */

CRA Git | Maintained and supported by SUSTech CRA and CCSE