From a2693975d78855792603d9c0ac47756e72040373 Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Tue, 11 Jun 2019 14:20:32 -0500 Subject: [PATCH] dts: Convert from DT___ to DT_INST... Change code from using now deprecated DT___ defines to using DT_INST___. Signed-off-by: Kumar Gala --- boards/arc/em_starterkit/arc_mpu_regions.c | 6 +- boards/arm/nrf52_pca20020/board.c | 2 +- boards/arm/particle_argon/board.h | 12 +- boards/arm/particle_boron/board.h | 8 +- boards/arm/particle_xenon/board.h | 12 +- boards/arm/reel_board/board.c | 4 +- boards/arm/twr_ke18f/pinmux.c | 4 +- boards/posix/native_posix/dts_fixup.h | 2 +- boards/posix/nrf52_bsim/board_soc.h | 12 +- boards/x86/galileo/Kconfig.defconfig | 8 +- boards/x86/quark_se_c1000_devboard/board.c | 24 +- drivers/audio/mpxxdtyy.c | 6 +- drivers/bluetooth/hci/spi.c | 34 +- drivers/clock_control/nrf_power_clock.c | 28 +- drivers/counter/Kconfig.nrfx | 6 +- drivers/counter/counter_gecko_rtcc.c | 18 +- drivers/counter/counter_mcux_rtc.c | 4 +- drivers/counter/counter_nrfx_rtc.c | 2 +- drivers/counter/timer_dtmr_cmsdk_apb.c | 16 +- drivers/counter/timer_tmr_cmsdk_apb.c | 28 +- drivers/display/display_ili9340.c | 40 +- drivers/display/display_mcux_elcdif.c | 10 +- drivers/display/ssd1306.c | 72 ++-- drivers/display/ssd1673.c | 82 ++-- drivers/dma/dma_sam0.c | 10 +- drivers/entropy/entropy_cc13xx_cc26xx.c | 8 +- drivers/ethernet/eth_smsc911x.c | 6 +- drivers/ethernet/eth_smsc911x_priv.h | 2 +- drivers/flash/flash_gecko.c | 6 +- drivers/flash/flash_sam.c | 16 +- drivers/flash/flash_sam0.c | 2 +- drivers/flash/flash_stm32.c | 4 +- drivers/flash/soc_flash_mcux.c | 4 +- drivers/flash/soc_flash_rv32m1.c | 4 +- drivers/flash/spi_flash_w25qxxdv.c | 10 +- drivers/flash/spi_nor.c | 30 +- drivers/gpio/gpio_cc13xx_cc26xx.c | 8 +- drivers/gpio/gpio_ht16k33.c | 6 +- drivers/gpio/gpio_sifive.c | 72 ++-- drivers/gpio/gpio_sx1509b.c | 6 +- drivers/hwinfo/hwinfo_sam0.c | 8 +- drivers/i2c/i2c_cc13xx_cc26xx.c | 16 +- drivers/i2c/i2c_dw.h | 16 +- drivers/i2c/i2c_dw_port_x.h | 46 +-- drivers/i2c/i2c_gecko.c | 48 +-- drivers/i2c/i2c_mchp_xec.c | 18 +- drivers/i2c/i2c_sbcon.c | 4 +- drivers/i2c/i2c_sifive.c | 2 +- drivers/i2c/slave/eeprom_slave.c | 20 +- drivers/ieee802154/ieee802154_cc2520.c | 14 +- drivers/ieee802154/ieee802154_mcr20a.c | 32 +- drivers/interrupt_controller/plic.c | 20 +- drivers/interrupt_controller/sam0_eic.c | 10 +- drivers/interrupt_controller/vexriscv_litex.c | 4 +- drivers/ipm/ipm_mhu.c | 20 +- drivers/led/ht16k33.c | 34 +- drivers/led/lp3943.c | 6 +- drivers/led/lp5562.c | 6 +- drivers/led/pca9633.c | 6 +- drivers/led_strip/apa102.c | 8 +- drivers/led_strip/lpd880x.c | 30 +- drivers/led_strip/ws2812.c | 10 +- drivers/led_strip/ws2812b_sw.c | 2 +- drivers/modem/ublox-sara-r4.c | 10 +- drivers/modem/wncm14a2a.c | 32 +- drivers/pwm/pwm_nrf5_sw.c | 14 +- drivers/pwm/pwm_sam.c | 10 +- drivers/pwm/pwm_sifive.c | 12 +- drivers/sensor/adt7420/adt7420.c | 10 +- drivers/sensor/adxl362/adxl362.c | 20 +- drivers/sensor/adxl362/adxl362.h | 4 +- drivers/sensor/adxl372/adxl372.c | 24 +- drivers/sensor/adxl372/adxl372.h | 4 +- drivers/sensor/ams_iAQcore/iAQcore.c | 8 +- drivers/sensor/apds9960/apds9960.c | 12 +- drivers/sensor/bme280/bme280.c | 18 +- drivers/sensor/bme680/bme680.c | 8 +- drivers/sensor/bmi160/bmi160.c | 14 +- drivers/sensor/ccs811/ccs811.c | 22 +- drivers/sensor/ens210/ens210.c | 20 +- drivers/sensor/fxas21002/fxas21002.c | 14 +- drivers/sensor/fxos8700/fxos8700.c | 20 +- drivers/sensor/hts221/hts221.c | 14 +- drivers/sensor/hts221/hts221_trigger.c | 20 +- drivers/sensor/lis2dh/lis2dh.c | 2 +- drivers/sensor/lis2dh/lis2dh.h | 32 +- drivers/sensor/lis2dh/lis2dh_trigger.c | 24 +- drivers/sensor/lis2ds12/lis2ds12.c | 4 +- drivers/sensor/lis2ds12/lis2ds12_i2c.c | 2 +- drivers/sensor/lis2ds12/lis2ds12_spi.c | 16 +- drivers/sensor/lis2ds12/lis2ds12_trigger.c | 18 +- drivers/sensor/lis2dw12/lis2dw12.c | 8 +- drivers/sensor/lis2dw12/lis2dw12.h | 2 +- drivers/sensor/lis2dw12/lis2dw12_i2c.c | 2 +- drivers/sensor/lis2dw12/lis2dw12_spi.c | 14 +- drivers/sensor/lis2mdl/lis2mdl.c | 10 +- drivers/sensor/lis3mdl/lis3mdl.c | 14 +- drivers/sensor/lis3mdl/lis3mdl_trigger.c | 2 +- drivers/sensor/lps22hb/lps22hb.c | 6 +- drivers/sensor/lps25hb/lps25hb.c | 6 +- .../sensor/lsm303dlhc_magn/lsm303dlhc_magn.c | 6 +- drivers/sensor/lsm6ds0/lsm6ds0.c | 6 +- drivers/sensor/lsm6dsl/lsm6dsl.c | 4 +- drivers/sensor/lsm6dsl/lsm6dsl_i2c.c | 2 +- drivers/sensor/lsm6dsl/lsm6dsl_spi.c | 16 +- drivers/sensor/lsm6dsl/lsm6dsl_trigger.c | 18 +- drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c | 10 +- drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c | 6 +- drivers/sensor/max30101/max30101.c | 4 +- drivers/sensor/ms5837/ms5837.c | 8 +- drivers/sensor/nrf5/temp_nrf5.c | 8 +- drivers/sensor/sht3xd/sht3xd.c | 10 +- drivers/sensor/ti_hdc/ti_hdc.c | 38 +- drivers/sensor/ti_hdc/ti_hdc.h | 4 +- drivers/sensor/vl53l0x/vl53l0x.c | 8 +- drivers/serial/leuart_gecko.c | 30 +- drivers/serial/uart_cmsdk_apb.c | 136 +++---- drivers/serial/uart_gecko.c | 72 ++-- drivers/serial/uart_nsim.c | 4 +- drivers/serial/uart_rv32m1_lpuart.c | 4 +- drivers/serial/uart_sifive.c | 24 +- drivers/spi/spi_cc13xx_cc26xx.c | 2 +- drivers/spi/spi_sifive.c | 18 +- drivers/timer/nrf_rtc_timer.c | 2 +- drivers/timer/sam0_rtc_timer.c | 12 +- drivers/usb/device/usb_dc_nrfx.c | 2 +- drivers/usb/device/usb_dc_sam0.c | 12 +- drivers/usb/device/usb_dc_stm32.c | 12 +- drivers/watchdog/wdt_cmsdk_apb.c | 2 +- drivers/watchdog/wdt_iwdg_stm32.c | 4 +- drivers/watchdog/wdt_sam0.c | 10 +- .../winc1500/wifi_winc1500_nm_bus_wrapper.c | 14 +- ext/hal/nordic/nrfx_glue.h | 4 +- samples/bluetooth/hci_spi/src/main.c | 6 +- .../boards/96b_argonkey/microphone/src/main.c | 8 +- .../boards/96b_argonkey/sensors/src/main.c | 20 +- .../reel_board/mesh_badge/src/periphs.c | 8 +- .../reel_board/mesh_badge/src/reel_board.c | 2 +- samples/display/ili9340/src/main.c | 2 +- samples/drivers/ht16k33/src/main.c | 8 +- samples/drivers/led_apa102/src/main.c | 6 +- samples/drivers/led_lp3943/src/main.c | 2 +- samples/drivers/led_lp5562/src/main.c | 2 +- samples/drivers/led_lpd8806/src/main.c | 2 +- samples/drivers/led_pca9633/src/main.c | 2 +- samples/drivers/led_ws2812/src/main.c | 2 +- samples/net/lwm2m_client/src/lwm2m-client.c | 2 +- samples/net/wifi/src/wifi_test.c | 12 +- samples/sensor/adt7420/src/main.c | 2 +- samples/sensor/adxl362/src/main.c | 2 +- samples/sensor/adxl372/src/main.c | 4 +- samples/sensor/ams_iAQcore/src/main.c | 2 +- samples/sensor/apds9960/src/main.c | 2 +- samples/sensor/bme680/src/main.c | 2 +- samples/sensor/bmi160/src/bmi160.c | 2 +- samples/sensor/ccs811/src/main.c | 2 +- samples/sensor/ens210/src/main.c | 2 +- samples/sensor/fxas21002/src/main.c | 2 +- samples/sensor/fxos8700-hid/src/main.c | 2 +- samples/sensor/fxos8700/src/main.c | 2 +- samples/sensor/lsm303dlhc/src/main.c | 8 +- samples/sensor/lsm6dsl/src/main.c | 2 +- samples/sensor/max30101/src/main.c | 2 +- samples/sensor/ms5837/src/main.c | 2 +- samples/sensor/ti_hdc/src/main.c | 2 +- samples/sensor/vl53l0x/src/main.c | 2 +- samples/shields/x_nucleo_iks01a1/src/main.c | 8 +- samples/shields/x_nucleo_iks01a2/src/main.c | 10 +- .../ipc/ipm_mcux/remote/src/main_remote.c | 2 +- samples/subsys/ipc/ipm_mcux/src/main_master.c | 2 +- .../subsys/ipc/ipm_mhu_dual_core/src/main.c | 2 +- soc/arc/snps_emsk/dts_fixup.h | 4 +- soc/arc/snps_nsim/dts_fixup.h | 4 +- soc/arm/atmel_sam0/samd20/dts_fixup.h | 6 +- soc/arm/atmel_sam0/samd21/dts_fixup.h | 8 +- soc/arm/atmel_sam0/samr21/dts_fixup.h | 8 +- soc/arm/microchip_mec/mec1501/dts_fixup.h | 78 ++-- soc/arm/microchip_mec/mec1701/dts_fixup.h | 4 +- soc/arm/nordic_nrf/nrf51/dts_fixup.h | 2 +- soc/arm/nordic_nrf/nrf52/dts_fixup.h | 2 +- soc/arm/nxp_imx/rt/Kconfig.defconfig.series | 8 +- soc/arm/nxp_kinetis/ke1xf/soc.c | 88 ++--- soc/arm/st_stm32/stm32f0/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32f1/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32f2/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32f3/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32f4/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32f7/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32l0/dts_fixup.h | 2 +- soc/arm/st_stm32/stm32l4/dts_fixup.h | 2 +- .../ti_simplelink/cc13x2_cc26x2/dts_fixup.h | 2 +- soc/riscv32/litex-vexriscv/soc.h | 4 +- .../riscv-privilege/sifive-freedom/soc.h | 2 +- soc/x86/apollo_lake/dts_fixup.h | 72 ++-- soc/x86/intel_quark/quark_x1000/dts_fixup.h | 36 +- subsys/bluetooth/controller/ll_sw/ctrl.c | 2 +- subsys/bluetooth/controller/ll_sw/ll.c | 4 +- .../controller/ll_sw/nordic/lll/lll.c | 4 +- .../controller/ll_sw/nordic/lll/lll_clock.c | 2 +- subsys/disk/disk_access_sdhc.c | 8 +- tests/boards/intel_s1000_crb/src/spi_flash.c | 2 +- tests/drivers/adc/adc_api/src/test_adc.c | 2 +- tests/drivers/build_all/dts_fixup.h | 369 +++++++++--------- .../counter_basic_api/src/test_counter.c | 12 +- tests/drivers/i2c/i2c_slave_api/src/main.c | 58 +-- tests/drivers/pwm/pwm_api/src/test_pwm.c | 2 +- 206 files changed, 1480 insertions(+), 1479 deletions(-) diff --git a/boards/arc/em_starterkit/arc_mpu_regions.c b/boards/arc/em_starterkit/arc_mpu_regions.c index d1ecf3be474..e75bbe5025c 100644 --- a/boards/arc/em_starterkit/arc_mpu_regions.c +++ b/boards/arc/em_starterkit/arc_mpu_regions.c @@ -25,11 +25,11 @@ static struct arc_mpu_region mpu_regions[] = { REGION_KERNEL_RAM_ATTR | REGION_DYNAMIC), #endif -#if DT_MMIO_SRAM_0_SIZE > 0 +#if DT_INST_0_MMIO_SRAM_SIZE > 0 /* Region DDR RAM */ MPU_REGION_ENTRY("DDR RAM", - DT_MMIO_SRAM_0_BASE_ADDRESS, - DT_MMIO_SRAM_0_SIZE, + DT_INST_0_MMIO_SRAM_BASE_ADDRESS, + DT_INST_0_MMIO_SRAM_SIZE, AUX_MPU_ATTR_KW | AUX_MPU_ATTR_KR | AUX_MPU_ATTR_UR | AUX_MPU_ATTR_KE | AUX_MPU_ATTR_UE | REGION_DYNAMIC), #endif diff --git a/boards/arm/nrf52_pca20020/board.c b/boards/arm/nrf52_pca20020/board.c index 754e0b08b8a..34ecdd06b92 100644 --- a/boards/arm/nrf52_pca20020/board.c +++ b/boards/arm/nrf52_pca20020/board.c @@ -67,7 +67,7 @@ DEVICE_INIT(vdd_pwr_ctrl_init, "", pwr_ctrl_init, NULL, &vdd_pwr_ctrl_cfg, #endif static const struct pwr_ctrl_cfg ccs_vdd_pwr_ctrl_cfg = { - .port = DT_SEMTECH_SX1509B_0_LABEL, + .port = DT_INST_0_SEMTECH_SX1509B_LABEL, .pin = CCS_VDD_PWR_CTRL_GPIO_PIN, }; diff --git a/boards/arm/particle_argon/board.h b/boards/arm/particle_argon/board.h index 940508e938a..695f9a44c3c 100644 --- a/boards/arm/particle_argon/board.h +++ b/boards/arm/particle_argon/board.h @@ -8,11 +8,11 @@ #define __INC_BOARD_H /* SKYWORKS SKY13351 antenna selection settings */ -#define SKY_UFLn_GPIO_NAME DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_CONTROLLER -#define SKY_UFLn_GPIO_FLAGS DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_FLAGS -#define SKY_UFLn_GPIO_PIN DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_PIN -#define SKY_PCBn_GPIO_NAME DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_CONTROLLER -#define SKY_PCBn_GPIO_FLAGS DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_FLAGS -#define SKY_PCBn_GPIO_PIN DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_PIN +#define SKY_UFLn_GPIO_NAME DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_CONTROLLER +#define SKY_UFLn_GPIO_FLAGS DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_FLAGS +#define SKY_UFLn_GPIO_PIN DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_PIN +#define SKY_PCBn_GPIO_NAME DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_CONTROLLER +#define SKY_PCBn_GPIO_FLAGS DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_FLAGS +#define SKY_PCBn_GPIO_PIN DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_PIN #endif /* __INC_BOARD_H */ diff --git a/boards/arm/particle_boron/board.h b/boards/arm/particle_boron/board.h index 6a1782f0daf..6097b6b8821 100644 --- a/boards/arm/particle_boron/board.h +++ b/boards/arm/particle_boron/board.h @@ -8,15 +8,15 @@ #define __INC_BOARD_H /* pin used to enable the buffer power */ -#define SERIAL_BUFFER_ENABLE_GPIO_NAME DT_NORDIC_NRF_GPIO_0_LABEL +#define SERIAL_BUFFER_ENABLE_GPIO_NAME DT_INST_0_NORDIC_NRF_GPIO_LABEL #define SERIAL_BUFFER_ENABLE_GPIO_PIN 25 /* pin used to detect V_INT (buffer power) */ #define V_INT_DETECT_GPIO_PIN 2 /* SKYWORKS SKY13351 antenna selection settings (only use vctl1) */ -#define ANT_SEL_GPIO_NAME DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_CONTROLLER -#define ANT_SEL_GPIO_FLAGS DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_FLAGS -#define ANT_SEL_GPIO_PIN DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_PIN +#define ANT_SEL_GPIO_NAME DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_CONTROLLER +#define ANT_SEL_GPIO_FLAGS DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_FLAGS +#define ANT_SEL_GPIO_PIN DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_PIN #endif /* __INC_BOARD_H */ diff --git a/boards/arm/particle_xenon/board.h b/boards/arm/particle_xenon/board.h index 940508e938a..695f9a44c3c 100644 --- a/boards/arm/particle_xenon/board.h +++ b/boards/arm/particle_xenon/board.h @@ -8,11 +8,11 @@ #define __INC_BOARD_H /* SKYWORKS SKY13351 antenna selection settings */ -#define SKY_UFLn_GPIO_NAME DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_CONTROLLER -#define SKY_UFLn_GPIO_FLAGS DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_FLAGS -#define SKY_UFLn_GPIO_PIN DT_SKYWORKS_SKY13351_0_VCTL1_GPIOS_PIN -#define SKY_PCBn_GPIO_NAME DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_CONTROLLER -#define SKY_PCBn_GPIO_FLAGS DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_FLAGS -#define SKY_PCBn_GPIO_PIN DT_SKYWORKS_SKY13351_0_VCTL2_GPIOS_PIN +#define SKY_UFLn_GPIO_NAME DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_CONTROLLER +#define SKY_UFLn_GPIO_FLAGS DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_FLAGS +#define SKY_UFLn_GPIO_PIN DT_INST_0_SKYWORKS_SKY13351_VCTL1_GPIOS_PIN +#define SKY_PCBn_GPIO_NAME DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_CONTROLLER +#define SKY_PCBn_GPIO_FLAGS DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_FLAGS +#define SKY_PCBn_GPIO_PIN DT_INST_0_SKYWORKS_SKY13351_VCTL2_GPIOS_PIN #endif /* __INC_BOARD_H */ diff --git a/boards/arm/reel_board/board.c b/boards/arm/reel_board/board.c index 5e5f019e9d1..80a14a042d6 100644 --- a/boards/arm/reel_board/board.c +++ b/boards/arm/reel_board/board.c @@ -33,11 +33,11 @@ static int board_reel_board_init(struct device *dev) * (High-Impedance state of pin B from Dual-Supply Bus Transceiver). */ gpio = NRF_P0; - gpio->PIN_CNF[DT_NORDIC_NRF_UART_0_RX_PIN] = + gpio->PIN_CNF[DT_INST_0_NORDIC_NRF_UART_RX_PIN] = (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos) | (GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos); - gpio->PIN_CNF[DT_NORDIC_NRF_UART_0_TX_PIN] = + gpio->PIN_CNF[DT_INST_0_NORDIC_NRF_UART_TX_PIN] = (GPIO_PIN_CNF_INPUT_Disconnect << GPIO_PIN_CNF_INPUT_Pos) | (GPIO_PIN_CNF_PULL_Pullup << GPIO_PIN_CNF_PULL_Pos) | (GPIO_PIN_CNF_DIR_Input << GPIO_PIN_CNF_DIR_Pos); diff --git a/boards/arm/twr_ke18f/pinmux.c b/boards/arm/twr_ke18f/pinmux.c index f9b3d2fedf8..69c4aae9aa1 100644 --- a/boards/arm/twr_ke18f/pinmux.c +++ b/boards/arm/twr_ke18f/pinmux.c @@ -103,10 +103,10 @@ static int twr_ke18f_pinmux_init(struct device *dev) #endif /* FXOS8700 INT1, INT2, RST */ -#ifdef DT_NXP_FXOS8700_0_INT1_GPIOS_PIN +#ifdef DT_INST_0_NXP_FXOS8700_INT1_GPIOS_PIN pinmux_pin_set(porta, 14, PORT_PCR_MUX(kPORT_MuxAsGpio)); #endif -#ifdef DT_NXP_FXOS8700_0_INT2_GPIOS_PIN +#ifdef DT_INST_0_NXP_FXOS8700_INT2_GPIOS_PIN pinmux_pin_set(portc, 17, PORT_PCR_MUX(kPORT_MuxAsGpio)); #endif pinmux_pin_set(portc, 15, PORT_PCR_MUX(kPORT_MuxAsGpio)); diff --git a/boards/posix/native_posix/dts_fixup.h b/boards/posix/native_posix/dts_fixup.h index 3b81f441f6c..6b3a42d0dd1 100644 --- a/boards/posix/native_posix/dts_fixup.h +++ b/boards/posix/native_posix/dts_fixup.h @@ -4,6 +4,6 @@ * SPDX-License-Identifier: Apache-2.0 */ -#define DT_FLASH_DEV_NAME DT_ZEPHYR_NATIVE_POSIX_FLASH_CONTROLLER_0_LABEL +#define DT_FLASH_DEV_NAME DT_INST_0_ZEPHYR_NATIVE_POSIX_FLASH_CONTROLLER_LABEL #define DT_UART_0_DEV_NAME DT_ZEPHYR_NATIVE_POSIX_UART_1_LABEL diff --git a/boards/posix/nrf52_bsim/board_soc.h b/boards/posix/nrf52_bsim/board_soc.h index f6074bc573e..a1226eee328 100644 --- a/boards/posix/nrf52_bsim/board_soc.h +++ b/boards/posix/nrf52_bsim/board_soc.h @@ -34,14 +34,14 @@ #define OFFLOAD_SW_IRQ SWI0_EGU0_IRQn /* HACK due to the nrf52_bsim not yet supporting DTS */ -#if !defined(DT_NORDIC_NRF_CLOCK_0_LABEL) -#define DT_NORDIC_NRF_CLOCK_0_LABEL "CLOCK" +#if !defined(DT_INST_0_NORDIC_NRF_CLOCK_LABEL) +#define DT_INST_0_NORDIC_NRF_CLOCK_LABEL "CLOCK" #endif -#if !defined(DT_NORDIC_NRF_CLOCK_0_IRQ_0) -#define DT_NORDIC_NRF_CLOCK_0_IRQ_0 POWER_CLOCK_IRQn +#if !defined(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0) +#define DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0 POWER_CLOCK_IRQn #endif -#if !defined(DT_NORDIC_NRF_CLOCK_0_IRQ_0_PRIORITY) -#define DT_NORDIC_NRF_CLOCK_0_IRQ_0_PRIORITY 1 +#if !defined(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0_PRIORITY) +#define DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0_PRIORITY 1 #endif #ifdef __cplusplus diff --git a/boards/x86/galileo/Kconfig.defconfig b/boards/x86/galileo/Kconfig.defconfig index b52b5dba15c..8a49f857acd 100644 --- a/boards/x86/galileo/Kconfig.defconfig +++ b/boards/x86/galileo/Kconfig.defconfig @@ -40,7 +40,7 @@ config GPIO_PCAL9535A_0_DEV_NAME config GPIO_PCAL9535A_0_I2C_ADDR default 0x25 config GPIO_PCAL9535A_0_I2C_MASTER_DEV_NAME - default "$(dt_str_val,DT_SNPS_DESIGNWARE_I2C_0_LABEL)" + default "$(dt_str_val,DT_INST_0_SNPS_DESIGNWARE_I2C_LABEL)" endif # GPIO_PCAL9535A_0 @@ -54,7 +54,7 @@ config GPIO_PCAL9535A_1_DEV_NAME config GPIO_PCAL9535A_1_I2C_ADDR default 0x26 config GPIO_PCAL9535A_1_I2C_MASTER_DEV_NAME - default "$(dt_str_val,DT_SNPS_DESIGNWARE_I2C_0_LABEL)" + default "$(dt_str_val,DT_INST_0_SNPS_DESIGNWARE_I2C_LABEL)" endif # GPIO_PCAL9535A_1 @@ -68,7 +68,7 @@ config GPIO_PCAL9535A_2_DEV_NAME config GPIO_PCAL9535A_2_I2C_ADDR default 0x27 config GPIO_PCAL9535A_2_I2C_MASTER_DEV_NAME - default "$(dt_str_val,DT_SNPS_DESIGNWARE_I2C_0_LABEL)" + default "$(dt_str_val,DT_INST_0_SNPS_DESIGNWARE_I2C_LABEL)" endif # GPIO_PCAL9535A_2 @@ -93,7 +93,7 @@ config PWM_PCA9685_0_DEV_NAME config PWM_PCA9685_0_I2C_ADDR default 0x47 config PWM_PCA9685_0_I2C_MASTER_DEV_NAME - default "$(dt_str_val,DT_SNPS_DESIGNWARE_I2C_0_LABEL)" + default "$(dt_str_val,DT_INST_0_SNPS_DESIGNWARE_I2C_LABEL)" endif # PWM_PCA9685_0 endif # PWM_PCA9685 diff --git a/boards/x86/quark_se_c1000_devboard/board.c b/boards/x86/quark_se_c1000_devboard/board.c index 5933f11e5c0..6cd6eb0967b 100644 --- a/boards/x86/quark_se_c1000_devboard/board.c +++ b/boards/x86/quark_se_c1000_devboard/board.c @@ -15,12 +15,12 @@ #include static struct cc2520_gpio_configuration cc2520_gpios[CC2520_GPIO_IDX_MAX] = { - { .dev = NULL, .pin = DT_TI_CC2520_0_VREG_EN_GPIOS_PIN, }, - { .dev = NULL, .pin = DT_TI_CC2520_0_RESET_GPIOS_PIN, }, - { .dev = NULL, .pin = DT_TI_CC2520_0_FIFO_GPIOS_PIN, }, - { .dev = NULL, .pin = DT_TI_CC2520_0_CCA_GPIOS_PIN, }, - { .dev = NULL, .pin = DT_TI_CC2520_0_SFD_GPIOS_PIN, }, - { .dev = NULL, .pin = DT_TI_CC2520_0_FIFOP_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_VREG_EN_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_RESET_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_FIFO_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_CCA_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_SFD_GPIOS_PIN, }, + { .dev = NULL, .pin = DT_INST_0_TI_CC2520_FIFOP_GPIOS_PIN, }, }; struct cc2520_gpio_configuration *cc2520_configure_gpios(void) @@ -31,32 +31,32 @@ struct cc2520_gpio_configuration *cc2520_configure_gpios(void) GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE); struct device *gpio; - gpio = device_get_binding(DT_TI_CC2520_0_VREG_EN_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_VREG_EN_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].pin, flags_noint_out); cc2520_gpios[CC2520_GPIO_IDX_VREG_EN].dev = gpio; - gpio = device_get_binding(DT_TI_CC2520_0_RESET_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_RESET_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_RESET].pin, flags_noint_out); cc2520_gpios[CC2520_GPIO_IDX_RESET].dev = gpio; - gpio = device_get_binding(DT_TI_CC2520_0_SFD_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_SFD_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_SFD].pin, flags_int_in); cc2520_gpios[CC2520_GPIO_IDX_SFD].dev = gpio; - gpio = device_get_binding(DT_TI_CC2520_0_FIFOP_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_FIFOP_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFOP].pin, flags_int_in); cc2520_gpios[CC2520_GPIO_IDX_FIFOP].dev = gpio; - gpio = device_get_binding(DT_TI_CC2520_0_FIFO_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_FIFO_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_FIFO].pin, flags_noint_in); cc2520_gpios[CC2520_GPIO_IDX_FIFO].dev = gpio; - gpio = device_get_binding(DT_TI_CC2520_0_CCA_GPIOS_CONTROLLER); + gpio = device_get_binding(DT_INST_0_TI_CC2520_CCA_GPIOS_CONTROLLER); gpio_pin_configure(gpio, cc2520_gpios[CC2520_GPIO_IDX_CCA].pin, flags_noint_in); cc2520_gpios[CC2520_GPIO_IDX_CCA].dev = gpio; diff --git a/drivers/audio/mpxxdtyy.c b/drivers/audio/mpxxdtyy.c index e8c2342a20e..7ce5cdef3b6 100644 --- a/drivers/audio/mpxxdtyy.c +++ b/drivers/audio/mpxxdtyy.c @@ -150,10 +150,10 @@ static int mpxxdtyy_initialize(struct device *dev) { struct mpxxdtyy_data *const data = DEV_DATA(dev); - data->comm_master = device_get_binding(DT_ST_MPXXDTYY_0_BUS_NAME); + data->comm_master = device_get_binding(DT_INST_0_ST_MPXXDTYY_BUS_NAME); if (data->comm_master == NULL) { - LOG_ERR("master %s not found", DT_ST_MPXXDTYY_0_BUS_NAME); + LOG_ERR("master %s not found", DT_INST_0_ST_MPXXDTYY_BUS_NAME); return -EINVAL; } @@ -163,6 +163,6 @@ static int mpxxdtyy_initialize(struct device *dev) static struct mpxxdtyy_data mpxxdtyy_data; -DEVICE_AND_API_INIT(mpxxdtyy, DT_ST_MPXXDTYY_0_LABEL, mpxxdtyy_initialize, +DEVICE_AND_API_INIT(mpxxdtyy, DT_INST_0_ST_MPXXDTYY_LABEL, mpxxdtyy_initialize, &mpxxdtyy_data, NULL, POST_KERNEL, CONFIG_AUDIO_DMIC_INIT_PRIORITY, &mpxxdtyy_driver_api); diff --git a/drivers/bluetooth/hci/spi.c b/drivers/bluetooth/hci/spi.c index b83e288872b..e2f62550fd5 100644 --- a/drivers/bluetooth/hci/spi.c +++ b/drivers/bluetooth/hci/spi.c @@ -45,11 +45,11 @@ #define CMD_OGF 1 #define CMD_OCF 2 -#define GPIO_IRQ_PIN DT_ZEPHYR_BT_HCI_SPI_0_IRQ_GPIO_PIN -#define GPIO_RESET_PIN DT_ZEPHYR_BT_HCI_SPI_0_RESET_GPIO_PIN -#ifdef DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_PIN -#define GPIO_CS_PIN DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_PIN -#endif /* DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_PIN */ +#define GPIO_IRQ_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_IRQ_GPIO_PIN +#define GPIO_RESET_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_RESET_GPIO_PIN +#ifdef DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_PIN +#define GPIO_CS_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_PIN +#endif /* DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_PIN */ /* Max SPI buffer length for transceive operations. * @@ -124,7 +124,7 @@ static int bt_spi_send_aci_config_data_controller_mode(void); static struct device *spi_dev; static struct spi_config spi_conf = { - .frequency = DT_ZEPHYR_BT_HCI_SPI_0_SPI_MAX_FREQUENCY, + .frequency = DT_INST_0_ZEPHYR_BT_HCI_SPI_SPI_MAX_FREQUENCY, .operation = (SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB | SPI_WORD_SET(8) | SPI_LINES_SINGLE), .slave = 0, @@ -194,10 +194,10 @@ static void bt_spi_handle_vendor_evt(u8_t *rxmsg) */ static int configure_cs(void) { - cs_dev = device_get_binding(DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_CONTROLLER); + cs_dev = device_get_binding(DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_CONTROLLER); if (!cs_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_CONTROLLER); return -EIO; } @@ -254,10 +254,10 @@ static int configure_cs(void) spi_conf_cs.gpio_pin = GPIO_CS_PIN, spi_conf_cs.gpio_dev = device_get_binding( - DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_CONTROLLER); if (!spi_conf_cs.gpio_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - DT_ZEPHYR_BT_HCI_SPI_0_CS_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_CS_GPIO_CONTROLLER); return -EIO; } @@ -520,7 +520,7 @@ static int bt_spi_open(void) } static const struct bt_hci_driver drv = { - .name = DT_ZEPHYR_BT_HCI_SPI_0_LABEL, + .name = DT_INST_0_ZEPHYR_BT_HCI_SPI_LABEL, .bus = BT_HCI_DRIVER_BUS_SPI, #if defined(CONFIG_BT_BLUENRG_ACI) .quirks = BT_QUIRK_NO_RESET, @@ -533,10 +533,10 @@ static int bt_spi_init(struct device *unused) { ARG_UNUSED(unused); - spi_dev = device_get_binding(DT_ZEPHYR_BT_HCI_SPI_0_BUS_NAME); + spi_dev = device_get_binding(DT_INST_0_ZEPHYR_BT_HCI_SPI_BUS_NAME); if (!spi_dev) { BT_ERR("Failed to initialize SPI driver: %s", - DT_ZEPHYR_BT_HCI_SPI_0_BUS_NAME); + DT_INST_0_ZEPHYR_BT_HCI_SPI_BUS_NAME); return -EIO; } @@ -545,18 +545,18 @@ static int bt_spi_init(struct device *unused) } irq_dev = device_get_binding( - DT_ZEPHYR_BT_HCI_SPI_0_IRQ_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_IRQ_GPIO_CONTROLLER); if (!irq_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - DT_ZEPHYR_BT_HCI_SPI_0_IRQ_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_IRQ_GPIO_CONTROLLER); return -EIO; } rst_dev = device_get_binding( - DT_ZEPHYR_BT_HCI_SPI_0_RESET_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_RESET_GPIO_CONTROLLER); if (!rst_dev) { BT_ERR("Failed to initialize GPIO driver: %s", - DT_ZEPHYR_BT_HCI_SPI_0_RESET_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_RESET_GPIO_CONTROLLER); return -EIO; } diff --git a/drivers/clock_control/nrf_power_clock.c b/drivers/clock_control/nrf_power_clock.c index 6a729606c6d..3a5f0238331 100644 --- a/drivers/clock_control/nrf_power_clock.c +++ b/drivers/clock_control/nrf_power_clock.c @@ -56,7 +56,7 @@ static int m16src_start(struct device *dev, clock_control_subsys_t sub_system) if (blocking) { u32_t intenset; - irq_disable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_disable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); NRF_CLOCK->EVENTS_HFCLKSTARTED = 0; @@ -77,9 +77,9 @@ static int m16src_start(struct device *dev, clock_control_subsys_t sub_system) nrf_clock_int_disable(NRF_CLOCK_INT_HF_STARTED_MASK); } - NVIC_ClearPendingIRQ(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + NVIC_ClearPendingIRQ(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); - irq_enable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_enable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); } else { NRF_CLOCK->EVENTS_HFCLKSTARTED = 0; @@ -184,7 +184,7 @@ static int k32src_start(struct device *dev, clock_control_subsys_t sub_system) NRF_CLOCK->LFCLKSRC = lf_clk_src; #if defined(CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING) - irq_disable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_disable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); intenset = NRF_CLOCK->INTENSET; nrf_clock_int_enable(NRF_CLOCK_INT_LF_STARTED_MASK); @@ -204,9 +204,9 @@ static int k32src_start(struct device *dev, clock_control_subsys_t sub_system) nrf_clock_int_disable(NRF_CLOCK_INT_LF_STARTED_MASK); } - NVIC_ClearPendingIRQ(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + NVIC_ClearPendingIRQ(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); - irq_enable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_enable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); #else /* !CONFIG_CLOCK_CONTROL_NRF_K32SRC_BLOCKING */ /* NOTE: LFCLK will initially start running from the LFRC if LFXO is @@ -250,7 +250,7 @@ static int k32src_start(struct device *dev, clock_control_subsys_t sub_system) err = m16src_start(dev, false); if (!err) { - NVIC_SetPendingIRQ(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + NVIC_SetPendingIRQ(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); } else { __ASSERT_NO_MSG(err == -EINPROGRESS); } @@ -410,7 +410,7 @@ void nrf_power_clock_isr(void *arg) err = m16src_start(dev, false); if (!err) { - NVIC_SetPendingIRQ(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + NVIC_SetPendingIRQ(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); } else { __ASSERT_NO_MSG(err == -EINPROGRESS); } @@ -443,11 +443,11 @@ static int clock_control_init(struct device *dev) * power peripheral driver and/or new SoC series. * NOTE: Currently the operations here are idempotent. */ - IRQ_CONNECT(DT_NORDIC_NRF_CLOCK_0_IRQ_0, - DT_NORDIC_NRF_CLOCK_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0, + DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0_PRIORITY, nrf_power_clock_isr, 0, 0); - irq_enable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_enable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); return 0; } @@ -459,7 +459,7 @@ static const struct clock_control_driver_api _m16src_clock_control_api = { }; DEVICE_AND_API_INIT(clock_nrf5_m16src, - DT_NORDIC_NRF_CLOCK_0_LABEL "_16M", + DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M", clock_control_init, NULL, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &_m16src_clock_control_api); @@ -471,7 +471,7 @@ static const struct clock_control_driver_api _k32src_clock_control_api = { }; DEVICE_AND_API_INIT(clock_nrf5_k32src, - DT_NORDIC_NRF_CLOCK_0_LABEL "_32K", + DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K", clock_control_init, NULL, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &_k32src_clock_control_api); @@ -489,7 +489,7 @@ void nrf5_power_usb_power_int_enable(bool enable) if (enable) { nrf_power_int_enable(mask); - irq_enable(DT_NORDIC_NRF_CLOCK_0_IRQ_0); + irq_enable(DT_INST_0_NORDIC_NRF_CLOCK_IRQ_0); } else { nrf_power_int_disable(mask); } diff --git a/drivers/counter/Kconfig.nrfx b/drivers/counter/Kconfig.nrfx index 4c5ed4f1a82..08b34a1837f 100644 --- a/drivers/counter/Kconfig.nrfx +++ b/drivers/counter/Kconfig.nrfx @@ -62,9 +62,9 @@ config COUNTER_RTC2 select NRFX_RTC2 # Internal flag which detects if PPI wrap feature is enabled for any instance -if $(dt_int_val,DT_NORDIC_NRF_RTC_0_PPI_WRAP) > 0 || \ - $(dt_int_val,DT_NORDIC_NRF_RTC_1_PPI_WRAP) > 0 || \ - $(dt_int_val,DT_NORDIC_NRF_RTC_2_PPI_WRAP) > 0 +if $(dt_int_val,DT_INST_0_NORDIC_NRF_RTC_PPI_WRAP) > 0 || \ + $(dt_int_val,DT_INST_1_NORDIC_NRF_RTC_PPI_WRAP) > 0 || \ + $(dt_int_val,DT_INST_2_NORDIC_NRF_RTC_PPI_WRAP) > 0 config COUNTER_RTC_WITH_PPI_WRAP bool diff --git a/drivers/counter/counter_gecko_rtcc.c b/drivers/counter/counter_gecko_rtcc.c index 25ee363cfb3..b0ea5cc1e7a 100644 --- a/drivers/counter/counter_gecko_rtcc.c +++ b/drivers/counter/counter_gecko_rtcc.c @@ -340,32 +340,32 @@ ISR_DIRECT_DECLARE(counter_gecko_isr_0) return 1; } -BUILD_ASSERT((DT_SILABS_GECKO_RTCC_0_PRESCALER > 0U) && - (DT_SILABS_GECKO_RTCC_0_PRESCALER <= 32768U)); +BUILD_ASSERT((DT_INST_0_SILABS_GECKO_RTCC_PRESCALER > 0U) && + (DT_INST_0_SILABS_GECKO_RTCC_PRESCALER <= 32768U)); static void counter_gecko_0_irq_config(void) { - IRQ_DIRECT_CONNECT(DT_SILABS_GECKO_RTCC_0_IRQ_0, - DT_SILABS_GECKO_RTCC_0_IRQ_0_PRIORITY, + IRQ_DIRECT_CONNECT(DT_INST_0_SILABS_GECKO_RTCC_IRQ_0, + DT_INST_0_SILABS_GECKO_RTCC_IRQ_0_PRIORITY, counter_gecko_isr_0, 0); - irq_enable(DT_SILABS_GECKO_RTCC_0_IRQ_0); + irq_enable(DT_INST_0_SILABS_GECKO_RTCC_IRQ_0); } static const struct counter_gecko_config counter_gecko_0_config = { .info = { .max_top_value = RTCC_MAX_VALUE, - .freq = DT_SILABS_GECKO_RTCC_0_CLOCK_FREQUENCY / - DT_SILABS_GECKO_RTCC_0_PRESCALER, + .freq = DT_INST_0_SILABS_GECKO_RTCC_CLOCK_FREQUENCY / + DT_INST_0_SILABS_GECKO_RTCC_PRESCALER, .flags = COUNTER_CONFIG_INFO_COUNT_UP, .channels = RTCC_ALARM_NUM, }, .irq_config = counter_gecko_0_irq_config, - .prescaler = DT_SILABS_GECKO_RTCC_0_PRESCALER, + .prescaler = DT_INST_0_SILABS_GECKO_RTCC_PRESCALER, }; static struct counter_gecko_data counter_gecko_0_data; -DEVICE_AND_API_INIT(counter_gecko_0, DT_SILABS_GECKO_RTCC_0_LABEL, +DEVICE_AND_API_INIT(counter_gecko_0, DT_INST_0_SILABS_GECKO_RTCC_LABEL, counter_gecko_init, &counter_gecko_0_data, &counter_gecko_0_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &counter_gecko_driver_api); diff --git a/drivers/counter/counter_mcux_rtc.c b/drivers/counter/counter_mcux_rtc.c index 3237c71f446..3c7ff7eddb8 100644 --- a/drivers/counter/counter_mcux_rtc.c +++ b/drivers/counter/counter_mcux_rtc.c @@ -256,8 +256,8 @@ static struct mcux_rtc_config mcux_rtc_config_0 = { .irq_config_func = mcux_rtc_irq_config_0, .info = { .max_top_value = UINT32_MAX, - .freq = DT_NXP_KINETIS_RTC_0_CLOCK_FREQUENCY / - DT_NXP_KINETIS_RTC_0_PRESCALER, + .freq = DT_INST_0_NXP_KINETIS_RTC_CLOCK_FREQUENCY / + DT_INST_0_NXP_KINETIS_RTC_PRESCALER, .flags = COUNTER_CONFIG_INFO_COUNT_UP, .channels = 1, }, diff --git a/drivers/counter/counter_nrfx_rtc.c b/drivers/counter/counter_nrfx_rtc.c index a68a0040931..891a06ef0e0 100644 --- a/drivers/counter/counter_nrfx_rtc.c +++ b/drivers/counter/counter_nrfx_rtc.c @@ -267,7 +267,7 @@ static int init_rtc(struct device *dev, const nrfx_rtc_t *rtc = &nrfx_config->rtc; int err; - clock = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + clock = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); if (!clock) { return -ENODEV; } diff --git a/drivers/counter/timer_dtmr_cmsdk_apb.c b/drivers/counter/timer_dtmr_cmsdk_apb.c index 5e38a0237e8..969339b0842 100644 --- a/drivers/counter/timer_dtmr_cmsdk_apb.c +++ b/drivers/counter/timer_dtmr_cmsdk_apb.c @@ -165,14 +165,14 @@ static const struct dtmr_cmsdk_apb_cfg dtmr_cmsdk_apb_cfg_0 = { .flags = 0, .channels = 0U, }, - .dtimer = ((volatile struct dualtimer_cmsdk_apb *)DT_ARM_CMSDK_DTIMER_0_BASE_ADDRESS), + .dtimer = ((volatile struct dualtimer_cmsdk_apb *)DT_INST_0_ARM_CMSDK_DTIMER_BASE_ADDRESS), .dtimer_config_func = dtimer_cmsdk_apb_config_0, .dtimer_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_DTIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_DTIMER_BASE_ADDRESS,}, .dtimer_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_DTIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_DTIMER_BASE_ADDRESS,}, .dtimer_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_DTIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_DTIMER_BASE_ADDRESS,}, }; static struct dtmr_cmsdk_apb_dev_data dtmr_cmsdk_apb_dev_data_0 = { @@ -180,7 +180,7 @@ static struct dtmr_cmsdk_apb_dev_data dtmr_cmsdk_apb_dev_data_0 = { }; DEVICE_AND_API_INIT(dtmr_cmsdk_apb_0, - DT_ARM_CMSDK_DTIMER_0_LABEL, + DT_INST_0_ARM_CMSDK_DTIMER_LABEL, dtmr_cmsdk_apb_init, &dtmr_cmsdk_apb_dev_data_0, &dtmr_cmsdk_apb_cfg_0, POST_KERNEL, @@ -189,10 +189,10 @@ DEVICE_AND_API_INIT(dtmr_cmsdk_apb_0, static void dtimer_cmsdk_apb_config_0(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_DTIMER_0_IRQ_0, - DT_ARM_CMSDK_DTIMER_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_ARM_CMSDK_DTIMER_IRQ_0, + DT_INST_0_ARM_CMSDK_DTIMER_IRQ_0_PRIORITY, dtmr_cmsdk_apb_isr, DEVICE_GET(dtmr_cmsdk_apb_0), 0); - irq_enable(DT_ARM_CMSDK_DTIMER_0_IRQ_0); + irq_enable(DT_INST_0_ARM_CMSDK_DTIMER_IRQ_0); } #endif /* DT_ARM_CMSDK_DTIMER_0 */ diff --git a/drivers/counter/timer_tmr_cmsdk_apb.c b/drivers/counter/timer_tmr_cmsdk_apb.c index 2699fb1200e..d707dd634fb 100644 --- a/drivers/counter/timer_tmr_cmsdk_apb.c +++ b/drivers/counter/timer_tmr_cmsdk_apb.c @@ -167,14 +167,14 @@ static const struct tmr_cmsdk_apb_cfg tmr_cmsdk_apb_cfg_0 = { .flags = 0, .channels = 0U, }, - .timer = ((volatile struct timer_cmsdk_apb *)DT_ARM_CMSDK_TIMER_0_BASE_ADDRESS), + .timer = ((volatile struct timer_cmsdk_apb *)DT_INST_0_ARM_CMSDK_TIMER_BASE_ADDRESS), .timer_config_func = timer_cmsdk_apb_config_0, .timer_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_TIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_TIMER_BASE_ADDRESS,}, .timer_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_TIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_TIMER_BASE_ADDRESS,}, .timer_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_TIMER_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_TIMER_BASE_ADDRESS,}, }; static struct tmr_cmsdk_apb_dev_data tmr_cmsdk_apb_dev_data_0 = { @@ -182,7 +182,7 @@ static struct tmr_cmsdk_apb_dev_data tmr_cmsdk_apb_dev_data_0 = { }; DEVICE_AND_API_INIT(tmr_cmsdk_apb_0, - DT_ARM_CMSDK_TIMER_0_LABEL, + DT_INST_0_ARM_CMSDK_TIMER_LABEL, tmr_cmsdk_apb_init, &tmr_cmsdk_apb_dev_data_0, &tmr_cmsdk_apb_cfg_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -190,10 +190,10 @@ DEVICE_AND_API_INIT(tmr_cmsdk_apb_0, static void timer_cmsdk_apb_config_0(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_TIMER_0_IRQ_0, DT_ARM_CMSDK_TIMER_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_ARM_CMSDK_TIMER_IRQ_0, DT_INST_0_ARM_CMSDK_TIMER_IRQ_0_PRIORITY, tmr_cmsdk_apb_isr, DEVICE_GET(tmr_cmsdk_apb_0), 0); - irq_enable(DT_ARM_CMSDK_TIMER_0_IRQ_0); + irq_enable(DT_INST_0_ARM_CMSDK_TIMER_IRQ_0); } #endif /* DT_ARM_CMSDK_TIMER_0 */ @@ -208,14 +208,14 @@ static const struct tmr_cmsdk_apb_cfg tmr_cmsdk_apb_cfg_1 = { .flags = 0, .channels = 0U, }, - .timer = ((volatile struct timer_cmsdk_apb *)DT_ARM_CMSDK_TIMER_1_BASE_ADDRESS), + .timer = ((volatile struct timer_cmsdk_apb *)DT_INST_1_ARM_CMSDK_TIMER_BASE_ADDRESS), .timer_config_func = timer_cmsdk_apb_config_1, .timer_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_TIMER_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_TIMER_BASE_ADDRESS,}, .timer_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_TIMER_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_TIMER_BASE_ADDRESS,}, .timer_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_TIMER_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_TIMER_BASE_ADDRESS,}, }; static struct tmr_cmsdk_apb_dev_data tmr_cmsdk_apb_dev_data_1 = { @@ -223,7 +223,7 @@ static struct tmr_cmsdk_apb_dev_data tmr_cmsdk_apb_dev_data_1 = { }; DEVICE_AND_API_INIT(tmr_cmsdk_apb_1, - DT_ARM_CMSDK_TIMER_1_LABEL, + DT_INST_1_ARM_CMSDK_TIMER_LABEL, tmr_cmsdk_apb_init, &tmr_cmsdk_apb_dev_data_1, &tmr_cmsdk_apb_cfg_1, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -231,9 +231,9 @@ DEVICE_AND_API_INIT(tmr_cmsdk_apb_1, static void timer_cmsdk_apb_config_1(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_TIMER_1_IRQ_0, DT_ARM_CMSDK_TIMER_1_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_1_ARM_CMSDK_TIMER_IRQ_0, DT_INST_1_ARM_CMSDK_TIMER_IRQ_0_PRIORITY, tmr_cmsdk_apb_isr, DEVICE_GET(tmr_cmsdk_apb_1), 0); - irq_enable(DT_ARM_CMSDK_TIMER_1_IRQ_0); + irq_enable(DT_INST_1_ARM_CMSDK_TIMER_IRQ_0); } #endif /* DT_ARM_CMSDK_TIMER_1 */ diff --git a/drivers/display/display_ili9340.c b/drivers/display/display_ili9340.c index 5e8443ba59b..8907c2e116b 100644 --- a/drivers/display/display_ili9340.c +++ b/drivers/display/display_ili9340.c @@ -18,13 +18,13 @@ LOG_MODULE_REGISTER(display_ili9340); #include struct ili9340_data { -#ifdef DT_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER +#ifdef DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_CONTROLLER struct device *reset_gpio; #endif struct device *command_data_gpio; struct device *spi_dev; struct spi_config spi_config; -#ifdef DT_ILITEK_ILI9340_0_CS_GPIO_CONTROLLER +#ifdef DT_INST_0_ILITEK_ILI9340_CS_GPIO_CONTROLLER struct spi_cs_control cs_ctrl; #endif }; @@ -51,55 +51,55 @@ static int ili9340_init(struct device *dev) LOG_DBG("Initializing display driver"); - data->spi_dev = device_get_binding(DT_ILITEK_ILI9340_0_BUS_NAME); + data->spi_dev = device_get_binding(DT_INST_0_ILITEK_ILI9340_BUS_NAME); if (data->spi_dev == NULL) { LOG_ERR("Could not get SPI device for ILI9340"); return -EPERM; } - data->spi_config.frequency = DT_ILITEK_ILI9340_0_SPI_MAX_FREQUENCY; + data->spi_config.frequency = DT_INST_0_ILITEK_ILI9340_SPI_MAX_FREQUENCY; data->spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8); - data->spi_config.slave = DT_ILITEK_ILI9340_0_BASE_ADDRESS; + data->spi_config.slave = DT_INST_0_ILITEK_ILI9340_BASE_ADDRESS; -#ifdef DT_ILITEK_ILI9340_0_CS_GPIO_CONTROLLER +#ifdef DT_INST_0_ILITEK_ILI9340_CS_GPIO_CONTROLLER data->cs_ctrl.gpio_dev = - device_get_binding(DT_ILITEK_ILI9340_0_CS_GPIO_CONTROLLER); - data->cs_ctrl.gpio_pin = DT_ILITEK_ILI9340_0_CS_GPIO_PIN; + device_get_binding(DT_INST_0_ILITEK_ILI9340_CS_GPIO_CONTROLLER); + data->cs_ctrl.gpio_pin = DT_INST_0_ILITEK_ILI9340_CS_GPIO_PIN; data->cs_ctrl.delay = 0U; data->spi_config.cs = &(data->cs_ctrl); #else data->spi_config.cs = NULL; #endif -#ifdef DT_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER +#ifdef DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_CONTROLLER data->reset_gpio = - device_get_binding(DT_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER); + device_get_binding(DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_CONTROLLER); if (data->reset_gpio == NULL) { LOG_ERR("Could not get GPIO port for ILI9340 reset"); return -EPERM; } - gpio_pin_configure(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, + gpio_pin_configure(data->reset_gpio, DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_PIN, GPIO_DIR_OUT); #endif data->command_data_gpio = - device_get_binding(DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_CONTROLLER); + device_get_binding(DT_INST_0_ILITEK_ILI9340_CMD_DATA_GPIOS_CONTROLLER); if (data->command_data_gpio == NULL) { LOG_ERR("Could not get GPIO port for ILI9340 command/data"); return -EPERM; } - gpio_pin_configure(data->command_data_gpio, DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN, + gpio_pin_configure(data->command_data_gpio, DT_INST_0_ILITEK_ILI9340_CMD_DATA_GPIOS_PIN, GPIO_DIR_OUT); -#ifdef DT_ILITEK_ILI9340_0_RESET_GPIOS_CONTROLLER +#ifdef DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_CONTROLLER LOG_DBG("Resetting display driver"); - gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1); + gpio_pin_write(data->reset_gpio, DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_PIN, 1); k_sleep(1); - gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 0); + gpio_pin_write(data->reset_gpio, DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_PIN, 0); k_sleep(1); - gpio_pin_write(data->reset_gpio, DT_ILITEK_ILI9340_0_RESET_GPIOS_PIN, 1); + gpio_pin_write(data->reset_gpio, DT_INST_0_ILITEK_ILI9340_RESET_GPIOS_PIN, 1); k_sleep(5); #endif @@ -266,7 +266,7 @@ void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data, struct spi_buf tx_buf = { .buf = &cmd, .len = 1 }; struct spi_buf_set tx_bufs = { .buffers = &tx_buf, .count = 1 }; - gpio_pin_write(data->command_data_gpio, DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN, + gpio_pin_write(data->command_data_gpio, DT_INST_0_ILITEK_ILI9340_CMD_DATA_GPIOS_PIN, ILI9340_CMD_DATA_PIN_COMMAND); spi_write(data->spi_dev, &data->spi_config, &tx_bufs); @@ -274,7 +274,7 @@ void ili9340_transmit(struct ili9340_data *data, u8_t cmd, void *tx_data, tx_buf.buf = tx_data; tx_buf.len = tx_len; gpio_pin_write(data->command_data_gpio, - DT_ILITEK_ILI9340_0_CMD_DATA_GPIOS_PIN, + DT_INST_0_ILITEK_ILI9340_CMD_DATA_GPIOS_PIN, ILI9340_CMD_DATA_PIN_DATA); spi_write(data->spi_dev, &data->spi_config, &tx_bufs); } @@ -295,6 +295,6 @@ static const struct display_driver_api ili9340_api = { static struct ili9340_data ili9340_data; -DEVICE_AND_API_INIT(ili9340, DT_ILITEK_ILI9340_0_LABEL, &ili9340_init, +DEVICE_AND_API_INIT(ili9340, DT_INST_0_ILITEK_ILI9340_LABEL, &ili9340_init, &ili9340_data, NULL, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY, &ili9340_api); diff --git a/drivers/display/display_mcux_elcdif.c b/drivers/display/display_mcux_elcdif.c index c1b56f73ec2..379219427a3 100644 --- a/drivers/display/display_mcux_elcdif.c +++ b/drivers/display/display_mcux_elcdif.c @@ -226,7 +226,7 @@ static const struct display_driver_api mcux_elcdif_api = { static void mcux_elcdif_config_func_1(struct device *dev); static struct mcux_elcdif_config mcux_elcdif_config_1 = { - .base = (LCDIF_Type *) DT_FSL_IMX6SX_LCDIF_0_BASE_ADDRESS, + .base = (LCDIF_Type *) DT_INST_0_FSL_IMX6SX_LCDIF_BASE_ADDRESS, .irq_config_func = mcux_elcdif_config_func_1, #ifdef CONFIG_MCUX_ELCDIF_PANEL_RK043FN02H .rgb_mode = { @@ -252,7 +252,7 @@ static struct mcux_elcdif_config mcux_elcdif_config_1 = { static struct mcux_elcdif_data mcux_elcdif_data_1; -DEVICE_AND_API_INIT(mcux_elcdif_1, DT_FSL_IMX6SX_LCDIF_0_LABEL, +DEVICE_AND_API_INIT(mcux_elcdif_1, DT_INST_0_FSL_IMX6SX_LCDIF_LABEL, &mcux_elcdif_init, &mcux_elcdif_data_1, &mcux_elcdif_config_1, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -260,9 +260,9 @@ DEVICE_AND_API_INIT(mcux_elcdif_1, DT_FSL_IMX6SX_LCDIF_0_LABEL, static void mcux_elcdif_config_func_1(struct device *dev) { - IRQ_CONNECT(DT_FSL_IMX6SX_LCDIF_0_IRQ_0, - DT_FSL_IMX6SX_LCDIF_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_FSL_IMX6SX_LCDIF_IRQ_0, + DT_INST_0_FSL_IMX6SX_LCDIF_IRQ_0_PRIORITY, mcux_elcdif_isr, DEVICE_GET(mcux_elcdif_1), 0); - irq_enable(DT_FSL_IMX6SX_LCDIF_0_IRQ_0); + irq_enable(DT_INST_0_FSL_IMX6SX_LCDIF_IRQ_0); } diff --git a/drivers/display/ssd1306.c b/drivers/display/ssd1306.c index 6ff1af5c570..864be326999 100644 --- a/drivers/display/ssd1306.c +++ b/drivers/display/ssd1306.c @@ -17,19 +17,19 @@ LOG_MODULE_REGISTER(ssd1306); #include "ssd1306_regs.h" #include -#if DT_SOLOMON_SSD1306FB_0_SEGMENT_REMAP == 1 +#if DT_INST_0_SOLOMON_SSD1306FB_SEGMENT_REMAP == 1 #define SSD1306_PANEL_SEGMENT_REMAP true #else #define SSD1306_PANEL_SEGMENT_REMAP false #endif -#if DT_SOLOMON_SSD1306FB_0_COM_INVDIR == 1 +#if DT_INST_0_SOLOMON_SSD1306FB_COM_INVDIR == 1 #define SSD1306_PANEL_COM_INVDIR true #else #define SSD1306_PANEL_COM_INVDIR false #endif -#define SSD1306_PANEL_NUMOF_PAGES (DT_SOLOMON_SSD1306FB_0_HEIGHT / 8) +#define SSD1306_PANEL_NUMOF_PAGES (DT_INST_0_SOLOMON_SSD1306FB_HEIGHT / 8) #define SSD1306_CLOCK_DIV_RATIO 0x0 #define SSD1306_CLOCK_FREQUENCY 0x8 #define SSD1306_PANEL_MUX_RATIO 63 @@ -56,21 +56,21 @@ struct ssd1306_data { static inline int ssd1306_reg_read(struct ssd1306_data *driver, u8_t reg, u8_t * const val) { - return i2c_reg_read_byte(driver->i2c, DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS, + return i2c_reg_read_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, reg, val); } static inline int ssd1306_reg_write(struct ssd1306_data *driver, u8_t reg, u8_t val) { - return i2c_reg_write_byte(driver->i2c, DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS, + return i2c_reg_write_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, reg, val); } static inline int ssd1306_reg_update(struct ssd1306_data *driver, u8_t reg, u8_t mask, u8_t val) { - return i2c_reg_update_byte(driver->i2c, DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS, + return i2c_reg_update_byte(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, reg, mask, val); } @@ -89,7 +89,7 @@ static inline int ssd1306_set_panel_orientation(struct device *dev) }; return i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS); + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS); } static inline int ssd1306_set_timing_setting(struct device *dev) @@ -103,7 +103,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev) SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_CHARGE_PERIOD, SSD1306_CONTROL_BYTE_CMD, - DT_SOLOMON_SSD1306FB_0_PRECHARGEP, + DT_INST_0_SOLOMON_SSD1306FB_PRECHARGEP, SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_VCOM_DESELECT_LEVEL, SSD1306_CONTROL_LAST_BYTE_CMD, @@ -111,7 +111,7 @@ static inline int ssd1306_set_timing_setting(struct device *dev) }; return i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS); + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS); } static inline int ssd1306_set_hardware_config(struct device *dev) @@ -123,7 +123,7 @@ static inline int ssd1306_set_hardware_config(struct device *dev) SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_DISPLAY_OFFSET, SSD1306_CONTROL_BYTE_CMD, - DT_SOLOMON_SSD1306FB_0_DISPLAY_OFFSET, + DT_INST_0_SOLOMON_SSD1306FB_DISPLAY_OFFSET, SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_PADS_HW_CONFIG, SSD1306_CONTROL_BYTE_CMD, @@ -135,7 +135,7 @@ static inline int ssd1306_set_hardware_config(struct device *dev) }; return i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS); + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS); } static inline int ssd1306_set_charge_pump(const struct device *dev) @@ -159,7 +159,7 @@ static inline int ssd1306_set_charge_pump(const struct device *dev) }; return i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS); + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS); } int ssd1306_resume(const struct device *dev) @@ -191,11 +191,11 @@ int ssd1306_write_page(const struct device *dev, u8_t page, void const *data, #endif SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_LOWER_COL_ADDRESS | - (DT_SOLOMON_SSD1306FB_0_SEGMENT_OFFSET & + (DT_INST_0_SOLOMON_SSD1306FB_SEGMENT_OFFSET & SSD1306_SET_LOWER_COL_ADDRESS_MASK), SSD1306_CONTROL_BYTE_CMD, SSD1306_SET_HIGHER_COL_ADDRESS | - ((DT_SOLOMON_SSD1306FB_0_SEGMENT_OFFSET >> 4) & + ((DT_INST_0_SOLOMON_SSD1306FB_SEGMENT_OFFSET >> 4) & SSD1306_SET_LOWER_COL_ADDRESS_MASK), SSD1306_CONTROL_LAST_BYTE_CMD, SSD1306_SET_PAGE_START_ADDRESS | page @@ -210,11 +210,11 @@ int ssd1306_write_page(const struct device *dev, u8_t page, void const *data, } if (i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS)) { + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS)) { return -1; } - return i2c_burst_write(driver->i2c, DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS, + return i2c_burst_write(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, SSD1306_CONTROL_LAST_BYTE_DATA, data, length); } @@ -266,27 +266,27 @@ int ssd1306_write(const struct device *dev, const u16_t x, const u16_t y, }; if (i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS)) { + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS)) { LOG_ERR("Failed to write command"); return -1; } - return i2c_burst_write(driver->i2c, DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS, + return i2c_burst_write(driver->i2c, DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS, SSD1306_CONTROL_LAST_BYTE_DATA, (u8_t *)buf, desc->buf_size); #elif defined(CONFIG_SSD1306_SH1106_COMPATIBLE) if (desc->buf_size != - (SSD1306_PANEL_NUMOF_PAGES * DT_SOLOMON_SSD1306FB_0_WIDTH)) { + (SSD1306_PANEL_NUMOF_PAGES * DT_INST_0_SOLOMON_SSD1306FB_WIDTH)) { return -1; } for (size_t pidx = 0; pidx < SSD1306_PANEL_NUMOF_PAGES; pidx++) { if (ssd1306_write_page(dev, pidx, buf, - DT_SOLOMON_SSD1306FB_0_WIDTH)) { + DT_INST_0_SOLOMON_SSD1306FB_WIDTH)) { return -1; } - buf = (u8_t *)buf + DT_SOLOMON_SSD1306FB_0_WIDTH; + buf = (u8_t *)buf + DT_INST_0_SOLOMON_SSD1306FB_WIDTH; } #endif @@ -326,15 +326,15 @@ int ssd1306_set_contrast(const struct device *dev, const u8_t contrast) }; return i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS); + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS); } static void ssd1306_get_capabilities(const struct device *dev, struct display_capabilities *caps) { memset(caps, 0, sizeof(struct display_capabilities)); - caps->x_resolution = DT_SOLOMON_SSD1306FB_0_WIDTH; - caps->y_resolution = DT_SOLOMON_SSD1306FB_0_HEIGHT; + caps->x_resolution = DT_INST_0_SOLOMON_SSD1306FB_WIDTH; + caps->y_resolution = DT_INST_0_SOLOMON_SSD1306FB_HEIGHT; caps->supported_pixel_formats = PIXEL_FORMAT_MONO10; caps->current_pixel_format = PIXEL_FORMAT_MONO10; caps->screen_info = SCREEN_INFO_MONO_VTILED; @@ -369,12 +369,12 @@ static int ssd1306_init_device(struct device *dev) SSD1306_SET_NORMAL_DISPLAY, }; -#ifdef DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_CONTROLLER - gpio_pin_write(driver->reset, DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_PIN, 1); +#ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER + gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1); k_sleep(SSD1306_RESET_DELAY); - gpio_pin_write(driver->reset, DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_PIN, 0); + gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 0); k_sleep(SSD1306_RESET_DELAY); - gpio_pin_write(driver->reset, DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_PIN, 1); + gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, 1); #endif /* Turn display off */ @@ -400,7 +400,7 @@ static int ssd1306_init_device(struct device *dev) } if (i2c_write(driver->i2c, cmd_buf, sizeof(cmd_buf), - DT_SOLOMON_SSD1306FB_0_BASE_ADDRESS)) { + DT_INST_0_SOLOMON_SSD1306FB_BASE_ADDRESS)) { return -EIO; } @@ -419,22 +419,22 @@ static int ssd1306_init(struct device *dev) LOG_DBG(""); - driver->i2c = device_get_binding(DT_SOLOMON_SSD1306FB_0_BUS_NAME); + driver->i2c = device_get_binding(DT_INST_0_SOLOMON_SSD1306FB_BUS_NAME); if (driver->i2c == NULL) { LOG_ERR("Failed to get pointer to %s device!", - DT_SOLOMON_SSD1306FB_0_BUS_NAME); + DT_INST_0_SOLOMON_SSD1306FB_BUS_NAME); return -EINVAL; } -#ifdef DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_CONTROLLER - driver->reset = device_get_binding(DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_CONTROLLER); +#ifdef DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER + driver->reset = device_get_binding(DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER); if (driver->reset == NULL) { LOG_ERR("Failed to get pointer to %s device!", - DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_CONTROLLER); + DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_CONTROLLER); return -EINVAL; } - gpio_pin_configure(driver->reset, DT_SOLOMON_SSD1306FB_0_RESET_GPIOS_PIN, + gpio_pin_configure(driver->reset, DT_INST_0_SOLOMON_SSD1306FB_RESET_GPIOS_PIN, GPIO_DIR_OUT); #endif @@ -461,7 +461,7 @@ static struct display_driver_api ssd1306_driver_api = { .set_orientation = ssd1306_set_orientation, }; -DEVICE_AND_API_INIT(ssd1306, DT_SOLOMON_SSD1306FB_0_LABEL, ssd1306_init, +DEVICE_AND_API_INIT(ssd1306, DT_INST_0_SOLOMON_SSD1306FB_LABEL, ssd1306_init, &ssd1306_driver, NULL, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY, &ssd1306_driver_api); diff --git a/drivers/display/ssd1673.c b/drivers/display/ssd1673.c index 8c0585fb258..c2337648090 100644 --- a/drivers/display/ssd1673.c +++ b/drivers/display/ssd1673.c @@ -19,8 +19,8 @@ LOG_MODULE_REGISTER(ssd1673); #include "ssd1673_regs.h" #include -#define EPD_PANEL_WIDTH DT_SOLOMON_SSD1673FB_0_WIDTH -#define EPD_PANEL_HEIGHT DT_SOLOMON_SSD1673FB_0_HEIGHT +#define EPD_PANEL_WIDTH DT_INST_0_SOLOMON_SSD1673FB_WIDTH +#define EPD_PANEL_HEIGHT DT_INST_0_SOLOMON_SSD1673FB_HEIGHT #define EPD_PANEL_NUMOF_COLUMS EPD_PANEL_WIDTH #define EPD_PANEL_NUMOF_ROWS_PER_PAGE 8 #define EPD_PANEL_NUMOF_PAGES (EPD_PANEL_HEIGHT / \ @@ -39,7 +39,7 @@ struct ssd1673_data { struct device *busy; struct device *spi_dev; struct spi_config spi_config; -#if defined(DT_SOLOMON_SSD1673FB_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_SOLOMON_SSD1673FB_CS_GPIO_CONTROLLER) struct spi_cs_control cs_ctrl; #endif u8_t scan_mode; @@ -98,7 +98,7 @@ static inline int ssd1673_write_cmd(struct ssd1673_data *driver, struct spi_buf buf = {.buf = &cmd, .len = sizeof(cmd)}; struct spi_buf_set buf_set = {.buffers = &buf, .count = 1}; - gpio_pin_write(driver->dc, DT_SOLOMON_SSD1673FB_0_DC_GPIOS_PIN, 0); + gpio_pin_write(driver->dc, DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_PIN, 0); err = spi_write(driver->spi_dev, &driver->spi_config, &buf_set); if (err < 0) { return err; @@ -107,7 +107,7 @@ static inline int ssd1673_write_cmd(struct ssd1673_data *driver, if (data != NULL) { buf.buf = data; buf.len = len; - gpio_pin_write(driver->dc, DT_SOLOMON_SSD1673FB_0_DC_GPIOS_PIN, 1); + gpio_pin_write(driver->dc, DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_PIN, 1); err = spi_write(driver->spi_dev, &driver->spi_config, &buf_set); if (err < 0) { return err; @@ -121,36 +121,36 @@ static inline void ssd1673_busy_wait(struct ssd1673_data *driver) { u32_t val = 0U; - gpio_pin_read(driver->busy, DT_SOLOMON_SSD1673FB_0_BUSY_GPIOS_PIN, &val); + gpio_pin_read(driver->busy, DT_INST_0_SOLOMON_SSD1673FB_BUSY_GPIOS_PIN, &val); while (val) { k_sleep(SSD1673_BUSY_DELAY); - gpio_pin_read(driver->busy, DT_SOLOMON_SSD1673FB_0_BUSY_GPIOS_PIN, &val); + gpio_pin_read(driver->busy, DT_INST_0_SOLOMON_SSD1673FB_BUSY_GPIOS_PIN, &val); } } static inline size_t push_x_param(u8_t *data, u16_t x) { -#if DT_SOLOMON_SSD1673FB_0_PP_WIDTH_BITS == 8 +#if DT_INST_0_SOLOMON_SSD1673FB_PP_WIDTH_BITS == 8 data[0] = (u8_t)x; return 1; -#elif DT_SOLOMON_SSD1673FB_0_PP_WIDTH_BITS == 16 +#elif DT_INST_0_SOLOMON_SSD1673FB_PP_WIDTH_BITS == 16 sys_put_le16(sys_cpu_to_le16(x), data); return 2; #else -#error Unsupported DT_SOLOMON_SSD1673FB_0_PP_WIDTH_BITS value +#error Unsupported DT_INST_0_SOLOMON_SSD1673FB_PP_WIDTH_BITS value #endif } static inline size_t push_y_param(u8_t *data, u16_t y) { -#if DT_SOLOMON_SSD1673FB_0_PP_HEIGHT_BITS == 8 +#if DT_INST_0_SOLOMON_SSD1673FB_PP_HEIGHT_BITS == 8 data[0] = (u8_t)y; return 1; -#elif DT_SOLOMON_SSD1673FB_0_PP_HEIGHT_BITS == 16 +#elif DT_INST_0_SOLOMON_SSD1673FB_PP_HEIGHT_BITS == 16 sys_put_le16(sys_cpu_to_le16(y), data); return 2; #else -#error Unsupported DT_SOLOMON_SSD1673FB_0_PP_HEIGHT_BITS value +#error Unsupported DT_INST_0_SOLOMON_SSD1673FB_PP_HEIGHT_BITS value #endif } @@ -199,7 +199,7 @@ static inline int ssd1673_set_ram_ptr(struct ssd1673_data *driver, static void ssd1673_set_orientation_internall(struct ssd1673_data *driver) { -#if DT_SOLOMON_SSD1673FB_0_ORIENTATION_FLIPPED == 1 +#if DT_INST_0_SOLOMON_SSD1673FB_ORIENTATION_FLIPPED == 1 driver->scan_mode = SSD1673_DATA_ENTRY_XIYDY; #else driver->scan_mode = SSD1673_DATA_ENTRY_XDYIY; @@ -446,7 +446,7 @@ static int ssd1673_clear_and_write_buffer(struct device *dev) return err; } - gpio_pin_write(driver->dc, DT_SOLOMON_SSD1673FB_0_DC_GPIOS_PIN, 0); + gpio_pin_write(driver->dc, DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_PIN, 0); tmp = SSD1673_CMD_WRITE_RAM; sbuf.buf = &tmp; @@ -456,7 +456,7 @@ static int ssd1673_clear_and_write_buffer(struct device *dev) return err; } - gpio_pin_write(driver->dc, DT_SOLOMON_SSD1673FB_0_DC_GPIOS_PIN, 1); + gpio_pin_write(driver->dc, DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_PIN, 1); memset(clear_page, 0xff, sizeof(clear_page)); sbuf.buf = clear_page; @@ -480,9 +480,9 @@ static int ssd1673_controller_init(struct device *dev) LOG_DBG(""); - gpio_pin_write(driver->reset, DT_SOLOMON_SSD1673FB_0_RESET_GPIOS_PIN, 0); + gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1673FB_RESET_GPIOS_PIN, 0); k_sleep(SSD1673_RESET_DELAY); - gpio_pin_write(driver->reset, DT_SOLOMON_SSD1673FB_0_RESET_GPIOS_PIN, 1); + gpio_pin_write(driver->reset, DT_INST_0_SOLOMON_SSD1673FB_RESET_GPIOS_PIN, 1); k_sleep(SSD1673_RESET_DELAY); ssd1673_busy_wait(driver); @@ -499,19 +499,19 @@ static int ssd1673_controller_init(struct device *dev) return err; } -#if defined(DT_SOLOMON_SSD1673FB_0_SOFTSTART_1) - tmp[0] = DT_SOLOMON_SSD1673FB_0_SOFTSTART_1; - tmp[1] = DT_SOLOMON_SSD1673FB_0_SOFTSTART_2; - tmp[2] = DT_SOLOMON_SSD1673FB_0_SOFTSTART_3; +#if defined(DT_INST_0_SOLOMON_SSD1673FB_SOFTSTART_1) + tmp[0] = DT_INST_0_SOLOMON_SSD1673FB_SOFTSTART_1; + tmp[1] = DT_INST_0_SOLOMON_SSD1673FB_SOFTSTART_2; + tmp[2] = DT_INST_0_SOLOMON_SSD1673FB_SOFTSTART_3; err = ssd1673_write_cmd(driver, SSD1673_CMD_SOFTSTART, tmp, 3); if (err < 0) { return err; } #endif - tmp[0] = DT_SOLOMON_SSD1673FB_0_GDV_A; -#if defined(DT_SOLOMON_SSD1673FB_0_GDV_B) - tmp[1] = DT_SOLOMON_SSD1673FB_0_GDV_B; + tmp[0] = DT_INST_0_SOLOMON_SSD1673FB_GDV_A; +#if defined(DT_INST_0_SOLOMON_SSD1673FB_GDV_B) + tmp[1] = DT_INST_0_SOLOMON_SSD1673FB_GDV_B; err = ssd1673_write_cmd(driver, SSD1673_CMD_GDV_CTRL, tmp, 2); #else err = ssd1673_write_cmd(driver, SSD1673_CMD_GDV_CTRL, tmp, 1); @@ -520,13 +520,13 @@ static int ssd1673_controller_init(struct device *dev) return err; } - tmp[0] = DT_SOLOMON_SSD1673FB_0_SDV; + tmp[0] = DT_INST_0_SOLOMON_SSD1673FB_SDV; err = ssd1673_write_cmd(driver, SSD1673_CMD_SDV_CTRL, tmp, 1); if (err < 0) { return err; } - tmp[0] = DT_SOLOMON_SSD1673FB_0_VCOM; + tmp[0] = DT_INST_0_SOLOMON_SSD1673FB_VCOM; err = ssd1673_write_cmd(driver, SSD1673_CMD_VCOM_VOLTAGE, tmp, 1); if (err < 0) { return err; @@ -544,7 +544,7 @@ static int ssd1673_controller_init(struct device *dev) return err; } - tmp[0] = DT_SOLOMON_SSD1673FB_0_BORDER_WAVEFORM; + tmp[0] = DT_INST_0_SOLOMON_SSD1673FB_BORDER_WAVEFORM; err = ssd1673_write_cmd(driver, SSD1673_CMD_BWF_CTRL, tmp, 1); if (err < 0) { return err; @@ -582,53 +582,53 @@ static int ssd1673_init(struct device *dev) LOG_DBG(""); - driver->spi_dev = device_get_binding(DT_SOLOMON_SSD1673FB_0_BUS_NAME); + driver->spi_dev = device_get_binding(DT_INST_0_SOLOMON_SSD1673FB_BUS_NAME); if (driver->spi_dev == NULL) { LOG_ERR("Could not get SPI device for SSD1673"); return -EIO; } - driver->spi_config.frequency = DT_SOLOMON_SSD1673FB_0_SPI_MAX_FREQUENCY; + driver->spi_config.frequency = DT_INST_0_SOLOMON_SSD1673FB_SPI_MAX_FREQUENCY; driver->spi_config.operation = SPI_OP_MODE_MASTER | SPI_WORD_SET(8); - driver->spi_config.slave = DT_SOLOMON_SSD1673FB_0_BASE_ADDRESS; + driver->spi_config.slave = DT_INST_0_SOLOMON_SSD1673FB_BASE_ADDRESS; driver->spi_config.cs = NULL; - driver->reset = device_get_binding(DT_SOLOMON_SSD1673FB_0_RESET_GPIOS_CONTROLLER); + driver->reset = device_get_binding(DT_INST_0_SOLOMON_SSD1673FB_RESET_GPIOS_CONTROLLER); if (driver->reset == NULL) { LOG_ERR("Could not get GPIO port for SSD1673 reset"); return -EIO; } - gpio_pin_configure(driver->reset, DT_SOLOMON_SSD1673FB_0_RESET_GPIOS_PIN, + gpio_pin_configure(driver->reset, DT_INST_0_SOLOMON_SSD1673FB_RESET_GPIOS_PIN, GPIO_DIR_OUT); - driver->dc = device_get_binding(DT_SOLOMON_SSD1673FB_0_DC_GPIOS_CONTROLLER); + driver->dc = device_get_binding(DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_CONTROLLER); if (driver->dc == NULL) { LOG_ERR("Could not get GPIO port for SSD1673 DC signal"); return -EIO; } - gpio_pin_configure(driver->dc, DT_SOLOMON_SSD1673FB_0_DC_GPIOS_PIN, + gpio_pin_configure(driver->dc, DT_INST_0_SOLOMON_SSD1673FB_DC_GPIOS_PIN, GPIO_DIR_OUT); - driver->busy = device_get_binding(DT_SOLOMON_SSD1673FB_0_BUSY_GPIOS_CONTROLLER); + driver->busy = device_get_binding(DT_INST_0_SOLOMON_SSD1673FB_BUSY_GPIOS_CONTROLLER); if (driver->busy == NULL) { LOG_ERR("Could not get GPIO port for SSD1673 busy signal"); return -EIO; } - gpio_pin_configure(driver->busy, DT_SOLOMON_SSD1673FB_0_BUSY_GPIOS_PIN, + gpio_pin_configure(driver->busy, DT_INST_0_SOLOMON_SSD1673FB_BUSY_GPIOS_PIN, GPIO_DIR_IN); -#if defined(DT_SOLOMON_SSD1673FB_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_SOLOMON_SSD1673FB_CS_GPIO_CONTROLLER) driver->cs_ctrl.gpio_dev = device_get_binding( - DT_SOLOMON_SSD1673FB_0_CS_GPIO_CONTROLLER); + DT_INST_0_SOLOMON_SSD1673FB_CS_GPIO_CONTROLLER); if (!driver->cs_ctrl.gpio_dev) { LOG_ERR("Unable to get SPI GPIO CS device"); return -EIO; } - driver->cs_ctrl.gpio_pin = DT_SOLOMON_SSD1673FB_0_CS_GPIO_PIN; + driver->cs_ctrl.gpio_pin = DT_INST_0_SOLOMON_SSD1673FB_CS_GPIO_PIN; driver->cs_ctrl.delay = 0U; driver->spi_config.cs = &driver->cs_ctrl; #endif @@ -652,7 +652,7 @@ static struct display_driver_api ssd1673_driver_api = { }; -DEVICE_AND_API_INIT(ssd1673, DT_SOLOMON_SSD1673FB_0_LABEL, ssd1673_init, +DEVICE_AND_API_INIT(ssd1673, DT_INST_0_SOLOMON_SSD1673FB_LABEL, ssd1673_init, &ssd1673_driver, NULL, POST_KERNEL, CONFIG_APPLICATION_INIT_PRIORITY, &ssd1673_driver_api); diff --git a/drivers/dma/dma_sam0.c b/drivers/dma/dma_sam0.c index fe51c4ce36e..bdab70664a9 100644 --- a/drivers/dma/dma_sam0.c +++ b/drivers/dma/dma_sam0.c @@ -11,7 +11,7 @@ #include LOG_MODULE_REGISTER(dma_sam0, CONFIG_DMA_LOG_LEVEL); -#define DMA_REGS ((Dmac *)DT_ATMEL_SAM0_DMAC_0_BASE_ADDRESS) +#define DMA_REGS ((Dmac *)DT_INST_0_ATMEL_SAM0_DMAC_BASE_ADDRESS) typedef void (*dma_callback)(void *callback_arg, u32_t channel, int error_code); @@ -397,10 +397,10 @@ DEVICE_DECLARE(dma_sam0_0); #define DMA_SAM0_IRQ_CONNECT(n) \ do { \ - IRQ_CONNECT(DT_ATMEL_SAM0_DMAC_0_IRQ_ ## n, \ - DT_ATMEL_SAM0_DMAC_0_IRQ_ ## n ## _PRIORITY, \ + IRQ_CONNECT(DT_INST_0_ATMEL_SAM0_DMAC_IRQ_ ## n, \ + DT_INST_0_ATMEL_SAM0_DMAC_IRQ_ ## n ## _PRIORITY, \ dma_sam0_isr, DEVICE_GET(dma_sam0_0), 0); \ - irq_enable(DT_ATMEL_SAM0_DMAC_0_IRQ_ ## n); \ + irq_enable(DT_INST_0_ATMEL_SAM0_DMAC_IRQ_ ## n); \ } while (0) static int dma_sam0_init(struct device *dev) @@ -427,7 +427,7 @@ static int dma_sam0_init(struct device *dev) /* Enable the unit and enable all priorities */ DMA_REGS->CTRL.reg = DMAC_CTRL_DMAENABLE | DMAC_CTRL_LVLEN(0x0F); -#ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_0 +#ifdef DT_INST_0_ATMEL_SAM0_DMAC_IRQ_0 DMA_SAM0_IRQ_CONNECT(0); #endif #ifdef DT_ATMEL_SAM0_DMAC_0_IRQ_1 diff --git a/drivers/entropy/entropy_cc13xx_cc26xx.c b/drivers/entropy/entropy_cc13xx_cc26xx.c index 50754de1d1d..1b4e4bbf00d 100644 --- a/drivers/entropy/entropy_cc13xx_cc26xx.c +++ b/drivers/entropy/entropy_cc13xx_cc26xx.c @@ -146,11 +146,11 @@ static int entropy_cc13xx_cc26xx_init(struct device *dev) TRNGEnable(); TRNGIntEnable(TRNG_NUMBER_READY | TRNG_FRO_SHUTDOWN); - IRQ_CONNECT(DT_TI_CC13XX_CC26XX_TRNG_0_IRQ_0, - DT_TI_CC13XX_CC26XX_TRNG_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_TI_CC13XX_CC26XX_TRNG_IRQ_0, + DT_INST_0_TI_CC13XX_CC26XX_TRNG_IRQ_0_PRIORITY, entropy_cc13xx_cc26xx_isr, DEVICE_GET(entropy_cc13xx_cc26xx), 0); - irq_enable(DT_TI_CC13XX_CC26XX_TRNG_0_IRQ_0); + irq_enable(DT_INST_0_TI_CC13XX_CC26XX_TRNG_IRQ_0); return 0; } @@ -164,7 +164,7 @@ static struct entropy_cc13xx_cc26xx_data entropy_cc13xx_cc26xx_data = { .sync = Z_SEM_INITIALIZER(entropy_cc13xx_cc26xx_data.sync, 0, 1), }; -DEVICE_AND_API_INIT(entropy_cc13xx_cc26xx, DT_TI_CC13XX_CC26XX_TRNG_0_LABEL, +DEVICE_AND_API_INIT(entropy_cc13xx_cc26xx, DT_INST_0_TI_CC13XX_CC26XX_TRNG_LABEL, entropy_cc13xx_cc26xx_init, &entropy_cc13xx_cc26xx_data, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &entropy_cc13xx_cc26xx_driver_api); diff --git a/drivers/ethernet/eth_smsc911x.c b/drivers/ethernet/eth_smsc911x.c index 1681099f41e..9172dfe717e 100644 --- a/drivers/ethernet/eth_smsc911x.c +++ b/drivers/ethernet/eth_smsc911x.c @@ -659,8 +659,8 @@ static struct device DEVICE_NAME_GET(eth_smsc911x_0); int eth_init(struct device *dev) { - IRQ_CONNECT(DT_SMSC_LAN9220_0_IRQ_0, - DT_SMSC_LAN9220_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_SMSC_LAN9220_IRQ_0, + DT_INST_0_SMSC_LAN9220_IRQ_0_PRIORITY, eth_smsc911x_isr, DEVICE_GET(eth_smsc911x_0), 0); int ret = smsc_init(); @@ -670,7 +670,7 @@ int eth_init(struct device *dev) return -ENODEV; } - irq_enable(DT_SMSC_LAN9220_0_IRQ_0); + irq_enable(DT_INST_0_SMSC_LAN9220_IRQ_0); return ret; } diff --git a/drivers/ethernet/eth_smsc911x_priv.h b/drivers/ethernet/eth_smsc911x_priv.h index eccf9b64596..755facdf7a3 100644 --- a/drivers/ethernet/eth_smsc911x_priv.h +++ b/drivers/ethernet/eth_smsc911x_priv.h @@ -176,7 +176,7 @@ __IO uint32_t E2P_DATA; #define SMSC9220_PHY_CS 31 #ifndef SMSC9220_BASE -#define SMSC9220_BASE DT_SMSC_LAN9220_0_BASE_ADDRESS +#define SMSC9220_BASE DT_INST_0_SMSC_LAN9220_BASE_ADDRESS #endif #define SMSC9220 ((volatile SMSC9220_TypeDef *)SMSC9220_BASE) diff --git a/drivers/flash/flash_gecko.c b/drivers/flash/flash_gecko.c index b86fb762ac5..9f365db3e72 100644 --- a/drivers/flash/flash_gecko.c +++ b/drivers/flash/flash_gecko.c @@ -162,8 +162,8 @@ static int erase_flash_block(off_t offset, size_t size) #if CONFIG_FLASH_PAGE_LAYOUT static const struct flash_pages_layout flash_gecko_0_pages_layout = { .pages_count = (CONFIG_FLASH_SIZE * 1024) / - DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, - .pages_size = DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, + DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, + .pages_size = DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, }; void flash_gecko_page_layout(struct device *dev, @@ -199,7 +199,7 @@ static const struct flash_driver_api flash_gecko_driver_api = { #ifdef CONFIG_FLASH_PAGE_LAYOUT .page_layout = flash_gecko_page_layout, #endif - .write_block_size = DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE, + .write_block_size = DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE, }; static struct flash_gecko_data flash_gecko_0_data; diff --git a/drivers/flash/flash_sam.c b/drivers/flash/flash_sam.c index e3c3a09b077..75826730789 100644 --- a/drivers/flash/flash_sam.c +++ b/drivers/flash/flash_sam.c @@ -166,10 +166,10 @@ static int flash_sam_write(struct device *dev, off_t offset, * Check that the offset and length are multiples of the write * block size. */ - if ((offset % DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE) != 0) { + if ((offset % DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE) != 0) { return -EINVAL; } - if ((len % DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE) != 0) { + if ((len % DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE) != 0) { return -EINVAL; } @@ -253,17 +253,17 @@ static int flash_sam_erase(struct device *dev, off_t offset, size_t len) * Check that the offset and length are multiples of the write * erase block size. */ - if ((offset % DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE) != 0) { + if ((offset % DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE) != 0) { return -EINVAL; } - if ((len % DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE) != 0) { + if ((len % DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE) != 0) { return -EINVAL; } flash_sam_sem_take(dev); /* Loop through the pages to erase */ - for (i = offset; i < offset + len; i += DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE) { + for (i = offset; i < offset + len; i += DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE) { rc = flash_sam_erase_block(dev, i); if (rc < 0) { goto done; @@ -311,8 +311,8 @@ done: * Here a page refers to the granularity at which the flash can be erased. */ static const struct flash_pages_layout flash_sam_pages_layout = { - .pages_count = (CONFIG_FLASH_SIZE * 1024) / DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, - .pages_size = DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, + .pages_count = (CONFIG_FLASH_SIZE * 1024) / DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, + .pages_size = DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, }; void flash_sam_page_layout(struct device *dev, @@ -341,7 +341,7 @@ static const struct flash_driver_api flash_sam_api = { #ifdef CONFIG_FLASH_PAGE_LAYOUT .page_layout = flash_sam_page_layout, #endif - .write_block_size = DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE, + .write_block_size = DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE, }; static const struct flash_sam_dev_cfg flash_sam_cfg = { diff --git a/drivers/flash/flash_sam0.c b/drivers/flash/flash_sam0.c index 9b14c17daa4..0bcd040d728 100644 --- a/drivers/flash/flash_sam0.c +++ b/drivers/flash/flash_sam0.c @@ -376,6 +376,6 @@ static const struct flash_driver_api flash_sam0_api = { static struct flash_sam0_data flash_sam0_data_0; -DEVICE_AND_API_INIT(flash_sam0, DT_ATMEL_SAM0_NVMCTRL_0_LABEL, +DEVICE_AND_API_INIT(flash_sam0, DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL, flash_sam0_init, &flash_sam0_data_0, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &flash_sam0_api); diff --git a/drivers/flash/flash_stm32.c b/drivers/flash/flash_stm32.c index dc22f561fe5..21ebb1ae2bb 100644 --- a/drivers/flash/flash_stm32.c +++ b/drivers/flash/flash_stm32.c @@ -274,8 +274,8 @@ static const struct flash_driver_api flash_stm32_api = { #ifdef CONFIG_FLASH_PAGE_LAYOUT .page_layout = flash_stm32_page_layout, #endif -#ifdef DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE - .write_block_size = DT_SOC_NV_FLASH_0_WRITE_BLOCK_SIZE, +#ifdef DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE + .write_block_size = DT_INST_0_SOC_NV_FLASH_WRITE_BLOCK_SIZE, #else #error Flash write block size not available /* Flash Write block size is extracted from device tree */ diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c index 228696a6248..f027b5afda9 100644 --- a/drivers/flash/soc_flash_mcux.c +++ b/drivers/flash/soc_flash_mcux.c @@ -113,8 +113,8 @@ static int flash_mcux_write_protection(struct device *dev, bool enable) #if defined(CONFIG_FLASH_PAGE_LAYOUT) static const struct flash_pages_layout dev_layout = { - .pages_count = KB(CONFIG_FLASH_SIZE) / DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, - .pages_size = DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, + .pages_count = KB(CONFIG_FLASH_SIZE) / DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, + .pages_size = DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, }; static void flash_mcux_pages_layout(struct device *dev, diff --git a/drivers/flash/soc_flash_rv32m1.c b/drivers/flash/soc_flash_rv32m1.c index b91fc7f84ab..89dcfaea0c5 100644 --- a/drivers/flash/soc_flash_rv32m1.c +++ b/drivers/flash/soc_flash_rv32m1.c @@ -116,8 +116,8 @@ static int flash_mcux_write_protection(struct device *dev, bool enable) #if defined(CONFIG_FLASH_PAGE_LAYOUT) static const struct flash_pages_layout dev_layout = { .pages_count = KB(CONFIG_FLASH_SIZE) / - DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, - .pages_size = DT_SOC_NV_FLASH_0_ERASE_BLOCK_SIZE, + DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, + .pages_size = DT_INST_0_SOC_NV_FLASH_ERASE_BLOCK_SIZE, }; static void flash_mcux_pages_layout( diff --git a/drivers/flash/spi_flash_w25qxxdv.c b/drivers/flash/spi_flash_w25qxxdv.c index 85a7d95319e..571b1dcee73 100644 --- a/drivers/flash/spi_flash_w25qxxdv.c +++ b/drivers/flash/spi_flash_w25qxxdv.c @@ -401,23 +401,23 @@ static int spi_flash_wb_configure(struct device *dev) { struct spi_flash_data *data = dev->driver_data; - data->spi = device_get_binding(DT_WINBOND_W25Q16_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_WINBOND_W25Q16_BUS_NAME); if (!data->spi) { return -EINVAL; } - data->spi_cfg.frequency = DT_WINBOND_W25Q16_0_SPI_MAX_FREQUENCY; + data->spi_cfg.frequency = DT_INST_0_WINBOND_W25Q16_SPI_MAX_FREQUENCY; data->spi_cfg.operation = SPI_WORD_SET(8); - data->spi_cfg.slave = DT_WINBOND_W25Q16_0_BASE_ADDRESS; + data->spi_cfg.slave = DT_INST_0_WINBOND_W25Q16_BASE_ADDRESS; #if defined(CONFIG_SPI_FLASH_W25QXXDV_GPIO_SPI_CS) data->cs_ctrl.gpio_dev = device_get_binding( - DT_WINBOND_W25Q16_0_CS_GPIO_CONTROLLER); + DT_INST_0_WINBOND_W25Q16_CS_GPIO_CONTROLLER); if (!data->cs_ctrl.gpio_dev) { return -ENODEV; } - data->cs_ctrl.gpio_pin = DT_WINBOND_W25Q16_0_CS_GPIO_PIN; + data->cs_ctrl.gpio_pin = DT_INST_0_WINBOND_W25Q16_CS_GPIO_PIN; data->cs_ctrl.delay = CONFIG_SPI_FLASH_W25QXXDV_GPIO_CS_WAIT_DELAY; data->spi_cfg.cs = &data->cs_ctrl; diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c index d5a96deef28..e8268e9d016 100644 --- a/drivers/flash/spi_nor.c +++ b/drivers/flash/spi_nor.c @@ -27,7 +27,7 @@ #define MASK_64K 0xFFFF #define SPI_NOR_MAX_ADDR_WIDTH 4 -#define SECTORS_COUNT ((DT_JEDEC_SPI_NOR_0_SIZE / 8) \ +#define SECTORS_COUNT ((DT_INST_0_JEDEC_SPI_NOR_SIZE / 8) \ / CONFIG_SPI_NOR_SECTOR_SIZE) #define JEDEC_ID(x) \ @@ -47,9 +47,9 @@ struct spi_nor_data { struct device *spi; struct spi_config spi_cfg; -#ifdef DT_JEDEC_SPI_NOR_0_CS_GPIO_CONTROLLER +#ifdef DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_CONTROLLER struct spi_cs_control cs_ctrl; -#endif /* DT_JEDEC_SPI_NOR_0_CS_GPIO_CONTROLLER */ +#endif /* DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_CONTROLLER */ struct k_sem sem; }; @@ -339,27 +339,27 @@ static int spi_nor_configure(struct device *dev) struct spi_nor_data *data = dev->driver_data; const struct spi_nor_config *params = dev->config->config_info; - data->spi = device_get_binding(DT_JEDEC_SPI_NOR_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_JEDEC_SPI_NOR_BUS_NAME); if (!data->spi) { return -EINVAL; } - data->spi_cfg.frequency = DT_JEDEC_SPI_NOR_0_SPI_MAX_FREQUENCY; + data->spi_cfg.frequency = DT_INST_0_JEDEC_SPI_NOR_SPI_MAX_FREQUENCY; data->spi_cfg.operation = SPI_WORD_SET(8); - data->spi_cfg.slave = DT_JEDEC_SPI_NOR_0_BASE_ADDRESS; + data->spi_cfg.slave = DT_INST_0_JEDEC_SPI_NOR_BASE_ADDRESS; -#ifdef DT_JEDEC_SPI_NOR_0_CS_GPIO_CONTROLLER +#ifdef DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_CONTROLLER data->cs_ctrl.gpio_dev = - device_get_binding(DT_JEDEC_SPI_NOR_0_CS_GPIO_CONTROLLER); + device_get_binding(DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_CONTROLLER); if (!data->cs_ctrl.gpio_dev) { return -ENODEV; } - data->cs_ctrl.gpio_pin = DT_JEDEC_SPI_NOR_0_CS_GPIO_PIN; + data->cs_ctrl.gpio_pin = DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_PIN; data->cs_ctrl.delay = CONFIG_SPI_NOR_CS_WAIT_DELAY; data->spi_cfg.cs = &data->cs_ctrl; -#endif /* DT_JEDEC_SPI_NOR_0_CS_GPIO_CONTROLLER */ +#endif /* DT_INST_0_JEDEC_SPI_NOR_CS_GPIO_CONTROLLER */ /* now the spi bus is configured, we can verify the flash id */ if (spi_nor_read_id(dev, params) != 0) { @@ -385,7 +385,7 @@ static int spi_nor_init(struct device *dev) #if defined(CONFIG_FLASH_PAGE_LAYOUT) static const struct flash_pages_layout dev_layout = { - .pages_count = DT_JEDEC_SPI_NOR_0_SIZE / 8 / DT_JEDEC_SPI_NOR_0_ERASE_BLOCK_SIZE, + .pages_count = DT_INST_0_JEDEC_SPI_NOR_SIZE / 8 / DT_JEDEC_SPI_NOR_0_ERASE_BLOCK_SIZE, .pages_size = DT_JEDEC_SPI_NOR_0_ERASE_BLOCK_SIZE, }; @@ -411,9 +411,9 @@ static const struct flash_driver_api spi_nor_api = { static const struct spi_nor_config flash_id = { .id = { - DT_JEDEC_SPI_NOR_0_JEDEC_ID_0, - DT_JEDEC_SPI_NOR_0_JEDEC_ID_1, - DT_JEDEC_SPI_NOR_0_JEDEC_ID_2, + DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_0, + DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_1, + DT_INST_0_JEDEC_SPI_NOR_JEDEC_ID_2, }, .page_size = CONFIG_SPI_NOR_PAGE_SIZE, .sector_size = CONFIG_SPI_NOR_SECTOR_SIZE, @@ -422,7 +422,7 @@ static const struct spi_nor_config flash_id = { static struct spi_nor_data spi_nor_memory_data; -DEVICE_AND_API_INIT(spi_flash_memory, DT_JEDEC_SPI_NOR_0_LABEL, +DEVICE_AND_API_INIT(spi_flash_memory, DT_INST_0_JEDEC_SPI_NOR_LABEL, &spi_nor_init, &spi_nor_memory_data, &flash_id, POST_KERNEL, CONFIG_SPI_NOR_INIT_PRIORITY, &spi_nor_api); diff --git a/drivers/gpio/gpio_cc13xx_cc26xx.c b/drivers/gpio/gpio_cc13xx_cc26xx.c index a5e62dd8a80..610bb240de9 100644 --- a/drivers/gpio/gpio_cc13xx_cc26xx.c +++ b/drivers/gpio/gpio_cc13xx_cc26xx.c @@ -224,10 +224,10 @@ static int gpio_cc13xx_cc26xx_init(struct device *dev) } /* Enable IRQ */ - IRQ_CONNECT(DT_TI_CC13XX_CC26XX_GPIO_0_IRQ_0, - DT_TI_CC13XX_CC26XX_GPIO_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_TI_CC13XX_CC26XX_GPIO_IRQ_0, + DT_INST_0_TI_CC13XX_CC26XX_GPIO_IRQ_0_PRIORITY, gpio_cc13xx_cc26xx_isr, DEVICE_GET(gpio_cc13xx_cc26xx), 0); - irq_enable(DT_TI_CC13XX_CC26XX_GPIO_0_IRQ_0); + irq_enable(DT_INST_0_TI_CC13XX_CC26XX_GPIO_IRQ_0); /* Disable callbacks */ data->pin_callback_enables = 0; @@ -251,7 +251,7 @@ static const struct gpio_driver_api gpio_cc13xx_cc26xx_driver_api = { .get_pending_int = gpio_cc13xx_cc26xx_get_pending_int }; -DEVICE_AND_API_INIT(gpio_cc13xx_cc26xx, DT_TI_CC13XX_CC26XX_GPIO_0_LABEL, +DEVICE_AND_API_INIT(gpio_cc13xx_cc26xx, DT_INST_0_TI_CC13XX_CC26XX_GPIO_LABEL, gpio_cc13xx_cc26xx_init, &gpio_cc13xx_cc26xx_data_0, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_cc13xx_cc26xx_driver_api); diff --git a/drivers/gpio/gpio_ht16k33.c b/drivers/gpio/gpio_ht16k33.c index 12eabc006d2..8dd48731282 100644 --- a/drivers/gpio/gpio_ht16k33.c +++ b/drivers/gpio/gpio_ht16k33.c @@ -148,15 +148,15 @@ static const struct gpio_driver_api gpio_ht16k33_api = { #define GPIO_HT16K33_DEVICE(id) \ static const struct gpio_ht16k33_cfg gpio_ht16k33_##id##_cfg = {\ .parent_dev_name = \ - DT_HOLTEK_HT16K33_KEYSCAN_##id##_BUS_NAME, \ + DT_INST_##id##_HOLTEK_HT16K33_KEYSCAN_BUS_NAME, \ .keyscan_idx = \ - DT_HOLTEK_HT16K33_KEYSCAN_##id##_BASE_ADDRESS, \ + DT_INST_##id##_HOLTEK_HT16K33_KEYSCAN_BASE_ADDRESS, \ }; \ \ static struct gpio_ht16k33_data gpio_ht16k33_##id##_data; \ \ DEVICE_AND_API_INIT(gpio_ht16k33_##id, \ - DT_HOLTEK_HT16K33_KEYSCAN_##id##_LABEL, \ + DT_INST_##id##_HOLTEK_HT16K33_KEYSCAN_LABEL, \ &gpio_ht16k33_init, \ &gpio_ht16k33_##id##_data, \ &gpio_ht16k33_##id##_cfg, POST_KERNEL, \ diff --git a/drivers/gpio/gpio_sifive.c b/drivers/gpio/gpio_sifive.c index dfe9b342dd5..b17fe05cf54 100644 --- a/drivers/gpio/gpio_sifive.c +++ b/drivers/gpio/gpio_sifive.c @@ -374,21 +374,21 @@ static int gpio_sifive_init(struct device *dev) static void gpio_sifive_cfg_0(void); static const struct gpio_sifive_config gpio_sifive_config0 = { - .gpio_base_addr = DT_SIFIVE_GPIO0_0_BASE_ADDRESS, - .gpio_irq_base = RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_GPIO0_0_IRQ_0, + .gpio_base_addr = DT_INST_0_SIFIVE_GPIO0_BASE_ADDRESS, + .gpio_irq_base = RISCV_MAX_GENERIC_IRQ + DT_INST_0_SIFIVE_GPIO0_IRQ_0, .gpio_cfg_func = gpio_sifive_cfg_0, }; static struct gpio_sifive_data gpio_sifive_data0; -DEVICE_AND_API_INIT(gpio_sifive_0, DT_SIFIVE_GPIO0_0_LABEL, +DEVICE_AND_API_INIT(gpio_sifive_0, DT_INST_0_SIFIVE_GPIO0_LABEL, gpio_sifive_init, &gpio_sifive_data0, &gpio_sifive_config0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &gpio_sifive_driver); #define IRQ_INIT(n) \ -IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_GPIO0_0_IRQ_##n, \ +IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_INST_0_SIFIVE_GPIO0_IRQ_##n, \ CONFIG_GPIO_SIFIVE_##n##_PRIORITY, \ gpio_sifive_irq_handler, \ DEVICE_GET(gpio_sifive_0), \ @@ -396,100 +396,100 @@ IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_GPIO0_0_IRQ_##n, \ static void gpio_sifive_cfg_0(void) { -#ifdef DT_SIFIVE_GPIO0_0_IRQ_0 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_0 IRQ_INIT(0); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_1 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_1 IRQ_INIT(1); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_2 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_2 IRQ_INIT(2); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_3 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_3 IRQ_INIT(3); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_4 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_4 IRQ_INIT(4); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_5 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_5 IRQ_INIT(5); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_6 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_6 IRQ_INIT(6); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_7 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_7 IRQ_INIT(7); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_8 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_8 IRQ_INIT(8); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_9 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_9 IRQ_INIT(9); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_10 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_10 IRQ_INIT(10); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_11 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_11 IRQ_INIT(11); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_12 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_12 IRQ_INIT(12); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_13 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_13 IRQ_INIT(13); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_14 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_14 IRQ_INIT(14); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_15 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_15 IRQ_INIT(15); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_16 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_16 IRQ_INIT(16); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_17 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_17 IRQ_INIT(17); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_18 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_18 IRQ_INIT(18); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_19 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_19 IRQ_INIT(19); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_20 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_20 IRQ_INIT(20); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_21 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_21 IRQ_INIT(21); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_22 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_22 IRQ_INIT(22); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_23 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_23 IRQ_INIT(23); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_24 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_24 IRQ_INIT(24); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_25 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_25 IRQ_INIT(25); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_26 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_26 IRQ_INIT(26); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_27 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_27 IRQ_INIT(27); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_28 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_28 IRQ_INIT(28); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_29 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_29 IRQ_INIT(29); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_30 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_30 IRQ_INIT(30); #endif -#ifdef DT_SIFIVE_GPIO0_0_IRQ_31 +#ifdef DT_INST_0_SIFIVE_GPIO0_IRQ_31 IRQ_INIT(31); #endif } diff --git a/drivers/gpio/gpio_sx1509b.c b/drivers/gpio/gpio_sx1509b.c index 4638a39365e..bafdc4aae7c 100644 --- a/drivers/gpio/gpio_sx1509b.c +++ b/drivers/gpio/gpio_sx1509b.c @@ -15,9 +15,9 @@ #include #ifdef CONFIG_HAS_DTS_I2C -#define CONFIG_GPIO_SX1509B_DEV_NAME DT_SEMTECH_SX1509B_0_LABEL -#define CONFIG_GPIO_SX1509B_I2C_ADDR DT_SEMTECH_SX1509B_0_BASE_ADDRESS -#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME DT_SEMTECH_SX1509B_0_BUS_NAME +#define CONFIG_GPIO_SX1509B_DEV_NAME DT_INST_0_SEMTECH_SX1509B_LABEL +#define CONFIG_GPIO_SX1509B_I2C_ADDR DT_INST_0_SEMTECH_SX1509B_BASE_ADDRESS +#define CONFIG_GPIO_SX1509B_I2C_MASTER_DEV_NAME DT_INST_0_SEMTECH_SX1509B_BUS_NAME #endif /** Cache of the output configuration and data of the pins */ diff --git a/drivers/hwinfo/hwinfo_sam0.c b/drivers/hwinfo/hwinfo_sam0.c index be87d9939a8..90308f1aea5 100644 --- a/drivers/hwinfo/hwinfo_sam0.c +++ b/drivers/hwinfo/hwinfo_sam0.c @@ -16,10 +16,10 @@ ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length) { struct sam0_uid dev_id; - dev_id.id[0] = *(const u32_t *) DT_ATMEL_SAM0_ID_0_BASE_ADDRESS_0; - dev_id.id[1] = *(const u32_t *) DT_ATMEL_SAM0_ID_0_BASE_ADDRESS_1; - dev_id.id[2] = *(const u32_t *) DT_ATMEL_SAM0_ID_0_BASE_ADDRESS_2; - dev_id.id[3] = *(const u32_t *) DT_ATMEL_SAM0_ID_0_BASE_ADDRESS_3; + dev_id.id[0] = *(const u32_t *) DT_INST_0_ATMEL_SAM0_ID_BASE_ADDRESS_0; + dev_id.id[1] = *(const u32_t *) DT_INST_0_ATMEL_SAM0_ID_BASE_ADDRESS_1; + dev_id.id[2] = *(const u32_t *) DT_INST_0_ATMEL_SAM0_ID_BASE_ADDRESS_2; + dev_id.id[3] = *(const u32_t *) DT_INST_0_ATMEL_SAM0_ID_BASE_ADDRESS_3; if (length > sizeof(dev_id.id)) { length = sizeof(dev_id.id); diff --git a/drivers/i2c/i2c_cc13xx_cc26xx.c b/drivers/i2c/i2c_cc13xx_cc26xx.c index 79762fa89a4..a39d8f839b9 100644 --- a/drivers/i2c/i2c_cc13xx_cc26xx.c +++ b/drivers/i2c/i2c_cc13xx_cc26xx.c @@ -293,16 +293,16 @@ static int i2c_cc13xx_cc26xx_init(struct device *dev) continue; } - IRQ_CONNECT(DT_TI_CC13XX_CC26XX_I2C_0_IRQ_0, - DT_TI_CC13XX_CC26XX_I2C_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_TI_CC13XX_CC26XX_I2C_IRQ_0, + DT_INST_0_TI_CC13XX_CC26XX_I2C_IRQ_0_PRIORITY, i2c_cc13xx_cc26xx_isr, DEVICE_GET(i2c_cc13xx_cc26xx), 0); - irq_enable(DT_TI_CC13XX_CC26XX_I2C_0_IRQ_0); + irq_enable(DT_INST_0_TI_CC13XX_CC26XX_I2C_IRQ_0); /* Configure IOC module to route SDA and SCL signals */ IOCPinTypeI2c(get_dev_config(dev)->base, get_dev_config(dev)->sda_pin, get_dev_config(dev)->scl_pin); - cfg = i2c_map_dt_bitrate(DT_TI_CC13XX_CC26XX_I2C_0_CLOCK_FREQUENCY); + cfg = i2c_map_dt_bitrate(DT_INST_0_TI_CC13XX_CC26XX_I2C_CLOCK_FREQUENCY); err = i2c_cc13xx_cc26xx_configure(dev, cfg | I2C_MODE_MASTER); if (err) { LOG_ERR("Failed to configure"); @@ -320,9 +320,9 @@ static const struct i2c_driver_api i2c_cc13xx_cc26xx_driver_api = { }; static const struct i2c_cc13xx_cc26xx_config i2c_cc13xx_cc26xx_config = { - .base = DT_TI_CC13XX_CC26XX_I2C_0_BASE_ADDRESS, - .sda_pin = DT_TI_CC13XX_CC26XX_I2C_0_SDA_PIN, - .scl_pin = DT_TI_CC13XX_CC26XX_I2C_0_SCL_PIN + .base = DT_INST_0_TI_CC13XX_CC26XX_I2C_BASE_ADDRESS, + .sda_pin = DT_INST_0_TI_CC13XX_CC26XX_I2C_SDA_PIN, + .scl_pin = DT_INST_0_TI_CC13XX_CC26XX_I2C_SCL_PIN }; static struct i2c_cc13xx_cc26xx_data i2c_cc13xx_cc26xx_data = { @@ -331,7 +331,7 @@ static struct i2c_cc13xx_cc26xx_data i2c_cc13xx_cc26xx_data = { .error = I2C_MASTER_ERR_NONE }; -DEVICE_AND_API_INIT(i2c_cc13xx_cc26xx, DT_TI_CC13XX_CC26XX_I2C_0_LABEL, +DEVICE_AND_API_INIT(i2c_cc13xx_cc26xx, DT_INST_0_TI_CC13XX_CC26XX_I2C_LABEL, i2c_cc13xx_cc26xx_init, &i2c_cc13xx_cc26xx_data, &i2c_cc13xx_cc26xx_config, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &i2c_cc13xx_cc26xx_driver_api); diff --git a/drivers/i2c/i2c_dw.h b/drivers/i2c/i2c_dw.h index 092d9412786..807f1a9466b 100644 --- a/drivers/i2c/i2c_dw.h +++ b/drivers/i2c/i2c_dw.h @@ -11,14 +11,14 @@ #include #include -#if DT_SNPS_DESIGNWARE_I2C_0_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_1_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_2_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_3_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_4_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_5_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_6_PCIE || \ - DT_SNPS_DESIGNWARE_I2C_7_PCIE +#if DT_INST_0_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_1_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_2_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_3_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_4_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_5_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_6_SNPS_DESIGNWARE_I2C_PCIE || \ + DT_INST_7_SNPS_DESIGNWARE_I2C_PCIE BUILD_ASSERT_MSG(IS_ENABLED(CONFIG_PCIE), "DW I2C in DT needs CONFIG_PCIE"); #define I2C_DW_PCIE_ENABLED #include diff --git a/drivers/i2c/i2c_dw_port_x.h b/drivers/i2c/i2c_dw_port_x.h index 8868218b697..4441d8750cf 100644 --- a/drivers/i2c/i2c_dw_port_x.h +++ b/drivers/i2c/i2c_dw_port_x.h @@ -10,34 +10,34 @@ static void i2c_config_@NUM@(struct device *port); static const struct i2c_dw_rom_config i2c_config_dw_@NUM@ = { .config_func = i2c_config_@NUM@, - .bitrate = DT_SNPS_DESIGNWARE_I2C_@NUM@_CLOCK_FREQUENCY, + .bitrate = DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_CLOCK_FREQUENCY, -#if DT_SNPS_DESIGNWARE_I2C_@NUM@_PCIE +#if DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_PCIE .pcie = true, - .pcie_bdf = DT_SNPS_DESIGNWARE_I2C_@NUM@_BASE_ADDRESS, - .pcie_id = DT_SNPS_DESIGNWARE_I2C_@NUM@_SIZE, + .pcie_bdf = DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_BASE_ADDRESS, + .pcie_id = DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_SIZE, #endif }; static struct i2c_dw_dev_config i2c_@NUM@_runtime = { - .base_address = DT_SNPS_DESIGNWARE_I2C_@NUM@_BASE_ADDRESS + .base_address = DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_BASE_ADDRESS }; -DEVICE_AND_API_INIT(i2c_@NUM@, DT_SNPS_DESIGNWARE_I2C_@NUM@_LABEL, +DEVICE_AND_API_INIT(i2c_@NUM@, DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_LABEL, &i2c_dw_initialize, &i2c_@NUM@_runtime, &i2c_config_dw_@NUM@, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &funcs); -#ifndef DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_SENSE -#define DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_SENSE 0 +#ifndef DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_SENSE +#define DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_SENSE 0 #endif static void i2c_config_@NUM@(struct device *port) { ARG_UNUSED(port); -#if DT_SNPS_DESIGNWARE_I2C_@NUM@_PCIE -#if DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0 == PCIE_IRQ_DETECT +#if DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_PCIE +#if DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0 == PCIE_IRQ_DETECT /* PCI(e) with auto IRQ detection */ @@ -46,39 +46,39 @@ static void i2c_config_@NUM@(struct device *port) unsigned int irq; - irq = pcie_wired_irq(DT_SNPS_DESIGNWARE_I2C_@NUM@_BASE_ADDRESS); + irq = pcie_wired_irq(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_BASE_ADDRESS); if (irq == PCIE_CONF_INTR_IRQ_NONE) { return; } irq_connect_dynamic(irq, - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_PRIORITY, + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_PRIORITY, i2c_dw_isr, DEVICE_GET(i2c_@NUM@), - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_SENSE); - pcie_irq_enable(DT_SNPS_DESIGNWARE_I2C_@NUM@_BASE_ADDRESS, irq); + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_SENSE); + pcie_irq_enable(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_BASE_ADDRESS, irq); #else /* PCI(e) with fixed or MSI IRQ */ - IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0, - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0, + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_PRIORITY, i2c_dw_isr, DEVICE_GET(i2c_@NUM@), - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_SENSE); - pcie_irq_enable(DT_SNPS_DESIGNWARE_I2C_@NUM@_BASE_ADDRESS, - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0); + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_SENSE); + pcie_irq_enable(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_BASE_ADDRESS, + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0); #endif #else /* not PCI(e) */ - IRQ_CONNECT(DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0, - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0, + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_PRIORITY, i2c_dw_isr, DEVICE_GET(i2c_@NUM@), - DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0_SENSE); - irq_enable(DT_SNPS_DESIGNWARE_I2C_@NUM@_IRQ_0); + DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0_SENSE); + irq_enable(DT_INST_@NUM@_SNPS_DESIGNWARE_I2C_IRQ_0); #endif } diff --git a/drivers/i2c/i2c_gecko.c b/drivers/i2c/i2c_gecko.c index be202f667a3..a06d4e0d958 100644 --- a/drivers/i2c/i2c_gecko.c +++ b/drivers/i2c/i2c_gecko.c @@ -185,33 +185,33 @@ static const struct i2c_driver_api i2c_gecko_driver_api = { #ifdef DT_SILABS_GECKO_I2C_0 -#define PIN_I2C_0_SDA {DT_SILABS_GECKO_I2C_0_LOCATION_SDA_1, \ - DT_SILABS_GECKO_I2C_0_LOCATION_SDA_2, gpioModeWiredAnd, 1} -#define PIN_I2C_0_SCL {DT_SILABS_GECKO_I2C_0_LOCATION_SCL_1, \ - DT_SILABS_GECKO_I2C_0_LOCATION_SCL_2, gpioModeWiredAnd, 1} +#define PIN_I2C_0_SDA {DT_INST_0_SILABS_GECKO_I2C_LOCATION_SDA_1, \ + DT_INST_0_SILABS_GECKO_I2C_LOCATION_SDA_2, gpioModeWiredAnd, 1} +#define PIN_I2C_0_SCL {DT_INST_0_SILABS_GECKO_I2C_LOCATION_SCL_1, \ + DT_INST_0_SILABS_GECKO_I2C_LOCATION_SCL_2, gpioModeWiredAnd, 1} static struct i2c_gecko_config i2c_gecko_config_0 = { - .base = (I2C_TypeDef *)DT_SILABS_GECKO_I2C_0_BASE_ADDRESS, + .base = (I2C_TypeDef *)DT_INST_0_SILABS_GECKO_I2C_BASE_ADDRESS, .clock = cmuClock_I2C0, .i2cInit = I2C_INIT_DEFAULT, .pin_sda = PIN_I2C_0_SDA, .pin_scl = PIN_I2C_0_SCL, #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION - .loc_sda = DT_SILABS_GECKO_I2C_0_LOCATION_SDA_0, - .loc_scl = DT_SILABS_GECKO_I2C_0_LOCATION_SCL_0, + .loc_sda = DT_INST_0_SILABS_GECKO_I2C_LOCATION_SDA_0, + .loc_scl = DT_INST_0_SILABS_GECKO_I2C_LOCATION_SCL_0, #else -#if DT_SILABS_GECKO_I2C_0_LOCATION_SDA_0 \ - != DT_SILABS_GECKO_I2C_0_LOCATION_SCL_0 +#if DT_INST_0_SILABS_GECKO_I2C_LOCATION_SDA_0 \ + != DT_INST_0_SILABS_GECKO_I2C_LOCATION_SCL_0 #error I2C_0 DTS location-* properties must have identical value #endif - .loc = DT_SILABS_GECKO_I2C_0_LOCATION_SCL_0, + .loc = DT_INST_0_SILABS_GECKO_I2C_LOCATION_SCL_0, #endif - .bitrate = DT_SILABS_GECKO_I2C_0_CLOCK_FREQUENCY, + .bitrate = DT_INST_0_SILABS_GECKO_I2C_CLOCK_FREQUENCY, }; static struct i2c_gecko_data i2c_gecko_data_0; -DEVICE_AND_API_INIT(i2c_gecko_0, DT_SILABS_GECKO_I2C_0_LABEL, +DEVICE_AND_API_INIT(i2c_gecko_0, DT_INST_0_SILABS_GECKO_I2C_LABEL, &i2c_gecko_init, &i2c_gecko_data_0, &i2c_gecko_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_gecko_driver_api); @@ -219,33 +219,33 @@ DEVICE_AND_API_INIT(i2c_gecko_0, DT_SILABS_GECKO_I2C_0_LABEL, #ifdef DT_SILABS_GECKO_I2C_1 -#define PIN_I2C_1_SDA {DT_SILABS_GECKO_I2C_1_LOCATION_SDA_1, \ - DT_SILABS_GECKO_I2C_1_LOCATION_SDA_2, gpioModeWiredAnd, 1} -#define PIN_I2C_1_SCL {DT_SILABS_GECKO_I2C_1_LOCATION_SCL_1, \ - DT_SILABS_GECKO_I2C_1_LOCATION_SCL_2, gpioModeWiredAnd, 1} +#define PIN_I2C_1_SDA {DT_INST_1_SILABS_GECKO_I2C_LOCATION_SDA_1, \ + DT_INST_1_SILABS_GECKO_I2C_LOCATION_SDA_2, gpioModeWiredAnd, 1} +#define PIN_I2C_1_SCL {DT_INST_1_SILABS_GECKO_I2C_LOCATION_SCL_1, \ + DT_INST_1_SILABS_GECKO_I2C_LOCATION_SCL_2, gpioModeWiredAnd, 1} static struct i2c_gecko_config i2c_gecko_config_1 = { - .base = (I2C_TypeDef *)DT_SILABS_GECKO_I2C_1_BASE_ADDRESS, + .base = (I2C_TypeDef *)DT_INST_1_SILABS_GECKO_I2C_BASE_ADDRESS, .clock = cmuClock_I2C1, .i2cInit = I2C_INIT_DEFAULT, .pin_sda = PIN_I2C_1_SDA, .pin_scl = PIN_I2C_1_SCL, #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION - .loc_sda = DT_SILABS_GECKO_I2C_1_LOCATION_SDA_0, - .loc_scl = DT_SILABS_GECKO_I2C_1_LOCATION_SCL_0, + .loc_sda = DT_INST_1_SILABS_GECKO_I2C_LOCATION_SDA_0, + .loc_scl = DT_INST_1_SILABS_GECKO_I2C_LOCATION_SCL_0, #else -#if DT_SILABS_GECKO_I2C_1_LOCATION_SDA_0 \ - != DT_SILABS_GECKO_I2C_1_LOCATION_SCL_0 +#if DT_INST_1_SILABS_GECKO_I2C_LOCATION_SDA_0 \ + != DT_INST_1_SILABS_GECKO_I2C_LOCATION_SCL_0 #error I2C_1 DTS location-* properties must have identical value #endif - .loc = DT_SILABS_GECKO_I2C_1_LOCATION_SCL_0, + .loc = DT_INST_1_SILABS_GECKO_I2C_LOCATION_SCL_0, #endif - .bitrate = DT_SILABS_GECKO_I2C_1_CLOCK_FREQUENCY, + .bitrate = DT_INST_1_SILABS_GECKO_I2C_CLOCK_FREQUENCY, }; static struct i2c_gecko_data i2c_gecko_data_1; -DEVICE_AND_API_INIT(i2c_gecko_1, DT_SILABS_GECKO_I2C_1_LABEL, +DEVICE_AND_API_INIT(i2c_gecko_1, DT_INST_1_SILABS_GECKO_I2C_LABEL, &i2c_gecko_init, &i2c_gecko_data_1, &i2c_gecko_config_1, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &i2c_gecko_driver_api); diff --git a/drivers/i2c/i2c_mchp_xec.c b/drivers/i2c/i2c_mchp_xec.c index 34f308b1072..e16e0fb4e5c 100644 --- a/drivers/i2c/i2c_mchp_xec.c +++ b/drivers/i2c/i2c_mchp_xec.c @@ -357,10 +357,10 @@ static const struct i2c_driver_api i2c_xec_driver_api = { #ifdef CONFIG_I2C_XEC_0 static struct i2c_xec_data i2c_xec_data_0; static const struct i2c_xec_config i2c_xec_config_0 = { - .base_addr = DT_MICROCHIP_XEC_I2C_0_BASE_ADDRESS, - .port_sel = DT_MICROCHIP_XEC_I2C_0_PORT_SEL, + .base_addr = DT_INST_0_MICROCHIP_XEC_I2C_BASE_ADDRESS, + .port_sel = DT_INST_0_MICROCHIP_XEC_I2C_PORT_SEL, }; -DEVICE_AND_API_INIT(i2c_xec_0, DT_MICROCHIP_XEC_I2C_0_LABEL, +DEVICE_AND_API_INIT(i2c_xec_0, DT_INST_0_MICROCHIP_XEC_I2C_LABEL, &i2c_xec_init, &i2c_xec_data_0, &i2c_xec_config_0, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &i2c_xec_driver_api); @@ -369,10 +369,10 @@ DEVICE_AND_API_INIT(i2c_xec_0, DT_MICROCHIP_XEC_I2C_0_LABEL, #ifdef CONFIG_I2C_XEC_1 static struct i2c_xec_data i2c_xec_data_1; static const struct i2c_xec_config i2c_xec_config_1 = { - .base_addr = DT_MICROCHIP_XEC_I2C_1_BASE_ADDRESS, - .port_sel = DT_MICROCHIP_XEC_I2C_1_PORT_SEL, + .base_addr = DT_INST_1_MICROCHIP_XEC_I2C_BASE_ADDRESS, + .port_sel = DT_INST_1_MICROCHIP_XEC_I2C_PORT_SEL, }; -DEVICE_AND_API_INIT(i2c_xec_1, DT_MICROCHIP_XEC_I2C_1_LABEL, +DEVICE_AND_API_INIT(i2c_xec_1, DT_INST_1_MICROCHIP_XEC_I2C_LABEL, &i2c_xec_init, &i2c_xec_data_1, &i2c_xec_config_1, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &i2c_xec_driver_api); @@ -381,10 +381,10 @@ DEVICE_AND_API_INIT(i2c_xec_1, DT_MICROCHIP_XEC_I2C_1_LABEL, #ifdef CONFIG_I2C_XEC_2 static struct i2c_xec_data i2c_xec_data_2; static const struct i2c_xec_config i2c_xec_config_2 = { - .base_addr = DT_MICROCHIP_XEC_I2C_2_BASE_ADDRESS, - .port_sel = DT_MICROCHIP_XEC_I2C_2_PORT_SEL, + .base_addr = DT_INST_2_MICROCHIP_XEC_I2C_BASE_ADDRESS, + .port_sel = DT_INST_2_MICROCHIP_XEC_I2C_PORT_SEL, }; -DEVICE_AND_API_INIT(i2c_xec_2, DT_MICROCHIP_XEC_I2C_2_LABEL, +DEVICE_AND_API_INIT(i2c_xec_2, DT_INST_2_MICROCHIP_XEC_I2C_LABEL, &i2c_xec_init, &i2c_xec_data_2, &i2c_xec_config_2, POST_KERNEL, CONFIG_I2C_INIT_PRIORITY, &i2c_xec_driver_api); diff --git a/drivers/i2c/i2c_sbcon.c b/drivers/i2c/i2c_sbcon.c index 5e9e79f3c1e..b4360543a5a 100644 --- a/drivers/i2c/i2c_sbcon.c +++ b/drivers/i2c/i2c_sbcon.c @@ -111,10 +111,10 @@ static int i2c_sbcon_init(struct device *dev) static struct i2c_sbcon_context i2c_sbcon_dev_data_##_num; \ \ static const struct i2c_sbcon_config i2c_sbcon_dev_cfg_##_num = { \ - .sbcon = (void *)DT_ARM_VERSATILE_I2C_##_num##_BASE_ADDRESS, \ + .sbcon = (void *)DT_INST_##_num##_ARM_VERSATILE_I2C_BASE_ADDRESS, \ }; \ \ -DEVICE_AND_API_INIT(i2c_sbcon_##_num, DT_ARM_VERSATILE_I2C_##_num##_LABEL, \ +DEVICE_AND_API_INIT(i2c_sbcon_##_num, DT_INST_##_num##_ARM_VERSATILE_I2C_LABEL, \ i2c_sbcon_init, \ &i2c_sbcon_dev_data_##_num, \ &i2c_sbcon_dev_cfg_##_num, \ diff --git a/drivers/i2c/i2c_sifive.c b/drivers/i2c/i2c_sifive.c index 95f74621ccc..b9bd8adb316 100644 --- a/drivers/i2c/i2c_sifive.c +++ b/drivers/i2c/i2c_sifive.c @@ -345,7 +345,7 @@ static struct i2c_driver_api i2c_sifive_api = { CONFIG_I2C_INIT_PRIORITY, \ &i2c_sifive_api) -#ifdef DT_SIFIVE_I2C0_0_LABEL +#ifdef DT_INST_0_SIFIVE_I2C0_LABEL I2C_SIFIVE_INIT(0); #endif diff --git a/drivers/i2c/slave/eeprom_slave.c b/drivers/i2c/slave/eeprom_slave.c index 8004288a879..b15122d411c 100644 --- a/drivers/i2c/slave/eeprom_slave.c +++ b/drivers/i2c/slave/eeprom_slave.c @@ -207,16 +207,16 @@ static int i2c_eeprom_slave_init(struct device *dev) static struct i2c_eeprom_slave_data i2c_eeprom_slave_0_dev_data; -static u8_t i2c_eeprom_slave_0_buffer[(DT_ATMEL_AT24_0_SIZE * 1024)]; +static u8_t i2c_eeprom_slave_0_buffer[(DT_INST_0_ATMEL_AT24_SIZE * 1024)]; static const struct i2c_eeprom_slave_config i2c_eeprom_slave_0_cfg = { - .controller_dev_name = DT_ATMEL_AT24_0_BUS_NAME, - .address = DT_ATMEL_AT24_0_BASE_ADDRESS, - .buffer_size = (DT_ATMEL_AT24_0_SIZE * 1024), + .controller_dev_name = DT_INST_0_ATMEL_AT24_BUS_NAME, + .address = DT_INST_0_ATMEL_AT24_BASE_ADDRESS, + .buffer_size = (DT_INST_0_ATMEL_AT24_SIZE * 1024), .buffer = i2c_eeprom_slave_0_buffer }; -DEVICE_AND_API_INIT(i2c_eeprom_slave_0, DT_ATMEL_AT24_0_LABEL, +DEVICE_AND_API_INIT(i2c_eeprom_slave_0, DT_INST_0_ATMEL_AT24_LABEL, &i2c_eeprom_slave_init, &i2c_eeprom_slave_0_dev_data, &i2c_eeprom_slave_0_cfg, POST_KERNEL, CONFIG_I2C_SLAVE_INIT_PRIORITY, @@ -228,16 +228,16 @@ DEVICE_AND_API_INIT(i2c_eeprom_slave_0, DT_ATMEL_AT24_0_LABEL, static struct i2c_eeprom_slave_data i2c_eeprom_slave_1_dev_data; -static u8_t i2c_eeprom_slave_1_buffer[(DT_ATMEL_AT24_1_SIZE * 1024)]; +static u8_t i2c_eeprom_slave_1_buffer[(DT_INST_1_ATMEL_AT24_SIZE * 1024)]; static const struct i2c_eeprom_slave_config i2c_eeprom_slave_1_cfg = { - .controller_dev_name = DT_ATMEL_AT24_1_BUS_NAME, - .address = DT_ATMEL_AT24_1_BASE_ADDRESS, - .buffer_size = (DT_ATMEL_AT24_1_SIZE * 1024), + .controller_dev_name = DT_INST_1_ATMEL_AT24_BUS_NAME, + .address = DT_INST_1_ATMEL_AT24_BASE_ADDRESS, + .buffer_size = (DT_INST_1_ATMEL_AT24_SIZE * 1024), .buffer = i2c_eeprom_slave_1_buffer }; -DEVICE_AND_API_INIT(i2c_eeprom_slave_1, DT_ATMEL_AT24_1_LABEL, +DEVICE_AND_API_INIT(i2c_eeprom_slave_1, DT_INST_1_ATMEL_AT24_LABEL, &i2c_eeprom_slave_init, &i2c_eeprom_slave_1_dev_data, &i2c_eeprom_slave_1_cfg, POST_KERNEL, CONFIG_I2C_SLAVE_INIT_PRIORITY, diff --git a/drivers/ieee802154/ieee802154_cc2520.c b/drivers/ieee802154/ieee802154_cc2520.c index 7391c4b07a0..f9a2dc5ace7 100644 --- a/drivers/ieee802154/ieee802154_cc2520.c +++ b/drivers/ieee802154/ieee802154_cc2520.c @@ -977,7 +977,7 @@ static inline int configure_spi(struct device *dev) { struct cc2520_context *cc2520 = dev->driver_data; - cc2520->spi = device_get_binding(DT_TI_CC2520_0_BUS_NAME); + cc2520->spi = device_get_binding(DT_INST_0_TI_CC2520_BUS_NAME); if (!cc2520->spi) { LOG_ERR("Unable to get SPI device"); return -ENODEV; @@ -985,25 +985,25 @@ static inline int configure_spi(struct device *dev) #if defined(CONFIG_IEEE802154_CC2520_GPIO_SPI_CS) cs_ctrl.gpio_dev = device_get_binding( - DT_TI_CC2520_0_CS_GPIO_CONTROLLER); + DT_INST_0_TI_CC2520_CS_GPIO_CONTROLLER); if (!cs_ctrl.gpio_dev) { LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } - cs_ctrl.gpio_pin = DT_TI_CC2520_0_CS_GPIO_PIN; + cs_ctrl.gpio_pin = DT_INST_0_TI_CC2520_CS_GPIO_PIN; cs_ctrl.delay = 0U; cc2520->spi_cfg.cs = &cs_ctrl; LOG_DBG("SPI GPIO CS configured on %s:%u", - DT_TI_CC2520_0_CS_GPIO_CONTROLLER, - DT_TI_CC2520_0_CS_GPIO_PIN); + DT_INST_0_TI_CC2520_CS_GPIO_CONTROLLER, + DT_INST_0_TI_CC2520_CS_GPIO_PIN); #endif /* CONFIG_IEEE802154_CC2520_GPIO_SPI_CS */ - cc2520->spi_cfg.frequency = DT_TI_CC2520_0_SPI_MAX_FREQUENCY; + cc2520->spi_cfg.frequency = DT_INST_0_TI_CC2520_SPI_MAX_FREQUENCY; cc2520->spi_cfg.operation = SPI_WORD_SET(8); - cc2520->spi_cfg.slave = DT_TI_CC2520_0_BASE_ADDRESS; + cc2520->spi_cfg.slave = DT_INST_0_TI_CC2520_BASE_ADDRESS; return 0; } diff --git a/drivers/ieee802154/ieee802154_mcr20a.c b/drivers/ieee802154/ieee802154_mcr20a.c index 42d40e64f61..f1d7039fb5a 100644 --- a/drivers/ieee802154/ieee802154_mcr20a.c +++ b/drivers/ieee802154/ieee802154_mcr20a.c @@ -797,7 +797,7 @@ static inline void set_reset(struct device *dev, u32_t value) struct mcr20a_context *mcr20a = dev->driver_data; gpio_pin_write(mcr20a->reset_gpio, - DT_NXP_MCR20A_0_RESET_GPIOS_PIN, value); + DT_INST_0_NXP_MCR20A_RESET_GPIOS_PIN, value); } static void enable_irqb_interrupt(struct mcr20a_context *mcr20a, @@ -805,10 +805,10 @@ static void enable_irqb_interrupt(struct mcr20a_context *mcr20a, { if (enable) { gpio_pin_enable_callback(mcr20a->irq_gpio, - DT_NXP_MCR20A_0_IRQB_GPIOS_PIN); + DT_INST_0_NXP_MCR20A_IRQB_GPIOS_PIN); } else { gpio_pin_disable_callback(mcr20a->irq_gpio, - DT_NXP_MCR20A_0_IRQB_GPIOS_PIN); + DT_INST_0_NXP_MCR20A_IRQB_GPIOS_PIN); } } @@ -816,7 +816,7 @@ static inline void setup_gpio_callbacks(struct mcr20a_context *mcr20a) { gpio_init_callback(&mcr20a->irqb_cb, irqb_int_handler, - BIT(DT_NXP_MCR20A_0_IRQB_GPIOS_PIN)); + BIT(DT_INST_0_NXP_MCR20A_IRQB_GPIOS_PIN)); gpio_add_callback(mcr20a->irq_gpio, &mcr20a->irqb_cb); } @@ -1281,7 +1281,7 @@ static int power_on_and_setup(struct device *dev) z_usleep(50); timeout--; gpio_pin_read(mcr20a->irq_gpio, - DT_NXP_MCR20A_0_IRQB_GPIOS_PIN, &status); + DT_INST_0_NXP_MCR20A_IRQB_GPIOS_PIN, &status); } while (status && timeout); if (status) { @@ -1335,15 +1335,15 @@ static inline int configure_gpios(struct device *dev) /* setup gpio for the modem interrupt */ mcr20a->irq_gpio = - device_get_binding(DT_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER); + device_get_binding(DT_INST_0_NXP_MCR20A_IRQB_GPIOS_CONTROLLER); if (mcr20a->irq_gpio == NULL) { LOG_ERR("Failed to get pointer to %s device", - DT_NXP_MCR20A_0_IRQB_GPIOS_CONTROLLER); + DT_INST_0_NXP_MCR20A_IRQB_GPIOS_CONTROLLER); return -EINVAL; } gpio_pin_configure(mcr20a->irq_gpio, - DT_NXP_MCR20A_0_IRQB_GPIOS_PIN, + DT_INST_0_NXP_MCR20A_IRQB_GPIOS_PIN, GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | GPIO_PUD_PULL_UP | GPIO_INT_ACTIVE_LOW); @@ -1352,15 +1352,15 @@ static inline int configure_gpios(struct device *dev) /* setup gpio for the modems reset */ mcr20a->reset_gpio = device_get_binding( - DT_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER); + DT_INST_0_NXP_MCR20A_RESET_GPIOS_CONTROLLER); if (mcr20a->reset_gpio == NULL) { LOG_ERR("Failed to get pointer to %s device", - DT_NXP_MCR20A_0_RESET_GPIOS_CONTROLLER); + DT_INST_0_NXP_MCR20A_RESET_GPIOS_CONTROLLER); return -EINVAL; } gpio_pin_configure(mcr20a->reset_gpio, - DT_NXP_MCR20A_0_RESET_GPIOS_PIN, + DT_INST_0_NXP_MCR20A_RESET_GPIOS_PIN, GPIO_DIR_OUT); set_reset(dev, 0); } @@ -1372,7 +1372,7 @@ static inline int configure_spi(struct device *dev) { struct mcr20a_context *mcr20a = dev->driver_data; - mcr20a->spi = device_get_binding(DT_NXP_MCR20A_0_BUS_NAME); + mcr20a->spi = device_get_binding(DT_INST_0_NXP_MCR20A_BUS_NAME); if (!mcr20a->spi) { LOG_ERR("Unable to get SPI device"); return -ENODEV; @@ -1396,13 +1396,13 @@ static inline int configure_spi(struct device *dev) DT_NXP_MCR20A_0_CS_GPIO_PIN); #endif /* DT_NXP_MCR20A_0_CS_GPIO_CONTROLLER */ - mcr20a->spi_cfg.frequency = DT_NXP_MCR20A_0_SPI_MAX_FREQUENCY; + mcr20a->spi_cfg.frequency = DT_INST_0_NXP_MCR20A_SPI_MAX_FREQUENCY; mcr20a->spi_cfg.operation = SPI_WORD_SET(8); - mcr20a->spi_cfg.slave = DT_NXP_MCR20A_0_BASE_ADDRESS; + mcr20a->spi_cfg.slave = DT_INST_0_NXP_MCR20A_BASE_ADDRESS; LOG_DBG("SPI configured %s, %d", - DT_NXP_MCR20A_0_BUS_NAME, - DT_NXP_MCR20A_0_BASE_ADDRESS); + DT_INST_0_NXP_MCR20A_BUS_NAME, + DT_INST_0_NXP_MCR20A_BASE_ADDRESS); return 0; } diff --git a/drivers/interrupt_controller/plic.c b/drivers/interrupt_controller/plic.c index d281efa030b..b21b284974c 100644 --- a/drivers/interrupt_controller/plic.c +++ b/drivers/interrupt_controller/plic.c @@ -42,7 +42,7 @@ void riscv_plic_irq_enable(u32_t irq) u32_t key; u32_t plic_irq = irq - RISCV_MAX_GENERIC_IRQ; volatile u32_t *en = - (volatile u32_t *)DT_RISCV_PLIC0_0_IRQ_EN_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_IRQ_EN_BASE_ADDRESS; key = irq_lock(); en += (plic_irq >> 5); @@ -68,7 +68,7 @@ void riscv_plic_irq_disable(u32_t irq) u32_t key; u32_t plic_irq = irq - RISCV_MAX_GENERIC_IRQ; volatile u32_t *en = - (volatile u32_t *)DT_RISCV_PLIC0_0_IRQ_EN_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_IRQ_EN_BASE_ADDRESS; key = irq_lock(); en += (plic_irq >> 5); @@ -88,7 +88,7 @@ void riscv_plic_irq_disable(u32_t irq) int riscv_plic_irq_is_enabled(u32_t irq) { volatile u32_t *en = - (volatile u32_t *)DT_RISCV_PLIC0_0_IRQ_EN_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_IRQ_EN_BASE_ADDRESS; u32_t plic_irq = irq - RISCV_MAX_GENERIC_IRQ; en += (plic_irq >> 5); @@ -109,14 +109,14 @@ int riscv_plic_irq_is_enabled(u32_t irq) void riscv_plic_set_priority(u32_t irq, u32_t priority) { volatile u32_t *prio = - (volatile u32_t *)DT_RISCV_PLIC0_0_PRIO_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_PRIO_BASE_ADDRESS; /* Can set priority only for PLIC-specific interrupt line */ if (irq <= RISCV_MAX_GENERIC_IRQ) return; - if (priority > DT_RISCV_PLIC0_0_RISCV_MAX_PRIORITY) - priority = DT_RISCV_PLIC0_0_RISCV_MAX_PRIORITY; + if (priority > DT_INST_0_RISCV_PLIC0_RISCV_MAX_PRIORITY) + priority = DT_INST_0_RISCV_PLIC0_RISCV_MAX_PRIORITY; prio += (irq - RISCV_MAX_GENERIC_IRQ); *prio = priority; @@ -140,7 +140,7 @@ int riscv_plic_get_irq(void) static void plic_irq_handler(void *arg) { volatile struct plic_regs_t *regs = - (volatile struct plic_regs_t *) DT_RISCV_PLIC0_0_REG_BASE_ADDRESS; + (volatile struct plic_regs_t *) DT_INST_0_RISCV_PLIC0_REG_BASE_ADDRESS; u32_t irq; struct _isr_table_entry *ite; @@ -186,11 +186,11 @@ static int plic_init(struct device *dev) ARG_UNUSED(dev); volatile u32_t *en = - (volatile u32_t *)DT_RISCV_PLIC0_0_IRQ_EN_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_IRQ_EN_BASE_ADDRESS; volatile u32_t *prio = - (volatile u32_t *)DT_RISCV_PLIC0_0_PRIO_BASE_ADDRESS; + (volatile u32_t *)DT_INST_0_RISCV_PLIC0_PRIO_BASE_ADDRESS; volatile struct plic_regs_t *regs = - (volatile struct plic_regs_t *)DT_RISCV_PLIC0_0_REG_BASE_ADDRESS; + (volatile struct plic_regs_t *)DT_INST_0_RISCV_PLIC0_REG_BASE_ADDRESS; int i; /* Ensure that all interrupts are disabled initially */ diff --git a/drivers/interrupt_controller/sam0_eic.c b/drivers/interrupt_controller/sam0_eic.c index a70cd500f54..7299ea573f7 100644 --- a/drivers/interrupt_controller/sam0_eic.c +++ b/drivers/interrupt_controller/sam0_eic.c @@ -316,10 +316,10 @@ u32_t sam0_eic_interrupt_pending(int port) #define SAM0_EIC_IRQ_CONNECT(n) \ do { \ - IRQ_CONNECT(DT_ATMEL_SAM0_EIC_0_IRQ_ ## n, \ - DT_ATMEL_SAM0_EIC_0_IRQ_ ## n ## _PRIORITY, \ + IRQ_CONNECT(DT_INST_0_ATMEL_SAM0_EIC_IRQ_ ## n, \ + DT_INST_0_ATMEL_SAM0_EIC_IRQ_ ## n ## _PRIORITY, \ sam0_eic_isr, DEVICE_GET(sam0_eic), 0); \ - irq_enable(DT_ATMEL_SAM0_EIC_0_IRQ_ ## n); \ + irq_enable(DT_INST_0_ATMEL_SAM0_EIC_IRQ_ ## n); \ } while (0) static int sam0_eic_init(struct device *dev) @@ -333,7 +333,7 @@ static int sam0_eic_init(struct device *dev) GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID_EIC | GCLK_CLKCTRL_GEN_GCLK0 | GCLK_CLKCTRL_CLKEN; -#ifdef DT_ATMEL_SAM0_EIC_0_IRQ_0 +#ifdef DT_INST_0_ATMEL_SAM0_EIC_IRQ_0 SAM0_EIC_IRQ_CONNECT(0); #endif #ifdef DT_ATMEL_SAM0_EIC_0_IRQ_1 @@ -389,6 +389,6 @@ static int sam0_eic_init(struct device *dev) } static struct sam0_eic_data eic_data; -DEVICE_INIT(sam0_eic, DT_ATMEL_SAM0_EIC_0_LABEL, sam0_eic_init, +DEVICE_INIT(sam0_eic, DT_INST_0_ATMEL_SAM0_EIC_LABEL, sam0_eic_init, &eic_data, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT); diff --git a/drivers/interrupt_controller/vexriscv_litex.c b/drivers/interrupt_controller/vexriscv_litex.c index a94cf13d885..648251ce0ac 100644 --- a/drivers/interrupt_controller/vexriscv_litex.c +++ b/drivers/interrupt_controller/vexriscv_litex.c @@ -12,8 +12,8 @@ #include #include -#define IRQ_MASK DT_VEXRISCV_INTC0_0_IRQ_MASK_BASE_ADDRESS -#define IRQ_PENDING DT_VEXRISCV_INTC0_0_IRQ_PENDING_BASE_ADDRESS +#define IRQ_MASK DT_INST_0_VEXRISCV_INTC0_IRQ_MASK_BASE_ADDRESS +#define IRQ_PENDING DT_INST_0_VEXRISCV_INTC0_IRQ_PENDING_BASE_ADDRESS #define TIMER0_IRQ DT_LITEX_TIMER0_E0002800_IRQ_0 #define UART0_IRQ DT_LITEX_UART0_E0001800_IRQ_0 diff --git a/drivers/ipm/ipm_mhu.c b/drivers/ipm/ipm_mhu.c index eb0912062c4..7edc4d110e5 100644 --- a/drivers/ipm/ipm_mhu.c +++ b/drivers/ipm/ipm_mhu.c @@ -175,7 +175,7 @@ static const struct ipm_driver_api ipm_mhu_driver_api = { static void ipm_mhu_irq_config_func_0(struct device *d); static const struct ipm_mhu_device_config ipm_mhu_cfg_0 = { - .base = (u8_t *)DT_ARM_MHU_0_BASE_ADDRESS, + .base = (u8_t *)DT_INST_0_ARM_MHU_BASE_ADDRESS, .irq_config_func = ipm_mhu_irq_config_func_0, }; @@ -185,7 +185,7 @@ static struct ipm_mhu_data ipm_mhu_data_0 = { }; DEVICE_AND_API_INIT(mhu_0, - DT_ARM_MHU_0_LABEL, + DT_INST_0_ARM_MHU_LABEL, &ipm_mhu_init, &ipm_mhu_data_0, &ipm_mhu_cfg_0, PRE_KERNEL_1, @@ -195,18 +195,18 @@ DEVICE_AND_API_INIT(mhu_0, static void ipm_mhu_irq_config_func_0(struct device *d) { ARG_UNUSED(d); - IRQ_CONNECT(DT_ARM_MHU_0_IRQ_0, - DT_ARM_MHU_0_IRQ_0, + IRQ_CONNECT(DT_INST_0_ARM_MHU_IRQ_0, + DT_INST_0_ARM_MHU_IRQ_0, ipm_mhu_isr, DEVICE_GET(mhu_0), 0); - irq_enable(DT_ARM_MHU_0_IRQ_0); + irq_enable(DT_INST_0_ARM_MHU_IRQ_0); } static void ipm_mhu_irq_config_func_1(struct device *d); static const struct ipm_mhu_device_config ipm_mhu_cfg_1 = { - .base = (u8_t *)DT_ARM_MHU_1_BASE_ADDRESS, + .base = (u8_t *)DT_INST_1_ARM_MHU_BASE_ADDRESS, .irq_config_func = ipm_mhu_irq_config_func_1, }; @@ -216,7 +216,7 @@ static struct ipm_mhu_data ipm_mhu_data_1 = { }; DEVICE_AND_API_INIT(mhu_1, - DT_ARM_MHU_1_LABEL, + DT_INST_1_ARM_MHU_LABEL, &ipm_mhu_init, &ipm_mhu_data_1, &ipm_mhu_cfg_1, PRE_KERNEL_1, @@ -226,10 +226,10 @@ DEVICE_AND_API_INIT(mhu_1, static void ipm_mhu_irq_config_func_1(struct device *d) { ARG_UNUSED(d); - IRQ_CONNECT(DT_ARM_MHU_1_IRQ_0, - DT_ARM_MHU_1_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_1_ARM_MHU_IRQ_0, + DT_INST_1_ARM_MHU_IRQ_0_PRIORITY, ipm_mhu_isr, DEVICE_GET(mhu_1), 0); - irq_enable(DT_ARM_MHU_1_IRQ_0); + irq_enable(DT_INST_1_ARM_MHU_IRQ_0); } diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c index 8d763d81e40..8dcc54fc113 100644 --- a/drivers/led/ht16k33.c +++ b/drivers/led/ht16k33.c @@ -465,14 +465,14 @@ static const struct led_driver_api ht16k33_leds_api = { #define HT16K33_DEVICE(id) \ static const struct ht16k33_cfg ht16k33_##id##_cfg = { \ - .i2c_dev_name = DT_HOLTEK_HT16K33_##id##_BUS_NAME, \ - .i2c_addr = DT_HOLTEK_HT16K33_##id##_BASE_ADDRESS, \ + .i2c_dev_name = DT_INST_##id##_HOLTEK_HT16K33_BUS_NAME, \ + .i2c_addr = DT_INST_##id##_HOLTEK_HT16K33_BASE_ADDRESS, \ .irq_enabled = false, \ }; \ \ static struct ht16k33_data ht16k33_##id##_data; \ \ -DEVICE_AND_API_INIT(ht16k33_##id, DT_HOLTEK_HT16K33_##id##_LABEL, \ +DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL, \ &ht16k33_init, &ht16k33_##id##_data, \ &ht16k33_##id##_cfg, POST_KERNEL, \ CONFIG_LED_INIT_PRIORITY, &ht16k33_leds_api) @@ -480,19 +480,19 @@ DEVICE_AND_API_INIT(ht16k33_##id, DT_HOLTEK_HT16K33_##id##_LABEL, \ #ifdef CONFIG_HT16K33_KEYSCAN #define HT16K33_DEVICE_WITH_IRQ(id) \ static const struct ht16k33_cfg ht16k33_##id##_cfg = { \ - .i2c_dev_name = DT_HOLTEK_HT16K33_##id##_BUS_NAME, \ - .i2c_addr = DT_HOLTEK_HT16K33_##id##_BASE_ADDRESS, \ + .i2c_dev_name = DT_INST_##id##_HOLTEK_HT16K33_BUS_NAME, \ + .i2c_addr = DT_INST_##id##_HOLTEK_HT16K33_BASE_ADDRESS, \ .irq_enabled = true, \ .irq_dev_name = \ - DT_HOLTEK_HT16K33_##id##_IRQ_GPIOS_CONTROLLER, \ - .irq_pin = DT_HOLTEK_HT16K33_##id##_IRQ_GPIOS_PIN, \ + DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER, \ + .irq_pin = DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_PIN, \ .irq_flags = \ - DT_HOLTEK_HT16K33_##id##_IRQ_GPIOS_FLAGS, \ + DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_FLAGS, \ }; \ \ static struct ht16k33_data ht16k33_##id##_data; \ \ -DEVICE_AND_API_INIT(ht16k33_##id, DT_HOLTEK_HT16K33_##id##_LABEL, \ +DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL, \ &ht16k33_init, &ht16k33_##id##_data, \ &ht16k33_##id##_cfg, POST_KERNEL, \ CONFIG_LED_INIT_PRIORITY, &ht16k33_leds_api) @@ -503,7 +503,7 @@ DEVICE_AND_API_INIT(ht16k33_##id, DT_HOLTEK_HT16K33_##id##_LABEL, \ /* Support up to eight HT16K33 devices */ #ifdef DT_HOLTEK_HT16K33_0 -#ifdef DT_HOLTEK_HT16K33_0_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_0_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(0); #else HT16K33_DEVICE(0); @@ -511,7 +511,7 @@ HT16K33_DEVICE(0); #endif #ifdef DT_HOLTEK_HT16K33_1 -#ifdef DT_HOLTEK_HT16K33_1_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_1_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(1); #else HT16K33_DEVICE(1); @@ -519,7 +519,7 @@ HT16K33_DEVICE(1); #endif #ifdef DT_HOLTEK_HT16K33_2 -#ifdef DT_HOLTEK_HT16K33_2_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_2_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(2); #else HT16K33_DEVICE(2); @@ -527,7 +527,7 @@ HT16K33_DEVICE(2); #endif #ifdef DT_HOLTEK_HT16K33_3 -#ifdef DT_HOLTEK_HT16K33_3_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_3_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(3); #else HT16K33_DEVICE(3); @@ -535,7 +535,7 @@ HT16K33_DEVICE(3); #endif #ifdef DT_HOLTEK_HT16K33_4 -#ifdef DT_HOLTEK_HT16K33_4_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_4_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(4); #else HT16K33_DEVICE(4); @@ -543,7 +543,7 @@ HT16K33_DEVICE(4); #endif #ifdef DT_HOLTEK_HT16K33_5 -#ifdef DT_HOLTEK_HT16K33_5_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_5_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(5); #else HT16K33_DEVICE(5); @@ -551,7 +551,7 @@ HT16K33_DEVICE(5); #endif #ifdef DT_HOLTEK_HT16K33_6 -#ifdef DT_HOLTEK_HT16K33_6_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_6_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(6); #else HT16K33_DEVICE(6); @@ -559,7 +559,7 @@ HT16K33_DEVICE(6); #endif #ifdef DT_HOLTEK_HT16K33_7 -#ifdef DT_HOLTEK_HT16K33_7_IRQ_GPIOS_CONTROLLER +#ifdef DT_INST_7_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER HT16K33_DEVICE_WITH_IRQ(7); #else HT16K33_DEVICE(7); diff --git a/drivers/led/lp3943.c b/drivers/led/lp3943.c index e503217cf40..d1c2d0210bd 100644 --- a/drivers/led/lp3943.c +++ b/drivers/led/lp3943.c @@ -27,9 +27,9 @@ LOG_MODULE_REGISTER(lp3943); #ifdef CONFIG_HAS_DTS_I2C -#define CONFIG_LP3943_DEV_NAME DT_TI_LP3943_0_LABEL -#define CONFIG_LP3943_I2C_ADDRESS DT_TI_LP3943_0_BASE_ADDRESS -#define CONFIG_LP3943_I2C_MASTER_DEV_NAME DT_TI_LP3943_0_BUS_NAME +#define CONFIG_LP3943_DEV_NAME DT_INST_0_TI_LP3943_LABEL +#define CONFIG_LP3943_I2C_ADDRESS DT_INST_0_TI_LP3943_BASE_ADDRESS +#define CONFIG_LP3943_I2C_MASTER_DEV_NAME DT_INST_0_TI_LP3943_BUS_NAME #endif #include "led_context.h" diff --git a/drivers/led/lp5562.c b/drivers/led/lp5562.c index 9cb213875b2..d3c9341049d 100644 --- a/drivers/led/lp5562.c +++ b/drivers/led/lp5562.c @@ -38,9 +38,9 @@ LOG_MODULE_REGISTER(lp5562); #ifdef CONFIG_HAS_DTS_I2C -#define CONFIG_LP5562_DEV_NAME DT_TI_LP5562_0_LABEL -#define CONFIG_LP5562_I2C_ADDRESS DT_TI_LP5562_0_BASE_ADDRESS -#define CONFIG_LP5562_I2C_MASTER_DEV_NAME DT_TI_LP5562_0_BUS_NAME +#define CONFIG_LP5562_DEV_NAME DT_INST_0_TI_LP5562_LABEL +#define CONFIG_LP5562_I2C_ADDRESS DT_INST_0_TI_LP5562_BASE_ADDRESS +#define CONFIG_LP5562_I2C_MASTER_DEV_NAME DT_INST_0_TI_LP5562_BUS_NAME #endif #include "led_context.h" diff --git a/drivers/led/pca9633.c b/drivers/led/pca9633.c index d0f6cdd3a90..fb3d302fa33 100644 --- a/drivers/led/pca9633.c +++ b/drivers/led/pca9633.c @@ -19,9 +19,9 @@ LOG_MODULE_REGISTER(pca9633); #ifdef CONFIG_HAS_DTS_I2C -#define CONFIG_PCA9633_DEV_NAME DT_NXP_PCA9633_0_LABEL -#define CONFIG_PCA9633_I2C_ADDRESS DT_NXP_PCA9633_0_BASE_ADDRESS -#define CONFIG_PCA9633_I2C_MASTER_DEV_NAME DT_NXP_PCA9633_0_BUS_NAME +#define CONFIG_PCA9633_DEV_NAME DT_INST_0_NXP_PCA9633_LABEL +#define CONFIG_PCA9633_I2C_ADDRESS DT_INST_0_NXP_PCA9633_BASE_ADDRESS +#define CONFIG_PCA9633_I2C_MASTER_DEV_NAME DT_INST_0_NXP_PCA9633_BUS_NAME #endif #include "led_context.h" diff --git a/drivers/led_strip/apa102.c b/drivers/led_strip/apa102.c index c28dcbf520c..32116df31f3 100644 --- a/drivers/led_strip/apa102.c +++ b/drivers/led_strip/apa102.c @@ -81,13 +81,13 @@ static int apa102_init(struct device *dev) { struct apa102_data *data = dev->driver_data; - data->spi = device_get_binding(DT_APA_APA102_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_APA_APA102_BUS_NAME); if (!data->spi) { return -ENODEV; } - data->cfg.slave = DT_APA_APA102_0_BASE_ADDRESS; - data->cfg.frequency = DT_APA_APA102_0_SPI_MAX_FREQUENCY; + data->cfg.slave = DT_INST_0_APA_APA102_BASE_ADDRESS; + data->cfg.frequency = DT_INST_0_APA_APA102_SPI_MAX_FREQUENCY; data->cfg.operation = SPI_OP_MODE_MASTER | SPI_TRANSFER_MSB | SPI_WORD_SET(8); @@ -101,6 +101,6 @@ static const struct led_strip_driver_api apa102_api = { .update_channels = apa102_update_channels, }; -DEVICE_AND_API_INIT(apa102_0, DT_APA_APA102_0_LABEL, apa102_init, +DEVICE_AND_API_INIT(apa102_0, DT_INST_0_APA_APA102_LABEL, apa102_init, &apa102_data_0, NULL, POST_KERNEL, CONFIG_LED_STRIP_INIT_PRIORITY, &apa102_api); diff --git a/drivers/led_strip/lpd880x.c b/drivers/led_strip/lpd880x.c index 6a83f35a062..9e8acc6d74b 100644 --- a/drivers/led_strip/lpd880x.c +++ b/drivers/led_strip/lpd880x.c @@ -10,17 +10,17 @@ #include #ifdef DT_COLORWAY_LPD8806_0 -#define DT_COLORWAY_LPD880X_0 DT_COLORWAY_LPD8806_0 -#define DT_COLORWAY_LPD880X_0_BASE_ADDRESS DT_COLORWAY_LPD8806_0_BASE_ADDRESS -#define DT_COLORWAY_LPD880X_0_BUS_NAME DT_COLORWAY_LPD8806_0_BUS_NAME -#define DT_COLORWAY_LPD880X_0_LABEL DT_COLORWAY_LPD8806_0_LABEL -#define DT_COLORWAY_LPD880X_0_SPI_MAX_FREQUENCY DT_COLORWAY_LPD8806_0_SPI_MAX_FREQUENCY +#define DT_INST_0_COLORWAY_LPD880X DT_INST_0_COLORWAY_LPD8806 +#define DT_INST_0_COLORWAY_LPD880X_BASE_ADDRESS DT_INST_0_COLORWAY_LPD8806_BASE_ADDRESS +#define DT_INST_0_COLORWAY_LPD880X_BUS_NAME DT_INST_0_COLORWAY_LPD8806_BUS_NAME +#define DT_INST_0_COLORWAY_LPD880X_LABEL DT_INST_0_COLORWAY_LPD8806_LABEL +#define DT_INST_0_COLORWAY_LPD880X_SPI_MAX_FREQUENCY DT_INST_0_COLORWAY_LPD8806_SPI_MAX_FREQUENCY #else -#define DT_COLORWAY_LPD880X_0 DT_COLORWAY_LPD8803_0 -#define DT_COLORWAY_LPD880X_0_BASE_ADDRESS DT_COLORWAY_LPD8803_0_BASE_ADDRESS -#define DT_COLORWAY_LPD880X_0_BUS_NAME DT_COLORWAY_LPD8803_0_BUS_NAME -#define DT_COLORWAY_LPD880X_0_LABEL DT_COLORWAY_LPD8803_0_LABEL -#define DT_COLORWAY_LPD880X_0_SPI_MAX_FREQUENCY DT_COLORWAY_LPD8803_0_SPI_MAX_FREQUENCY +#define DT_INST_0_COLORWAY_LPD880X DT_INST_0_COLORWAY_LPD8803 +#define DT_INST_0_COLORWAY_LPD880X_BASE_ADDRESS DT_INST_0_COLORWAY_LPD8803_BASE_ADDRESS +#define DT_INST_0_COLORWAY_LPD880X_BUS_NAME DT_INST_0_COLORWAY_LPD8803_BUS_NAME +#define DT_INST_0_COLORWAY_LPD880X_LABEL DT_INST_0_COLORWAY_LPD8803_LABEL +#define DT_INST_0_COLORWAY_LPD880X_SPI_MAX_FREQUENCY DT_INST_0_COLORWAY_LPD8803_SPI_MAX_FREQUENCY #endif #define LOG_LEVEL CONFIG_LED_STRIP_LOG_LEVEL @@ -139,16 +139,16 @@ static int lpd880x_strip_init(struct device *dev) struct lpd880x_data *data = dev->driver_data; struct spi_config *config = &data->config; - data->spi = device_get_binding(DT_COLORWAY_LPD880X_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_COLORWAY_LPD880X_BUS_NAME); if (!data->spi) { LOG_ERR("SPI device %s not found", - DT_COLORWAY_LPD880X_0_BUS_NAME); + DT_INST_0_COLORWAY_LPD880X_BUS_NAME); return -ENODEV; } - config->frequency = DT_COLORWAY_LPD880X_0_SPI_MAX_FREQUENCY; + config->frequency = DT_INST_0_COLORWAY_LPD880X_SPI_MAX_FREQUENCY; config->operation = LPD880X_SPI_OPERATION; - config->slave = DT_COLORWAY_LPD880X_0_BASE_ADDRESS; /* MOSI/CLK only; CS is not supported. */ + config->slave = DT_INST_0_COLORWAY_LPD880X_BASE_ADDRESS; /* MOSI/CLK only; CS is not supported. */ config->cs = NULL; return 0; @@ -161,7 +161,7 @@ static const struct led_strip_driver_api lpd880x_strip_api = { .update_channels = lpd880x_strip_update_channels, }; -DEVICE_AND_API_INIT(lpd880x_strip, DT_COLORWAY_LPD880X_0_LABEL, +DEVICE_AND_API_INIT(lpd880x_strip, DT_INST_0_COLORWAY_LPD880X_LABEL, lpd880x_strip_init, &lpd880x_strip_data, NULL, POST_KERNEL, CONFIG_LED_STRIP_INIT_PRIORITY, &lpd880x_strip_api); diff --git a/drivers/led_strip/ws2812.c b/drivers/led_strip/ws2812.c index 37f9455bfe7..1928d38517f 100644 --- a/drivers/led_strip/ws2812.c +++ b/drivers/led_strip/ws2812.c @@ -29,7 +29,7 @@ LOG_MODULE_REGISTER(ws2812); SPI_WORD_SET(8) | \ SPI_LINES_SINGLE) -#define SPI_FREQ DT_WORLDSEMI_WS2812_0_SPI_MAX_FREQUENCY +#define SPI_FREQ DT_INST_0_WORLDSEMI_WS2812_SPI_MAX_FREQUENCY #define ONE_FRAME CONFIG_WS2812_STRIP_ONE_FRAME #define ZERO_FRAME CONFIG_WS2812_STRIP_ZERO_FRAME #define RED_OFFSET (8 * sizeof(u8_t) * CONFIG_WS2812_RED_ORDER) @@ -181,16 +181,16 @@ static int ws2812_strip_init(struct device *dev) struct ws2812_data *data = dev->driver_data; struct spi_config *config = &data->config; - data->spi = device_get_binding(DT_WORLDSEMI_WS2812_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_WORLDSEMI_WS2812_BUS_NAME); if (!data->spi) { LOG_ERR("SPI device %s not found", - DT_WORLDSEMI_WS2812_0_BUS_NAME); + DT_INST_0_WORLDSEMI_WS2812_BUS_NAME); return -ENODEV; } config->frequency = SPI_FREQ; config->operation = SPI_OPER; - config->slave = DT_WORLDSEMI_WS2812_0_BASE_ADDRESS; + config->slave = DT_INST_0_WORLDSEMI_WS2812_BASE_ADDRESS; config->cs = NULL; return 0; @@ -203,7 +203,7 @@ static const struct led_strip_driver_api ws2812_strip_api = { .update_channels = ws2812_strip_update_channels, }; -DEVICE_AND_API_INIT(ws2812_strip, DT_WORLDSEMI_WS2812_0_LABEL, +DEVICE_AND_API_INIT(ws2812_strip, DT_INST_0_WORLDSEMI_WS2812_LABEL, ws2812_strip_init, &ws2812_strip_data, NULL, POST_KERNEL, CONFIG_LED_STRIP_INIT_PRIORITY, &ws2812_strip_api); diff --git a/drivers/led_strip/ws2812b_sw.c b/drivers/led_strip/ws2812b_sw.c index 191162a03f7..56539b5430c 100644 --- a/drivers/led_strip/ws2812b_sw.c +++ b/drivers/led_strip/ws2812b_sw.c @@ -32,7 +32,7 @@ static int send_buf(u8_t *buf, size_t len) */ u32_t i = 0U; - clock = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_16M"); + clock = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M"); if (!clock) { LOG_ERR("Unable to get HF clock"); return -EIO; diff --git a/drivers/modem/ublox-sara-r4.c b/drivers/modem/ublox-sara-r4.c index b01d83a67c3..d8c55801513 100644 --- a/drivers/modem/ublox-sara-r4.c +++ b/drivers/modem/ublox-sara-r4.c @@ -63,15 +63,15 @@ enum mdm_control_pins { static const struct mdm_control_pinconfig pinconfig[] = { /* MDM_POWER */ - PINCONFIG(DT_UBLOX_SARA_R4_0_MDM_POWER_GPIOS_CONTROLLER, - DT_UBLOX_SARA_R4_0_MDM_POWER_GPIOS_PIN), + PINCONFIG(DT_INST_0_UBLOX_SARA_R4_MDM_POWER_GPIOS_CONTROLLER, + DT_INST_0_UBLOX_SARA_R4_MDM_POWER_GPIOS_PIN), /* MDM_RESET */ - PINCONFIG(DT_UBLOX_SARA_R4_0_MDM_RESET_GPIOS_CONTROLLER, - DT_UBLOX_SARA_R4_0_MDM_RESET_GPIOS_PIN), + PINCONFIG(DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_CONTROLLER, + DT_INST_0_UBLOX_SARA_R4_MDM_RESET_GPIOS_PIN), }; -#define MDM_UART_DEV_NAME DT_UBLOX_SARA_R4_0_BUS_NAME +#define MDM_UART_DEV_NAME DT_INST_0_UBLOX_SARA_R4_BUS_NAME #define MDM_POWER_ENABLE 1 #define MDM_POWER_DISABLE 0 diff --git a/drivers/modem/wncm14a2a.c b/drivers/modem/wncm14a2a.c index 8cb38aa999d..31bf3735b2d 100644 --- a/drivers/modem/wncm14a2a.c +++ b/drivers/modem/wncm14a2a.c @@ -57,7 +57,7 @@ enum mdm_control_pins { MDM_KEEP_AWAKE, MDM_RESET, SHLD_3V3_1V8_SIG_TRANS_ENA, -#ifdef DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN +#ifdef DT_INST_0_WNC_M14A2A_MDM_SEND_OK_GPIOS_PIN MDM_SEND_OK, #endif MAX_MDM_CONTROL_PINS, @@ -65,33 +65,33 @@ enum mdm_control_pins { static const struct mdm_control_pinconfig pinconfig[] = { /* MDM_BOOT_MODE_SEL */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_BOOT_MODE_SEL_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_BOOT_MODE_SEL_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_BOOT_MODE_SEL_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_BOOT_MODE_SEL_GPIOS_PIN), /* MDM_POWER */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_POWER_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_POWER_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_POWER_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_POWER_GPIOS_PIN), /* MDM_KEEP_AWAKE */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_KEEP_AWAKE_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_KEEP_AWAKE_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_KEEP_AWAKE_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_KEEP_AWAKE_GPIOS_PIN), /* MDM_RESET */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_RESET_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_RESET_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_RESET_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_RESET_GPIOS_PIN), /* SHLD_3V3_1V8_SIG_TRANS_ENA */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_SHLD_TRANS_ENA_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_SHLD_TRANS_ENA_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_SHLD_TRANS_ENA_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_SHLD_TRANS_ENA_GPIOS_PIN), -#ifdef DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN +#ifdef DT_INST_0_WNC_M14A2A_MDM_SEND_OK_GPIOS_PIN /* MDM_SEND_OK */ - PINCONFIG(DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_CONTROLLER, - DT_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN), + PINCONFIG(DT_INST_0_WNC_M14A2A_MDM_SEND_OK_GPIOS_CONTROLLER, + DT_INST_0_WNC_M14A2A_MDM_SEND_OK_GPIOS_PIN), #endif }; -#define MDM_UART_DEV_NAME DT_WNC_M14A2A_0_BUS_NAME +#define MDM_UART_DEV_NAME DT_INST_0_WNC_M14A2A_BUS_NAME #define MDM_BOOT_MODE_SPECIAL 0 #define MDM_BOOT_MODE_NORMAL 1 @@ -1248,7 +1248,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_WNC_M14A2A_0_MDM_SEND_OK_GPIOS_PIN +#ifdef DT_INST_0_WNC_M14A2A_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); diff --git a/drivers/pwm/pwm_nrf5_sw.c b/drivers/pwm/pwm_nrf5_sw.c index 4fa0f253507..2ba32094bf7 100644 --- a/drivers/pwm/pwm_nrf5_sw.c +++ b/drivers/pwm/pwm_nrf5_sw.c @@ -14,13 +14,13 @@ LOG_MODULE_REGISTER(pwm_nrf5_sw); /* One compare channel is needed to set the PWM period, hence +1. */ -#if ((DT_NORDIC_NRF_SW_PWM_0_CHANNEL_COUNT + 1) > \ +#if ((DT_INST_0_NORDIC_NRF_SW_PWM_CHANNEL_COUNT + 1) > \ (_CONCAT( \ - _CONCAT(TIMER, DT_NORDIC_NRF_SW_PWM_0_TIMER_INSTANCE), \ + _CONCAT(TIMER, DT_INST_0_NORDIC_NRF_SW_PWM_TIMER_INSTANCE), \ _CC_NUM))) #error "Invalid number of PWM channels configured." #endif -#define PWM_0_MAP_SIZE DT_NORDIC_NRF_SW_PWM_0_CHANNEL_COUNT +#define PWM_0_MAP_SIZE DT_INST_0_NORDIC_NRF_SW_PWM_CHANNEL_COUNT struct pwm_config { NRF_TIMER_Type *timer; @@ -245,11 +245,11 @@ static int pwm_nrf5_sw_init(struct device *dev) } static const struct pwm_config pwm_nrf5_sw_0_config = { - .timer = _CONCAT(NRF_TIMER, DT_NORDIC_NRF_SW_PWM_0_TIMER_INSTANCE), - .ppi_base = DT_NORDIC_NRF_SW_PWM_0_PPI_BASE, - .gpiote_base = DT_NORDIC_NRF_SW_PWM_0_GPIOTE_BASE, + .timer = _CONCAT(NRF_TIMER, DT_INST_0_NORDIC_NRF_SW_PWM_TIMER_INSTANCE), + .ppi_base = DT_INST_0_NORDIC_NRF_SW_PWM_PPI_BASE, + .gpiote_base = DT_INST_0_NORDIC_NRF_SW_PWM_GPIOTE_BASE, .map_size = PWM_0_MAP_SIZE, - .prescaler = DT_NORDIC_NRF_SW_PWM_0_CLOCK_PRESCALER, + .prescaler = DT_INST_0_NORDIC_NRF_SW_PWM_CLOCK_PRESCALER, }; static struct pwm_data pwm_nrf5_sw_0_data; diff --git a/drivers/pwm/pwm_sam.c b/drivers/pwm/pwm_sam.c index 4490cff0bf4..33a22dd8cb0 100644 --- a/drivers/pwm/pwm_sam.c +++ b/drivers/pwm/pwm_sam.c @@ -92,13 +92,13 @@ static const struct pwm_driver_api sam_pwm_driver_api = { #ifdef DT_ATMEL_SAM_PWM_0 static const struct sam_pwm_config sam_pwm_config_0 = { - .regs = (Pwm *)DT_ATMEL_SAM_PWM_0_BASE_ADDRESS, - .id = DT_ATMEL_SAM_PWM_0_PERIPHERAL_ID, - .prescaler = DT_ATMEL_SAM_PWM_0_PRESCALER, - .divider = DT_ATMEL_SAM_PWM_0_DIVIDER, + .regs = (Pwm *)DT_INST_0_ATMEL_SAM_PWM_BASE_ADDRESS, + .id = DT_INST_0_ATMEL_SAM_PWM_PERIPHERAL_ID, + .prescaler = DT_INST_0_ATMEL_SAM_PWM_PRESCALER, + .divider = DT_INST_0_ATMEL_SAM_PWM_DIVIDER, }; -DEVICE_AND_API_INIT(sam_pwm_0, DT_ATMEL_SAM_PWM_0_LABEL, &sam_pwm_init, +DEVICE_AND_API_INIT(sam_pwm_0, DT_INST_0_ATMEL_SAM_PWM_LABEL, &sam_pwm_init, NULL, &sam_pwm_config_0, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &sam_pwm_driver_api); diff --git a/drivers/pwm/pwm_sifive.c b/drivers/pwm/pwm_sifive.c index 15d9f68ffbc..05ecb83827d 100644 --- a/drivers/pwm/pwm_sifive.c +++ b/drivers/pwm/pwm_sifive.c @@ -238,15 +238,15 @@ static const struct pwm_driver_api pwm_sifive_api = { CONFIG_PWM_SIFIVE_INIT_PRIORITY, \ &pwm_sifive_api) -#ifdef DT_SIFIVE_PWM0_0_LABEL +#ifdef DT_INST_0_SIFIVE_PWM0_LABEL PWM_SIFIVE_INIT(0); -#endif /* DT_SIFIVE_PWM0_0_LABEL */ +#endif /* DT_INST_0_SIFIVE_PWM0_LABEL */ -#ifdef DT_SIFIVE_PWM0_1_LABEL +#ifdef DT_INST_1_SIFIVE_PWM0_LABEL PWM_SIFIVE_INIT(1); -#endif /* DT_SIFIVE_PWM0_1_LABEL */ +#endif /* DT_INST_1_SIFIVE_PWM0_LABEL */ -#ifdef DT_SIFIVE_PWM0_2_LABEL +#ifdef DT_INST_2_SIFIVE_PWM0_LABEL PWM_SIFIVE_INIT(2); -#endif /* DT_SIFIVE_PWM0_2_LABEL */ +#endif /* DT_INST_2_SIFIVE_PWM0_LABEL */ diff --git a/drivers/sensor/adt7420/adt7420.c b/drivers/sensor/adt7420/adt7420.c index b1a61d36d76..e20210d3cd3 100644 --- a/drivers/sensor/adt7420/adt7420.c +++ b/drivers/sensor/adt7420/adt7420.c @@ -217,14 +217,14 @@ static int adt7420_init(struct device *dev) static struct adt7420_data adt7420_driver; static const struct adt7420_dev_config adt7420_config = { - .i2c_port = DT_ADI_ADT7420_0_BUS_NAME, - .i2c_addr = DT_ADI_ADT7420_0_BASE_ADDRESS, + .i2c_port = DT_INST_0_ADI_ADT7420_BUS_NAME, + .i2c_addr = DT_INST_0_ADI_ADT7420_BASE_ADDRESS, #ifdef CONFIG_ADT7420_TRIGGER - .gpio_port = DT_ADI_ADT7420_0_INT_GPIOS_CONTROLLER, - .int_gpio = DT_ADI_ADT7420_0_INT_GPIOS_PIN, + .gpio_port = DT_INST_0_ADI_ADT7420_INT_GPIOS_CONTROLLER, + .int_gpio = DT_INST_0_ADI_ADT7420_INT_GPIOS_PIN, #endif }; -DEVICE_AND_API_INIT(adt7420, DT_ADI_ADT7420_0_LABEL, adt7420_init, &adt7420_driver, +DEVICE_AND_API_INIT(adt7420, DT_INST_0_ADI_ADT7420_LABEL, adt7420_init, &adt7420_driver, &adt7420_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &adt7420_driver_api); diff --git a/drivers/sensor/adxl362/adxl362.c b/drivers/sensor/adxl362/adxl362.c index cf683141413..ebad99f3476 100644 --- a/drivers/sensor/adxl362/adxl362.c +++ b/drivers/sensor/adxl362/adxl362.c @@ -734,7 +734,7 @@ static int adxl362_init(struct device *dev) data->spi_cfg.frequency = config->spi_max_frequency; data->spi_cfg.slave = config->spi_slave; -#if defined(DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER) data->adxl362_cs_ctrl.gpio_dev = device_get_binding(config->gpio_cs_port); if (!data->adxl362_cs_ctrl.gpio_dev) { @@ -785,19 +785,19 @@ static int adxl362_init(struct device *dev) } static const struct adxl362_config adxl362_config = { - .spi_name = DT_ADI_ADXL362_0_BUS_NAME, - .spi_slave = DT_ADI_ADXL362_0_BASE_ADDRESS, - .spi_max_frequency = DT_ADI_ADXL362_0_SPI_MAX_FREQUENCY, -#if defined(DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER) - .gpio_cs_port = DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER, - .cs_gpio = DT_ADI_ADXL362_0_CS_GPIO_PIN, + .spi_name = DT_INST_0_ADI_ADXL362_BUS_NAME, + .spi_slave = DT_INST_0_ADI_ADXL362_BASE_ADDRESS, + .spi_max_frequency = DT_INST_0_ADI_ADXL362_SPI_MAX_FREQUENCY, +#if defined(DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER) + .gpio_cs_port = DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER, + .cs_gpio = DT_INST_0_ADI_ADXL362_CS_GPIO_PIN, #endif #if defined(CONFIG_ADXL362_TRIGGER) - .gpio_port = DT_ADI_ADXL362_0_INT1_GPIOS_CONTROLLER, - .int_gpio = DT_ADI_ADXL362_0_INT1_GPIOS_PIN, + .gpio_port = DT_INST_0_ADI_ADXL362_INT1_GPIOS_CONTROLLER, + .int_gpio = DT_INST_0_ADI_ADXL362_INT1_GPIOS_PIN, #endif }; -DEVICE_AND_API_INIT(adxl362, DT_ADI_ADXL362_0_LABEL, adxl362_init, +DEVICE_AND_API_INIT(adxl362, DT_INST_0_ADI_ADXL362_LABEL, adxl362_init, &adxl362_data, &adxl362_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &adxl362_api_funcs); diff --git a/drivers/sensor/adxl362/adxl362.h b/drivers/sensor/adxl362/adxl362.h index 076deb4898a..adafc9748d8 100644 --- a/drivers/sensor/adxl362/adxl362.h +++ b/drivers/sensor/adxl362/adxl362.h @@ -174,7 +174,7 @@ struct adxl362_config { char *spi_name; u32_t spi_max_frequency; u16_t spi_slave; -#if defined(DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER) const char *gpio_cs_port; u8_t cs_gpio; #endif @@ -189,7 +189,7 @@ struct adxl362_config { struct adxl362_data { struct device *spi; struct spi_config spi_cfg; -#if defined(DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER) struct spi_cs_control adxl362_cs_ctrl; #endif s16_t acc_x; diff --git a/drivers/sensor/adxl372/adxl372.c b/drivers/sensor/adxl372/adxl372.c index 60ad0b4e17e..663bb8cbf3b 100644 --- a/drivers/sensor/adxl372/adxl372.c +++ b/drivers/sensor/adxl372/adxl372.c @@ -898,7 +898,7 @@ static int adxl372_init(struct device *dev) data->spi_cfg.frequency = cfg->spi_max_frequency; data->spi_cfg.slave = cfg->spi_slave; -#if defined(DT_ADI_ADXL372_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL372_CS_GPIO_CONTROLLER) /* handle SPI CS thru GPIO if it is the case */ data->adxl372_cs_ctrl.gpio_dev = device_get_binding(cfg->gpio_cs_port); @@ -925,21 +925,21 @@ static struct adxl372_data adxl372_data; static const struct adxl372_dev_config adxl372_config = { #ifdef CONFIG_ADXL372_I2C - .i2c_port = DT_ADI_ADXL372_0_BUS_NAME, - .i2c_addr = DT_ADI_ADXL372_0_BASE_ADDRESS, + .i2c_port = DT_INST_0_ADI_ADXL372_BUS_NAME, + .i2c_addr = DT_INST_0_ADI_ADXL372_BASE_ADDRESS, #endif #ifdef CONFIG_ADXL372_SPI - .spi_port = DT_ADI_ADXL372_0_BUS_NAME, - .spi_slave = DT_ADI_ADXL372_0_BASE_ADDRESS, - .spi_max_frequency = DT_ADI_ADXL372_0_SPI_MAX_FREQUENCY, -#ifdef DT_ADI_ADXL372_0_CS_GPIO_CONTROLLER - .gpio_cs_port = DT_ADI_ADXL372_0_CS_GPIO_CONTROLLER, - .cs_gpio = DT_ADI_ADXL372_0_CS_GPIO_PIN, + .spi_port = DT_INST_0_ADI_ADXL372_BUS_NAME, + .spi_slave = DT_INST_0_ADI_ADXL372_BASE_ADDRESS, + .spi_max_frequency = DT_INST_0_ADI_ADXL372_SPI_MAX_FREQUENCY, +#ifdef DT_INST_0_ADI_ADXL372_CS_GPIO_CONTROLLER + .gpio_cs_port = DT_INST_0_ADI_ADXL372_CS_GPIO_CONTROLLER, + .cs_gpio = DT_INST_0_ADI_ADXL372_CS_GPIO_PIN, #endif #endif #ifdef CONFIG_ADXL372_TRIGGER - .gpio_port = DT_ADI_ADXL372_0_INT1_GPIOS_CONTROLLER, - .int_gpio = DT_ADI_ADXL372_0_INT1_GPIOS_PIN, + .gpio_port = DT_INST_0_ADI_ADXL372_INT1_GPIOS_CONTROLLER, + .int_gpio = DT_INST_0_ADI_ADXL372_INT1_GPIOS_PIN, #endif .max_peak_detect_mode = IS_ENABLED(CONFIG_ADXL372_PEAK_DETECT_MODE), @@ -1011,6 +1011,6 @@ static const struct adxl372_dev_config adxl372_config = { .op_mode = ADXL372_FULL_BW_MEASUREMENT, }; -DEVICE_AND_API_INIT(adxl372, DT_ADI_ADXL372_0_LABEL, adxl372_init, +DEVICE_AND_API_INIT(adxl372, DT_INST_0_ADI_ADXL372_LABEL, adxl372_init, &adxl372_data, &adxl372_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &adxl372_api_funcs); diff --git a/drivers/sensor/adxl372/adxl372.h b/drivers/sensor/adxl372/adxl372.h index 036ae2d8c05..f7ea8a4412f 100644 --- a/drivers/sensor/adxl372/adxl372.h +++ b/drivers/sensor/adxl372/adxl372.h @@ -282,7 +282,7 @@ struct adxl372_data { struct device *bus; #ifdef CONFIG_ADXL372_SPI struct spi_config spi_cfg; -#if defined(DT_ADI_ADXL372_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL372_CS_GPIO_CONTROLLER) struct spi_cs_control adxl372_cs_ctrl; #endif #endif @@ -318,7 +318,7 @@ struct adxl372_dev_config { const char *spi_port; u16_t spi_slave; u32_t spi_max_frequency; -#if defined(DT_ADI_ADXL372_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ADI_ADXL372_CS_GPIO_CONTROLLER) const char *gpio_cs_port; u8_t cs_gpio; #endif diff --git a/drivers/sensor/ams_iAQcore/iAQcore.c b/drivers/sensor/ams_iAQcore/iAQcore.c index 650d6f07429..35b54d04542 100644 --- a/drivers/sensor/ams_iAQcore/iAQcore.c +++ b/drivers/sensor/ams_iAQcore/iAQcore.c @@ -34,7 +34,7 @@ static int iaqcore_sample_fetch(struct device *dev, enum sensor_channel chan) for (tries = 0; tries < CONFIG_IAQ_CORE_MAX_READ_RETRIES; tries++) { ret = i2c_transfer(drv_data->i2c, &msg, 1, - DT_AMS_IAQCORE_0_BASE_ADDRESS); + DT_INST_0_AMS_IAQCORE_BASE_ADDRESS); if (ret < 0) { LOG_ERR("Failed to read registers data [%d].", ret); return -EIO; @@ -100,10 +100,10 @@ static int iaq_core_init(struct device *dev) { struct iaq_core_data *drv_data = dev->driver_data; - drv_data->i2c = device_get_binding(DT_AMS_IAQCORE_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_AMS_IAQCORE_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Failed to get pointer to %s device!", - DT_AMS_IAQCORE_0_BUS_NAME); + DT_INST_0_AMS_IAQCORE_BUS_NAME); return -EINVAL; } @@ -112,6 +112,6 @@ static int iaq_core_init(struct device *dev) static struct iaq_core_data iaq_core_driver; -DEVICE_AND_API_INIT(iaq_core, DT_AMS_IAQCORE_0_LABEL, iaq_core_init, +DEVICE_AND_API_INIT(iaq_core, DT_INST_0_AMS_IAQCORE_LABEL, iaq_core_init, &iaq_core_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &iaq_core_driver_api); diff --git a/drivers/sensor/apds9960/apds9960.c b/drivers/sensor/apds9960/apds9960.c index 1c9fcce18ae..a1f19564262 100644 --- a/drivers/sensor/apds9960/apds9960.c +++ b/drivers/sensor/apds9960/apds9960.c @@ -482,10 +482,10 @@ static const struct sensor_driver_api apds9960_driver_api = { }; static const struct apds9960_config apds9960_config = { - .i2c_name = DT_AVAGO_APDS9960_0_BUS_NAME, - .i2c_address = DT_AVAGO_APDS9960_0_BASE_ADDRESS, - .gpio_name = DT_AVAGO_APDS9960_0_INT_GPIOS_CONTROLLER, - .gpio_pin = DT_AVAGO_APDS9960_0_INT_GPIOS_PIN, + .i2c_name = DT_INST_0_AVAGO_APDS9960_BUS_NAME, + .i2c_address = DT_INST_0_AVAGO_APDS9960_BASE_ADDRESS, + .gpio_name = DT_INST_0_AVAGO_APDS9960_INT_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_AVAGO_APDS9960_INT_GPIOS_PIN, #if CONFIG_APDS9960_PGAIN_8X .pgain = APDS9960_PGAIN_8X, #elif CONFIG_APDS9960_PGAIN_4X @@ -531,11 +531,11 @@ static const struct apds9960_config apds9960_config = { static struct apds9960_data apds9960_data; #ifndef CONFIG_DEVICE_POWER_MANAGEMENT -DEVICE_AND_API_INIT(apds9960, DT_AVAGO_APDS9960_0_LABEL, &apds9960_init, +DEVICE_AND_API_INIT(apds9960, DT_INST_0_AVAGO_APDS9960_LABEL, &apds9960_init, &apds9960_data, &apds9960_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api); #else -DEVICE_DEFINE(apds9960, DT_AVAGO_APDS9960_0_LABEL, apds9960_init, +DEVICE_DEFINE(apds9960, DT_INST_0_AVAGO_APDS9960_LABEL, apds9960_init, apds9960_device_ctrl, &apds9960_data, &apds9960_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &apds9960_driver_api); #endif diff --git a/drivers/sensor/bme280/bme280.c b/drivers/sensor/bme280/bme280.c index 856ce5aad61..a8767462c46 100644 --- a/drivers/sensor/bme280/bme280.c +++ b/drivers/sensor/bme280/bme280.c @@ -336,17 +336,17 @@ static int bme280_chip_init(struct device *dev) #ifdef DT_BOSCH_BME280_BUS_SPI static inline int bme280_spi_init(struct bme280_data *data) { - data->spi = device_get_binding(DT_BOSCH_BME280_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_BOSCH_BME280_BUS_NAME); if (!data->spi) { LOG_DBG("spi device not found: %s", - DT_BOSCH_BME280_0_BUS_NAME); + DT_INST_0_BOSCH_BME280_BUS_NAME); return -EINVAL; } data->spi_cfg.operation = SPI_WORD_SET(8) | SPI_TRANSFER_MSB | SPI_MODE_CPOL | SPI_MODE_CPHA; - data->spi_cfg.frequency = DT_BOSCH_BME280_0_SPI_MAX_FREQUENCY; - data->spi_cfg.slave = DT_BOSCH_BME280_0_BASE_ADDRESS; + data->spi_cfg.frequency = DT_INST_0_BOSCH_BME280_SPI_MAX_FREQUENCY; + data->spi_cfg.slave = DT_INST_0_BOSCH_BME280_BASE_ADDRESS; return 0; } @@ -357,18 +357,18 @@ int bme280_init(struct device *dev) struct bme280_data *data = dev->driver_data; #ifdef DT_BOSCH_BME280_BUS_I2C - data->i2c_master = device_get_binding(DT_BOSCH_BME280_0_BUS_NAME); + data->i2c_master = device_get_binding(DT_INST_0_BOSCH_BME280_BUS_NAME); if (!data->i2c_master) { LOG_DBG("i2c master not found: %s", - DT_BOSCH_BME280_0_BUS_NAME); + DT_INST_0_BOSCH_BME280_BUS_NAME); return -EINVAL; } - data->i2c_slave_addr = DT_BOSCH_BME280_0_BASE_ADDRESS; + data->i2c_slave_addr = DT_INST_0_BOSCH_BME280_BASE_ADDRESS; #elif defined DT_BOSCH_BME280_BUS_SPI if (bme280_spi_init(data) < 0) { LOG_DBG("spi master not found: %s", - DT_BOSCH_BME280_0_BUS_NAME); + DT_INST_0_BOSCH_BME280_BUS_NAME); return -EINVAL; } #endif @@ -382,6 +382,6 @@ int bme280_init(struct device *dev) static struct bme280_data bme280_data; -DEVICE_AND_API_INIT(bme280, DT_BOSCH_BME280_0_LABEL, bme280_init, &bme280_data, +DEVICE_AND_API_INIT(bme280, DT_INST_0_BOSCH_BME280_LABEL, bme280_init, &bme280_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &bme280_api_funcs); diff --git a/drivers/sensor/bme680/bme680.c b/drivers/sensor/bme680/bme680.c index 9d2d0a521c0..fe1ee17301d 100644 --- a/drivers/sensor/bme680/bme680.c +++ b/drivers/sensor/bme680/bme680.c @@ -401,14 +401,14 @@ static int bme680_init(struct device *dev) struct bme680_data *data = dev->driver_data; data->i2c_master = device_get_binding( - DT_BOSCH_BME680_0_BUS_NAME); + DT_INST_0_BOSCH_BME680_BUS_NAME); if (!data->i2c_master) { LOG_ERR("I2C master not found: %s", - DT_BOSCH_BME680_0_BUS_NAME); + DT_INST_0_BOSCH_BME680_BUS_NAME); return -EINVAL; } - data->i2c_slave_addr = DT_BOSCH_BME680_0_BASE_ADDRESS; + data->i2c_slave_addr = DT_INST_0_BOSCH_BME680_BASE_ADDRESS; if (bme680_chip_init(dev) < 0) { return -EINVAL; @@ -424,6 +424,6 @@ static const struct sensor_driver_api bme680_api_funcs = { static struct bme680_data bme680_data; -DEVICE_AND_API_INIT(bme680, DT_BOSCH_BME680_0_LABEL, bme680_init, &bme680_data, +DEVICE_AND_API_INIT(bme680, DT_INST_0_BOSCH_BME680_LABEL, bme680_init, &bme680_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &bme680_api_funcs); diff --git a/drivers/sensor/bmi160/bmi160.c b/drivers/sensor/bmi160/bmi160.c index cefa52b9ff8..6e8b2c13046 100644 --- a/drivers/sensor/bmi160/bmi160.c +++ b/drivers/sensor/bmi160/bmi160.c @@ -796,16 +796,16 @@ int bmi160_init(struct device *dev) u8_t val = 0U; s32_t acc_range, gyr_range; - bmi160->spi = device_get_binding(DT_BOSCH_BMI160_0_BUS_NAME); + bmi160->spi = device_get_binding(DT_INST_0_BOSCH_BMI160_BUS_NAME); if (!bmi160->spi) { LOG_DBG("SPI master controller not found: %s.", - DT_BOSCH_BMI160_0_BUS_NAME); + DT_INST_0_BOSCH_BMI160_BUS_NAME); return -EINVAL; } bmi160->spi_cfg.operation = SPI_WORD_SET(8); - bmi160->spi_cfg.frequency = DT_BOSCH_BMI160_0_SPI_MAX_FREQUENCY; - bmi160->spi_cfg.slave = DT_BOSCH_BMI160_0_BASE_ADDRESS; + bmi160->spi_cfg.frequency = DT_INST_0_BOSCH_BMI160_SPI_MAX_FREQUENCY; + bmi160->spi_cfg.slave = DT_INST_0_BOSCH_BMI160_BASE_ADDRESS; /* reboot the chip */ if (bmi160_byte_write(dev, BMI160_REG_CMD, BMI160_CMD_SOFT_RESET) < 0) { @@ -900,13 +900,13 @@ int bmi160_init(struct device *dev) const struct bmi160_device_config bmi160_config = { #if defined(CONFIG_BMI160_TRIGGER) - .gpio_port = DT_BOSCH_BMI160_0_INT_GPIOS_CONTROLLER, - .int_pin = DT_BOSCH_BMI160_0_INT_GPIOS_PIN, + .gpio_port = DT_INST_0_BOSCH_BMI160_INT_GPIOS_CONTROLLER, + .int_pin = DT_INST_0_BOSCH_BMI160_INT_GPIOS_PIN, #endif }; -DEVICE_AND_API_INIT(bmi160, DT_BOSCH_BMI160_0_LABEL, bmi160_init, &bmi160_data, +DEVICE_AND_API_INIT(bmi160, DT_INST_0_BOSCH_BMI160_LABEL, bmi160_init, &bmi160_data, &bmi160_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &bmi160_api); diff --git a/drivers/sensor/ccs811/ccs811.c b/drivers/sensor/ccs811/ccs811.c index b845e087705..4cac11f1ddf 100644 --- a/drivers/sensor/ccs811/ccs811.c +++ b/drivers/sensor/ccs811/ccs811.c @@ -28,7 +28,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) /* Check data ready flag for the measurement interval of 1 seconds */ while (tries-- > 0) { - if (i2c_reg_read_byte(drv_data->i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_read_byte(drv_data->i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_STATUS, &status) < 0) { LOG_ERR("Failed to read Status register"); return -EIO; @@ -46,7 +46,7 @@ static int ccs811_sample_fetch(struct device *dev, enum sensor_channel chan) return -EIO; } - if (i2c_burst_read(drv_data->i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_burst_read(drv_data->i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_ALG_RESULT_DATA, (u8_t *)buf, 8) < 0) { LOG_ERR("Failed to read conversion data."); return -EIO; @@ -117,7 +117,7 @@ static int switch_to_app_mode(struct device *i2c) LOG_DBG("Switching to Application mode..."); - if (i2c_reg_read_byte(i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_read_byte(i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_STATUS, &status) < 0) { LOG_ERR("Failed to read Status register"); return -EIO; @@ -131,12 +131,12 @@ static int switch_to_app_mode(struct device *i2c) buf = CCS811_REG_APP_START; /* Set the device to application mode */ - if (i2c_write(i2c, &buf, 1, DT_AMS_CCS811_0_BASE_ADDRESS) < 0) { + if (i2c_write(i2c, &buf, 1, DT_INST_0_AMS_CCS811_BASE_ADDRESS) < 0) { LOG_ERR("Failed to set Application mode"); return -EIO; } - if (i2c_reg_read_byte(i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_read_byte(i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_STATUS, &status) < 0) { LOG_ERR("Failed to read Status register"); return -EIO; @@ -159,10 +159,10 @@ int ccs811_init(struct device *dev) int ret; u8_t hw_id, status; - drv_data->i2c = device_get_binding(DT_AMS_CCS811_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_AMS_CCS811_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Failed to get pointer to %s device!", - DT_AMS_CCS811_0_BUS_NAME); + DT_INST_0_AMS_CCS811_BUS_NAME); return -EINVAL; } @@ -202,7 +202,7 @@ int ccs811_init(struct device *dev) } /* Check Hardware ID */ - if (i2c_reg_read_byte(drv_data->i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_read_byte(drv_data->i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_HW_ID, &hw_id) < 0) { LOG_ERR("Failed to read Hardware ID register"); return -EIO; @@ -214,7 +214,7 @@ int ccs811_init(struct device *dev) } /* Set Measurement mode for 1 second */ - if (i2c_reg_write_byte(drv_data->i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_write_byte(drv_data->i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_MEAS_MODE, CCS811_MODE_IAQ_1SEC) < 0) { LOG_ERR("Failed to set Measurement mode"); @@ -222,7 +222,7 @@ int ccs811_init(struct device *dev) } /* Check for error */ - if (i2c_reg_read_byte(drv_data->i2c, DT_AMS_CCS811_0_BASE_ADDRESS, + if (i2c_reg_read_byte(drv_data->i2c, DT_INST_0_AMS_CCS811_BASE_ADDRESS, CCS811_REG_STATUS, &status) < 0) { LOG_ERR("Failed to read Status register"); return -EIO; @@ -238,6 +238,6 @@ int ccs811_init(struct device *dev) static struct ccs811_data ccs811_driver; -DEVICE_AND_API_INIT(ccs811, DT_AMS_CCS811_0_LABEL, ccs811_init, &ccs811_driver, +DEVICE_AND_API_INIT(ccs811, DT_INST_0_AMS_CCS811_LABEL, ccs811_init, &ccs811_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &ccs811_driver_api); diff --git a/drivers/sensor/ens210/ens210.c b/drivers/sensor/ens210/ens210.c index 7220a326353..38179c94c0c 100644 --- a/drivers/sensor/ens210/ens210.c +++ b/drivers/sensor/ens210/ens210.c @@ -50,7 +50,7 @@ static int ens210_sample_fetch(struct device *dev, enum sensor_channel chan) __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); for (cnt = 0; cnt <= CONFIG_ENS210_MAX_READ_RETRIES; cnt++) { - ret = i2c_burst_read(drv_data->i2c, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_burst_read(drv_data->i2c, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_T_VAL, (u8_t *)&data, sizeof(data)); if (ret < 0) { LOG_ERR("Failed to read data"); @@ -129,7 +129,7 @@ static int ens210_sys_reset(struct device *i2c_dev) const struct ens210_sys_ctrl sys_ctrl = {.low_power = 0, .reset = 1}; int ret; - ret = i2c_reg_write_byte(i2c_dev, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_reg_write_byte(i2c_dev, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_SYS_CTRL, *(u8_t *)&sys_ctrl); if (ret < 0) { LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(u8_t *)&sys_ctrl); @@ -142,7 +142,7 @@ static int ens210_sys_enable(struct device *i2c_dev) const struct ens210_sys_ctrl sys_ctrl = {.low_power = 0, .reset = 0}; int ret; - ret = i2c_reg_write_byte(i2c_dev, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_reg_write_byte(i2c_dev, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_SYS_CTRL, *(u8_t *)&sys_ctrl); if (ret < 0) { LOG_ERR("Failed to set SYS_CTRL to 0x%x", *(u8_t *)&sys_ctrl); @@ -157,7 +157,7 @@ static int ens210_wait_boot(struct device *i2c_dev) struct ens210_sys_stat sys_stat; for (cnt = 0; cnt <= CONFIG_ENS210_MAX_STAT_RETRIES; cnt++) { - ret = i2c_reg_read_byte(i2c_dev, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_reg_read_byte(i2c_dev, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_SYS_STAT, (u8_t *)&sys_stat); @@ -207,10 +207,10 @@ static int ens210_init(struct device *dev) int ret; u16_t part_id; - drv_data->i2c = device_get_binding(DT_AMS_ENS210_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_AMS_ENS210_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Failed to get pointer to %s device!", - DT_AMS_ENS210_0_BUS_NAME); + DT_INST_0_AMS_ENS210_BUS_NAME); return -EINVAL; } @@ -221,7 +221,7 @@ static int ens210_init(struct device *dev) } /* Check Hardware ID. This is only possible after device is ready */ - ret = i2c_burst_read(drv_data->i2c, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_burst_read(drv_data->i2c, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_PART_ID, (u8_t *)&part_id, sizeof(part_id)); if (ret < 0) { @@ -236,7 +236,7 @@ static int ens210_init(struct device *dev) } /* Set continuous measurement */ - ret = i2c_reg_write_byte(drv_data->i2c, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_reg_write_byte(drv_data->i2c, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_SENS_RUN, *(u8_t *)&sense_run); if (ret < 0) { LOG_ERR("Failed to set SENS_RUN to 0x%x", @@ -245,7 +245,7 @@ static int ens210_init(struct device *dev) } /* Start measuring */ - ret = i2c_reg_write_byte(drv_data->i2c, DT_AMS_ENS210_0_BASE_ADDRESS, + ret = i2c_reg_write_byte(drv_data->i2c, DT_INST_0_AMS_ENS210_BASE_ADDRESS, ENS210_REG_SENS_START, *(u8_t *)&sense_start); if (ret < 0) { LOG_ERR("Failed to set SENS_START to 0x%x", @@ -257,6 +257,6 @@ static int ens210_init(struct device *dev) static struct ens210_data ens210_driver; -DEVICE_AND_API_INIT(ens210, DT_AMS_ENS210_0_LABEL, ens210_init, &ens210_driver, +DEVICE_AND_API_INIT(ens210, DT_INST_0_AMS_ENS210_LABEL, ens210_init, &ens210_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &en210_driver_api); diff --git a/drivers/sensor/fxas21002/fxas21002.c b/drivers/sensor/fxas21002/fxas21002.c index e9e39d2144f..82d5722b8a6 100644 --- a/drivers/sensor/fxas21002/fxas21002.c +++ b/drivers/sensor/fxas21002/fxas21002.c @@ -285,25 +285,25 @@ static const struct sensor_driver_api fxas21002_driver_api = { }; static const struct fxas21002_config fxas21002_config = { - .i2c_name = DT_NXP_FXAS21002_0_BUS_NAME, - .i2c_address = DT_NXP_FXAS21002_0_BASE_ADDRESS, + .i2c_name = DT_INST_0_NXP_FXAS21002_BUS_NAME, + .i2c_address = DT_INST_0_NXP_FXAS21002_BASE_ADDRESS, .whoami = CONFIG_FXAS21002_WHOAMI, .range = CONFIG_FXAS21002_RANGE, .dr = CONFIG_FXAS21002_DR, #ifdef CONFIG_FXAS21002_TRIGGER #ifdef CONFIG_FXAS21002_DRDY_INT1 - .gpio_name = DT_NXP_FXAS21002_0_INT1_GPIOS_CONTROLLER, - .gpio_pin = DT_NXP_FXAS21002_0_INT1_GPIOS_PIN, + .gpio_name = DT_INST_0_NXP_FXAS21002_INT1_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_NXP_FXAS21002_INT1_GPIOS_PIN, #else - .gpio_name = DT_NXP_FXAS21002_0_INT2_GPIOS_CONTROLLER, - .gpio_pin = DT_NXP_FXAS21002_0_INT2_GPIOS_PIN, + .gpio_name = DT_INST_0_NXP_FXAS21002_INT2_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_NXP_FXAS21002_INT2_GPIOS_PIN, #endif #endif }; static struct fxas21002_data fxas21002_data; -DEVICE_AND_API_INIT(fxas21002, DT_NXP_FXAS21002_0_LABEL, fxas21002_init, +DEVICE_AND_API_INIT(fxas21002, DT_INST_0_NXP_FXAS21002_LABEL, fxas21002_init, &fxas21002_data, &fxas21002_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &fxas21002_driver_api); diff --git a/drivers/sensor/fxos8700/fxos8700.c b/drivers/sensor/fxos8700/fxos8700.c index eaa7c9e36e7..c495be6757d 100644 --- a/drivers/sensor/fxos8700/fxos8700.c +++ b/drivers/sensor/fxos8700/fxos8700.c @@ -520,11 +520,11 @@ static const struct sensor_driver_api fxos8700_driver_api = { }; static const struct fxos8700_config fxos8700_config = { - .i2c_name = DT_NXP_FXOS8700_0_BUS_NAME, - .i2c_address = DT_NXP_FXOS8700_0_BASE_ADDRESS, -#ifdef DT_NXP_FXOS8700_0_RESET_GPIOS_CONTROLLER - .reset_name = DT_NXP_FXOS8700_0_RESET_GPIOS_CONTROLLER, - .reset_pin = DT_NXP_FXOS8700_0_RESET_GPIOS_PIN, + .i2c_name = DT_INST_0_NXP_FXOS8700_BUS_NAME, + .i2c_address = DT_INST_0_NXP_FXOS8700_BASE_ADDRESS, +#ifdef DT_INST_0_NXP_FXOS8700_RESET_GPIOS_CONTROLLER + .reset_name = DT_INST_0_NXP_FXOS8700_RESET_GPIOS_CONTROLLER, + .reset_pin = DT_INST_0_NXP_FXOS8700_RESET_GPIOS_PIN, #else .reset_name = NULL, .reset_pin = 0, @@ -563,11 +563,11 @@ static const struct fxos8700_config fxos8700_config = { #endif #ifdef CONFIG_FXOS8700_TRIGGER #ifdef CONFIG_FXOS8700_DRDY_INT1 - .gpio_name = DT_NXP_FXOS8700_0_INT1_GPIOS_CONTROLLER, - .gpio_pin = DT_NXP_FXOS8700_0_INT1_GPIOS_PIN, + .gpio_name = DT_INST_0_NXP_FXOS8700_INT1_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_NXP_FXOS8700_INT1_GPIOS_PIN, #else - .gpio_name = DT_NXP_FXOS8700_0_INT2_GPIOS_CONTROLLER, - .gpio_pin = DT_NXP_FXOS8700_0_INT2_GPIOS_PIN, + .gpio_name = DT_INST_0_NXP_FXOS8700_INT2_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_NXP_FXOS8700_INT2_GPIOS_PIN, #endif #endif #ifdef CONFIG_FXOS8700_PULSE @@ -583,7 +583,7 @@ static const struct fxos8700_config fxos8700_config = { static struct fxos8700_data fxos8700_data; -DEVICE_AND_API_INIT(fxos8700, DT_NXP_FXOS8700_0_LABEL, fxos8700_init, +DEVICE_AND_API_INIT(fxos8700, DT_INST_0_NXP_FXOS8700_LABEL, fxos8700_init, &fxos8700_data, &fxos8700_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &fxos8700_driver_api); diff --git a/drivers/sensor/hts221/hts221.c b/drivers/sensor/hts221/hts221.c index 7a81f70eec8..11cd65549e7 100644 --- a/drivers/sensor/hts221/hts221.c +++ b/drivers/sensor/hts221/hts221.c @@ -66,7 +66,7 @@ static int hts221_sample_fetch(struct device *dev, enum sensor_channel chan) __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); - if (i2c_burst_read(drv_data->i2c, DT_ST_HTS221_0_BASE_ADDRESS, + if (i2c_burst_read(drv_data->i2c, DT_INST_0_ST_HTS221_BASE_ADDRESS, HTS221_REG_DATA_START | HTS221_AUTOINCREMENT_ADDR, buf, 4) < 0) { LOG_ERR("Failed to fetch data sample."); @@ -83,7 +83,7 @@ static int hts221_read_conversion_data(struct hts221_data *drv_data) { u8_t buf[16]; - if (i2c_burst_read(drv_data->i2c, DT_ST_HTS221_0_BASE_ADDRESS, + if (i2c_burst_read(drv_data->i2c, DT_INST_0_ST_HTS221_BASE_ADDRESS, HTS221_REG_CONVERSION_START | HTS221_AUTOINCREMENT_ADDR, buf, 16) < 0) { LOG_ERR("Failed to read conversion data."); @@ -115,15 +115,15 @@ int hts221_init(struct device *dev) struct hts221_data *drv_data = dev->driver_data; u8_t id, idx; - drv_data->i2c = device_get_binding(DT_ST_HTS221_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_ST_HTS221_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Could not get pointer to %s device.", - DT_ST_HTS221_0_BUS_NAME); + DT_INST_0_ST_HTS221_BUS_NAME); return -EINVAL; } /* check chip ID */ - if (i2c_reg_read_byte(drv_data->i2c, DT_ST_HTS221_0_BASE_ADDRESS, + if (i2c_reg_read_byte(drv_data->i2c, DT_INST_0_ST_HTS221_BASE_ADDRESS, HTS221_REG_WHO_AM_I, &id) < 0) { LOG_ERR("Failed to read chip ID."); return -EIO; @@ -146,7 +146,7 @@ int hts221_init(struct device *dev) return -EINVAL; } - if (i2c_reg_write_byte(drv_data->i2c, DT_ST_HTS221_0_BASE_ADDRESS, + if (i2c_reg_write_byte(drv_data->i2c, DT_INST_0_ST_HTS221_BASE_ADDRESS, HTS221_REG_CTRL1, (idx + 1) << HTS221_ODR_SHIFT | HTS221_BDU_BIT | HTS221_PD_BIT) < 0) { @@ -177,6 +177,6 @@ int hts221_init(struct device *dev) struct hts221_data hts221_driver; -DEVICE_AND_API_INIT(hts221, DT_ST_HTS221_0_LABEL, hts221_init, &hts221_driver, +DEVICE_AND_API_INIT(hts221, DT_INST_0_ST_HTS221_LABEL, hts221_init, &hts221_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &hts221_driver_api); diff --git a/drivers/sensor/hts221/hts221_trigger.c b/drivers/sensor/hts221/hts221_trigger.c index d4f28409561..d73898245e4 100644 --- a/drivers/sensor/hts221/hts221_trigger.c +++ b/drivers/sensor/hts221/hts221_trigger.c @@ -26,7 +26,7 @@ int hts221_trigger_set(struct device *dev, __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); gpio_pin_disable_callback(drv_data->gpio, - DT_ST_HTS221_0_DRDY_GPIOS_PIN); + DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN); drv_data->data_ready_handler = handler; if (handler == NULL) { @@ -36,7 +36,7 @@ int hts221_trigger_set(struct device *dev, drv_data->data_ready_trigger = *trig; gpio_pin_enable_callback(drv_data->gpio, - DT_ST_HTS221_0_DRDY_GPIOS_PIN); + DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN); return 0; } @@ -49,7 +49,7 @@ static void hts221_gpio_callback(struct device *dev, ARG_UNUSED(pins); - gpio_pin_disable_callback(dev, DT_ST_HTS221_0_DRDY_GPIOS_PIN); + gpio_pin_disable_callback(dev, DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN); #if defined(CONFIG_HTS221_TRIGGER_OWN_THREAD) k_sem_give(&drv_data->gpio_sem); @@ -68,7 +68,7 @@ static void hts221_thread_cb(void *arg) &drv_data->data_ready_trigger); } - gpio_pin_enable_callback(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN); + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN); } #ifdef CONFIG_HTS221_TRIGGER_OWN_THREAD @@ -102,20 +102,20 @@ int hts221_init_interrupt(struct device *dev) /* setup data ready gpio interrupt */ drv_data->gpio = - device_get_binding(DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER); + device_get_binding(DT_INST_0_ST_HTS221_DRDY_GPIOS_CONTROLLER); if (drv_data->gpio == NULL) { LOG_ERR("Cannot get pointer to %s device.", - DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER); + DT_INST_0_ST_HTS221_DRDY_GPIOS_CONTROLLER); return -EINVAL; } - gpio_pin_configure(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN, + gpio_pin_configure(drv_data->gpio, DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN, GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE); gpio_init_callback(&drv_data->gpio_cb, hts221_gpio_callback, - BIT(DT_ST_HTS221_0_DRDY_GPIOS_PIN)); + BIT(DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { LOG_ERR("Could not set gpio callback."); @@ -123,7 +123,7 @@ int hts221_init_interrupt(struct device *dev) } /* enable data-ready interrupt */ - if (i2c_reg_write_byte(drv_data->i2c, DT_ST_HTS221_0_BASE_ADDRESS, + if (i2c_reg_write_byte(drv_data->i2c, DT_INST_0_ST_HTS221_BASE_ADDRESS, HTS221_REG_CTRL3, HTS221_DRDY_EN) < 0) { LOG_ERR("Could not enable data-ready interrupt."); return -EIO; @@ -142,7 +142,7 @@ int hts221_init_interrupt(struct device *dev) drv_data->dev = dev; #endif - gpio_pin_enable_callback(drv_data->gpio, DT_ST_HTS221_0_DRDY_GPIOS_PIN); + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN); return 0; } diff --git a/drivers/sensor/lis2dh/lis2dh.c b/drivers/sensor/lis2dh/lis2dh.c index 1ed8e9d60e3..6a0f7cf0a2c 100644 --- a/drivers/sensor/lis2dh/lis2dh.c +++ b/drivers/sensor/lis2dh/lis2dh.c @@ -367,6 +367,6 @@ int lis2dh_init(struct device *dev) static struct lis2dh_data lis2dh_driver; -DEVICE_AND_API_INIT(lis2dh, DT_ST_LIS2DH_0_LABEL, lis2dh_init, &lis2dh_driver, +DEVICE_AND_API_INIT(lis2dh, DT_INST_0_ST_LIS2DH_LABEL, lis2dh_init, &lis2dh_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis2dh_driver_api); diff --git a/drivers/sensor/lis2dh/lis2dh.h b/drivers/sensor/lis2dh/lis2dh.h index a81f13c2a51..4dd6536cdc4 100644 --- a/drivers/sensor/lis2dh/lis2dh.h +++ b/drivers/sensor/lis2dh/lis2dh.h @@ -15,8 +15,8 @@ #include #include -#define LIS2DH_BUS_ADDRESS DT_ST_LIS2DH_0_BASE_ADDRESS -#define LIS2DH_BUS_DEV_NAME DT_ST_LIS2DH_0_BUS_NAME +#define LIS2DH_BUS_ADDRESS DT_INST_0_ST_LIS2DH_BASE_ADDRESS +#define LIS2DH_BUS_DEV_NAME DT_INST_0_ST_LIS2DH_BUS_NAME #if defined(DT_ST_LIS2DH_0_BUS_SPI) #include @@ -28,7 +28,7 @@ /* LIS2DH supports only SPI mode 0, word size 8 bits, MSB first */ #define LIS2DH_SPI_CFG SPI_WORD_SET(8) -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) #include #else #error "define bus type (I2C/SPI)" @@ -169,16 +169,16 @@ #define LIS2DH_DATA_OFS 0 #endif -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) /* INT1 and INT2 are configured */ -#define DT_LIS2DH_INT1_GPIO_PIN DT_ST_LIS2DH_0_IRQ_GPIOS_PIN_0 -#define DT_LIS2DH_INT1_GPIO_DEV_NAME DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_0 -#define DT_LIS2DH_INT2_GPIO_PIN DT_ST_LIS2DH_0_IRQ_GPIOS_PIN_1 -#define DT_LIS2DH_INT2_GPIO_DEV_NAME DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 +#define DT_LIS2DH_INT1_GPIO_PIN DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN_0 +#define DT_LIS2DH_INT1_GPIO_DEV_NAME DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_0 +#define DT_LIS2DH_INT2_GPIO_PIN DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN_1 +#define DT_LIS2DH_INT2_GPIO_DEV_NAME DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 #else /* INT1 only */ -#define DT_LIS2DH_INT1_GPIO_PIN DT_ST_LIS2DH_0_IRQ_GPIOS_PIN -#define DT_LIS2DH_INT1_GPIO_DEV_NAME DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER +#define DT_LIS2DH_INT1_GPIO_PIN DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN +#define DT_LIS2DH_INT1_GPIO_DEV_NAME DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER #endif union lis2dh_sample { @@ -244,11 +244,11 @@ static inline int lis2dh_bus_configure(struct device *dev) } lis2dh->spi_cfg.operation = LIS2DH_SPI_CFG; - lis2dh->spi_cfg.frequency = DT_ST_LIS2DH_0_SPI_MAX_FREQUENCY; + lis2dh->spi_cfg.frequency = DT_INST_0_ST_LIS2DH_SPI_MAX_FREQUENCY; lis2dh->spi_cfg.slave = LIS2DH_BUS_ADDRESS; return 0; -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) lis2dh->bus = device_get_binding(LIS2DH_BUS_DEV_NAME); if (lis2dh->bus == NULL) { LOG_ERR("Could not get pointer to %s device", @@ -271,7 +271,7 @@ static inline int lis2dh_burst_read(struct device *dev, u8_t start_addr, start_addr |= LIS2DH_SPI_READ_BIT | LIS2DH_SPI_AUTOINC_ADDR; return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes); -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) return i2c_burst_read(lis2dh->bus, LIS2DH_BUS_ADDRESS, start_addr | LIS2DH_AUTOINCREMENT_ADDR, buf, num_bytes); @@ -289,7 +289,7 @@ static inline int lis2dh_reg_read_byte(struct device *dev, u8_t reg_addr, reg_addr |= LIS2DH_SPI_READ_BIT; return lis2dh_spi_access(lis2dh, reg_addr, value, 1); -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) return i2c_reg_read_byte(lis2dh->bus, LIS2DH_BUS_ADDRESS, reg_addr, value); #else @@ -306,7 +306,7 @@ static inline int lis2dh_burst_write(struct device *dev, u8_t start_addr, start_addr |= LIS2DH_SPI_AUTOINC_ADDR; return lis2dh_spi_access(lis2dh, start_addr, buf, num_bytes); -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) return i2c_burst_write(lis2dh->bus, LIS2DH_BUS_ADDRESS, start_addr | LIS2DH_AUTOINCREMENT_ADDR, buf, num_bytes); @@ -324,7 +324,7 @@ static inline int lis2dh_reg_write_byte(struct device *dev, u8_t reg_addr, reg_addr &= LIS2DH_SPI_ADDR_MASK; return lis2dh_spi_access(lis2dh, reg_addr, &value, 1); -#elif defined(DT_ST_LIS2DH_0_BUS_I2C) +#elif defined(DT_ST_LIS2DH_BUS_I2C) u8_t tx_buf[2] = {reg_addr, value}; return i2c_write(lis2dh->bus, tx_buf, sizeof(tx_buf), diff --git a/drivers/sensor/lis2dh/lis2dh_trigger.c b/drivers/sensor/lis2dh/lis2dh_trigger.c index f339604816b..229d634284a 100644 --- a/drivers/sensor/lis2dh/lis2dh_trigger.c +++ b/drivers/sensor/lis2dh/lis2dh_trigger.c @@ -91,7 +91,7 @@ static int lis2dh_start_trigger_int1(struct device *dev) LIS2DH_EN_DRDY1_INT1, 1); } -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) #define LIS2DH_ANYM_CFG (LIS2DH_INT_CFG_ZHIE_ZUPE | LIS2DH_INT_CFG_YHIE_YUPE |\ LIS2DH_INT_CFG_XHIE_XUPE) @@ -144,7 +144,7 @@ static int lis2dh_start_trigger_int2(struct device *dev) return lis2dh_reg_write_byte(dev, LIS2DH_REG_INT2_CFG, LIS2DH_ANYM_CFG); } -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ int lis2dh_trigger_set(struct device *dev, const struct sensor_trigger *trig, @@ -153,10 +153,10 @@ int lis2dh_trigger_set(struct device *dev, if (trig->type == SENSOR_TRIG_DATA_READY && trig->chan == SENSOR_CHAN_ACCEL_XYZ) { return lis2dh_trigger_drdy_set(dev, trig->chan, handler); -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) } else if (trig->type == SENSOR_TRIG_DELTA) { return lis2dh_trigger_anym_set(dev, handler); -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ } return -ENOTSUP; @@ -230,7 +230,7 @@ static void lis2dh_gpio_int1_callback(struct device *dev, #endif } -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) static void lis2dh_gpio_int2_callback(struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -247,7 +247,7 @@ static void lis2dh_gpio_int2_callback(struct device *dev, k_work_submit(&lis2dh->work); #endif } -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ static void lis2dh_thread_cb(void *arg) { @@ -265,7 +265,7 @@ static void lis2dh_thread_cb(void *arg) return; } -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) if (unlikely(atomic_test_and_clear_bit(&lis2dh->trig_flags, START_TRIG_INT2))) { status = lis2dh_start_trigger_int2(dev); @@ -275,7 +275,7 @@ static void lis2dh_thread_cb(void *arg) } return; } -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ if (atomic_test_and_clear_bit(&lis2dh->trig_flags, TRIGGED_INT1)) { @@ -291,7 +291,7 @@ static void lis2dh_thread_cb(void *arg) return; } -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) if (atomic_test_and_clear_bit(&lis2dh->trig_flags, TRIGGED_INT2)) { struct sensor_trigger anym_trigger = { @@ -317,7 +317,7 @@ static void lis2dh_thread_cb(void *arg) return; } -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ } #ifdef CONFIG_LIS2DH_TRIGGER_OWN_THREAD @@ -388,7 +388,7 @@ int lis2dh_init_interrupt(struct device *dev) LOG_INF("int1 on pin=%d cfg=0x%x", DT_LIS2DH_INT1_GPIO_PIN, LIS2DH_INT1_CFG); -#if defined(DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1) +#if defined(DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1) /* setup any motion gpio interrupt */ lis2dh->gpio_int2 = device_get_binding(DT_LIS2DH_INT2_GPIO_DEV_NAME); if (lis2dh->gpio_int2 == NULL) { @@ -419,7 +419,7 @@ int lis2dh_init_interrupt(struct device *dev) LOG_INF("int2 on pin=%d cfg=0x%x", DT_LIS2DH_INT2_GPIO_PIN, LIS2DH_INT2_CFG); -#endif /* DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER_1 */ +#endif /* DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER_1 */ #if defined(CONFIG_LIS2DH_TRIGGER_OWN_THREAD) k_sem_init(&lis2dh->gpio_sem, 0, UINT_MAX); diff --git a/drivers/sensor/lis2ds12/lis2ds12.c b/drivers/sensor/lis2ds12/lis2ds12.c index b4519affdad..c53d2d48968 100644 --- a/drivers/sensor/lis2ds12/lis2ds12.c +++ b/drivers/sensor/lis2ds12/lis2ds12.c @@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(LIS2DS12); static struct lis2ds12_data lis2ds12_data; static struct lis2ds12_config lis2ds12_config = { - .comm_master_dev_name = DT_ST_LIS2DS12_0_BUS_NAME, + .comm_master_dev_name = DT_INST_0_ST_LIS2DS12_BUS_NAME, #if defined(DT_ST_LIS2DS12_BUS_SPI) .bus_init = lis2ds12_spi_init, #elif defined(DT_ST_LIS2DS12_BUS_I2C) @@ -312,6 +312,6 @@ static int lis2ds12_init(struct device *dev) return 0; } -DEVICE_AND_API_INIT(lis2ds12, DT_ST_LIS2DS12_0_LABEL, lis2ds12_init, +DEVICE_AND_API_INIT(lis2ds12, DT_INST_0_ST_LIS2DS12_LABEL, lis2ds12_init, &lis2ds12_data, &lis2ds12_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis2ds12_api_funcs); diff --git a/drivers/sensor/lis2ds12/lis2ds12_i2c.c b/drivers/sensor/lis2ds12/lis2ds12_i2c.c index d1458e6ec7c..58ba124f0ca 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_i2c.c +++ b/drivers/sensor/lis2ds12/lis2ds12_i2c.c @@ -16,7 +16,7 @@ #ifdef DT_ST_LIS2DS12_BUS_I2C -static u16_t lis2ds12_i2c_slave_addr = DT_ST_LIS2DS12_0_BASE_ADDRESS; +static u16_t lis2ds12_i2c_slave_addr = DT_INST_0_ST_LIS2DS12_BASE_ADDRESS; #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LIS2DS12); diff --git a/drivers/sensor/lis2ds12/lis2ds12_spi.c b/drivers/sensor/lis2ds12/lis2ds12_spi.c index 1a2c398e6d0..6a9638bd151 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_spi.c +++ b/drivers/sensor/lis2ds12/lis2ds12_spi.c @@ -21,15 +21,15 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LIS2DS12); -#if defined(DT_ST_LIS2DS12_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LIS2DS12_CS_GPIO_CONTROLLER) static struct spi_cs_control lis2ds12_cs_ctrl; #endif static struct spi_config lis2ds12_spi_conf = { - .frequency = DT_ST_LIS2DS12_0_SPI_MAX_FREQUENCY, + .frequency = DT_INST_0_ST_LIS2DS12_SPI_MAX_FREQUENCY, .operation = (SPI_OP_MODE_MASTER | SPI_MODE_CPOL | SPI_MODE_CPHA | SPI_WORD_SET(8) | SPI_LINES_SINGLE), - .slave = DT_ST_LIS2DS12_0_BASE_ADDRESS, + .slave = DT_INST_0_ST_LIS2DS12_BASE_ADDRESS, .cs = NULL, }; @@ -156,23 +156,23 @@ int lis2ds12_spi_init(struct device *dev) data->hw_tf = &lis2ds12_spi_transfer_fn; -#if defined(DT_ST_LIS2DS12_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LIS2DS12_CS_GPIO_CONTROLLER) /* handle SPI CS thru GPIO if it is the case */ lis2ds12_cs_ctrl.gpio_dev = device_get_binding( - DT_ST_LIS2DS12_0_CS_GPIO_CONTROLLER); + DT_INST_0_ST_LIS2DS12_CS_GPIO_CONTROLLER); if (!lis2ds12_cs_ctrl.gpio_dev) { LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } - lis2ds12_cs_ctrl.gpio_pin = DT_ST_LIS2DS12_0_CS_GPIO_PIN; + lis2ds12_cs_ctrl.gpio_pin = DT_INST_0_ST_LIS2DS12_CS_GPIO_PIN; lis2ds12_cs_ctrl.delay = 0U; lis2ds12_spi_conf.cs = &lis2ds12_cs_ctrl; LOG_DBG("SPI GPIO CS configured on %s:%u", - DT_ST_LIS2DS12_0_CS_GPIO_CONTROLLER, - DT_ST_LIS2DS12_0_CS_GPIO_PIN); + DT_INST_0_ST_LIS2DS12_CS_GPIO_CONTROLLER, + DT_INST_0_ST_LIS2DS12_CS_GPIO_PIN); #endif return 0; diff --git a/drivers/sensor/lis2ds12/lis2ds12_trigger.c b/drivers/sensor/lis2ds12/lis2ds12_trigger.c index a85f09ff262..a2720b74c3d 100644 --- a/drivers/sensor/lis2ds12/lis2ds12_trigger.c +++ b/drivers/sensor/lis2ds12/lis2ds12_trigger.c @@ -29,7 +29,7 @@ static void lis2ds12_gpio_callback(struct device *dev, ARG_UNUSED(pins); - gpio_pin_disable_callback(dev, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN); + gpio_pin_disable_callback(dev, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN); #if defined(CONFIG_LIS2DS12_TRIGGER_OWN_THREAD) k_sem_give(&data->trig_sem); @@ -62,7 +62,7 @@ static void lis2ds12_handle_int(void *arg) lis2ds12_handle_drdy_int(dev); } - gpio_pin_enable_callback(data->gpio, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(data->gpio, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN); } #ifdef CONFIG_LIS2DS12_TRIGGER_OWN_THREAD @@ -120,20 +120,20 @@ int lis2ds12_trigger_init(struct device *dev) struct lis2ds12_data *data = dev->driver_data; /* setup data ready gpio interrupt */ - data->gpio = device_get_binding(DT_ST_LIS2DS12_0_IRQ_GPIOS_CONTROLLER); + data->gpio = device_get_binding(DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_CONTROLLER); if (data->gpio == NULL) { LOG_ERR("Cannot get pointer to %s device.", - DT_ST_LIS2DS12_0_IRQ_GPIOS_CONTROLLER); + DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_CONTROLLER); return -EINVAL; } - gpio_pin_configure(data->gpio, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN, + gpio_pin_configure(data->gpio, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN, GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE); gpio_init_callback(&data->gpio_cb, lis2ds12_gpio_callback, - BIT(DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN)); + BIT(DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN)); if (gpio_add_callback(data->gpio, &data->gpio_cb) < 0) { LOG_ERR("Could not set gpio callback."); @@ -153,7 +153,7 @@ int lis2ds12_trigger_init(struct device *dev) data->dev = dev; #endif - gpio_pin_enable_callback(data->gpio, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(data->gpio, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN); return 0; } @@ -167,7 +167,7 @@ int lis2ds12_trigger_set(struct device *dev, __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); - gpio_pin_disable_callback(data->gpio, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN); + gpio_pin_disable_callback(data->gpio, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN); data->data_ready_handler = handler; if (handler == NULL) { @@ -185,7 +185,7 @@ int lis2ds12_trigger_set(struct device *dev, data->data_ready_trigger = *trig; lis2ds12_init_interrupt(dev); - gpio_pin_enable_callback(data->gpio, DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(data->gpio, DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN); return 0; } diff --git a/drivers/sensor/lis2dw12/lis2dw12.c b/drivers/sensor/lis2dw12/lis2dw12.c index 38c2bd48ed6..aa441f965d7 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.c +++ b/drivers/sensor/lis2dw12/lis2dw12.c @@ -346,11 +346,11 @@ static int lis2dw12_init(struct device *dev) } const struct lis2dw12_device_config lis2dw12_cfg = { - .bus_name = DT_ST_LIS2DW12_0_BUS_NAME, + .bus_name = DT_INST_0_ST_LIS2DW12_BUS_NAME, .pm = CONFIG_LIS2DW12_POWER_MODE, #ifdef CONFIG_LIS2DW12_TRIGGER - .int_gpio_port = DT_ST_LIS2DW12_0_IRQ_GPIOS_CONTROLLER, - .int_gpio_pin = DT_ST_LIS2DW12_0_IRQ_GPIOS_PIN, + .int_gpio_port = DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_CONTROLLER, + .int_gpio_pin = DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_PIN, #if defined(CONFIG_LIS2DW12_INT_PIN_1) .int_pin = 1, #elif defined(CONFIG_LIS2DW12_INT_PIN_2) @@ -362,6 +362,6 @@ const struct lis2dw12_device_config lis2dw12_cfg = { struct lis2dw12_data lis2dw12_data; -DEVICE_AND_API_INIT(lis2dw12, DT_ST_LIS2DW12_0_LABEL, lis2dw12_init, +DEVICE_AND_API_INIT(lis2dw12, DT_INST_0_ST_LIS2DW12_LABEL, lis2dw12_init, &lis2dw12_data, &lis2dw12_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis2dw12_driver_api); diff --git a/drivers/sensor/lis2dw12/lis2dw12.h b/drivers/sensor/lis2dw12/lis2dw12.h index ef327139e08..73111827600 100644 --- a/drivers/sensor/lis2dw12/lis2dw12.h +++ b/drivers/sensor/lis2dw12/lis2dw12.h @@ -203,7 +203,7 @@ struct lis2dw12_data { struct device *dev; #endif /* CONFIG_LIS2DW12_TRIGGER_GLOBAL_THREAD */ #endif /* CONFIG_LIS2DW12_TRIGGER */ -#if defined(DT_ST_LIS2DW12_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LIS2DW12_CS_GPIO_CONTROLLER) struct spi_cs_control cs_ctrl; #endif }; diff --git a/drivers/sensor/lis2dw12/lis2dw12_i2c.c b/drivers/sensor/lis2dw12/lis2dw12_i2c.c index a20034904e5..0922def0388 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_i2c.c +++ b/drivers/sensor/lis2dw12/lis2dw12_i2c.c @@ -16,7 +16,7 @@ #ifdef DT_ST_LIS2DW12_BUS_I2C -static u16_t lis2dw12_i2c_slave_addr = DT_ST_LIS2DW12_0_BASE_ADDRESS; +static u16_t lis2dw12_i2c_slave_addr = DT_INST_0_ST_LIS2DW12_BASE_ADDRESS; #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LIS2DW12); diff --git a/drivers/sensor/lis2dw12/lis2dw12_spi.c b/drivers/sensor/lis2dw12/lis2dw12_spi.c index 9d1731985f9..af7a924be7d 100644 --- a/drivers/sensor/lis2dw12/lis2dw12_spi.c +++ b/drivers/sensor/lis2dw12/lis2dw12_spi.c @@ -21,10 +21,10 @@ LOG_MODULE_DECLARE(LIS2DW12); static struct spi_config lis2dw12_spi_conf = { - .frequency = DT_ST_LIS2DW12_0_SPI_MAX_FREQUENCY, + .frequency = DT_INST_0_ST_LIS2DW12_SPI_MAX_FREQUENCY, .operation = (SPI_OP_MODE_MASTER | SPI_MODE_CPOL | SPI_MODE_CPHA | SPI_WORD_SET(8) | SPI_LINES_SINGLE), - .slave = DT_ST_LIS2DW12_0_BASE_ADDRESS, + .slave = DT_INST_0_ST_LIS2DW12_BASE_ADDRESS, .cs = NULL, }; @@ -151,23 +151,23 @@ int lis2dw12_spi_init(struct device *dev) data->hw_tf = &lis2dw12_spi_transfer_fn; -#if defined(DT_ST_LIS2DW12_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LIS2DW12_CS_GPIO_CONTROLLER) /* handle SPI CS thru GPIO if it is the case */ data->cs_ctrl.gpio_dev = device_get_binding( - DT_ST_LIS2DW12_0_CS_GPIO_CONTROLLER); + DT_INST_0_ST_LIS2DW12_CS_GPIO_CONTROLLER); if (!data->cs_ctrl.gpio_dev) { LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } - data->cs_ctrl.gpio_pin = DT_ST_LIS2DW12_0_CS_GPIO_PIN; + data->cs_ctrl.gpio_pin = DT_INST_0_ST_LIS2DW12_CS_GPIO_PIN; data->cs_ctrl.delay = 0U; lis2dw12_spi_conf.cs = &data->cs_ctrl; LOG_DBG("SPI GPIO CS configured on %s:%u", - DT_ST_LIS2DW12_0_CS_GPIO_CONTROLLER, - DT_ST_LIS2DW12_0_CS_GPIO_PIN); + DT_INST_0_ST_LIS2DW12_CS_GPIO_CONTROLLER, + DT_INST_0_ST_LIS2DW12_CS_GPIO_PIN); #endif return 0; diff --git a/drivers/sensor/lis2mdl/lis2mdl.c b/drivers/sensor/lis2mdl/lis2mdl.c index 1bb0dce62fc..846f1a6c695 100644 --- a/drivers/sensor/lis2mdl/lis2mdl.c +++ b/drivers/sensor/lis2mdl/lis2mdl.c @@ -310,12 +310,12 @@ static int lis2mdl_init_interface(struct device *dev) } static const struct lis2mdl_device_config lis2mdl_dev_config = { - .master_dev_name = DT_ST_LIS2MDL_MAGN_0_BUS_NAME, + .master_dev_name = DT_INST_0_ST_LIS2MDL_MAGN_BUS_NAME, #ifdef CONFIG_LIS2MDL_TRIGGER - .gpio_name = DT_ST_LIS2MDL_MAGN_0_IRQ_GPIOS_CONTROLLER, - .gpio_pin = DT_ST_LIS2MDL_MAGN_0_IRQ_GPIOS_PIN, + .gpio_name = DT_INST_0_ST_LIS2MDL_MAGN_IRQ_GPIOS_CONTROLLER, + .gpio_pin = DT_INST_0_ST_LIS2MDL_MAGN_IRQ_GPIOS_PIN, #endif /* CONFIG_LIS2MDL_TRIGGER */ - .i2c_addr_config = DT_ST_LIS2MDL_MAGN_0_BASE_ADDRESS, + .i2c_addr_config = DT_INST_0_ST_LIS2MDL_MAGN_BASE_ADDRESS, }; static int lis2mdl_init(struct device *dev) @@ -374,6 +374,6 @@ static int lis2mdl_init(struct device *dev) return 0; } -DEVICE_AND_API_INIT(lis2mdl, DT_ST_LIS2MDL_MAGN_0_LABEL, lis2mdl_init, +DEVICE_AND_API_INIT(lis2mdl, DT_INST_0_ST_LIS2MDL_MAGN_LABEL, lis2mdl_init, &lis2mdl_device_data, &lis2mdl_dev_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis2mdl_driver_api); diff --git a/drivers/sensor/lis3mdl/lis3mdl.c b/drivers/sensor/lis3mdl/lis3mdl.c index d10a8db6049..4cbb5378ad8 100644 --- a/drivers/sensor/lis3mdl/lis3mdl.c +++ b/drivers/sensor/lis3mdl/lis3mdl.c @@ -65,7 +65,7 @@ int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); /* fetch magnetometer sample */ - if (i2c_burst_read(drv_data->i2c, DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS, + if (i2c_burst_read(drv_data->i2c, DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS, LIS3MDL_REG_SAMPLE_START, (u8_t *)buf, 8) < 0) { LOG_DBG("Failed to fetch megnetometer sample."); return -EIO; @@ -76,7 +76,7 @@ int lis3mdl_sample_fetch(struct device *dev, enum sensor_channel chan) * the same read as magnetometer data, so do another * burst read to fetch the temperature sample */ - if (i2c_burst_read(drv_data->i2c, DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS, + if (i2c_burst_read(drv_data->i2c, DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS, LIS3MDL_REG_SAMPLE_START + 6, (u8_t *)(buf + 3), 2) < 0) { LOG_DBG("Failed to fetch temperature sample."); @@ -105,16 +105,16 @@ int lis3mdl_init(struct device *dev) u8_t chip_cfg[6]; u8_t id, idx; - drv_data->i2c = device_get_binding(DT_ST_LIS3MDL_MAGN_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_ST_LIS3MDL_MAGN_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Could not get pointer to %s device.", - DT_ST_LIS3MDL_MAGN_0_BUS_NAME); + DT_INST_0_ST_LIS3MDL_MAGN_BUS_NAME); return -EINVAL; } /* check chip ID */ - if (i2c_reg_read_byte(drv_data->i2c, DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS, + if (i2c_reg_read_byte(drv_data->i2c, DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS, LIS3MDL_REG_WHO_AM_I, &id) < 0) { LOG_ERR("Failed to read chip ID."); return -EIO; @@ -148,7 +148,7 @@ int lis3mdl_init(struct device *dev) chip_cfg[5] = LIS3MDL_BDU_EN; if (i2c_write(drv_data->i2c, - chip_cfg, 6, DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS) < 0) { + chip_cfg, 6, DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS) < 0) { LOG_DBG("Failed to configure chip."); return -EIO; } @@ -165,6 +165,6 @@ int lis3mdl_init(struct device *dev) struct lis3mdl_data lis3mdl_driver; -DEVICE_AND_API_INIT(lis3mdl, DT_ST_LIS3MDL_MAGN_0_LABEL, lis3mdl_init, +DEVICE_AND_API_INIT(lis3mdl, DT_INST_0_ST_LIS3MDL_MAGN_LABEL, lis3mdl_init, &lis3mdl_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lis3mdl_driver_api); diff --git a/drivers/sensor/lis3mdl/lis3mdl_trigger.c b/drivers/sensor/lis3mdl/lis3mdl_trigger.c index ec141009d3a..c401cf0c351 100644 --- a/drivers/sensor/lis3mdl/lis3mdl_trigger.c +++ b/drivers/sensor/lis3mdl/lis3mdl_trigger.c @@ -126,7 +126,7 @@ int lis3mdl_init_interrupt(struct device *dev) } /* enable interrupt */ - if (i2c_reg_write_byte(drv_data->i2c, DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS, + if (i2c_reg_write_byte(drv_data->i2c, DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS, LIS3MDL_REG_INT_CFG, LIS3MDL_INT_XYZ_EN) < 0) { LOG_DBG("Could not enable interrupt."); return -EIO; diff --git a/drivers/sensor/lps22hb/lps22hb.c b/drivers/sensor/lps22hb/lps22hb.c index e20f0860eaa..bceb05c8bf5 100644 --- a/drivers/sensor/lps22hb/lps22hb.c +++ b/drivers/sensor/lps22hb/lps22hb.c @@ -152,12 +152,12 @@ static int lps22hb_init(struct device *dev) } static const struct lps22hb_config lps22hb_config = { - .i2c_master_dev_name = DT_ST_LPS22HB_PRESS_0_BUS_NAME, - .i2c_slave_addr = DT_ST_LPS22HB_PRESS_0_BASE_ADDRESS, + .i2c_master_dev_name = DT_INST_0_ST_LPS22HB_PRESS_BUS_NAME, + .i2c_slave_addr = DT_INST_0_ST_LPS22HB_PRESS_BASE_ADDRESS, }; static struct lps22hb_data lps22hb_data; -DEVICE_AND_API_INIT(lps22hb, DT_ST_LPS22HB_PRESS_0_LABEL, lps22hb_init, +DEVICE_AND_API_INIT(lps22hb, DT_INST_0_ST_LPS22HB_PRESS_LABEL, lps22hb_init, &lps22hb_data, &lps22hb_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lps22hb_api_funcs); diff --git a/drivers/sensor/lps25hb/lps25hb.c b/drivers/sensor/lps25hb/lps25hb.c index 5d23911aa02..1603046e5a8 100644 --- a/drivers/sensor/lps25hb/lps25hb.c +++ b/drivers/sensor/lps25hb/lps25hb.c @@ -180,12 +180,12 @@ static int lps25hb_init(struct device *dev) } static const struct lps25hb_config lps25hb_config = { - .i2c_master_dev_name = DT_ST_LPS25HB_PRESS_0_BUS_NAME, - .i2c_slave_addr = DT_ST_LPS25HB_PRESS_0_BASE_ADDRESS, + .i2c_master_dev_name = DT_INST_0_ST_LPS25HB_PRESS_BUS_NAME, + .i2c_slave_addr = DT_INST_0_ST_LPS25HB_PRESS_BASE_ADDRESS, }; static struct lps25hb_data lps25hb_data; -DEVICE_AND_API_INIT(lps25hb, DT_ST_LPS25HB_PRESS_0_LABEL, lps25hb_init, +DEVICE_AND_API_INIT(lps25hb, DT_INST_0_ST_LPS25HB_PRESS_LABEL, lps25hb_init, &lps25hb_data, &lps25hb_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lps25hb_api_funcs); diff --git a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c index 09c2a772f03..5366843beb2 100644 --- a/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c +++ b/drivers/sensor/lsm303dlhc_magn/lsm303dlhc_magn.c @@ -132,13 +132,13 @@ static int lsm303dlhc_magn_init(struct device *dev) } static const struct lsm303dlhc_magn_config lsm303dlhc_magn_config = { - .i2c_name = DT_ST_LSM303DLHC_MAGN_0_BUS_NAME, - .i2c_address = DT_ST_LSM303DLHC_MAGN_0_BASE_ADDRESS, + .i2c_name = DT_INST_0_ST_LSM303DLHC_MAGN_BUS_NAME, + .i2c_address = DT_INST_0_ST_LSM303DLHC_MAGN_BASE_ADDRESS, }; static struct lsm303dlhc_magn_data lsm303dlhc_magn_driver; -DEVICE_AND_API_INIT(lsm303dlhc_magn, DT_ST_LSM303DLHC_MAGN_0_LABEL, +DEVICE_AND_API_INIT(lsm303dlhc_magn, DT_INST_0_ST_LSM303DLHC_MAGN_LABEL, lsm303dlhc_magn_init, &lsm303dlhc_magn_driver, &lsm303dlhc_magn_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lsm303dlhc_magn_driver_api); diff --git a/drivers/sensor/lsm6ds0/lsm6ds0.c b/drivers/sensor/lsm6ds0/lsm6ds0.c index 53afceedc08..ccfeee7dafe 100644 --- a/drivers/sensor/lsm6ds0/lsm6ds0.c +++ b/drivers/sensor/lsm6ds0/lsm6ds0.c @@ -500,12 +500,12 @@ static int lsm6ds0_init(struct device *dev) } static const struct lsm6ds0_config lsm6ds0_config = { - .i2c_master_dev_name = DT_ST_LSM6DS0_0_BUS_NAME, - .i2c_slave_addr = DT_ST_LSM6DS0_0_BASE_ADDRESS, + .i2c_master_dev_name = DT_INST_0_ST_LSM6DS0_BUS_NAME, + .i2c_slave_addr = DT_INST_0_ST_LSM6DS0_BASE_ADDRESS, }; static struct lsm6ds0_data lsm6ds0_data; -DEVICE_AND_API_INIT(lsm6ds0, DT_ST_LSM6DS0_0_LABEL, lsm6ds0_init, +DEVICE_AND_API_INIT(lsm6ds0, DT_INST_0_ST_LSM6DS0_LABEL, lsm6ds0_init, &lsm6ds0_data, &lsm6ds0_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lsm6ds0_api_funcs); diff --git a/drivers/sensor/lsm6dsl/lsm6dsl.c b/drivers/sensor/lsm6dsl/lsm6dsl.c index 5fa424a1c44..69780bd6fd0 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl.c @@ -773,7 +773,7 @@ static int lsm6dsl_init_chip(struct device *dev) } static struct lsm6dsl_config lsm6dsl_config = { - .comm_master_dev_name = DT_ST_LSM6DSL_0_BUS_NAME, + .comm_master_dev_name = DT_INST_0_ST_LSM6DSL_BUS_NAME, }; static int lsm6dsl_init(struct device *dev) @@ -819,6 +819,6 @@ static int lsm6dsl_init(struct device *dev) static struct lsm6dsl_data lsm6dsl_data; -DEVICE_AND_API_INIT(lsm6dsl, DT_ST_LSM6DSL_0_LABEL, lsm6dsl_init, +DEVICE_AND_API_INIT(lsm6dsl, DT_INST_0_ST_LSM6DSL_LABEL, lsm6dsl_init, &lsm6dsl_data, &lsm6dsl_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lsm6dsl_api_funcs); diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c index bb8d43f78c3..c9b888ed0fd 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_i2c.c @@ -15,7 +15,7 @@ #ifdef DT_ST_LSM6DSL_BUS_I2C -static u16_t lsm6dsl_i2c_slave_addr = DT_ST_LSM6DSL_0_BASE_ADDRESS; +static u16_t lsm6dsl_i2c_slave_addr = DT_INST_0_ST_LSM6DSL_BASE_ADDRESS; #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LSM6DSL); diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c index da9be822c8c..45517bd797e 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_spi.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_spi.c @@ -19,17 +19,17 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_DECLARE(LSM6DSL); -#if defined(DT_ST_LSM6DSL_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LSM6DSL_CS_GPIO_CONTROLLER) static struct spi_cs_control lsm6dsl_cs_ctrl; #endif #define SPI_CS NULL static struct spi_config lsm6dsl_spi_conf = { - .frequency = DT_ST_LSM6DSL_0_SPI_MAX_FREQUENCY, + .frequency = DT_INST_0_ST_LSM6DSL_SPI_MAX_FREQUENCY, .operation = (SPI_OP_MODE_MASTER | SPI_MODE_CPOL | SPI_MODE_CPHA | SPI_WORD_SET(8) | SPI_LINES_SINGLE), - .slave = DT_ST_LSM6DSL_0_BASE_ADDRESS, + .slave = DT_INST_0_ST_LSM6DSL_BASE_ADDRESS, .cs = SPI_CS, }; @@ -147,23 +147,23 @@ int lsm6dsl_spi_init(struct device *dev) data->hw_tf = &lsm6dsl_spi_transfer_fn; -#if defined(DT_ST_LSM6DSL_0_CS_GPIO_CONTROLLER) +#if defined(DT_INST_0_ST_LSM6DSL_CS_GPIO_CONTROLLER) /* handle SPI CS thru GPIO if it is the case */ lsm6dsl_cs_ctrl.gpio_dev = device_get_binding( - DT_ST_LSM6DSL_0_CS_GPIO_CONTROLLER); + DT_INST_0_ST_LSM6DSL_CS_GPIO_CONTROLLER); if (!lsm6dsl_cs_ctrl.gpio_dev) { LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } - lsm6dsl_cs_ctrl.gpio_pin = DT_ST_LSM6DSL_0_CS_GPIO_PIN; + lsm6dsl_cs_ctrl.gpio_pin = DT_INST_0_ST_LSM6DSL_CS_GPIO_PIN; lsm6dsl_cs_ctrl.delay = 0U; lsm6dsl_spi_conf.cs = &lsm6dsl_cs_ctrl; LOG_DBG("SPI GPIO CS configured on %s:%u", - DT_ST_LSM6DSL_0_CS_GPIO_CONTROLLER, - DT_ST_LSM6DSL_0_CS_GPIO_PIN); + DT_INST_0_ST_LSM6DSL_CS_GPIO_CONTROLLER, + DT_INST_0_ST_LSM6DSL_CS_GPIO_PIN); #endif return 0; diff --git a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c index 35129bd8a17..3e68089398b 100644 --- a/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c +++ b/drivers/sensor/lsm6dsl/lsm6dsl_trigger.c @@ -25,7 +25,7 @@ int lsm6dsl_trigger_set(struct device *dev, __ASSERT_NO_MSG(trig->type == SENSOR_TRIG_DATA_READY); - gpio_pin_disable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN); + gpio_pin_disable_callback(drv_data->gpio, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN); drv_data->data_ready_handler = handler; if (handler == NULL) { @@ -34,7 +34,7 @@ int lsm6dsl_trigger_set(struct device *dev, drv_data->data_ready_trigger = *trig; - gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN); return 0; } @@ -47,7 +47,7 @@ static void lsm6dsl_gpio_callback(struct device *dev, ARG_UNUSED(pins); - gpio_pin_disable_callback(dev, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN); + gpio_pin_disable_callback(dev, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN); #if defined(CONFIG_LSM6DSL_TRIGGER_OWN_THREAD) k_sem_give(&drv_data->gpio_sem); @@ -66,7 +66,7 @@ static void lsm6dsl_thread_cb(void *arg) &drv_data->data_ready_trigger); } - gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN); } #ifdef CONFIG_LSM6DSL_TRIGGER_OWN_THREAD @@ -99,20 +99,20 @@ int lsm6dsl_init_interrupt(struct device *dev) struct lsm6dsl_data *drv_data = dev->driver_data; /* setup data ready gpio interrupt */ - drv_data->gpio = device_get_binding(DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER); + drv_data->gpio = device_get_binding(DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_CONTROLLER); if (drv_data->gpio == NULL) { LOG_ERR("Cannot get pointer to %s device.", - DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER); + DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_CONTROLLER); return -EINVAL; } - gpio_pin_configure(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN, + gpio_pin_configure(drv_data->gpio, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN, GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | GPIO_INT_ACTIVE_HIGH | GPIO_INT_DEBOUNCE); gpio_init_callback(&drv_data->gpio_cb, lsm6dsl_gpio_callback, - BIT(DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN)); + BIT(DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { LOG_ERR("Could not set gpio callback."); @@ -143,7 +143,7 @@ int lsm6dsl_init_interrupt(struct device *dev) drv_data->dev = dev; #endif - gpio_pin_enable_callback(drv_data->gpio, DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN); + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN); return 0; } diff --git a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c index 90ab3d1c32f..9be0ff31017 100644 --- a/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c +++ b/drivers/sensor/lsm9ds0_gyro/lsm9ds0_gyro.c @@ -345,17 +345,17 @@ static int lsm9ds0_gyro_init(struct device *dev) } static const struct lsm9ds0_gyro_config lsm9ds0_gyro_config = { - .i2c_master_dev_name = DT_LSM9DS0_GYRO_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = DT_LSM9DS0_GYRO_I2C_ADDRESS, + .i2c_master_dev_name = DT_INST_0_ST_LSM9DS0_GYRO_BUS_NAME, + .i2c_slave_addr = DT_INST_0_ST_LSM9DS0_GYRO_BASE_ADDRESS, #if defined(CONFIG_LSM9DS0_GYRO_TRIGGER_DRDY) - .gpio_drdy_dev_name = DT_LSM9DS0_GYRO_INT_GPIO_DEV_NAME, - .gpio_drdy_int_pin = DT_LSM9DS0_GYRO_INT_GPIO_PIN, + .gpio_drdy_dev_name = DT_INST_0_ST_LSM9DS0_GYRO_IRQ_GPIOS_CONTROLLER, + .gpio_drdy_int_pin = DT_INST_0_ST_LSM9DS0_GYRO_IRQ_GPIOS_PIN, #endif }; static struct lsm9ds0_gyro_data lsm9ds0_gyro_data; -DEVICE_AND_API_INIT(lsm9ds0_gyro, DT_LSM9DS0_GYRO_DEV_NAME, +DEVICE_AND_API_INIT(lsm9ds0_gyro, DT_INST_0_ST_LSM9DS0_GYRO_LABEL, lsm9ds0_gyro_init, &lsm9ds0_gyro_data, &lsm9ds0_gyro_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lsm9ds0_gyro_api_funcs); diff --git a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c index 78ffb3ff187..45729c59004 100644 --- a/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c +++ b/drivers/sensor/lsm9ds0_mfd/lsm9ds0_mfd.c @@ -788,12 +788,12 @@ int lsm9ds0_mfd_init(struct device *dev) } static const struct lsm9ds0_mfd_config lsm9ds0_mfd_config = { - .i2c_master_dev_name = DT_LSM9DS0_MFD_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = DT_LSM9DS0_MFD_I2C_ADDRESS, + .i2c_master_dev_name = DT_INST_0_ST_LSM9DS0_MFD_BUS_NAME, + .i2c_slave_addr = DT_INST_0_ST_LSM9DS0_MFD_BASE_ADDRESS, }; static struct lsm9ds0_mfd_data lsm9ds0_mfd_data; -DEVICE_AND_API_INIT(lsm9ds0_mfd, DT_LSM9DS0_MFD_DEV_NAME, lsm9ds0_mfd_init, +DEVICE_AND_API_INIT(lsm9ds0_mfd, DT_INST_0_ST_LSM9DS0_MFD_LABEL, lsm9ds0_mfd_init, &lsm9ds0_mfd_data, &lsm9ds0_mfd_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &lsm9ds0_mfd_api_funcs); diff --git a/drivers/sensor/max30101/max30101.c b/drivers/sensor/max30101/max30101.c index c9789658f5b..6da1c96ad01 100644 --- a/drivers/sensor/max30101/max30101.c +++ b/drivers/sensor/max30101/max30101.c @@ -99,7 +99,7 @@ static int max30101_init(struct device *dev) int fifo_chan; /* Get the I2C device */ - data->i2c = device_get_binding(DT_MAX_MAX30101_0_BUS_NAME); + data->i2c = device_get_binding(DT_INST_0_MAX_MAX30101_BUS_NAME); if (!data->i2c) { LOG_ERR("Could not find I2C device"); return -EINVAL; @@ -242,7 +242,7 @@ static struct max30101_config max30101_config = { static struct max30101_data max30101_data; -DEVICE_AND_API_INIT(max30101, DT_MAX_MAX30101_0_LABEL, max30101_init, +DEVICE_AND_API_INIT(max30101, DT_INST_0_MAX_MAX30101_LABEL, max30101_init, &max30101_data, &max30101_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &max30101_driver_api); diff --git a/drivers/sensor/ms5837/ms5837.c b/drivers/sensor/ms5837/ms5837.c index 9079d8edbff..413ff8bfdf7 100644 --- a/drivers/sensor/ms5837/ms5837.c +++ b/drivers/sensor/ms5837/ms5837.c @@ -260,7 +260,7 @@ static int ms5837_init(struct device *dev) data->i2c_master = device_get_binding(cfg->i2c_name); if (data->i2c_master == NULL) { LOG_ERR("i2c master %s not found", - DT_MEAS_MS5837_0_BUS_NAME); + DT_INST_0_MEAS_MS5837_BUS_NAME); return -EINVAL; } @@ -318,10 +318,10 @@ static int ms5837_init(struct device *dev) static struct ms5837_data ms5837_data; static const struct ms5837_config ms5837_config = { - .i2c_name = DT_MEAS_MS5837_0_BUS_NAME, - .i2c_address = DT_MEAS_MS5837_0_BASE_ADDRESS + .i2c_name = DT_INST_0_MEAS_MS5837_BUS_NAME, + .i2c_address = DT_INST_0_MEAS_MS5837_BASE_ADDRESS }; -DEVICE_AND_API_INIT(ms5837, DT_MEAS_MS5837_0_LABEL, ms5837_init, &ms5837_data, +DEVICE_AND_API_INIT(ms5837, DT_INST_0_MEAS_MS5837_LABEL, ms5837_init, &ms5837_data, &ms5837_config, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &ms5837_api_funcs); diff --git a/drivers/sensor/nrf5/temp_nrf5.c b/drivers/sensor/nrf5/temp_nrf5.c index 62b2a6260ab..bfaa3fe436d 100644 --- a/drivers/sensor/nrf5/temp_nrf5.c +++ b/drivers/sensor/nrf5/temp_nrf5.c @@ -101,17 +101,17 @@ static int temp_nrf5_init(struct device *dev) LOG_DBG(""); data->clk_m16_dev = - device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_16M"); + device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M"); __ASSERT_NO_MSG(data->clk_m16_dev); k_sem_init(&data->device_sync_sem, 0, UINT_MAX); IRQ_CONNECT( - DT_NORDIC_NRF_TEMP_0_IRQ_0, - DT_NORDIC_NRF_TEMP_0_IRQ_0_PRIORITY, + DT_INST_0_NORDIC_NRF_TEMP_IRQ_0, + DT_INST_0_NORDIC_NRF_TEMP_IRQ_0_PRIORITY, temp_nrf5_isr, DEVICE_GET(temp_nrf5), 0); - irq_enable(DT_NORDIC_NRF_TEMP_0_IRQ_0); + irq_enable(DT_INST_0_NORDIC_NRF_TEMP_IRQ_0); NRF_TEMP->INTENSET = TEMP_INTENSET_DATARDY_Set; diff --git a/drivers/sensor/sht3xd/sht3xd.c b/drivers/sensor/sht3xd/sht3xd.c index 065794c3af9..c3e10c26f4f 100644 --- a/drivers/sensor/sht3xd/sht3xd.c +++ b/drivers/sensor/sht3xd/sht3xd.c @@ -201,17 +201,17 @@ static int sht3xd_init(struct device *dev) struct sht3xd_data sht3xd0_driver; static const struct sht3xd_config sht3xd0_cfg = { - .bus_name = DT_SENSIRION_SHT3XD_0_BUS_NAME, + .bus_name = DT_INST_0_SENSIRION_SHT3XD_BUS_NAME, #ifdef CONFIG_SHT3XD_TRIGGER - .alert_gpio_name = DT_SENSIRION_SHT3XD_0_ALERT_GPIOS_CONTROLLER, + .alert_gpio_name = DT_INST_0_SENSIRION_SHT3XD_ALERT_GPIOS_CONTROLLER, #endif - .base_address = DT_SENSIRION_SHT3XD_0_BASE_ADDRESS, + .base_address = DT_INST_0_SENSIRION_SHT3XD_BASE_ADDRESS, #ifdef CONFIG_SHT3XD_TRIGGER - .alert_pin = DT_SENSIRION_SHT3XD_0_ALERT_GPIOS_PIN, + .alert_pin = DT_INST_0_SENSIRION_SHT3XD_ALERT_GPIOS_PIN, #endif }; -DEVICE_AND_API_INIT(sht3xd0, DT_SENSIRION_SHT3XD_0_LABEL, +DEVICE_AND_API_INIT(sht3xd0, DT_INST_0_SENSIRION_SHT3XD_LABEL, sht3xd_init, &sht3xd0_driver, &sht3xd0_cfg, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &sht3xd_driver_api); diff --git a/drivers/sensor/ti_hdc/ti_hdc.c b/drivers/sensor/ti_hdc/ti_hdc.c index acf05a48382..f9e25081ffa 100644 --- a/drivers/sensor/ti_hdc/ti_hdc.c +++ b/drivers/sensor/ti_hdc/ti_hdc.c @@ -18,7 +18,7 @@ #define LOG_LEVEL CONFIG_SENSOR_LOG_LEVEL LOG_MODULE_REGISTER(TI_HDC); -#if defined(DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER) +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER) static void ti_hdc_gpio_callback(struct device *dev, struct gpio_callback *cb, u32_t pins) { @@ -27,7 +27,7 @@ static void ti_hdc_gpio_callback(struct device *dev, ARG_UNUSED(pins); - gpio_pin_disable_callback(dev, DT_TI_HDC_0_DRDY_GPIOS_PIN); + gpio_pin_disable_callback(dev, DT_INST_0_TI_HDC_DRDY_GPIOS_PIN); k_sem_give(&drv_data->data_sem); } #endif @@ -39,25 +39,25 @@ static int ti_hdc_sample_fetch(struct device *dev, enum sensor_channel chan) __ASSERT_NO_MSG(chan == SENSOR_CHAN_ALL); -#if defined(DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER) - gpio_pin_enable_callback(drv_data->gpio, DT_TI_HDC_0_DRDY_GPIOS_PIN); +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER) + gpio_pin_enable_callback(drv_data->gpio, DT_INST_0_TI_HDC_DRDY_GPIOS_PIN); #endif buf[0] = TI_HDC_REG_TEMP; if (i2c_write(drv_data->i2c, buf, 1, - DT_TI_HDC_0_BASE_ADDRESS) < 0) { + DT_INST_0_TI_HDC_BASE_ADDRESS) < 0) { LOG_DBG("Failed to write address pointer"); return -EIO; } -#if defined(DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER) +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER) k_sem_take(&drv_data->data_sem, K_FOREVER); #else /* wait for the conversion to finish */ k_sleep(HDC_CONVERSION_TIME); #endif - if (i2c_read(drv_data->i2c, buf, 4, DT_TI_HDC_0_BASE_ADDRESS) < 0) { + if (i2c_read(drv_data->i2c, buf, 4, DT_INST_0_TI_HDC_BASE_ADDRESS) < 0) { LOG_DBG("Failed to read sample data"); return -EIO; } @@ -118,48 +118,48 @@ static int ti_hdc_init(struct device *dev) struct ti_hdc_data *drv_data = dev->driver_data; u16_t tmp; - drv_data->i2c = device_get_binding(DT_TI_HDC_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_TI_HDC_BUS_NAME); if (drv_data->i2c == NULL) { LOG_DBG("Failed to get pointer to %s device!", - DT_TI_HDC_0_BUS_NAME); + DT_INST_0_TI_HDC_BUS_NAME); return -EINVAL; } - if (read16(drv_data->i2c, DT_TI_HDC_0_BASE_ADDRESS, + if (read16(drv_data->i2c, DT_INST_0_TI_HDC_BASE_ADDRESS, TI_HDC_REG_MANUFID) != TI_HDC_MANUFID) { LOG_ERR("Failed to get correct manufacturer ID"); return -EINVAL; } - tmp = read16(drv_data->i2c, DT_TI_HDC_0_BASE_ADDRESS, + tmp = read16(drv_data->i2c, DT_INST_0_TI_HDC_BASE_ADDRESS, TI_HDC_REG_DEVICEID); if (tmp != TI_HDC1000_DEVID && tmp != TI_HDC1050_DEVID) { LOG_ERR("Unsupported device ID"); return -EINVAL; } -#if defined(DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER) +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER) k_sem_init(&drv_data->data_sem, 0, UINT_MAX); /* setup data ready gpio interrupt */ drv_data->gpio = device_get_binding( - DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER); + DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER); if (drv_data->gpio == NULL) { LOG_DBG("Failed to get pointer to %s device", - DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER); + DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER); return -EINVAL; } - gpio_pin_configure(drv_data->gpio, DT_TI_HDC_0_DRDY_GPIOS_PIN, + gpio_pin_configure(drv_data->gpio, DT_INST_0_TI_HDC_DRDY_GPIOS_PIN, GPIO_DIR_IN | GPIO_INT | GPIO_INT_EDGE | -#if defined(DT_TI_HDC_0_DRDY_GPIOS_FLAGS) - DT_TI_HDC_0_DRDY_GPIOS_FLAGS | +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_FLAGS) + DT_INST_0_TI_HDC_DRDY_GPIOS_FLAGS | #endif GPIO_INT_ACTIVE_LOW | GPIO_INT_DEBOUNCE); gpio_init_callback(&drv_data->gpio_cb, ti_hdc_gpio_callback, - BIT(DT_TI_HDC_0_DRDY_GPIOS_PIN)); + BIT(DT_INST_0_TI_HDC_DRDY_GPIOS_PIN)); if (gpio_add_callback(drv_data->gpio, &drv_data->gpio_cb) < 0) { LOG_DBG("Failed to set GPIO callback"); @@ -174,6 +174,6 @@ static int ti_hdc_init(struct device *dev) static struct ti_hdc_data ti_hdc_data; -DEVICE_AND_API_INIT(ti_hdc, DT_TI_HDC_0_LABEL, ti_hdc_init, &ti_hdc_data, +DEVICE_AND_API_INIT(ti_hdc, DT_INST_0_TI_HDC_LABEL, ti_hdc_init, &ti_hdc_data, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &ti_hdc_driver_api); diff --git a/drivers/sensor/ti_hdc/ti_hdc.h b/drivers/sensor/ti_hdc/ti_hdc.h index 9e631905a71..5fe8dbcdf8c 100644 --- a/drivers/sensor/ti_hdc/ti_hdc.h +++ b/drivers/sensor/ti_hdc/ti_hdc.h @@ -26,11 +26,11 @@ struct ti_hdc_data { u16_t t_sample; u16_t rh_sample; -#if defined(DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER) +#if defined(DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER) struct device *gpio; struct gpio_callback gpio_cb; struct k_sem data_sem; -#endif /* DT_TI_HDC_0_DRDY_GPIOS_CONTROLLER */ +#endif /* DT_INST_0_TI_HDC_DRDY_GPIOS_CONTROLLER */ }; #endif diff --git a/drivers/sensor/vl53l0x/vl53l0x.c b/drivers/sensor/vl53l0x/vl53l0x.c index 5192af52877..e8f6ccc8fa5 100644 --- a/drivers/sensor/vl53l0x/vl53l0x.c +++ b/drivers/sensor/vl53l0x/vl53l0x.c @@ -227,15 +227,15 @@ static int vl53l0x_init(struct device *dev) k_sleep(100); #endif - drv_data->i2c = device_get_binding(DT_ST_VL53L0X_0_BUS_NAME); + drv_data->i2c = device_get_binding(DT_INST_0_ST_VL53L0X_BUS_NAME); if (drv_data->i2c == NULL) { LOG_ERR("Could not get pointer to %s device.", - DT_ST_VL53L0X_0_BUS_NAME); + DT_INST_0_ST_VL53L0X_BUS_NAME); return -EINVAL; } drv_data->vl53l0x.i2c = drv_data->i2c; - drv_data->vl53l0x.I2cDevAddr = DT_ST_VL53L0X_0_BASE_ADDRESS; + drv_data->vl53l0x.I2cDevAddr = DT_INST_0_ST_VL53L0X_BASE_ADDRESS; /* Get info from sensor */ (void)memset(&vl53l0x_dev_info, 0, sizeof(VL53L0X_DeviceInfo_t)); @@ -281,7 +281,7 @@ static int vl53l0x_init(struct device *dev) static struct vl53l0x_data vl53l0x_driver; -DEVICE_AND_API_INIT(vl53l0x, DT_ST_VL53L0X_0_LABEL, vl53l0x_init, &vl53l0x_driver, +DEVICE_AND_API_INIT(vl53l0x, DT_INST_0_ST_VL53L0X_LABEL, vl53l0x_init, &vl53l0x_driver, NULL, POST_KERNEL, CONFIG_SENSOR_INIT_PRIORITY, &vl53l0x_api_funcs); diff --git a/drivers/serial/leuart_gecko.c b/drivers/serial/leuart_gecko.c index a3751b696fe..9c957634540 100644 --- a/drivers/serial/leuart_gecko.c +++ b/drivers/serial/leuart_gecko.c @@ -312,30 +312,30 @@ static const struct uart_driver_api leuart_gecko_driver_api = { #ifdef DT_SILABS_GECKO_LEUART_0 -#define PIN_LEUART_0_RXD {DT_SILABS_GECKO_LEUART_0_LOCATION_RX_1, \ - DT_SILABS_GECKO_LEUART_0_LOCATION_RX_2, gpioModeInput, 1} -#define PIN_LEUART_0_TXD {DT_SILABS_GECKO_LEUART_0_LOCATION_TX_1, \ - DT_SILABS_GECKO_LEUART_0_LOCATION_TX_2, gpioModePushPull, 1} +#define PIN_LEUART_0_RXD {DT_INST_0_SILABS_GECKO_LEUART_LOCATION_RX_1, \ + DT_INST_0_SILABS_GECKO_LEUART_LOCATION_RX_2, gpioModeInput, 1} +#define PIN_LEUART_0_TXD {DT_INST_0_SILABS_GECKO_LEUART_LOCATION_TX_1, \ + DT_INST_0_SILABS_GECKO_LEUART_LOCATION_TX_2, gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void leuart_gecko_config_func_0(struct device *dev); #endif static const struct leuart_gecko_config leuart_gecko_0_config = { - .base = (LEUART_TypeDef *)DT_SILABS_GECKO_LEUART_0_BASE_ADDRESS, + .base = (LEUART_TypeDef *)DT_INST_0_SILABS_GECKO_LEUART_BASE_ADDRESS, .clock = cmuClock_LEUART0, - .baud_rate = DT_SILABS_GECKO_LEUART_0_CURRENT_SPEED, + .baud_rate = DT_INST_0_SILABS_GECKO_LEUART_CURRENT_SPEED, .pin_rx = PIN_LEUART_0_RXD, .pin_tx = PIN_LEUART_0_TXD, #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION - .loc_rx = DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0, - .loc_tx = DT_SILABS_GECKO_LEUART_0_LOCATION_TX_0, + .loc_rx = DT_INST_0_SILABS_GECKO_LEUART_LOCATION_RX_0, + .loc_tx = DT_INST_0_SILABS_GECKO_LEUART_LOCATION_TX_0, #else -#if DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0 \ - != DT_SILABS_GECKO_LEUART_0_LOCATION_TX_0 +#if DT_INST_0_SILABS_GECKO_LEUART_LOCATION_RX_0 \ + != DT_INST_0_SILABS_GECKO_LEUART_LOCATION_TX_0 #error LEUART_0 DTS location-* properties must have identical value #endif - .loc = DT_SILABS_GECKO_LEUART_0_LOCATION_RX_0, + .loc = DT_INST_0_SILABS_GECKO_LEUART_LOCATION_RX_0, #endif #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = leuart_gecko_config_func_0, @@ -344,7 +344,7 @@ static const struct leuart_gecko_config leuart_gecko_0_config = { static struct leuart_gecko_data leuart_gecko_0_data; -DEVICE_AND_API_INIT(leuart_0, DT_SILABS_GECKO_LEUART_0_LABEL, +DEVICE_AND_API_INIT(leuart_0, DT_INST_0_SILABS_GECKO_LEUART_LABEL, &leuart_gecko_init, &leuart_gecko_0_data, &leuart_gecko_0_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -353,11 +353,11 @@ DEVICE_AND_API_INIT(leuart_0, DT_SILABS_GECKO_LEUART_0_LABEL, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void leuart_gecko_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_SILABS_GECKO_LEUART_0_IRQ_0, - DT_SILABS_GECKO_LEUART_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_SILABS_GECKO_LEUART_IRQ_0, + DT_INST_0_SILABS_GECKO_LEUART_IRQ_0_PRIORITY, leuart_gecko_isr, DEVICE_GET(leuart_0), 0); - irq_enable(DT_SILABS_GECKO_LEUART_0_IRQ_0); + irq_enable(DT_INST_0_SILABS_GECKO_LEUART_IRQ_0); } #endif diff --git a/drivers/serial/uart_cmsdk_apb.c b/drivers/serial/uart_cmsdk_apb.c index c5399f6af32..1107c898cec 100644 --- a/drivers/serial/uart_cmsdk_apb.c +++ b/drivers/serial/uart_cmsdk_apb.c @@ -463,7 +463,7 @@ static void uart_cmsdk_apb_irq_config_func_0(struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_0 = { - .base = (u8_t *)DT_ARM_CMSDK_UART_0_BASE_ADDRESS, + .base = (u8_t *)DT_INST_0_ARM_CMSDK_UART_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_cmsdk_apb_irq_config_func_0, @@ -471,17 +471,17 @@ static const struct uart_device_config uart_cmsdk_apb_dev_cfg_0 = { }; static struct uart_cmsdk_apb_dev_data uart_cmsdk_apb_dev_data_0 = { - .baud_rate = DT_ARM_CMSDK_UART_0_CURRENT_SPEED, + .baud_rate = DT_INST_0_ARM_CMSDK_UART_CURRENT_SPEED, .uart_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_UART_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_UART_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_UART_0_BASE_ADDRESS,}, + .device = DT_INST_0_ARM_CMSDK_UART_BASE_ADDRESS,}, }; DEVICE_AND_API_INIT(uart_cmsdk_apb_0, - DT_ARM_CMSDK_UART_0_LABEL, + DT_INST_0_ARM_CMSDK_UART_LABEL, &uart_cmsdk_apb_init, &uart_cmsdk_apb_dev_data_0, &uart_cmsdk_apb_dev_cfg_0, PRE_KERNEL_1, @@ -489,32 +489,32 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_0, &uart_cmsdk_apb_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -#ifdef DT_ARM_CMSDK_UART_0_IRQ_0 +#ifdef DT_INST_0_ARM_CMSDK_UART_IRQ_0 static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_0_IRQ_0, - DT_ARM_CMSDK_UART_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_ARM_CMSDK_UART_IRQ_0, + DT_INST_0_ARM_CMSDK_UART_IRQ_0_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_0), 0); - irq_enable(DT_ARM_CMSDK_UART_0_IRQ_0); + irq_enable(DT_INST_0_ARM_CMSDK_UART_IRQ_0); } #else static void uart_cmsdk_apb_irq_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_0_IRQ_TX, - DT_ARM_CMSDK_UART_0_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_0_ARM_CMSDK_UART_IRQ_TX, + DT_INST_0_ARM_CMSDK_UART_IRQ_TX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_0), 0); - irq_enable(DT_ARM_CMSDK_UART_0_IRQ_TX); + irq_enable(DT_INST_0_ARM_CMSDK_UART_IRQ_TX); - IRQ_CONNECT(DT_ARM_CMSDK_UART_0_IRQ_RX, - DT_ARM_CMSDK_UART_0_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_0_ARM_CMSDK_UART_IRQ_RX, + DT_INST_0_ARM_CMSDK_UART_IRQ_RX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_0), 0); - irq_enable(DT_ARM_CMSDK_UART_0_IRQ_RX); + irq_enable(DT_INST_0_ARM_CMSDK_UART_IRQ_RX); } #endif #endif @@ -528,7 +528,7 @@ static void uart_cmsdk_apb_irq_config_func_1(struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_1 = { - .base = (u8_t *)DT_ARM_CMSDK_UART_1_BASE_ADDRESS, + .base = (u8_t *)DT_INST_1_ARM_CMSDK_UART_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_cmsdk_apb_irq_config_func_1, @@ -536,17 +536,17 @@ static const struct uart_device_config uart_cmsdk_apb_dev_cfg_1 = { }; static struct uart_cmsdk_apb_dev_data uart_cmsdk_apb_dev_data_1 = { - .baud_rate = DT_ARM_CMSDK_UART_1_CURRENT_SPEED, + .baud_rate = DT_INST_1_ARM_CMSDK_UART_CURRENT_SPEED, .uart_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_UART_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_UART_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_UART_1_BASE_ADDRESS,}, + .device = DT_INST_1_ARM_CMSDK_UART_BASE_ADDRESS,}, }; DEVICE_AND_API_INIT(uart_cmsdk_apb_1, - DT_ARM_CMSDK_UART_1_LABEL, + DT_INST_1_ARM_CMSDK_UART_LABEL, &uart_cmsdk_apb_init, &uart_cmsdk_apb_dev_data_1, &uart_cmsdk_apb_dev_cfg_1, PRE_KERNEL_1, @@ -554,32 +554,32 @@ DEVICE_AND_API_INIT(uart_cmsdk_apb_1, &uart_cmsdk_apb_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN -#ifdef DT_ARM_CMSDK_UART_1_IRQ_0 +#ifdef DT_INST_1_ARM_CMSDK_UART_IRQ_0 static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_1_IRQ_0, - DT_ARM_CMSDK_UART_1_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_1_ARM_CMSDK_UART_IRQ_0, + DT_INST_1_ARM_CMSDK_UART_IRQ_0_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_1), 0); - irq_enable(DT_ARM_CMSDK_UART_1_IRQ_0); + irq_enable(DT_INST_1_ARM_CMSDK_UART_IRQ_0); } #else static void uart_cmsdk_apb_irq_config_func_1(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_1_IRQ_TX, - DT_ARM_CMSDK_UART_1_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_1_ARM_CMSDK_UART_IRQ_TX, + DT_INST_1_ARM_CMSDK_UART_IRQ_TX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_1), 0); - irq_enable(DT_ARM_CMSDK_UART_1_IRQ_TX); + irq_enable(DT_INST_1_ARM_CMSDK_UART_IRQ_TX); - IRQ_CONNECT(DT_ARM_CMSDK_UART_1_IRQ_RX, - DT_ARM_CMSDK_UART_1_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_1_ARM_CMSDK_UART_IRQ_RX, + DT_INST_1_ARM_CMSDK_UART_IRQ_RX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_1), 0); - irq_enable(DT_ARM_CMSDK_UART_1_IRQ_RX); + irq_enable(DT_INST_1_ARM_CMSDK_UART_IRQ_RX); } #endif #endif @@ -593,7 +593,7 @@ static void uart_cmsdk_apb_irq_config_func_2(struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_2 = { - .base = (u8_t *)DT_ARM_CMSDK_UART_2_BASE_ADDRESS, + .base = (u8_t *)DT_INST_2_ARM_CMSDK_UART_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_cmsdk_apb_irq_config_func_2, @@ -601,17 +601,17 @@ static const struct uart_device_config uart_cmsdk_apb_dev_cfg_2 = { }; static struct uart_cmsdk_apb_dev_data uart_cmsdk_apb_dev_data_2 = { - .baud_rate = DT_ARM_CMSDK_UART_2_CURRENT_SPEED, + .baud_rate = DT_INST_2_ARM_CMSDK_UART_CURRENT_SPEED, .uart_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_UART_2_BASE_ADDRESS,}, + .device = DT_INST_2_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_UART_2_BASE_ADDRESS,}, + .device = DT_INST_2_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_UART_2_BASE_ADDRESS,}, + .device = DT_INST_2_ARM_CMSDK_UART_BASE_ADDRESS,}, }; DEVICE_AND_API_INIT(uart_cmsdk_apb_2, - DT_ARM_CMSDK_UART_2_LABEL, + DT_INST_2_ARM_CMSDK_UART_LABEL, &uart_cmsdk_apb_init, &uart_cmsdk_apb_dev_data_2, &uart_cmsdk_apb_dev_cfg_2, PRE_KERNEL_1, @@ -632,19 +632,19 @@ static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) #else static void uart_cmsdk_apb_irq_config_func_2(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_2_IRQ_TX, - DT_ARM_CMSDK_UART_2_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_2_ARM_CMSDK_UART_IRQ_TX, + DT_INST_2_ARM_CMSDK_UART_IRQ_TX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_2), 0); - irq_enable(DT_ARM_CMSDK_UART_2_IRQ_TX); + irq_enable(DT_INST_2_ARM_CMSDK_UART_IRQ_TX); - IRQ_CONNECT(DT_ARM_CMSDK_UART_2_IRQ_RX, - DT_ARM_CMSDK_UART_2_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_2_ARM_CMSDK_UART_IRQ_RX, + DT_INST_2_ARM_CMSDK_UART_IRQ_RX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_2), 0); - irq_enable(DT_ARM_CMSDK_UART_2_IRQ_RX); + irq_enable(DT_INST_2_ARM_CMSDK_UART_IRQ_RX); } #endif #endif @@ -658,7 +658,7 @@ static void uart_cmsdk_apb_irq_config_func_3(struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_3 = { - .base = (u8_t *)DT_ARM_CMSDK_UART_3_BASE_ADDRESS, + .base = (u8_t *)DT_INST_3_ARM_CMSDK_UART_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_cmsdk_apb_irq_config_func_3, @@ -666,17 +666,17 @@ static const struct uart_device_config uart_cmsdk_apb_dev_cfg_3 = { }; static struct uart_cmsdk_apb_dev_data uart_cmsdk_apb_dev_data_3 = { - .baud_rate = DT_ARM_CMSDK_UART_3_CURRENT_SPEED, + .baud_rate = DT_INST_3_ARM_CMSDK_UART_CURRENT_SPEED, .uart_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_UART_3_BASE_ADDRESS,}, + .device = DT_INST_3_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_UART_3_BASE_ADDRESS,}, + .device = DT_INST_3_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_UART_3_BASE_ADDRESS,}, + .device = DT_INST_3_ARM_CMSDK_UART_BASE_ADDRESS,}, }; DEVICE_AND_API_INIT(uart_cmsdk_apb_3, - DT_ARM_CMSDK_UART_3_LABEL, + DT_INST_3_ARM_CMSDK_UART_LABEL, &uart_cmsdk_apb_init, &uart_cmsdk_apb_dev_data_3, &uart_cmsdk_apb_dev_cfg_3, PRE_KERNEL_1, @@ -697,19 +697,19 @@ static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) #else static void uart_cmsdk_apb_irq_config_func_3(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_3_IRQ_TX, - DT_ARM_CMSDK_UART_3_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_3_ARM_CMSDK_UART_IRQ_TX, + DT_INST_3_ARM_CMSDK_UART_IRQ_TX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_3), 0); - irq_enable(DT_ARM_CMSDK_UART_3_IRQ_TX); + irq_enable(DT_INST_3_ARM_CMSDK_UART_IRQ_TX); - IRQ_CONNECT(DT_ARM_CMSDK_UART_3_IRQ_RX, - DT_ARM_CMSDK_UART_3_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_3_ARM_CMSDK_UART_IRQ_RX, + DT_INST_3_ARM_CMSDK_UART_IRQ_RX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_3), 0); - irq_enable(DT_ARM_CMSDK_UART_3_IRQ_RX); + irq_enable(DT_INST_3_ARM_CMSDK_UART_IRQ_RX); } #endif #endif @@ -723,7 +723,7 @@ static void uart_cmsdk_apb_irq_config_func_4(struct device *dev); #endif static const struct uart_device_config uart_cmsdk_apb_dev_cfg_4 = { - .base = (u8_t *)DT_ARM_CMSDK_UART_4_BASE_ADDRESS, + .base = (u8_t *)DT_INST_4_ARM_CMSDK_UART_BASE_ADDRESS, .sys_clk_freq = CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC, #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_cmsdk_apb_irq_config_func_4, @@ -731,17 +731,17 @@ static const struct uart_device_config uart_cmsdk_apb_dev_cfg_4 = { }; static struct uart_cmsdk_apb_dev_data uart_cmsdk_apb_dev_data_4 = { - .baud_rate = DT_ARM_CMSDK_UART_4_CURRENT_SPEED, + .baud_rate = DT_INST_4_ARM_CMSDK_UART_CURRENT_SPEED, .uart_cc_as = {.bus = CMSDK_APB, .state = SOC_ACTIVE, - .device = DT_ARM_CMSDK_UART_4_BASE_ADDRESS,}, + .device = DT_INST_4_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_ss = {.bus = CMSDK_APB, .state = SOC_SLEEP, - .device = DT_ARM_CMSDK_UART_4_BASE_ADDRESS,}, + .device = DT_INST_4_ARM_CMSDK_UART_BASE_ADDRESS,}, .uart_cc_dss = {.bus = CMSDK_APB, .state = SOC_DEEPSLEEP, - .device = DT_ARM_CMSDK_UART_4_BASE_ADDRESS,}, + .device = DT_INST_4_ARM_CMSDK_UART_BASE_ADDRESS,}, }; DEVICE_AND_API_INIT(uart_cmsdk_apb_4, - DT_ARM_CMSDK_UART_4_LABEL, + DT_INST_4_ARM_CMSDK_UART_LABEL, &uart_cmsdk_apb_init, &uart_cmsdk_apb_dev_data_4, &uart_cmsdk_apb_dev_cfg_4, PRE_KERNEL_1, @@ -762,19 +762,19 @@ static void uart_cmsdk_apb_irq_config_func_4(struct device *dev) #else static void uart_cmsdk_apb_irq_config_func_4(struct device *dev) { - IRQ_CONNECT(DT_ARM_CMSDK_UART_4_IRQ_TX, - DT_ARM_CMSDK_UART_4_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_4_ARM_CMSDK_UART_IRQ_TX, + DT_INST_4_ARM_CMSDK_UART_IRQ_TX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_4), 0); - irq_enable(DT_ARM_CMSDK_UART_4_IRQ_TX); + irq_enable(DT_INST_4_ARM_CMSDK_UART_IRQ_TX); - IRQ_CONNECT(DT_ARM_CMSDK_UART_4_IRQ_RX, - DT_ARM_CMSDK_UART_4_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_4_ARM_CMSDK_UART_IRQ_RX, + DT_INST_4_ARM_CMSDK_UART_IRQ_RX_PRIORITY, uart_cmsdk_apb_isr, DEVICE_GET(uart_cmsdk_apb_4), 0); - irq_enable(DT_ARM_CMSDK_UART_4_IRQ_RX); + irq_enable(DT_INST_4_ARM_CMSDK_UART_IRQ_RX); } #endif #endif diff --git a/drivers/serial/uart_gecko.c b/drivers/serial/uart_gecko.c index 12e1f30b91b..3326083c289 100644 --- a/drivers/serial/uart_gecko.c +++ b/drivers/serial/uart_gecko.c @@ -296,30 +296,30 @@ static const struct uart_driver_api uart_gecko_driver_api = { #ifdef DT_SILABS_GECKO_UART_0 -#define PIN_UART0_RXD {DT_SILABS_GECKO_UART_0_LOCATION_RX_1, \ - DT_SILABS_GECKO_UART_0_LOCATION_RX_2, gpioModeInput, 1} -#define PIN_UART0_TXD {DT_SILABS_GECKO_UART_0_LOCATION_TX_1, \ - DT_SILABS_GECKO_UART_0_LOCATION_TX_2, gpioModePushPull, 1} +#define PIN_UART0_RXD {DT_INST_0_SILABS_GECKO_UART_LOCATION_RX_1, \ + DT_INST_0_SILABS_GECKO_UART_LOCATION_RX_2, gpioModeInput, 1} +#define PIN_UART0_TXD {DT_INST_0_SILABS_GECKO_UART_LOCATION_TX_1, \ + DT_INST_0_SILABS_GECKO_UART_LOCATION_TX_2, gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_gecko_config_func_0(struct device *dev); #endif static const struct uart_gecko_config uart_gecko_0_config = { - .base = (USART_TypeDef *)DT_SILABS_GECKO_UART_0_BASE_ADDRESS, + .base = (USART_TypeDef *)DT_INST_0_SILABS_GECKO_UART_BASE_ADDRESS, .clock = cmuClock_UART0, - .baud_rate = DT_SILABS_GECKO_UART_0_CURRENT_SPEED, + .baud_rate = DT_INST_0_SILABS_GECKO_UART_CURRENT_SPEED, .pin_rx = PIN_UART0_RXD, .pin_tx = PIN_UART0_TXD, #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION - .loc_rx = DT_SILABS_GECKO_UART_0_LOCATION_RX_0, - .loc_tx = DT_SILABS_GECKO_UART_0_LOCATION_TX_0, + .loc_rx = DT_INST_0_SILABS_GECKO_UART_LOCATION_RX_0, + .loc_tx = DT_INST_0_SILABS_GECKO_UART_LOCATION_TX_0, #else -#if DT_SILABS_GECKO_UART_0_LOCATION_RX_0 \ - != DT_SILABS_GECKO_UART_0_LOCATION_TX_0 +#if DT_INST_0_SILABS_GECKO_UART_LOCATION_RX_0 \ + != DT_INST_0_SILABS_GECKO_UART_LOCATION_TX_0 #error UART_0 DTS location-* properties must have identical value #endif - .loc = DT_SILABS_GECKO_UART_0_LOCATION_RX_0, + .loc = DT_INST_0_SILABS_GECKO_UART_LOCATION_RX_0, #endif #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = uart_gecko_config_func_0, @@ -328,22 +328,22 @@ static const struct uart_gecko_config uart_gecko_0_config = { static struct uart_gecko_data uart_gecko_0_data; -DEVICE_AND_API_INIT(uart_0, DT_SILABS_GECKO_UART_0_LABEL, &uart_gecko_init, +DEVICE_AND_API_INIT(uart_0, DT_INST_0_SILABS_GECKO_UART_LABEL, &uart_gecko_init, &uart_gecko_0_data, &uart_gecko_0_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_gecko_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_SILABS_GECKO_UART_0_IRQ_RX, - DT_SILABS_GECKO_UART_0_IRQ_RX_PRIORITY, uart_gecko_isr, + IRQ_CONNECT(DT_INST_0_SILABS_GECKO_UART_IRQ_RX, + DT_INST_0_SILABS_GECKO_UART_IRQ_RX_PRIORITY, uart_gecko_isr, DEVICE_GET(uart_0), 0); - IRQ_CONNECT(DT_SILABS_GECKO_UART_0_IRQ_TX, - DT_SILABS_GECKO_UART_0_IRQ_TX_PRIORITY, uart_gecko_isr, + IRQ_CONNECT(DT_INST_0_SILABS_GECKO_UART_IRQ_TX, + DT_INST_0_SILABS_GECKO_UART_IRQ_TX_PRIORITY, uart_gecko_isr, DEVICE_GET(uart_0), 0); - irq_enable(DT_SILABS_GECKO_UART_0_IRQ_RX); - irq_enable(DT_SILABS_GECKO_UART_0_IRQ_TX); + irq_enable(DT_INST_0_SILABS_GECKO_UART_IRQ_RX); + irq_enable(DT_INST_0_SILABS_GECKO_UART_IRQ_TX); } #endif @@ -406,30 +406,30 @@ static void uart_gecko_config_func_1(struct device *dev) #ifdef DT_SILABS_GECKO_USART_0 -#define PIN_USART0_RXD {DT_SILABS_GECKO_USART_0_LOCATION_RX_1, \ - DT_SILABS_GECKO_USART_0_LOCATION_RX_2, gpioModeInput, 1} -#define PIN_USART0_TXD {DT_SILABS_GECKO_USART_0_LOCATION_TX_1, \ - DT_SILABS_GECKO_USART_0_LOCATION_TX_2, gpioModePushPull, 1} +#define PIN_USART0_RXD {DT_INST_0_SILABS_GECKO_USART_LOCATION_RX_1, \ + DT_INST_0_SILABS_GECKO_USART_LOCATION_RX_2, gpioModeInput, 1} +#define PIN_USART0_TXD {DT_INST_0_SILABS_GECKO_USART_LOCATION_TX_1, \ + DT_INST_0_SILABS_GECKO_USART_LOCATION_TX_2, gpioModePushPull, 1} #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void usart_gecko_config_func_0(struct device *dev); #endif static const struct uart_gecko_config usart_gecko_0_config = { - .base = (USART_TypeDef *)DT_SILABS_GECKO_USART_0_BASE_ADDRESS, + .base = (USART_TypeDef *)DT_INST_0_SILABS_GECKO_USART_BASE_ADDRESS, .clock = cmuClock_USART0, - .baud_rate = DT_SILABS_GECKO_USART_0_CURRENT_SPEED, + .baud_rate = DT_INST_0_SILABS_GECKO_USART_CURRENT_SPEED, .pin_rx = PIN_USART0_RXD, .pin_tx = PIN_USART0_TXD, #ifdef CONFIG_SOC_GECKO_HAS_INDIVIDUAL_PIN_LOCATION - .loc_rx = DT_SILABS_GECKO_USART_0_LOCATION_RX_0, - .loc_tx = DT_SILABS_GECKO_USART_0_LOCATION_TX_0, + .loc_rx = DT_INST_0_SILABS_GECKO_USART_LOCATION_RX_0, + .loc_tx = DT_INST_0_SILABS_GECKO_USART_LOCATION_TX_0, #else -#if DT_SILABS_GECKO_USART_0_LOCATION_RX_0 \ - != DT_SILABS_GECKO_USART_0_LOCATION_TX_0 +#if DT_INST_0_SILABS_GECKO_USART_LOCATION_RX_0 \ + != DT_INST_0_SILABS_GECKO_USART_LOCATION_TX_0 #error USART_0 DTS location-* properties must have identical value #endif - .loc = DT_SILABS_GECKO_USART_0_LOCATION_RX_0, + .loc = DT_INST_0_SILABS_GECKO_USART_LOCATION_RX_0, #endif #ifdef CONFIG_UART_INTERRUPT_DRIVEN .irq_config_func = usart_gecko_config_func_0, @@ -438,7 +438,7 @@ static const struct uart_gecko_config usart_gecko_0_config = { static struct uart_gecko_data usart_gecko_0_data; -DEVICE_AND_API_INIT(usart_0, DT_SILABS_GECKO_USART_0_LABEL, +DEVICE_AND_API_INIT(usart_0, DT_INST_0_SILABS_GECKO_USART_LABEL, &uart_gecko_init, &usart_gecko_0_data, &usart_gecko_0_config, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_gecko_driver_api); @@ -446,15 +446,15 @@ DEVICE_AND_API_INIT(usart_0, DT_SILABS_GECKO_USART_0_LABEL, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void usart_gecko_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_SILABS_GECKO_USART_0_IRQ_RX, - DT_SILABS_GECKO_USART_0_IRQ_RX_PRIORITY, + IRQ_CONNECT(DT_INST_0_SILABS_GECKO_USART_IRQ_RX, + DT_INST_0_SILABS_GECKO_USART_IRQ_RX_PRIORITY, uart_gecko_isr, DEVICE_GET(usart_0), 0); - IRQ_CONNECT(DT_SILABS_GECKO_USART_0_IRQ_TX, - DT_SILABS_GECKO_USART_0_IRQ_TX_PRIORITY, + IRQ_CONNECT(DT_INST_0_SILABS_GECKO_USART_IRQ_TX, + DT_INST_0_SILABS_GECKO_USART_IRQ_TX_PRIORITY, uart_gecko_isr, DEVICE_GET(usart_0), 0); - irq_enable(DT_SILABS_GECKO_USART_0_IRQ_RX); - irq_enable(DT_SILABS_GECKO_USART_0_IRQ_TX); + irq_enable(DT_INST_0_SILABS_GECKO_USART_IRQ_RX); + irq_enable(DT_INST_0_SILABS_GECKO_USART_IRQ_TX); } #endif diff --git a/drivers/serial/uart_nsim.c b/drivers/serial/uart_nsim.c index 5ab7265742a..24e40fa4e76 100644 --- a/drivers/serial/uart_nsim.c +++ b/drivers/serial/uart_nsim.c @@ -108,10 +108,10 @@ static const struct uart_driver_api uart_nsim_driver_api = { }; static struct uart_device_config uart_nsim_dev_cfg_0 = { - .regs = DT_SNPS_NSIM_UART_0_BASE_ADDRESS, + .regs = DT_INST_0_SNPS_NSIM_UART_BASE_ADDRESS, }; -DEVICE_AND_API_INIT(uart_nsim0, DT_SNPS_NSIM_UART_0_LABEL, &uart_nsim_init, +DEVICE_AND_API_INIT(uart_nsim0, DT_INST_0_SNPS_NSIM_UART_LABEL, &uart_nsim_init, NULL, &uart_nsim_dev_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &uart_nsim_driver_api); diff --git a/drivers/serial/uart_rv32m1_lpuart.c b/drivers/serial/uart_rv32m1_lpuart.c index e7418712f70..12266249481 100644 --- a/drivers/serial/uart_rv32m1_lpuart.c +++ b/drivers/serial/uart_rv32m1_lpuart.c @@ -326,10 +326,10 @@ DEVICE_AND_API_INIT(uart_0, DT_OPENISA_RV32M1_LPUART_UART_0_LABEL, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void rv32m1_lpuart_config_func_0(struct device *dev) { - IRQ_CONNECT(DT_OPENISA_RV32M1_LPUART_0_IRQ_0, DT_OPENISA_RV32M1_LPUART_0_IRQ_0_PRI, rv32m1_lpuart_isr, + IRQ_CONNECT(DT_INST_0_OPENISA_RV32M1_LPUART_IRQ_0, DT_INST_0_OPENISA_RV32M1_LPUART_IRQ_0_PRI, rv32m1_lpuart_isr, DEVICE_GET(uart_0), 0); - irq_enable(DT_OPENISA_RV32M1_LPUART_0_IRQ_0); + irq_enable(DT_INST_0_OPENISA_RV32M1_LPUART_IRQ_0); } #endif diff --git a/drivers/serial/uart_sifive.c b/drivers/serial/uart_sifive.c index 03469d4733e..81abf9a3d40 100644 --- a/drivers/serial/uart_sifive.c +++ b/drivers/serial/uart_sifive.c @@ -381,9 +381,9 @@ static void uart_sifive_irq_cfg_func_0(void); #endif static const struct uart_sifive_device_config uart_sifive_dev_cfg_0 = { - .port = DT_SIFIVE_UART0_0_BASE_ADDRESS, - .sys_clk_freq = DT_SIFIVE_UART0_0_CLOCK_FREQUENCY, - .baud_rate = DT_SIFIVE_UART0_0_CURRENT_SPEED, + .port = DT_INST_0_SIFIVE_UART0_BASE_ADDRESS, + .sys_clk_freq = DT_INST_0_SIFIVE_UART0_CLOCK_FREQUENCY, + .baud_rate = DT_INST_0_SIFIVE_UART0_CURRENT_SPEED, .rxcnt_irq = CONFIG_UART_SIFIVE_PORT_0_RXCNT_IRQ, .txcnt_irq = CONFIG_UART_SIFIVE_PORT_0_TXCNT_IRQ, #ifdef CONFIG_UART_INTERRUPT_DRIVEN @@ -391,7 +391,7 @@ static const struct uart_sifive_device_config uart_sifive_dev_cfg_0 = { #endif }; -DEVICE_AND_API_INIT(uart_sifive_0, DT_SIFIVE_UART0_0_LABEL, +DEVICE_AND_API_INIT(uart_sifive_0, DT_INST_0_SIFIVE_UART0_LABEL, uart_sifive_init, &uart_sifive_data_0, &uart_sifive_dev_cfg_0, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -400,12 +400,12 @@ DEVICE_AND_API_INIT(uart_sifive_0, DT_SIFIVE_UART0_0_LABEL, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_sifive_irq_cfg_func_0(void) { - IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_UART0_0_IRQ_0, + IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_INST_0_SIFIVE_UART0_IRQ_0, CONFIG_UART_SIFIVE_PORT_0_IRQ_PRIORITY, uart_sifive_irq_handler, DEVICE_GET(uart_sifive_0), 0); - irq_enable(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_UART0_0_IRQ_0); + irq_enable(RISCV_MAX_GENERIC_IRQ + DT_INST_0_SIFIVE_UART0_IRQ_0); } #endif @@ -420,9 +420,9 @@ static void uart_sifive_irq_cfg_func_1(void); #endif static const struct uart_sifive_device_config uart_sifive_dev_cfg_1 = { - .port = DT_SIFIVE_UART0_1_BASE_ADDRESS, - .sys_clk_freq = DT_SIFIVE_UART0_1_CLOCK_FREQUENCY, - .baud_rate = DT_SIFIVE_UART0_1_CURRENT_SPEED, + .port = DT_INST_1_SIFIVE_UART0_BASE_ADDRESS, + .sys_clk_freq = DT_INST_1_SIFIVE_UART0_CLOCK_FREQUENCY, + .baud_rate = DT_INST_1_SIFIVE_UART0_CURRENT_SPEED, .rxcnt_irq = CONFIG_UART_SIFIVE_PORT_1_RXCNT_IRQ, .txcnt_irq = CONFIG_UART_SIFIVE_PORT_1_TXCNT_IRQ, #ifdef CONFIG_UART_INTERRUPT_DRIVEN @@ -430,7 +430,7 @@ static const struct uart_sifive_device_config uart_sifive_dev_cfg_1 = { #endif }; -DEVICE_AND_API_INIT(uart_sifive_1, DT_SIFIVE_UART0_1_LABEL, +DEVICE_AND_API_INIT(uart_sifive_1, DT_INST_1_SIFIVE_UART0_LABEL, uart_sifive_init, &uart_sifive_data_1, &uart_sifive_dev_cfg_1, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, @@ -439,12 +439,12 @@ DEVICE_AND_API_INIT(uart_sifive_1, DT_SIFIVE_UART0_1_LABEL, #ifdef CONFIG_UART_INTERRUPT_DRIVEN static void uart_sifive_irq_cfg_func_1(void) { - IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_UART0_1_IRQ_0, + IRQ_CONNECT(RISCV_MAX_GENERIC_IRQ + DT_INST_1_SIFIVE_UART0_IRQ_0, CONFIG_UART_SIFIVE_PORT_1_IRQ_PRIORITY, uart_sifive_irq_handler, DEVICE_GET(uart_sifive_1), 0); - irq_enable(RISCV_MAX_GENERIC_IRQ + DT_SIFIVE_UART0_1_IRQ_0); + irq_enable(RISCV_MAX_GENERIC_IRQ + DT_INST_1_SIFIVE_UART0_IRQ_0); } #endif diff --git a/drivers/spi/spi_cc13xx_cc26xx.c b/drivers/spi/spi_cc13xx_cc26xx.c index 93a1e8bfb52..5f6f4d3e72b 100644 --- a/drivers/spi/spi_cc13xx_cc26xx.c +++ b/drivers/spi/spi_cc13xx_cc26xx.c @@ -239,7 +239,7 @@ static const struct spi_cc13xx_cc26xx_config spi_cc13xx_cc26xx_config_0 = { .cs_pin = DT_TI_CC13XX_CC26XX_SPI_40000000_CS_PIN, #else .cs_pin = IOID_UNUSED, -#endif /* DT_TI_CC13XX_CC26XX_SPI_0_CS_PIN */ +#endif /* DT_INST_0_TI_CC13XX_CC26XX_SPI_CS_PIN */ }; static struct spi_cc13xx_cc26xx_data spi_cc13xx_cc26xx_data_0 = { diff --git a/drivers/spi/spi_sifive.c b/drivers/spi/spi_sifive.c index 138f281538e..77ddf7881db 100644 --- a/drivers/spi/spi_sifive.c +++ b/drivers/spi/spi_sifive.c @@ -241,11 +241,11 @@ static struct spi_driver_api spi_sifive_api = { SPI_CONTEXT_INIT_SYNC(spi_sifive_data_##n, ctx), \ }; \ static struct spi_sifive_cfg spi_sifive_cfg_##n = { \ - .base = DT_SIFIVE_SPI0_##n##_CONTROL_BASE_ADDRESS, \ - .f_sys = DT_SIFIVE_SPI0_##n##_CLOCK_FREQUENCY, \ + .base = DT_INST_##n##_SIFIVE_SPI0_CONTROL_BASE_ADDRESS, \ + .f_sys = DT_INST_##n##_SIFIVE_SPI0_CLOCK_FREQUENCY, \ }; \ DEVICE_AND_API_INIT(spi_##n, \ - DT_SIFIVE_SPI0_##n##_LABEL, \ + DT_INST_##n##_SIFIVE_SPI0_LABEL, \ spi_sifive_init, \ &spi_sifive_data_##n, \ &spi_sifive_cfg_##n, \ @@ -254,22 +254,22 @@ static struct spi_driver_api spi_sifive_api = { &spi_sifive_api) #ifndef CONFIG_SIFIVE_SPI_0_ROM -#ifdef DT_SIFIVE_SPI0_0_LABEL +#ifdef DT_INST_0_SIFIVE_SPI0_LABEL SPI_INIT(0); -#endif /* DT_SIFIVE_SPI0_0_LABEL */ +#endif /* DT_INST_0_SIFIVE_SPI0_LABEL */ #endif /* !DT_SIFIVE_SPI0_0_ROM */ -#ifdef DT_SIFIVE_SPI0_1_LABEL +#ifdef DT_INST_1_SIFIVE_SPI0_LABEL SPI_INIT(1); -#endif /* DT_SIFIVE_SPI0_1_LABEL */ +#endif /* DT_INST_1_SIFIVE_SPI0_LABEL */ -#ifdef DT_SIFIVE_SPI0_2_LABEL +#ifdef DT_INST_2_SIFIVE_SPI0_LABEL SPI_INIT(2); -#endif /* DT_SIFIVE_SPI0_2_LABEL */ +#endif /* DT_INST_2_SIFIVE_SPI0_LABEL */ diff --git a/drivers/timer/nrf_rtc_timer.c b/drivers/timer/nrf_rtc_timer.c index 61faa6a81cb..59197f98b47 100644 --- a/drivers/timer/nrf_rtc_timer.c +++ b/drivers/timer/nrf_rtc_timer.c @@ -79,7 +79,7 @@ int z_clock_driver_init(struct device *device) ARG_UNUSED(device); - clock = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + clock = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); if (!clock) { return -1; } diff --git a/drivers/timer/sam0_rtc_timer.c b/drivers/timer/sam0_rtc_timer.c index ccd763d3844..df6ad340f43 100644 --- a/drivers/timer/sam0_rtc_timer.c +++ b/drivers/timer/sam0_rtc_timer.c @@ -20,7 +20,7 @@ #include /* RTC registers. */ -#define RTC0 ((RtcMode0 *) DT_ATMEL_SAM0_RTC_0_BASE_ADDRESS) +#define RTC0 ((RtcMode0 *) DT_INST_0_ATMEL_SAM0_RTC_BASE_ADDRESS) /* Number of sys timer cycles per on tick. */ #define CYCLES_PER_TICK (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC \ @@ -155,7 +155,7 @@ int z_clock_driver_init(struct device *device) /* Set up bus clock and GCLK generator. */ PM->APBAMASK.reg |= PM_APBAMASK_RTC; GCLK->CLKCTRL.reg = GCLK_CLKCTRL_ID(RTC_GCLK_ID) | GCLK_CLKCTRL_CLKEN - | GCLK_GEN(DT_ATMEL_SAM0_RTC_0_CLOCK_GENERATOR); + | GCLK_GEN(DT_INST_0_ATMEL_SAM0_RTC_CLOCK_GENERATOR); while (GCLK->STATUS.bit.SYNCBUSY) { /* Synchronize GCLK. */ @@ -191,10 +191,10 @@ int z_clock_driver_init(struct device *device) RTC0->CTRL.reg |= RTC_MODE0_CTRL_ENABLE; /* Enable RTC interrupt. */ - NVIC_ClearPendingIRQ(DT_ATMEL_SAM0_RTC_0_IRQ_0); - IRQ_CONNECT(DT_ATMEL_SAM0_RTC_0_IRQ_0, - DT_ATMEL_SAM0_RTC_0_IRQ_0_PRIORITY, rtc_isr, 0, 0); - irq_enable(DT_ATMEL_SAM0_RTC_0_IRQ_0); + NVIC_ClearPendingIRQ(DT_INST_0_ATMEL_SAM0_RTC_IRQ_0); + IRQ_CONNECT(DT_INST_0_ATMEL_SAM0_RTC_IRQ_0, + DT_INST_0_ATMEL_SAM0_RTC_IRQ_0_PRIORITY, rtc_isr, 0, 0); + irq_enable(DT_INST_0_ATMEL_SAM0_RTC_IRQ_0); return 0; } diff --git a/drivers/usb/device/usb_dc_nrfx.c b/drivers/usb/device/usb_dc_nrfx.c index e692b8fb638..e3a3edcd8c7 100644 --- a/drivers/usb/device/usb_dc_nrfx.c +++ b/drivers/usb/device/usb_dc_nrfx.c @@ -537,7 +537,7 @@ static int hf_clock_enable(bool on, bool blocking) struct device *clock; static bool clock_requested; - clock = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_16M"); + clock = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M"); if (!clock) { LOG_ERR("NRF HF Clock device not found!"); return ret; diff --git a/drivers/usb/device/usb_dc_sam0.c b/drivers/usb/device/usb_dc_sam0.c index 9af8d5817c8..4114ffa443c 100644 --- a/drivers/usb/device/usb_dc_sam0.c +++ b/drivers/usb/device/usb_dc_sam0.c @@ -21,8 +21,8 @@ LOG_MODULE_REGISTER(usb_dc_sam0); #define USB_SAM0_IN_EP 0x80 -#define REGS ((Usb *)DT_ATMEL_SAM0_USB_0_BASE_ADDRESS) -#define USB_NUM_ENDPOINTS DT_ATMEL_SAM0_USB_0_NUM_BIDIR_ENDPOINTS +#define REGS ((Usb *)DT_INST_0_ATMEL_SAM0_USB_BASE_ADDRESS) +#define USB_NUM_ENDPOINTS DT_INST_0_ATMEL_SAM0_USB_NUM_BIDIR_ENDPOINTS struct usb_sam0_data { UsbDeviceDescriptor descriptors[USB_NUM_ENDPOINTS]; @@ -203,10 +203,10 @@ int usb_dc_attach(void) regs->INTENSET.reg = USB_DEVICE_INTENSET_EORST; /* Connect and enable the interrupt */ - IRQ_CONNECT(DT_ATMEL_SAM0_USB_0_IRQ_0, - DT_ATMEL_SAM0_USB_0_IRQ_0_PRIORITY, + IRQ_CONNECT(DT_INST_0_ATMEL_SAM0_USB_IRQ_0, + DT_INST_0_ATMEL_SAM0_USB_IRQ_0_PRIORITY, usb_sam0_isr, 0, 0); - irq_enable(DT_ATMEL_SAM0_USB_0_IRQ_0); + irq_enable(DT_INST_0_ATMEL_SAM0_USB_IRQ_0); /* Enable and attach */ regs->CTRLA.bit.ENABLE = 1; @@ -232,7 +232,7 @@ int usb_dc_reset(void) { UsbDevice *regs = ®S->DEVICE; - irq_disable(DT_ATMEL_SAM0_USB_0_IRQ_0); + irq_disable(DT_INST_0_ATMEL_SAM0_USB_IRQ_0); regs->CTRLA.bit.SWRST = 1; usb_sam0_wait_syncbusy(); diff --git a/drivers/usb/device/usb_dc_stm32.c b/drivers/usb/device/usb_dc_stm32.c index 96ce29ec0f1..f08557f3f51 100644 --- a/drivers/usb/device/usb_dc_stm32.c +++ b/drivers/usb/device/usb_dc_stm32.c @@ -1022,18 +1022,18 @@ void HAL_PCDEx_SetConnectionState(PCD_HandleTypeDef *hpcd, uint8_t state) struct device *usb_disconnect; usb_disconnect = device_get_binding( - DT_ST_STM32_USB_0_DISCONNECT_GPIOS_CONTROLLER); + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_CONTROLLER); gpio_pin_configure(usb_disconnect, - DT_ST_STM32_USB_0_DISCONNECT_GPIOS_PIN, GPIO_DIR_OUT); + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, GPIO_DIR_OUT); if (state) { gpio_pin_write(usb_disconnect, - DT_ST_STM32_USB_0_DISCONNECT_GPIOS_PIN, - DT_ST_STM32_USB_0_DISCONNECT_GPIOS_FLAGS); + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_FLAGS); } else { gpio_pin_write(usb_disconnect, - DT_ST_STM32_USB_0_DISCONNECT_GPIOS_PIN, - !DT_ST_STM32_USB_0_DISCONNECT_GPIOS_FLAGS); + DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_PIN, + !DT_INST_0_ST_STM32_USB_DISCONNECT_GPIOS_FLAGS); } } #endif /* USB && CONFIG_USB_DC_STM32_DISCONN_ENABLE */ diff --git a/drivers/watchdog/wdt_cmsdk_apb.c b/drivers/watchdog/wdt_cmsdk_apb.c index 9e96e75b4cf..4e40f3738be 100644 --- a/drivers/watchdog/wdt_cmsdk_apb.c +++ b/drivers/watchdog/wdt_cmsdk_apb.c @@ -57,7 +57,7 @@ struct wdog_cmsdk_apb { #define CMSDK_APB_WDOG_LOCK_VALUE (0x2BDDF662) #define WDOG_STRUCT \ - ((volatile struct wdog_cmsdk_apb *)(DT_ARM_CMSDK_WATCHDOG_0_BASE_ADDRESS)) + ((volatile struct wdog_cmsdk_apb *)(DT_INST_0_ARM_CMSDK_WATCHDOG_BASE_ADDRESS)) /* Keep reference of the device to pass it to the callback */ struct device *wdog_r; diff --git a/drivers/watchdog/wdt_iwdg_stm32.c b/drivers/watchdog/wdt_iwdg_stm32.c index 62cc6f2a7e6..a21d89c9b7d 100644 --- a/drivers/watchdog/wdt_iwdg_stm32.c +++ b/drivers/watchdog/wdt_iwdg_stm32.c @@ -172,10 +172,10 @@ static int iwdg_stm32_init(struct device *dev) } static struct iwdg_stm32_data iwdg_stm32_dev_data = { - .Instance = (IWDG_TypeDef *)DT_ST_STM32_WATCHDOG_0_BASE_ADDRESS + .Instance = (IWDG_TypeDef *)DT_INST_0_ST_STM32_WATCHDOG_BASE_ADDRESS }; -DEVICE_AND_API_INIT(iwdg_stm32, DT_ST_STM32_WATCHDOG_0_LABEL, +DEVICE_AND_API_INIT(iwdg_stm32, DT_INST_0_ST_STM32_WATCHDOG_LABEL, iwdg_stm32_init, &iwdg_stm32_dev_data, NULL, POST_KERNEL, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &iwdg_stm32_api); diff --git a/drivers/watchdog/wdt_sam0.c b/drivers/watchdog/wdt_sam0.c index 17ce0480d0a..119695da6ba 100644 --- a/drivers/watchdog/wdt_sam0.c +++ b/drivers/watchdog/wdt_sam0.c @@ -12,7 +12,7 @@ #include LOG_MODULE_REGISTER(wdt_sam0); -#define WDT_REGS ((Wdt *)DT_ATMEL_SAM0_WATCHDOG_0_BASE_ADDRESS) +#define WDT_REGS ((Wdt *)DT_INST_0_ATMEL_SAM0_WATCHDOG_BASE_ADDRESS) struct wdt_sam0_dev_data { wdt_callback_t cb; @@ -214,16 +214,16 @@ static int wdt_sam0_init(struct device *dev) | GCLK_CLKCTRL_GEN_GCLK2 | GCLK_CLKCTRL_CLKEN; - IRQ_CONNECT(DT_ATMEL_SAM0_WATCHDOG_0_IRQ_0, - DT_ATMEL_SAM0_WATCHDOG_0_IRQ_0_PRIORITY, wdt_sam0_isr, + IRQ_CONNECT(DT_INST_0_ATMEL_SAM0_WATCHDOG_IRQ_0, + DT_INST_0_ATMEL_SAM0_WATCHDOG_IRQ_0_PRIORITY, wdt_sam0_isr, DEVICE_GET(wdt_sam0), 0); - irq_enable(DT_ATMEL_SAM0_WATCHDOG_0_IRQ_0); + irq_enable(DT_INST_0_ATMEL_SAM0_WATCHDOG_IRQ_0); return 0; } static struct wdt_sam0_dev_data wdt_sam0_data; -DEVICE_AND_API_INIT(wdt_sam0, DT_ATMEL_SAM0_WATCHDOG_0_LABEL, wdt_sam0_init, +DEVICE_AND_API_INIT(wdt_sam0, DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL, wdt_sam0_init, &wdt_sam0_data, NULL, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE, &wdt_sam0_api); diff --git a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c index 83c82b6b925..c897ed0731b 100644 --- a/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c +++ b/drivers/wifi/winc1500/wifi_winc1500_nm_bus_wrapper.c @@ -96,32 +96,32 @@ s8_t nm_bus_init(void *pvinit) /* Not implemented */ #elif defined CONF_WINC_USE_SPI /* setup SPI device */ - winc1500.spi = device_get_binding(DT_ATMEL_WINC1500_0_BUS_NAME); + winc1500.spi = device_get_binding(DT_INST_0_ATMEL_WINC1500_BUS_NAME); if (!winc1500.spi) { LOG_ERR("spi device binding"); return -1; } winc1500.spi_cfg.operation = SPI_WORD_SET(8) | SPI_TRANSFER_MSB; - winc1500.spi_cfg.frequency = DT_ATMEL_WINC1500_0_SPI_MAX_FREQUENCY; - winc1500.spi_cfg.slave = DT_ATMEL_WINC1500_0_BASE_ADDRESS; + winc1500.spi_cfg.frequency = DT_INST_0_ATMEL_WINC1500_SPI_MAX_FREQUENCY; + winc1500.spi_cfg.slave = DT_INST_0_ATMEL_WINC1500_BASE_ADDRESS; #ifdef CONFIG_WIFI_WINC1500_GPIO_SPI_CS cs_ctrl.gpio_dev = device_get_binding( - DT_ATMEL_WINC1500_0_CS_GPIO_CONTROLLER); + DT_INST_0_ATMEL_WINC1500_CS_GPIO_CONTROLLER); if (!cs_ctrl.gpio_dev) { LOG_ERR("Unable to get GPIO SPI CS device"); return -ENODEV; } - cs_ctrl.gpio_pin = DT_ATMEL_WINC1500_0_CS_GPIO_PIN; + cs_ctrl.gpio_pin = DT_INST_0_ATMEL_WINC1500_CS_GPIO_PIN; cs_ctrl.delay = 0U; winc1500.spi_cfg.cs = &cs_ctrl; LOG_DBG("SPI GPIO CS configured on %s:%u", - DT_ATMEL_WINC1500_0_CS_GPIO_CONTROLLER, - DT_ATMEL_WINC1500_0_CS_GPIO_PIN); + DT_INST_0_ATMEL_WINC1500_CS_GPIO_CONTROLLER, + DT_INST_0_ATMEL_WINC1500_CS_GPIO_PIN); #endif /* CONFIG_WIFI_WINC1500_GPIO_SPI_CS */ nm_bsp_reset(); diff --git a/ext/hal/nordic/nrfx_glue.h b/ext/hal/nordic/nrfx_glue.h index c5d97543d7f..f33f00dcdba 100644 --- a/ext/hal/nordic/nrfx_glue.h +++ b/ext/hal/nordic/nrfx_glue.h @@ -251,8 +251,8 @@ extern const u32_t z_bt_ctlr_used_nrf_ppi_channels; #if IS_ENABLED(CONFIG_PWM_NRF5_SW) #define NRFX_PPI_CHANNELS_USED_BY_PWM_SW \ - (BIT_MASK(DT_NORDIC_NRF_SW_PWM_0_CHANNEL_COUNT * 2) \ - << DT_NORDIC_NRF_SW_PWM_0_PPI_BASE) + (BIT_MASK(DT_INST_0_NORDIC_NRF_SW_PWM_CHANNEL_COUNT * 2) \ + << DT_INST_0_NORDIC_NRF_SW_PWM_PPI_BASE) #else #define NRFX_PPI_CHANNELS_USED_BY_PWM_SW 0 #endif diff --git a/samples/bluetooth/hci_spi/src/main.c b/samples/bluetooth/hci_spi/src/main.c index aa067c6bc73..9e0d5f27d78 100644 --- a/samples/bluetooth/hci_spi/src/main.c +++ b/samples/bluetooth/hci_spi/src/main.c @@ -48,7 +48,7 @@ LOG_MODULE_REGISTER(LOG_MODULE_NAME); #define PACKET_TYPE 0 #define EVT_BLUE_INITIALIZED 0x01 -#define GPIO_IRQ_PIN DT_ZEPHYR_BT_HCI_SPI_SLAVE_0_IRQ_GPIO_PIN +#define GPIO_IRQ_PIN DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_IRQ_GPIO_PIN /* Needs to be aligned with the SPI master buffer size */ #define SPI_MAX_MSG_LEN 255 @@ -272,13 +272,13 @@ static int hci_spi_init(struct device *unused) LOG_DBG(""); - spi_hci_dev = device_get_binding(DT_ZEPHYR_BT_HCI_SPI_SLAVE_0_BUS_NAME); + spi_hci_dev = device_get_binding(DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_BUS_NAME); if (!spi_hci_dev) { return -EINVAL; } gpio_dev = device_get_binding( - DT_ZEPHYR_BT_HCI_SPI_SLAVE_0_IRQ_GPIO_CONTROLLER); + DT_INST_0_ZEPHYR_BT_HCI_SPI_SLAVE_IRQ_GPIO_CONTROLLER); if (!gpio_dev) { return -EINVAL; } diff --git a/samples/boards/96b_argonkey/microphone/src/main.c b/samples/boards/96b_argonkey/microphone/src/main.c index 3ede087908d..0a88df24b62 100644 --- a/samples/boards/96b_argonkey/microphone/src/main.c +++ b/samples/boards/96b_argonkey/microphone/src/main.c @@ -96,10 +96,10 @@ void main(void) #ifdef CONFIG_LP3943 static struct device *ledc; - ledc = device_get_binding(DT_TI_LP3943_0_LABEL); + ledc = device_get_binding(DT_INST_0_TI_LP3943_LABEL); if (!ledc) { printk("Could not get pointer to %s sensor\n", - DT_TI_LP3943_0_LABEL); + DT_INST_0_TI_LP3943_LABEL); return; } @@ -121,11 +121,11 @@ void main(void) int ret; - struct device *mic_dev = device_get_binding(DT_ST_MPXXDTYY_0_LABEL); + struct device *mic_dev = device_get_binding(DT_INST_0_ST_MPXXDTYY_LABEL); if (!mic_dev) { printk("Could not get pointer to %s device\n", - DT_ST_MPXXDTYY_0_LABEL); + DT_INST_0_ST_MPXXDTYY_LABEL); return; } diff --git a/samples/boards/96b_argonkey/sensors/src/main.c b/samples/boards/96b_argonkey/sensors/src/main.c index 1e0ef569bb8..015c71270e1 100644 --- a/samples/boards/96b_argonkey/sensors/src/main.c +++ b/samples/boards/96b_argonkey/sensors/src/main.c @@ -113,10 +113,10 @@ void main(void) #ifdef CONFIG_LP3943 static struct device *ledc; - ledc = device_get_binding(DT_TI_LP3943_0_LABEL); + ledc = device_get_binding(DT_INST_0_TI_LP3943_LABEL); if (!ledc) { printk("Could not get pointer to %s sensor\n", - DT_TI_LP3943_0_LABEL); + DT_INST_0_TI_LP3943_LABEL); return; } @@ -150,31 +150,31 @@ void main(void) #ifdef CONFIG_LPS22HB struct device *baro_dev = - device_get_binding(DT_ST_LPS22HB_PRESS_0_LABEL); + device_get_binding(DT_INST_0_ST_LPS22HB_PRESS_LABEL); if (!baro_dev) { printk("Could not get pointer to %s sensor\n", - DT_ST_LPS22HB_PRESS_0_LABEL); + DT_INST_0_ST_LPS22HB_PRESS_LABEL); return; } #endif #ifdef CONFIG_HTS221 - struct device *hum_dev = device_get_binding(DT_ST_HTS221_0_LABEL); + struct device *hum_dev = device_get_binding(DT_INST_0_ST_HTS221_LABEL); if (!hum_dev) { printk("Could not get pointer to %s sensor\n", - DT_ST_HTS221_0_LABEL); + DT_INST_0_ST_HTS221_LABEL); return; } #endif #ifdef CONFIG_LSM6DSL - struct device *accel_dev = device_get_binding(DT_ST_LSM6DSL_0_LABEL); + struct device *accel_dev = device_get_binding(DT_INST_0_ST_LSM6DSL_LABEL); if (!accel_dev) { printk("Could not get pointer to %s sensor\n", - DT_ST_LSM6DSL_0_LABEL); + DT_INST_0_ST_LSM6DSL_LABEL); return; } @@ -235,11 +235,11 @@ void main(void) #endif #ifdef CONFIG_VL53L0X - struct device *tof_dev = device_get_binding(DT_ST_VL53L0X_0_LABEL); + struct device *tof_dev = device_get_binding(DT_INST_0_ST_VL53L0X_LABEL); if (!tof_dev) { printk("Could not get pointer to %s sensor\n", - DT_ST_VL53L0X_0_LABEL); + DT_INST_0_ST_VL53L0X_LABEL); return; } #endif diff --git a/samples/boards/reel_board/mesh_badge/src/periphs.c b/samples/boards/reel_board/mesh_badge/src/periphs.c index f0c858ab0dc..9ea0e3ca638 100644 --- a/samples/boards/reel_board/mesh_badge/src/periphs.c +++ b/samples/boards/reel_board/mesh_badge/src/periphs.c @@ -32,10 +32,10 @@ static struct led_device_info led_dev_info[] = { static struct device_info dev_info[] = { { NULL, SW0_GPIO_CONTROLLER }, - { NULL, DT_TI_HDC1010_0_LABEL }, - { NULL, DT_NXP_MMA8652FC_0_LABEL }, - { NULL, DT_AVAGO_APDS9960_0_LABEL }, - { NULL, DT_SOLOMON_SSD1673FB_0_LABEL }, + { NULL, DT_INST_0_TI_HDC1010_LABEL }, + { NULL, DT_INST_0_NXP_MMA8652FC_LABEL }, + { NULL, DT_INST_0_AVAGO_APDS9960_LABEL }, + { NULL, DT_INST_0_SOLOMON_SSD1673FB_LABEL }, }; static void configure_gpios(void) diff --git a/samples/boards/reel_board/mesh_badge/src/reel_board.c b/samples/boards/reel_board/mesh_badge/src/reel_board.c index 93c90968687..4acda72089b 100644 --- a/samples/boards/reel_board/mesh_badge/src/reel_board.c +++ b/samples/boards/reel_board/mesh_badge/src/reel_board.c @@ -588,7 +588,7 @@ void board_refresh_display(void) int board_init(void) { - epd_dev = device_get_binding(DT_SOLOMON_SSD1673FB_0_LABEL); + epd_dev = device_get_binding(DT_INST_0_SOLOMON_SSD1673FB_LABEL); if (epd_dev == NULL) { printk("SSD1673 device not found\n"); return -ENODEV; diff --git a/samples/display/ili9340/src/main.c b/samples/display/ili9340/src/main.c index 3f2e305e124..216f7e34792 100644 --- a/samples/display/ili9340/src/main.c +++ b/samples/display/ili9340/src/main.c @@ -46,7 +46,7 @@ void main(void) size_t cnt = 0; int h_step; - dev = device_get_binding(DT_ILITEK_ILI9340_0_LABEL); + dev = device_get_binding(DT_INST_0_ILITEK_ILI9340_LABEL); if (dev == NULL) { LOG_ERR("Device not found. Aborting test."); diff --git a/samples/drivers/ht16k33/src/main.c b/samples/drivers/ht16k33/src/main.c index 417f028ade8..bf098302b86 100644 --- a/samples/drivers/ht16k33/src/main.c +++ b/samples/drivers/ht16k33/src/main.c @@ -13,10 +13,10 @@ #include LOG_MODULE_REGISTER(main); -#define LED_DEV_NAME DT_HOLTEK_HT16K33_0_LABEL -#define KS0_DEV_NAME DT_HOLTEK_HT16K33_KEYSCAN_0_LABEL -#define KS1_DEV_NAME DT_HOLTEK_HT16K33_KEYSCAN_1_LABEL -#define KS2_DEV_NAME DT_HOLTEK_HT16K33_KEYSCAN_2_LABEL +#define LED_DEV_NAME DT_INST_0_HOLTEK_HT16K33_LABEL +#define KS0_DEV_NAME DT_INST_0_HOLTEK_HT16K33_KEYSCAN_LABEL +#define KS1_DEV_NAME DT_INST_1_HOLTEK_HT16K33_KEYSCAN_LABEL +#define KS2_DEV_NAME DT_INST_2_HOLTEK_HT16K33_KEYSCAN_LABEL #define KEYSCAN_DEVICES 3 diff --git a/samples/drivers/led_apa102/src/main.c b/samples/drivers/led_apa102/src/main.c index 2961d23c85d..47a9217e73c 100644 --- a/samples/drivers/led_apa102/src/main.c +++ b/samples/drivers/led_apa102/src/main.c @@ -56,11 +56,11 @@ void main(void) struct device *strip; size_t i, time; - strip = device_get_binding(DT_APA_APA102_0_LABEL); + strip = device_get_binding(DT_INST_0_APA_APA102_LABEL); if (strip) { - LOG_INF("Found LED strip device %s", DT_APA_APA102_0_LABEL); + LOG_INF("Found LED strip device %s", DT_INST_0_APA_APA102_LABEL); } else { - LOG_ERR("LED strip device %s not found", DT_APA_APA102_0_LABEL); + LOG_ERR("LED strip device %s not found", DT_INST_0_APA_APA102_LABEL); return; } diff --git a/samples/drivers/led_lp3943/src/main.c b/samples/drivers/led_lp3943/src/main.c index 6bcee109294..58b278c0813 100644 --- a/samples/drivers/led_lp3943/src/main.c +++ b/samples/drivers/led_lp3943/src/main.c @@ -14,7 +14,7 @@ #include LOG_MODULE_REGISTER(app); -#define LED_DEV_NAME DT_TI_LP3943_0_LABEL +#define LED_DEV_NAME DT_INST_0_TI_LP3943_LABEL #define NUM_LEDS 16 #define DELAY_TIME K_MSEC(1000) diff --git a/samples/drivers/led_lp5562/src/main.c b/samples/drivers/led_lp5562/src/main.c index 626a36d7239..cfc89aa1451 100644 --- a/samples/drivers/led_lp5562/src/main.c +++ b/samples/drivers/led_lp5562/src/main.c @@ -14,7 +14,7 @@ #include LOG_MODULE_REGISTER(main); -#define LED_DEV_NAME DT_TI_LP5562_0_LABEL +#define LED_DEV_NAME DT_INST_0_TI_LP5562_LABEL #define NUM_LEDS 4 #define BLINK_DELAY_ON 500 #define BLINK_DELAY_OFF 500 diff --git a/samples/drivers/led_lpd8806/src/main.c b/samples/drivers/led_lpd8806/src/main.c index 188045055de..3fce27808ac 100644 --- a/samples/drivers/led_lpd8806/src/main.c +++ b/samples/drivers/led_lpd8806/src/main.c @@ -22,7 +22,7 @@ LOG_MODULE_REGISTER(main); */ #define STRIP_NUM_LEDS 32 -#define STRIP_DEV_NAME DT_COLORWAY_LPD8806_0_LABEL +#define STRIP_DEV_NAME DT_INST_0_COLORWAY_LPD8806_LABEL #define DELAY_TIME K_MSEC(40) static const struct led_rgb colors[] = { diff --git a/samples/drivers/led_pca9633/src/main.c b/samples/drivers/led_pca9633/src/main.c index a53b346f65d..565eb533b15 100644 --- a/samples/drivers/led_pca9633/src/main.c +++ b/samples/drivers/led_pca9633/src/main.c @@ -14,7 +14,7 @@ #include LOG_MODULE_REGISTER(main); -#define LED_DEV_NAME DT_NXP_PCA9633_0_LABEL +#define LED_DEV_NAME DT_INST_0_NXP_PCA9633_LABEL #define NUM_LEDS 4 #define MAX_BRIGHTNESS 100 #define HALF_BRIGHTNESS (MAX_BRIGHTNESS / 2) diff --git a/samples/drivers/led_ws2812/src/main.c b/samples/drivers/led_ws2812/src/main.c index 8ae119e89b0..e850387034b 100644 --- a/samples/drivers/led_ws2812/src/main.c +++ b/samples/drivers/led_ws2812/src/main.c @@ -23,7 +23,7 @@ LOG_MODULE_REGISTER(main); */ #if defined(CONFIG_WS2812_STRIP) #define STRIP_NUM_LEDS 12 -#define STRIP_DEV_NAME DT_WORLDSEMI_WS2812_0_LABEL +#define STRIP_DEV_NAME DT_INST_0_WORLDSEMI_WS2812_LABEL #else #define STRIP_NUM_LEDS 24 #define STRIP_DEV_NAME CONFIG_WS2812B_SW_NAME diff --git a/samples/net/lwm2m_client/src/lwm2m-client.c b/samples/net/lwm2m_client/src/lwm2m-client.c index e99b63ae84e..a37e49b3b2d 100644 --- a/samples/net/lwm2m_client/src/lwm2m-client.c +++ b/samples/net/lwm2m_client/src/lwm2m-client.c @@ -186,7 +186,7 @@ static void *temperature_get_buf(u16_t obj_inst_id, size_t *data_len) struct device *dev = NULL; #if defined(CONFIG_FXOS8700_TEMP) - dev = device_get_binding(DT_NXP_FXOS8700_0_LABEL); + dev = device_get_binding(DT_INST_0_NXP_FXOS8700_LABEL); #endif if (dev != NULL) { diff --git a/samples/net/wifi/src/wifi_test.c b/samples/net/wifi/src/wifi_test.c index f260802e924..89fe7270ae0 100644 --- a/samples/net/wifi/src/wifi_test.c +++ b/samples/net/wifi/src/wifi_test.c @@ -15,9 +15,9 @@ static struct winc1500_gpio_configuration winc1500_gpios[WINC1500_GPIO_IDX_MAX] = { - { .dev = NULL, .pin = DT_ATMEL_WINC1500_0_ENABLE_GPIOS_PIN }, - { .dev = NULL, .pin = DT_ATMEL_WINC1500_0_IRQ_GPIOS_PIN }, - { .dev = NULL, .pin = DT_ATMEL_WINC1500_0_RESET_GPIOS_PIN }, + { .dev = NULL, .pin = DT_INST_0_ATMEL_WINC1500_ENABLE_GPIOS_PIN }, + { .dev = NULL, .pin = DT_INST_0_ATMEL_WINC1500_IRQ_GPIOS_PIN }, + { .dev = NULL, .pin = DT_INST_0_ATMEL_WINC1500_RESET_GPIOS_PIN }, }; struct winc1500_gpio_configuration *winc1500_configure_gpios(void) @@ -28,9 +28,9 @@ struct winc1500_gpio_configuration *winc1500_configure_gpios(void) const int flags_noint_out = GPIO_DIR_OUT; struct device *gpio_en, *gpio_irq, *gpio_reset; - gpio_en = device_get_binding(DT_ATMEL_WINC1500_0_ENABLE_GPIOS_CONTROLLER); - gpio_irq = device_get_binding(DT_ATMEL_WINC1500_0_IRQ_GPIOS_CONTROLLER); - gpio_reset = device_get_binding(DT_ATMEL_WINC1500_0_RESET_GPIOS_CONTROLLER); + gpio_en = device_get_binding(DT_INST_0_ATMEL_WINC1500_ENABLE_GPIOS_CONTROLLER); + gpio_irq = device_get_binding(DT_INST_0_ATMEL_WINC1500_IRQ_GPIOS_CONTROLLER); + gpio_reset = device_get_binding(DT_INST_0_ATMEL_WINC1500_RESET_GPIOS_CONTROLLER); gpio_pin_configure(gpio_en, winc1500_gpios[WINC1500_GPIO_IDX_CHIP_EN].pin, diff --git a/samples/sensor/adt7420/src/main.c b/samples/sensor/adt7420/src/main.c index 512d9669f5c..ea5a6a6abb7 100644 --- a/samples/sensor/adt7420/src/main.c +++ b/samples/sensor/adt7420/src/main.c @@ -91,7 +91,7 @@ static void process(struct device *dev) void main(void) { - struct device *dev = device_get_binding(DT_ADI_ADT7420_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_ADI_ADT7420_LABEL); if (dev == NULL) { printf("Failed to get device binding\n"); diff --git a/samples/sensor/adxl362/src/main.c b/samples/sensor/adxl362/src/main.c index a29c8d02322..fe141ade6d3 100644 --- a/samples/sensor/adxl362/src/main.c +++ b/samples/sensor/adxl362/src/main.c @@ -33,7 +33,7 @@ void main(void) { struct sensor_value accel[3]; - struct device *dev = device_get_binding(DT_ADI_ADXL362_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_ADI_ADXL362_LABEL); if (dev == NULL) { printf("Device get binding device\n"); return; diff --git a/samples/sensor/adxl372/src/main.c b/samples/sensor/adxl372/src/main.c index 5cbf3deaff1..80ae741a947 100644 --- a/samples/sensor/adxl372/src/main.c +++ b/samples/sensor/adxl372/src/main.c @@ -47,10 +47,10 @@ void main(void) int i; char meter[200]; - struct device *dev = device_get_binding(DT_ADI_ADXL372_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_ADI_ADXL372_LABEL); if (dev == NULL) { - printf("Could not get %s device\n", DT_ADI_ADXL372_0_LABEL); + printf("Could not get %s device\n", DT_INST_0_ADI_ADXL372_LABEL); return; } diff --git a/samples/sensor/ams_iAQcore/src/main.c b/samples/sensor/ams_iAQcore/src/main.c index a7d73bdd44d..c852fa24914 100644 --- a/samples/sensor/ams_iAQcore/src/main.c +++ b/samples/sensor/ams_iAQcore/src/main.c @@ -14,7 +14,7 @@ void main(void) struct device *dev; struct sensor_value co2, voc; - dev = device_get_binding(DT_AMS_IAQCORE_0_LABEL); + dev = device_get_binding(DT_INST_0_AMS_IAQCORE_LABEL); if (!dev) { printk("Failed to get device binding"); return; diff --git a/samples/sensor/apds9960/src/main.c b/samples/sensor/apds9960/src/main.c index f513a184615..1bb962eba28 100644 --- a/samples/sensor/apds9960/src/main.c +++ b/samples/sensor/apds9960/src/main.c @@ -29,7 +29,7 @@ void main(void) struct sensor_value intensity, pdata; printk("APDS9960 sample application\n"); - dev = device_get_binding(DT_AVAGO_APDS9960_0_LABEL); + dev = device_get_binding(DT_INST_0_AVAGO_APDS9960_LABEL); if (!dev) { printk("sensor: device not found.\n"); return; diff --git a/samples/sensor/bme680/src/main.c b/samples/sensor/bme680/src/main.c index 61c41e996e7..bb796c65168 100644 --- a/samples/sensor/bme680/src/main.c +++ b/samples/sensor/bme680/src/main.c @@ -11,7 +11,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_BOSCH_BME680_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_BOSCH_BME680_LABEL); struct sensor_value temp, press, humidity, gas_res; printf("Device %p name is %s\n", dev, dev->config->name); diff --git a/samples/sensor/bmi160/src/bmi160.c b/samples/sensor/bmi160/src/bmi160.c index 4f134210ce8..de5a527fca3 100644 --- a/samples/sensor/bmi160/src/bmi160.c +++ b/samples/sensor/bmi160/src/bmi160.c @@ -417,7 +417,7 @@ void main(void) #endif printk("IMU: Binding...\n"); - bmi160 = device_get_binding(DT_BOSCH_BMI160_0_LABEL); + bmi160 = device_get_binding(DT_INST_0_BOSCH_BMI160_LABEL); if (!bmi160) { printk("Gyro: Device not found.\n"); return; diff --git a/samples/sensor/ccs811/src/main.c b/samples/sensor/ccs811/src/main.c index 221e921ad8c..e80af7ef73e 100644 --- a/samples/sensor/ccs811/src/main.c +++ b/samples/sensor/ccs811/src/main.c @@ -34,7 +34,7 @@ void main(void) { struct device *dev; - dev = device_get_binding(DT_AMS_CCS811_0_LABEL); + dev = device_get_binding(DT_INST_0_AMS_CCS811_LABEL); if (!dev) { printk("Failed to get device binding"); return; diff --git a/samples/sensor/ens210/src/main.c b/samples/sensor/ens210/src/main.c index 77e071eec80..582f3996f04 100644 --- a/samples/sensor/ens210/src/main.c +++ b/samples/sensor/ens210/src/main.c @@ -14,7 +14,7 @@ void main(void) struct device *dev; struct sensor_value temperature, humidity; - dev = device_get_binding(DT_AMS_ENS210_0_LABEL); + dev = device_get_binding(DT_INST_0_AMS_ENS210_LABEL); if (!dev) { printk("Failed to get device binding"); return; diff --git a/samples/sensor/fxas21002/src/main.c b/samples/sensor/fxas21002/src/main.c index f6bcd9f1d16..8d5bbd37e3c 100644 --- a/samples/sensor/fxas21002/src/main.c +++ b/samples/sensor/fxas21002/src/main.c @@ -18,7 +18,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) void main(void) { struct sensor_value gyro[3]; - struct device *dev = device_get_binding(DT_NXP_FXAS21002_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_NXP_FXAS21002_LABEL); if (dev == NULL) { printf("Could not get fxas21002 device\n"); diff --git a/samples/sensor/fxos8700-hid/src/main.c b/samples/sensor/fxos8700-hid/src/main.c index d537c1f6734..0cf59076509 100644 --- a/samples/sensor/fxos8700-hid/src/main.c +++ b/samples/sensor/fxos8700-hid/src/main.c @@ -54,7 +54,7 @@ LOG_MODULE_REGISTER(main); #ifdef CONFIG_FXOS8700 #include -#define SENSOR_ACCEL_NAME DT_NXP_FXOS8700_0_LABEL +#define SENSOR_ACCEL_NAME DT_INST_0_NXP_FXOS8700_LABEL #endif static const u8_t hid_report_desc[] = HID_MOUSE_REPORT_DESC(2); diff --git a/samples/sensor/fxos8700/src/main.c b/samples/sensor/fxos8700/src/main.c index 07994c17b7f..b3eec471a1e 100644 --- a/samples/sensor/fxos8700/src/main.c +++ b/samples/sensor/fxos8700/src/main.c @@ -29,7 +29,7 @@ static void trigger_handler(struct device *dev, struct sensor_trigger *trigger) void main(void) { struct sensor_value accel[3]; - struct device *dev = device_get_binding(DT_NXP_FXOS8700_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_NXP_FXOS8700_LABEL); if (dev == NULL) { printf("Could not get fxos8700 device\n"); diff --git a/samples/sensor/lsm303dlhc/src/main.c b/samples/sensor/lsm303dlhc/src/main.c index 259ee2f521e..5d7a0c11709 100644 --- a/samples/sensor/lsm303dlhc/src/main.c +++ b/samples/sensor/lsm303dlhc/src/main.c @@ -38,19 +38,19 @@ end: void main(void) { struct device *accelerometer = device_get_binding( - DT_ST_LIS2DH_0_LABEL); + DT_INST_0_ST_LIS2DH_LABEL); struct device *magnetometer = device_get_binding( - DT_ST_LSM303DLHC_MAGN_0_LABEL); + DT_INST_0_ST_LSM303DLHC_MAGN_LABEL); if (accelerometer == NULL) { printf("Could not get %s device\n", - DT_ST_LIS2DH_0_LABEL); + DT_INST_0_ST_LIS2DH_LABEL); return; } if (magnetometer == NULL) { printf("Could not get %s device\n", - DT_ST_LSM303DLHC_MAGN_0_LABEL); + DT_INST_0_ST_LSM303DLHC_MAGN_LABEL); return; } diff --git a/samples/sensor/lsm6dsl/src/main.c b/samples/sensor/lsm6dsl/src/main.c index 0ea656508b0..b5d7d761fd3 100644 --- a/samples/sensor/lsm6dsl/src/main.c +++ b/samples/sensor/lsm6dsl/src/main.c @@ -100,7 +100,7 @@ void main(void) int cnt = 0; char out_str[64]; struct sensor_value odr_attr; - struct device *lsm6dsl_dev = device_get_binding(DT_ST_LSM6DSL_0_LABEL); + struct device *lsm6dsl_dev = device_get_binding(DT_INST_0_ST_LSM6DSL_LABEL); if (lsm6dsl_dev == NULL) { printk("Could not get LSM6DSL device\n"); diff --git a/samples/sensor/max30101/src/main.c b/samples/sensor/max30101/src/main.c index ed13c160abb..3a84451ec05 100644 --- a/samples/sensor/max30101/src/main.c +++ b/samples/sensor/max30101/src/main.c @@ -11,7 +11,7 @@ void main(void) { struct sensor_value green; - struct device *dev = device_get_binding(DT_MAX_MAX30101_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_MAX_MAX30101_LABEL); if (dev == NULL) { printf("Could not get max30101 device\n"); diff --git a/samples/sensor/ms5837/src/main.c b/samples/sensor/ms5837/src/main.c index d28511452b5..7c9dfa349c7 100644 --- a/samples/sensor/ms5837/src/main.c +++ b/samples/sensor/ms5837/src/main.c @@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(main); void main(void) { struct sensor_value oversampling_rate = { 8192, 0 }; - struct device *dev = device_get_binding(DT_MEAS_MS5837_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_MEAS_MS5837_LABEL); if (dev == NULL) { LOG_ERR("Could not find MS5837 device, aborting test."); diff --git a/samples/sensor/ti_hdc/src/main.c b/samples/sensor/ti_hdc/src/main.c index d0c5644163e..ed9cee4dd6c 100644 --- a/samples/sensor/ti_hdc/src/main.c +++ b/samples/sensor/ti_hdc/src/main.c @@ -15,7 +15,7 @@ void main(void) { printk("Running on %s!\n", CONFIG_ARCH); - struct device *dev = device_get_binding(DT_TI_HDC_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_TI_HDC_LABEL); __ASSERT(dev != NULL, "Failed to get device binding"); diff --git a/samples/sensor/vl53l0x/src/main.c b/samples/sensor/vl53l0x/src/main.c index 3405d5344b9..71e1f30dea0 100644 --- a/samples/sensor/vl53l0x/src/main.c +++ b/samples/sensor/vl53l0x/src/main.c @@ -12,7 +12,7 @@ void main(void) { - struct device *dev = device_get_binding(DT_ST_VL53L0X_0_LABEL); + struct device *dev = device_get_binding(DT_INST_0_ST_VL53L0X_LABEL); struct sensor_value value; int ret; diff --git a/samples/shields/x_nucleo_iks01a1/src/main.c b/samples/shields/x_nucleo_iks01a1/src/main.c index bf911be156b..dc84a279337 100644 --- a/samples/shields/x_nucleo_iks01a1/src/main.c +++ b/samples/shields/x_nucleo_iks01a1/src/main.c @@ -14,10 +14,10 @@ void main(void) { struct sensor_value temp, hum, press; struct sensor_value magn_xyz[3], accel_xyz[3]; - struct device *hts221 = device_get_binding(DT_ST_HTS221_0_LABEL); - struct device *lis3mdl = device_get_binding(DT_ST_LIS3MDL_MAGN_0_LABEL); - struct device *lsm6ds0 = device_get_binding(DT_ST_LSM6DS0_0_LABEL); - struct device *lps25hb = device_get_binding(DT_ST_LPS25HB_PRESS_0_LABEL); + struct device *hts221 = device_get_binding(DT_INST_0_ST_HTS221_LABEL); + struct device *lis3mdl = device_get_binding(DT_INST_0_ST_LIS3MDL_MAGN_LABEL); + struct device *lsm6ds0 = device_get_binding(DT_INST_0_ST_LSM6DS0_LABEL); + struct device *lps25hb = device_get_binding(DT_INST_0_ST_LPS25HB_PRESS_LABEL); if (hts221 == NULL) { printf("Could not get HTS221 device\n"); diff --git a/samples/shields/x_nucleo_iks01a2/src/main.c b/samples/shields/x_nucleo_iks01a2/src/main.c index 71d05fc3b9a..7274b040254 100644 --- a/samples/shields/x_nucleo_iks01a2/src/main.c +++ b/samples/shields/x_nucleo_iks01a2/src/main.c @@ -16,11 +16,11 @@ void main(void) struct sensor_value accel1[3], accel2[3]; struct sensor_value gyro[3]; struct sensor_value magn[3]; - struct device *hts221 = device_get_binding(DT_ST_HTS221_0_LABEL); - struct device *lps22hb = device_get_binding(DT_ST_LPS22HB_PRESS_0_LABEL); - struct device *lsm6dsl = device_get_binding(DT_ST_LSM6DSL_0_LABEL); - struct device *lsm303agr_a = device_get_binding(DT_ST_LIS2DH_0_LABEL); - struct device *lsm303agr_m = device_get_binding(DT_ST_LIS2MDL_MAGN_0_LABEL); + struct device *hts221 = device_get_binding(DT_INST_0_ST_HTS221_LABEL); + struct device *lps22hb = device_get_binding(DT_INST_0_ST_LPS22HB_PRESS_LABEL); + struct device *lsm6dsl = device_get_binding(DT_INST_0_ST_LSM6DSL_LABEL); + struct device *lsm303agr_a = device_get_binding(DT_INST_0_ST_LIS2DH_LABEL); + struct device *lsm303agr_m = device_get_binding(DT_INST_0_ST_LIS2MDL_MAGN_LABEL); if (hts221 == NULL) { printf("Could not get HTS221 device\n"); diff --git a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c index ddb2e376097..ac6f0191ed4 100644 --- a/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c +++ b/samples/subsys/ipc/ipm_mcux/remote/src/main_remote.c @@ -20,7 +20,7 @@ void ping_ipm_callback(void *context, u32_t id, volatile void *data) void main(void) { - ipm = device_get_binding(DT_NXP_LPC_MAILBOX_0_LABEL); + ipm = device_get_binding(DT_INST_0_NXP_LPC_MAILBOX_LABEL); if (!ipm) { while (1) { } diff --git a/samples/subsys/ipc/ipm_mcux/src/main_master.c b/samples/subsys/ipc/ipm_mcux/src/main_master.c index c13facaf87e..01a798e5629 100644 --- a/samples/subsys/ipc/ipm_mcux/src/main_master.c +++ b/samples/subsys/ipc/ipm_mcux/src/main_master.c @@ -33,7 +33,7 @@ void main(void) printk("Hello World from MASTER! %s\n", CONFIG_ARCH); /* Get IPM device handle */ - ipm = device_get_binding(DT_NXP_LPC_MAILBOX_0_LABEL); + ipm = device_get_binding(DT_INST_0_NXP_LPC_MAILBOX_LABEL); if (!ipm) { printk("Could not get IPM device handle!\n"); while (1) { diff --git a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c index 16157365ea3..65bf10aa5ac 100644 --- a/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c +++ b/samples/subsys/ipc/ipm_mhu_dual_core/src/main.c @@ -49,7 +49,7 @@ void main(void) { printk("IPM MHU sample on %s\n", CONFIG_BOARD); - mhu0 = device_get_binding(DT_ARM_MHU_0_LABEL); + mhu0 = device_get_binding(DT_INST_0_ARM_MHU_LABEL); if (!mhu0) { printk("CPU %d, get MHU0 fail!\n", sse_200_platform_get_cpu_id()); diff --git a/soc/arc/snps_emsk/dts_fixup.h b/soc/arc/snps_emsk/dts_fixup.h index 50d1013e9be..dc742f46f4b 100644 --- a/soc/arc/snps_emsk/dts_fixup.h +++ b/soc/arc/snps_emsk/dts_fixup.h @@ -6,8 +6,8 @@ #define DT_DCCM_BASE_ADDRESS DT_ARC_DCCM_80000000_BASE_ADDRESS #define DT_DCCM_SIZE (DT_ARC_DCCM_80000000_SIZE >> 10) -#define DT_ICCM_BASE_ADDRESS DT_ARC_ICCM_0_BASE_ADDRESS -#define DT_ICCM_SIZE (DT_ARC_ICCM_0_SIZE >> 10) +#define DT_ICCM_BASE_ADDRESS DT_INST_0_ARC_ICCM_BASE_ADDRESS +#define DT_ICCM_SIZE (DT_INST_0_ARC_ICCM_SIZE >> 10) #define DT_DDR_BASE_ADDRESS DT_MMIO_SRAM_10000000_BASE_ADDRESS #define DT_DDR_SIZE (DT_MMIO_SRAM_10000000_SIZE >> 10) diff --git a/soc/arc/snps_nsim/dts_fixup.h b/soc/arc/snps_nsim/dts_fixup.h index a021dfdfc60..1275d5949e1 100644 --- a/soc/arc/snps_nsim/dts_fixup.h +++ b/soc/arc/snps_nsim/dts_fixup.h @@ -6,7 +6,7 @@ #define DT_DCCM_BASE_ADDRESS DT_ARC_DCCM_80000000_BASE_ADDRESS #define DT_DCCM_SIZE (DT_ARC_DCCM_80000000_SIZE >> 10) -#define DT_ICCM_BASE_ADDRESS DT_ARC_ICCM_0_BASE_ADDRESS -#define DT_ICCM_SIZE (DT_ARC_ICCM_0_SIZE >> 10) +#define DT_ICCM_BASE_ADDRESS DT_INST_0_ARC_ICCM_BASE_ADDRESS +#define DT_ICCM_SIZE (DT_INST_0_ARC_ICCM_SIZE >> 10) /* End of SoC Level DTS fixup file */ diff --git a/soc/arm/atmel_sam0/samd20/dts_fixup.h b/soc/arm/atmel_sam0/samd20/dts_fixup.h index fa261d25945..98c8b4302d5 100644 --- a/soc/arm/atmel_sam0/samd20/dts_fixup.h +++ b/soc/arm/atmel_sam0/samd20/dts_fixup.h @@ -4,11 +4,11 @@ #define DT_FLASH_DEV_NAME DT_ATMEL_SAM0_NVMCTRL_41004000_LABEL -#define CONFIG_WDT_0_NAME DT_ATMEL_SAM0_WATCHDOG_0_LABEL +#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL -#define CONFIG_COUNTER_0_NAME DT_ATMEL_SAM0_TC32_0_LABEL +#define CONFIG_COUNTER_0_NAME DT_INST_0_ATMEL_SAM0_TC32_LABEL -#define CONFIG_I2C_0_NAME DT_ATMEL_SAM0_I2C_0_LABEL +#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS diff --git a/soc/arm/atmel_sam0/samd21/dts_fixup.h b/soc/arm/atmel_sam0/samd21/dts_fixup.h index ceaabe2dd69..040a990e777 100644 --- a/soc/arm/atmel_sam0/samd21/dts_fixup.h +++ b/soc/arm/atmel_sam0/samd21/dts_fixup.h @@ -2,13 +2,13 @@ /* SoC level DTS fixup file */ -#define DT_FLASH_DEV_NAME DT_ATMEL_SAM0_NVMCTRL_0_LABEL +#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL -#define CONFIG_WDT_0_NAME DT_ATMEL_SAM0_WATCHDOG_0_LABEL +#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL -#define CONFIG_COUNTER_0_NAME DT_ATMEL_SAM0_TC32_0_LABEL +#define CONFIG_COUNTER_0_NAME DT_INST_0_ATMEL_SAM0_TC32_LABEL -#define CONFIG_I2C_0_NAME DT_ATMEL_SAM0_I2C_0_LABEL +#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS diff --git a/soc/arm/atmel_sam0/samr21/dts_fixup.h b/soc/arm/atmel_sam0/samr21/dts_fixup.h index 74792118cb6..4c75a2ed7a2 100644 --- a/soc/arm/atmel_sam0/samr21/dts_fixup.h +++ b/soc/arm/atmel_sam0/samr21/dts_fixup.h @@ -6,13 +6,13 @@ /* SoC level DTS fixup file */ -#define DT_FLASH_DEV_NAME DT_ATMEL_SAM0_NVMCTRL_0_LABEL +#define DT_FLASH_DEV_NAME DT_INST_0_ATMEL_SAM0_NVMCTRL_LABEL -#define CONFIG_WDT_0_NAME DT_ATMEL_SAM0_WATCHDOG_0_LABEL +#define CONFIG_WDT_0_NAME DT_INST_0_ATMEL_SAM0_WATCHDOG_LABEL -#define CONFIG_COUNTER_0_NAME DT_ATMEL_SAM0_TC32_0_LABEL +#define CONFIG_COUNTER_0_NAME DT_INST_0_ATMEL_SAM0_TC32_LABEL -#define CONFIG_I2C_0_NAME DT_ATMEL_SAM0_I2C_0_LABEL +#define CONFIG_I2C_0_NAME DT_INST_0_ATMEL_SAM0_I2C_LABEL #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V6M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS diff --git a/soc/arm/microchip_mec/mec1501/dts_fixup.h b/soc/arm/microchip_mec/mec1501/dts_fixup.h index 5508d0c7315..eff094a239a 100644 --- a/soc/arm/microchip_mec/mec1501/dts_fixup.h +++ b/soc/arm/microchip_mec/mec1501/dts_fixup.h @@ -22,7 +22,7 @@ #define DT_UART_NS16550_PORT_0_BAUD_RATE \ DT_NS16550_400F2400_CURRENT_SPEED #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_400F2400_IRQ_0 -#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_INST_0_NS16550_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Deault */ #define DT_UART_NS16550_PORT_1_BASE_ADDR \ @@ -32,7 +32,7 @@ #define DT_UART_NS16550_PORT_1_BAUD_RATE \ DT_NS16550_400F2800_CURRENT_SPEED #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_400F2800_IRQ_0 -#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_INST_1_NS16550_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */ #define DT_UART_NS16550_PORT_2_BASE_ADDR \ @@ -42,49 +42,49 @@ #define DT_UART_NS16550_PORT_2_BAUD_RATE \ DT_NS16550_400F2C00_CURRENT_SPEED #define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_400F2C00_IRQ_0 -#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_2_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_INST_2_NS16550_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_2_IRQ_FLAGS 0 /* Default */ /* Pin multiplexing and GPIOs share the same registers in the HW */ -#define DT_PINMUX_XEC_GPIO000_036_BASE_ADDR DT_MICROCHIP_XEC_GPIO_0_BASE_ADDRESS -#define DT_PINMUX_XEC_GPIO040_076_BASE_ADDR DT_MICROCHIP_XEC_GPIO_1_BASE_ADDRESS -#define DT_PINMUX_XEC_GPIO100_136_BASE_ADDR DT_MICROCHIP_XEC_GPIO_2_BASE_ADDRESS -#define DT_PINMUX_XEC_GPIO140_176_BASE_ADDR DT_MICROCHIP_XEC_GPIO_3_BASE_ADDRESS -#define DT_PINMUX_XEC_GPIO200_236_BASE_ADDR DT_MICROCHIP_XEC_GPIO_4_BASE_ADDRESS -#define DT_PINMUX_XEC_GPIO240_276_BASE_ADDR DT_MICROCHIP_XEC_GPIO_5_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO000_036_BASE_ADDR DT_INST_0_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO040_076_BASE_ADDR DT_INST_1_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO100_136_BASE_ADDR DT_INST_2_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO140_176_BASE_ADDR DT_INST_3_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO200_236_BASE_ADDR DT_INST_4_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_PINMUX_XEC_GPIO240_276_BASE_ADDR DT_INST_5_MICROCHIP_XEC_GPIO_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO000_036_BASE_ADDR DT_MICROCHIP_XEC_GPIO_0_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO000_036_IRQ DT_MICROCHIP_XEC_GPIO_0_IRQ_0 -#define DT_GPIO_XEC_GPIO000_036_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_0_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO000_036_LABEL DT_MICROCHIP_XEC_GPIO_0_LABEL -#define DT_GPIO_XEC_GPIO000_036_SIZE DT_MICROCHIP_XEC_GPIO_0_SIZE +#define DT_GPIO_XEC_GPIO000_036_BASE_ADDR DT_INST_0_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO000_036_IRQ DT_INST_0_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO000_036_IRQ_PRIORITY DT_INST_0_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO000_036_LABEL DT_INST_0_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO000_036_SIZE DT_INST_0_MICROCHIP_XEC_GPIO_SIZE -#define DT_GPIO_XEC_GPIO040_076_BASE_ADDR DT_MICROCHIP_XEC_GPIO_1_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO040_076_IRQ DT_MICROCHIP_XEC_GPIO_1_IRQ_0 -#define DT_GPIO_XEC_GPIO040_076_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_1_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO040_076_LABEL DT_MICROCHIP_XEC_GPIO_1_LABEL -#define DT_GPIO_XEC_GPIO040_076_SIZE DT_MICROCHIP_XEC_GPIO_1_SIZE +#define DT_GPIO_XEC_GPIO040_076_BASE_ADDR DT_INST_1_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO040_076_IRQ DT_INST_1_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO040_076_IRQ_PRIORITY DT_INST_1_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO040_076_LABEL DT_INST_1_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO040_076_SIZE DT_INST_1_MICROCHIP_XEC_GPIO_SIZE -#define DT_GPIO_XEC_GPIO100_136_BASE_ADDR DT_MICROCHIP_XEC_GPIO_2_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO100_136_IRQ DT_MICROCHIP_XEC_GPIO_2_IRQ_0 -#define DT_GPIO_XEC_GPIO100_136_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_2_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO100_136_LABEL DT_MICROCHIP_XEC_GPIO_2_LABEL -#define DT_GPIO_XEC_GPIO100_136_SIZE DT_MICROCHIP_XEC_GPIO_2_SIZE +#define DT_GPIO_XEC_GPIO100_136_BASE_ADDR DT_INST_2_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO100_136_IRQ DT_INST_2_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO100_136_IRQ_PRIORITY DT_INST_2_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO100_136_LABEL DT_INST_2_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO100_136_SIZE DT_INST_2_MICROCHIP_XEC_GPIO_SIZE -#define DT_GPIO_XEC_GPIO140_176_BASE_ADDR DT_MICROCHIP_XEC_GPIO_3_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO140_176_IRQ DT_MICROCHIP_XEC_GPIO_3_IRQ_0 -#define DT_GPIO_XEC_GPIO140_176_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_3_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO140_176_LABEL DT_MICROCHIP_XEC_GPIO_3_LABEL -#define DT_GPIO_XEC_GPIO140_176_SIZE DT_MICROCHIP_XEC_GPIO_3_SIZE +#define DT_GPIO_XEC_GPIO140_176_BASE_ADDR DT_INST_3_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO140_176_IRQ DT_INST_3_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO140_176_IRQ_PRIORITY DT_INST_3_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO140_176_LABEL DT_INST_3_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO140_176_SIZE DT_INST_3_MICROCHIP_XEC_GPIO_SIZE -#define DT_GPIO_XEC_GPIO200_236_BASE_ADDR DT_MICROCHIP_XEC_GPIO_4_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO200_236_IRQ DT_MICROCHIP_XEC_GPIO_4_IRQ_0 -#define DT_GPIO_XEC_GPIO200_236_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_4_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO200_236_LABEL DT_MICROCHIP_XEC_GPIO_4_LABEL -#define DT_GPIO_XEC_GPIO200_236_SIZE DT_MICROCHIP_XEC_GPIO_4_SIZE +#define DT_GPIO_XEC_GPIO200_236_BASE_ADDR DT_INST_4_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO200_236_IRQ DT_INST_4_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO200_236_IRQ_PRIORITY DT_INST_4_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO200_236_LABEL DT_INST_4_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO200_236_SIZE DT_INST_4_MICROCHIP_XEC_GPIO_SIZE -#define DT_GPIO_XEC_GPIO240_276_BASE_ADDR DT_MICROCHIP_XEC_GPIO_5_BASE_ADDRESS -#define DT_GPIO_XEC_GPIO240_276_IRQ DT_MICROCHIP_XEC_GPIO_5_IRQ_0 -#define DT_GPIO_XEC_GPIO240_276_IRQ_PRIORITY DT_MICROCHIP_XEC_GPIO_5_IRQ_0_PRIORITY -#define DT_GPIO_XEC_GPIO240_276_LABEL DT_MICROCHIP_XEC_GPIO_5_LABEL -#define DT_GPIO_XEC_GPIO240_276_SIZE DT_MICROCHIP_XEC_GPIO_5_SIZE +#define DT_GPIO_XEC_GPIO240_276_BASE_ADDR DT_INST_5_MICROCHIP_XEC_GPIO_BASE_ADDRESS +#define DT_GPIO_XEC_GPIO240_276_IRQ DT_INST_5_MICROCHIP_XEC_GPIO_IRQ_0 +#define DT_GPIO_XEC_GPIO240_276_IRQ_PRIORITY DT_INST_5_MICROCHIP_XEC_GPIO_IRQ_0_PRIORITY +#define DT_GPIO_XEC_GPIO240_276_LABEL DT_INST_5_MICROCHIP_XEC_GPIO_LABEL +#define DT_GPIO_XEC_GPIO240_276_SIZE DT_INST_5_MICROCHIP_XEC_GPIO_SIZE diff --git a/soc/arm/microchip_mec/mec1701/dts_fixup.h b/soc/arm/microchip_mec/mec1701/dts_fixup.h index 1e42b4d2679..ce6b23ff074 100644 --- a/soc/arm/microchip_mec/mec1701/dts_fixup.h +++ b/soc/arm/microchip_mec/mec1701/dts_fixup.h @@ -14,7 +14,7 @@ #define DT_UART_NS16550_PORT_0_NAME DT_NS16550_400F2400_LABEL #define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_400F2400_CURRENT_SPEED #define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_400F2400_IRQ_0 -#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_INST_0_NS16550_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_0_IRQ_FLAGS 0 /* Deault */ #define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_400F2800_BASE_ADDRESS @@ -22,5 +22,5 @@ #define DT_UART_NS16550_PORT_1_NAME DT_NS16550_400F2800_LABEL #define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_400F2800_CURRENT_SPEED #define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_400F2800_IRQ_0 -#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_INST_1_NS16550_IRQ_0_PRIORITY #define DT_UART_NS16550_PORT_1_IRQ_FLAGS 0 /* Default */ diff --git a/soc/arm/nordic_nrf/nrf51/dts_fixup.h b/soc/arm/nordic_nrf/nrf51/dts_fixup.h index b6b59cb18bf..4fedcaa0828 100644 --- a/soc/arm/nordic_nrf/nrf51/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf51/dts_fixup.h @@ -8,7 +8,7 @@ #define DT_UART_0_NAME DT_NORDIC_NRF_UART_UART_0_LABEL -#define DT_FLASH_DEV_NAME DT_NORDIC_NRF51_FLASH_CONTROLLER_0_LABEL +#define DT_FLASH_DEV_NAME DT_INST_0_NORDIC_NRF51_FLASH_CONTROLLER_LABEL #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL diff --git a/soc/arm/nordic_nrf/nrf52/dts_fixup.h b/soc/arm/nordic_nrf/nrf52/dts_fixup.h index ef0a333cdba..9dfcc69cff3 100644 --- a/soc/arm/nordic_nrf/nrf52/dts_fixup.h +++ b/soc/arm/nordic_nrf/nrf52/dts_fixup.h @@ -14,7 +14,7 @@ #define DT_UART_1_NAME DT_NORDIC_NRF_UARTE_UART_1_LABEL -#define DT_FLASH_DEV_NAME DT_NORDIC_NRF52_FLASH_CONTROLLER_0_LABEL +#define DT_FLASH_DEV_NAME DT_INST_0_NORDIC_NRF52_FLASH_CONTROLLER_LABEL #define DT_GPIO_P0_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_0_LABEL #define DT_GPIO_P1_DEV_NAME DT_NORDIC_NRF_GPIO_GPIO_1_LABEL diff --git a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series index eec6ea4f678..d4a5165a627 100644 --- a/soc/arm/nxp_imx/rt/Kconfig.defconfig.series +++ b/soc/arm/nxp_imx/rt/Kconfig.defconfig.series @@ -74,10 +74,10 @@ endif # SPI if CODE_ITCM config FLASH_SIZE - default $(dt_int_val,DT_NXP_IMX_ITCM_0_SIZE,K) + default $(dt_int_val,DT_INST_0_NXP_IMX_ITCM_SIZE,K) config FLASH_BASE_ADDRESS - default $(dt_hex_val,DT_NXP_IMX_ITCM_0_BASE_ADDRESS) + default $(dt_hex_val,DT_INST_0_NXP_IMX_ITCM_BASE_ADDRESS) endif # CODE_ITCM @@ -104,10 +104,10 @@ endif # CODE_FLEXSPI2 if DATA_DTCM config SRAM_SIZE - default $(dt_int_val,DT_NXP_IMX_DTCM_0_SIZE,K) + default $(dt_int_val,DT_INST_0_NXP_IMX_DTCM_SIZE,K) config SRAM_BASE_ADDRESS - default $(dt_hex_val,DT_NXP_IMX_DTCM_0_BASE_ADDRESS) + default $(dt_hex_val,DT_INST_0_NXP_IMX_DTCM_BASE_ADDRESS) endif # DATA_DTCM diff --git a/soc/arm/nxp_kinetis/ke1xf/soc.c b/soc/arm/nxp_kinetis/ke1xf/soc.c index 976e215e789..1bcc3910510 100644 --- a/soc/arm/nxp_kinetis/ke1xf/soc.c +++ b/soc/arm/nxp_kinetis/ke1xf/soc.c @@ -58,53 +58,53 @@ u8_t __kinetis_flash_config_section __kinetis_flash_config[] = { #define TO_ASYNC_CLK_DIV(val) _DO_CONCAT(kSCG_AsyncClkDivBy, val) /* System Clock configuration */ -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_SLOW, 2, 8, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_SLOW, 2, 8, "Invalid SCG slow clock divider value"); -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_BUS, 1, 16, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_BUS, 1, 16, "Invalid SCG bus clock divider value"); -#if DT_NXP_KINETIS_SCG_0_CLK_SOURCE == KINETIS_SCG_SCLK_SRC_SPLL +#if DT_INST_0_NXP_KINETIS_SCG_CLK_SOURCE == KINETIS_SCG_SCLK_SRC_SPLL /* Core divider range is 1 to 4 with SPLL as clock source */ -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_CORE, 1, 4, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_CORE, 1, 4, "Invalid SCG core clock divider value"); #else -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_CORE, 1, 16, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_CORE, 1, 16, "Invalid SCG core clock divider value"); #endif static const scg_sys_clk_config_t scg_sys_clk_config = { - .divSlow = TO_SYS_CLK_DIV(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_SLOW), - .divBus = TO_SYS_CLK_DIV(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_BUS), - .divCore = TO_SYS_CLK_DIV(DT_NXP_KINETIS_SCG_0_CLK_DIVIDER_CORE), - .src = DT_NXP_KINETIS_SCG_0_CLK_SOURCE + .divSlow = TO_SYS_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_SLOW), + .divBus = TO_SYS_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_BUS), + .divCore = TO_SYS_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_CLK_DIVIDER_CORE), + .src = DT_INST_0_NXP_KINETIS_SCG_CLK_SOURCE }; -#ifdef DT_NXP_KINETIS_SCG_0_SOSC_FREQ +#ifdef DT_INST_0_NXP_KINETIS_SCG_SOSC_FREQ /* System Oscillator (SOSC) configuration */ -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SOSC_DIVIDER_1, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SOSC_DIVIDER_1, "Invalid SCG SOSC divider 1 value"); -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SOSC_DIVIDER_2, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SOSC_DIVIDER_2, "Invalid SCG SOSC divider 2 value"); static const scg_sosc_config_t scg_sosc_config = { - .freq = DT_NXP_KINETIS_SCG_0_SOSC_FREQ, + .freq = DT_INST_0_NXP_KINETIS_SCG_SOSC_FREQ, .monitorMode = kSCG_SysOscMonitorDisable, .enableMode = kSCG_SysOscEnable | kSCG_SysOscEnableInLowPower, - .div1 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SOSC_DIVIDER_1), - .div2 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SOSC_DIVIDER_2), - .workMode = DT_NXP_KINETIS_SCG_0_SOSC_MODE + .div1 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SOSC_DIVIDER_1), + .div2 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SOSC_DIVIDER_2), + .workMode = DT_INST_0_NXP_KINETIS_SCG_SOSC_MODE }; -#endif /* DT_NXP_KINETIS_SCG_0_SOSC_FREQ */ +#endif /* DT_INST_0_NXP_KINETIS_SCG_SOSC_FREQ */ /* Slow Internal Reference Clock (SIRC) configuration */ -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SIRC_DIVIDER_1, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SIRC_DIVIDER_1, "Invalid SCG SIRC divider 1 value"); -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SIRC_DIVIDER_2, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SIRC_DIVIDER_2, "Invalid SCG SIRC divider 2 value"); static const scg_sirc_config_t scg_sirc_config = { .enableMode = kSCG_SircEnable, - .div1 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SIRC_DIVIDER_1), - .div2 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SIRC_DIVIDER_2), -#if MHZ(2) == DT_NXP_KINETIS_SCG_0_SIRC_RANGE + .div1 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SIRC_DIVIDER_1), + .div2 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SIRC_DIVIDER_2), +#if MHZ(2) == DT_INST_0_NXP_KINETIS_SCG_SIRC_RANGE .range = kSCG_SircRangeLow -#elif MHZ(8) == DT_NXP_KINETIS_SCG_0_SIRC_RANGE +#elif MHZ(8) == DT_INST_0_NXP_KINETIS_SCG_SIRC_RANGE .range = kSCG_SircRangeHigh #else #error Invalid SCG SIRC range @@ -112,21 +112,21 @@ static const scg_sirc_config_t scg_sirc_config = { }; /* Fast Internal Reference Clock (FIRC) configuration */ -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_FIRC_DIVIDER_1, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_FIRC_DIVIDER_1, "Invalid SCG FIRC divider 1 value"); -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_FIRC_DIVIDER_2, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_FIRC_DIVIDER_2, "Invalid SCG FIRC divider 2 value"); static const scg_firc_config_t scg_firc_config = { .enableMode = kSCG_FircEnable, - .div1 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_FIRC_DIVIDER_1), - .div2 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_FIRC_DIVIDER_2), -#if MHZ(48) == DT_NXP_KINETIS_SCG_0_FIRC_RANGE + .div1 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_FIRC_DIVIDER_1), + .div2 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_FIRC_DIVIDER_2), +#if MHZ(48) == DT_INST_0_NXP_KINETIS_SCG_FIRC_RANGE .range = kSCG_FircRange48M, -#elif MHZ(52) == DT_NXP_KINETIS_SCG_0_FIRC_RANGE +#elif MHZ(52) == DT_INST_0_NXP_KINETIS_SCG_FIRC_RANGE .range = kSCG_FircRange52M, -#elif MHZ(56) == DT_NXP_KINETIS_SCG_0_FIRC_RANGE +#elif MHZ(56) == DT_INST_0_NXP_KINETIS_SCG_FIRC_RANGE .range = kSCG_FircRange56M, -#elif MHZ(60) == DT_NXP_KINETIS_SCG_0_FIRC_RANGE +#elif MHZ(60) == DT_INST_0_NXP_KINETIS_SCG_FIRC_RANGE .range = kSCG_FircRange60M, #else #error Invalid SCG FIRC range @@ -135,28 +135,28 @@ static const scg_firc_config_t scg_firc_config = { }; /* System Phase-Locked Loop (SPLL) configuration */ -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_1, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_1, "Invalid SCG SPLL divider 1 value"); -ASSERT_ASYNC_CLK_DIV_VALID(DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_2, +ASSERT_ASYNC_CLK_DIV_VALID(DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_2, "Invalid SCG SPLL divider 2 value"); -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_PRE, 1, 8, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_PRE, 1, 8, "Invalid SCG SPLL pre divider value"); -ASSERT_WITHIN_RANGE(DT_NXP_KINETIS_SCG_0_SPLL_MULTIPLIER, 16, 47, +ASSERT_WITHIN_RANGE(DT_INST_0_NXP_KINETIS_SCG_SPLL_MULTIPLIER, 16, 47, "Invalid SCG SPLL multiplier value"); static const scg_spll_config_t scg_spll_config = { .enableMode = kSCG_SysPllEnable, .monitorMode = kSCG_SysPllMonitorDisable, - .div1 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_1), - .div2 = TO_ASYNC_CLK_DIV(DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_2), -#if DT_NXP_KINETIS_SCG_0_SPLL_SOURCE == KINETIS_SCG_SPLL_SRC_SOSC + .div1 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_1), + .div2 = TO_ASYNC_CLK_DIV(DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_2), +#if DT_INST_0_NXP_KINETIS_SCG_SPLL_SOURCE == KINETIS_SCG_SPLL_SRC_SOSC .src = kSCG_SysPllSrcSysOsc, -#elif DT_NXP_KINETIS_SCG_0_SPLL_SOURCE == KINETIS_SCG_SPLL_SRC_FIRC +#elif DT_INST_0_NXP_KINETIS_SCG_SPLL_SOURCE == KINETIS_SCG_SPLL_SRC_FIRC .src = kSCG_SysPllSrcFirc, #else #error Invalid SCG SPLL source #endif - .prediv = (DT_NXP_KINETIS_SCG_0_SPLL_DIVIDER_PRE - 1U), - .mult = (DT_NXP_KINETIS_SCG_0_SPLL_MULTIPLIER - 16U) + .prediv = (DT_INST_0_NXP_KINETIS_SCG_SPLL_DIVIDER_PRE - 1U), + .mult = (DT_INST_0_NXP_KINETIS_SCG_SPLL_MULTIPLIER - 16U) }; static ALWAYS_INLINE void clk_init(void) @@ -169,7 +169,7 @@ static ALWAYS_INLINE void clk_init(void) }; scg_sys_clk_config_t current; -#ifdef DT_NXP_KINETIS_SCG_0_SOSC_FREQ +#ifdef DT_INST_0_NXP_KINETIS_SCG_SOSC_FREQ /* Optionally initialize system oscillator */ CLOCK_InitSysOsc(&scg_sosc_config); CLOCK_SetXtal0Freq(scg_sosc_config.freq); @@ -223,8 +223,8 @@ static ALWAYS_INLINE void clk_init(void) #ifdef CONFIG_ADC_2 CLOCK_SetIpSrc(kCLOCK_Adc2, kCLOCK_IpSrcFircAsync); #endif -#ifdef DT_NXP_KINETIS_SCG_0_CLKOUT_SOURCE - CLOCK_SetClkOutSel(DT_NXP_KINETIS_SCG_0_CLKOUT_SOURCE); +#ifdef DT_INST_0_NXP_KINETIS_SCG_CLKOUT_SOURCE + CLOCK_SetClkOutSel(DT_INST_0_NXP_KINETIS_SCG_CLKOUT_SOURCE); #endif } diff --git a/soc/arm/st_stm32/stm32f0/dts_fixup.h b/soc/arm/st_stm32/stm32f0/dts_fixup.h index 8536285016d..2f5ca81b405 100644 --- a/soc/arm/st_stm32/stm32f0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f0/dts_fixup.h @@ -185,7 +185,7 @@ #define DT_TIM_STM32_17_CLOCK_BITS DT_ST_STM32_TIMERS_40014800_CLOCK_BITS #define DT_TIM_STM32_17_CLOCK_BUS DT_ST_STM32_TIMERS_40014800_CLOCK_BUS -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 diff --git a/soc/arm/st_stm32/stm32f1/dts_fixup.h b/soc/arm/st_stm32/stm32f1/dts_fixup.h index f2ccab53343..6332239800c 100644 --- a/soc/arm/st_stm32/stm32f1/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f1/dts_fixup.h @@ -205,7 +205,7 @@ #define DT_TIM_STM32_8_CLOCK_BITS DT_ST_STM32_TIMERS_40013400_CLOCK_BITS #define DT_TIM_STM32_8_CLOCK_BUS DT_ST_STM32_TIMERS_40013400_CLOCK_BUS -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 diff --git a/soc/arm/st_stm32/stm32f2/dts_fixup.h b/soc/arm/st_stm32/stm32f2/dts_fixup.h index 9bf1c011934..f1fc80b4f38 100644 --- a/soc/arm/st_stm32/stm32f2/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f2/dts_fixup.h @@ -146,7 +146,7 @@ #define DT_USB_RAM_SIZE DT_ST_STM32_OTGFS_50000000_RAM_SIZE #define DT_USB_MAXIMUM_SPEED DT_ST_STM32_OTGFS_50000000_MAXIMUM_SPEED -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 diff --git a/soc/arm/st_stm32/stm32f3/dts_fixup.h b/soc/arm/st_stm32/stm32f3/dts_fixup.h index 3f24fd9006d..d30d645ce79 100644 --- a/soc/arm/st_stm32/stm32f3/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f3/dts_fixup.h @@ -260,7 +260,7 @@ #define CONFIG_RTC_0_NAME DT_ST_STM32_RTC_40002800_LABEL #define DT_RTC_0_NAME DT_ST_STM32_RTC_40002800_LABEL #define CONFIG_RTC_PRESCALER DT_ST_STM32_RTC_40002800_PRESCALER -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_RTC_0_CLOCK_BITS DT_ST_STM32_RTC_40002800_CLOCK_BITS #define DT_RTC_0_CLOCK_BUS DT_ST_STM32_RTC_40002800_CLOCK_BUS diff --git a/soc/arm/st_stm32/stm32f4/dts_fixup.h b/soc/arm/st_stm32/stm32f4/dts_fixup.h index 606745d8c94..3783f5e7493 100644 --- a/soc/arm/st_stm32/stm32f4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f4/dts_fixup.h @@ -394,7 +394,7 @@ #define DT_RTC_0_CLOCK_BITS DT_ST_STM32_RTC_40002800_CLOCK_BITS #define DT_RTC_0_CLOCK_BUS DT_ST_STM32_RTC_40002800_CLOCK_BUS -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 diff --git a/soc/arm/st_stm32/stm32f7/dts_fixup.h b/soc/arm/st_stm32/stm32f7/dts_fixup.h index 57c33505f0a..f173bd076af 100644 --- a/soc/arm/st_stm32/stm32f7/dts_fixup.h +++ b/soc/arm/st_stm32/stm32f7/dts_fixup.h @@ -387,7 +387,7 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012000_IRQ_0 diff --git a/soc/arm/st_stm32/stm32l0/dts_fixup.h b/soc/arm/st_stm32/stm32l0/dts_fixup.h index 9f2477aa19f..3da87131c82 100644 --- a/soc/arm/st_stm32/stm32l0/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l0/dts_fixup.h @@ -131,7 +131,7 @@ #define DT_USB_NUM_BIDIR_ENDPOINTS DT_ST_STM32_USB_40005C00_NUM_BIDIR_ENDPOINTS #define DT_USB_RAM_SIZE DT_ST_STM32_USB_40005C00_RAM_SIZE -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_40012400_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_40012400_IRQ_0 diff --git a/soc/arm/st_stm32/stm32l4/dts_fixup.h b/soc/arm/st_stm32/stm32l4/dts_fixup.h index 25e91075296..a9940553937 100644 --- a/soc/arm/st_stm32/stm32l4/dts_fixup.h +++ b/soc/arm/st_stm32/stm32l4/dts_fixup.h @@ -309,7 +309,7 @@ #define DT_CAN_1_CLOCK_BUS DT_ST_STM32_CAN_40006400_CLOCK_BUS #define DT_CAN_1_CLOCK_BITS DT_ST_STM32_CAN_40006400_CLOCK_BITS -#define DT_WDT_0_NAME DT_ST_STM32_WATCHDOG_0_LABEL +#define DT_WDT_0_NAME DT_INST_0_ST_STM32_WATCHDOG_LABEL #define DT_ADC_1_BASE_ADDRESS DT_ST_STM32_ADC_50040000_BASE_ADDRESS #define DT_ADC_1_IRQ DT_ST_STM32_ADC_50040000_IRQ_0 diff --git a/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h b/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h index 6eafb2049ff..1d461377df8 100644 --- a/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h +++ b/soc/arm/ti_simplelink/cc13x2_cc26x2/dts_fixup.h @@ -7,6 +7,6 @@ /* SoC level DTS fixup file */ #define DT_NUM_IRQ_PRIO_BITS DT_ARM_V7M_NVIC_E000E100_ARM_NUM_IRQ_PRIORITY_BITS -#define CONFIG_ENTROPY_NAME DT_TI_CC13XX_CC26XX_TRNG_0_LABEL +#define CONFIG_ENTROPY_NAME DT_INST_0_TI_CC13XX_CC26XX_TRNG_LABEL /* End of SoC Level DTS fixup file */ diff --git a/soc/riscv32/litex-vexriscv/soc.h b/soc/riscv32/litex-vexriscv/soc.h index 6ea9c846ea9..5451f5103c6 100644 --- a/soc/riscv32/litex-vexriscv/soc.h +++ b/soc/riscv32/litex-vexriscv/soc.h @@ -11,7 +11,7 @@ #include /* lib-c hooks required RAM defined variables */ -#define RISCV_RAM_BASE DT_MMIO_SRAM_0_BASE_ADDRESS -#define RISCV_RAM_SIZE DT_MMIO_SRAM_0_SIZE +#define RISCV_RAM_BASE DT_INST_0_MMIO_SRAM_BASE_ADDRESS +#define RISCV_RAM_SIZE DT_INST_0_MMIO_SRAM_SIZE #endif /* __RISCV32_LITEX_VEXRISCV_SOC_H_ */ diff --git a/soc/riscv32/riscv-privilege/sifive-freedom/soc.h b/soc/riscv32/riscv-privilege/sifive-freedom/soc.h index 9e77efcd238..0b9141b540c 100644 --- a/soc/riscv32/riscv-privilege/sifive-freedom/soc.h +++ b/soc/riscv32/riscv-privilege/sifive-freedom/soc.h @@ -15,7 +15,7 @@ #include /* PINMUX Configuration */ -#define SIFIVE_PINMUX_0_BASE_ADDR (DT_SIFIVE_GPIO0_0_BASE_ADDRESS + 0x38) +#define SIFIVE_PINMUX_0_BASE_ADDR (DT_INST_0_SIFIVE_GPIO0_BASE_ADDRESS + 0x38) /* PINMUX IO Hardware Functions */ #define SIFIVE_PINMUX_IOF0 0x00 diff --git a/soc/x86/apollo_lake/dts_fixup.h b/soc/x86/apollo_lake/dts_fixup.h index 304e5acda8e..cac12df7d96 100644 --- a/soc/x86/apollo_lake/dts_fixup.h +++ b/soc/x86/apollo_lake/dts_fixup.h @@ -37,57 +37,57 @@ #define DT_APL_GPIO_LABEL_SW_0 DT_INTEL_APL_GPIO_D0C50000_LABEL "_SW_0" #define DT_APL_GPIO_LABEL_SW_1 DT_INTEL_APL_GPIO_D0C50000_LABEL "_SW_1" -#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_0_BASE_ADDRESS -#define DT_UART_NS16550_PORT_0_SIZE DT_NS16550_0_SIZE -#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_0_CURRENT_SPEED -#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_0_LABEL -#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_0_IRQ_0 -#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_0_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_0_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_0_PCIE DT_NS16550_0_PCIE +#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_INST_0_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_0_SIZE DT_INST_0_NS16550_SIZE +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_INST_0_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_INST_0_NS16550_LABEL +#define DT_UART_NS16550_PORT_0_IRQ DT_INST_0_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_INST_0_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_INST_0_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_INST_0_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_0_PCIE DT_INST_0_NS16550_PCIE #ifdef DT_NS16550_0_PCP #define DT_UART_NS16550_PORT_0_PCP DT_NS16550_0_PCP #endif -#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_1_BASE_ADDRESS -#define DT_UART_NS16550_PORT_1_SIZE DT_NS16550_1_SIZE -#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_1_CURRENT_SPEED -#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_1_LABEL -#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_1_IRQ_0 -#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_1_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_1_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_1_PCIE DT_NS16550_1_PCIE +#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_INST_1_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_1_SIZE DT_INST_1_NS16550_SIZE +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_INST_1_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_INST_1_NS16550_LABEL +#define DT_UART_NS16550_PORT_1_IRQ DT_INST_1_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_INST_1_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_INST_1_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_INST_1_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_1_PCIE DT_INST_1_NS16550_PCIE #ifdef DT_NS16550_1_PCP #define DT_UART_NS16550_PORT_1_PCP DT_NS16550_1_PCP #endif -#define DT_UART_NS16550_PORT_2_BASE_ADDR DT_NS16550_2_BASE_ADDRESS -#define DT_UART_NS16550_PORT_2_SIZE DT_NS16550_2_SIZE -#define DT_UART_NS16550_PORT_2_BAUD_RATE DT_NS16550_2_CURRENT_SPEED -#define DT_UART_NS16550_PORT_2_NAME DT_NS16550_2_LABEL -#define DT_UART_NS16550_PORT_2_IRQ DT_NS16550_2_IRQ_0 -#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_NS16550_2_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_2_IRQ_FLAGS DT_NS16550_2_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_2_CLK_FREQ DT_NS16550_2_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_2_PCIE DT_NS16550_2_PCIE +#define DT_UART_NS16550_PORT_2_BASE_ADDR DT_INST_2_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_2_SIZE DT_INST_2_NS16550_SIZE +#define DT_UART_NS16550_PORT_2_BAUD_RATE DT_INST_2_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_2_NAME DT_INST_2_NS16550_LABEL +#define DT_UART_NS16550_PORT_2_IRQ DT_INST_2_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_2_IRQ_PRI DT_INST_2_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_2_IRQ_FLAGS DT_INST_2_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_2_CLK_FREQ DT_INST_2_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_2_PCIE DT_INST_2_NS16550_PCIE #ifdef DT_NS16550_2_PCP #define DT_UART_NS16550_PORT_2_PCP DT_NS16550_2_PCP #endif -#define DT_UART_NS16550_PORT_3_BASE_ADDR DT_NS16550_3_BASE_ADDRESS -#define DT_UART_NS16550_PORT_3_SIZE DT_NS16550_3_SIZE -#define DT_UART_NS16550_PORT_3_BAUD_RATE DT_NS16550_3_CURRENT_SPEED -#define DT_UART_NS16550_PORT_3_NAME DT_NS16550_3_LABEL -#define DT_UART_NS16550_PORT_3_IRQ DT_NS16550_3_IRQ_0 -#define DT_UART_NS16550_PORT_3_IRQ_PRI DT_NS16550_3_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_3_IRQ_FLAGS DT_NS16550_3_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_3_CLK_FREQ DT_NS16550_3_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_3_PCIE DT_NS16550_3_PCIE +#define DT_UART_NS16550_PORT_3_BASE_ADDR DT_INST_3_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_3_SIZE DT_INST_3_NS16550_SIZE +#define DT_UART_NS16550_PORT_3_BAUD_RATE DT_INST_3_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_3_NAME DT_INST_3_NS16550_LABEL +#define DT_UART_NS16550_PORT_3_IRQ DT_INST_3_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_3_IRQ_PRI DT_INST_3_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_3_IRQ_FLAGS DT_INST_3_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_3_CLK_FREQ DT_INST_3_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_3_PCIE DT_INST_3_NS16550_PCIE #ifdef DT_NS16550_3_PCP #define DT_UART_NS16550_PORT_3_PCP DT_NS16550_3_PCP diff --git a/soc/x86/intel_quark/quark_x1000/dts_fixup.h b/soc/x86/intel_quark/quark_x1000/dts_fixup.h index dd6feeadb2b..1446d124739 100644 --- a/soc/x86/intel_quark/quark_x1000/dts_fixup.h +++ b/soc/x86/intel_quark/quark_x1000/dts_fixup.h @@ -1,24 +1,24 @@ /* SPDX-License-Identifier: Apache-2.0 */ -#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_NS16550_0_BASE_ADDRESS -#define DT_UART_NS16550_PORT_0_SIZE DT_NS16550_0_SIZE -#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_NS16550_0_CURRENT_SPEED -#define DT_UART_NS16550_PORT_0_NAME DT_NS16550_0_LABEL -#define DT_UART_NS16550_PORT_0_IRQ DT_NS16550_0_IRQ_0 -#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_NS16550_0_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_NS16550_0_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_NS16550_0_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_0_PCIE DT_NS16550_0_PCIE +#define DT_UART_NS16550_PORT_0_BASE_ADDR DT_INST_0_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_0_SIZE DT_INST_0_NS16550_SIZE +#define DT_UART_NS16550_PORT_0_BAUD_RATE DT_INST_0_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_0_NAME DT_INST_0_NS16550_LABEL +#define DT_UART_NS16550_PORT_0_IRQ DT_INST_0_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_0_IRQ_PRI DT_INST_0_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_0_IRQ_FLAGS DT_INST_0_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_0_CLK_FREQ DT_INST_0_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_0_PCIE DT_INST_0_NS16550_PCIE -#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_NS16550_1_BASE_ADDRESS -#define DT_UART_NS16550_PORT_1_SIZE DT_NS16550_1_SIZE -#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_NS16550_1_CURRENT_SPEED -#define DT_UART_NS16550_PORT_1_NAME DT_NS16550_1_LABEL -#define DT_UART_NS16550_PORT_1_IRQ DT_NS16550_1_IRQ_0 -#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_NS16550_1_IRQ_0_PRIORITY -#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_NS16550_1_IRQ_0_SENSE -#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_NS16550_1_CLOCK_FREQUENCY -#define DT_UART_NS16550_PORT_1_PCIE DT_NS16550_1_PCIE +#define DT_UART_NS16550_PORT_1_BASE_ADDR DT_INST_1_NS16550_BASE_ADDRESS +#define DT_UART_NS16550_PORT_1_SIZE DT_INST_1_NS16550_SIZE +#define DT_UART_NS16550_PORT_1_BAUD_RATE DT_INST_1_NS16550_CURRENT_SPEED +#define DT_UART_NS16550_PORT_1_NAME DT_INST_1_NS16550_LABEL +#define DT_UART_NS16550_PORT_1_IRQ DT_INST_1_NS16550_IRQ_0 +#define DT_UART_NS16550_PORT_1_IRQ_PRI DT_INST_1_NS16550_IRQ_0_PRIORITY +#define DT_UART_NS16550_PORT_1_IRQ_FLAGS DT_INST_1_NS16550_IRQ_0_SENSE +#define DT_UART_NS16550_PORT_1_CLK_FREQ DT_INST_1_NS16550_CLOCK_FREQUENCY +#define DT_UART_NS16550_PORT_1_PCIE DT_INST_1_NS16550_PCIE #define DT_PHYS_RAM_ADDR CONFIG_SRAM_BASE_ADDRESS diff --git a/subsys/bluetooth/controller/ll_sw/ctrl.c b/subsys/bluetooth/controller/ll_sw/ctrl.c index 8e46c2e480d..daa1f8fe98e 100644 --- a/subsys/bluetooth/controller/ll_sw/ctrl.c +++ b/subsys/bluetooth/controller/ll_sw/ctrl.c @@ -4978,7 +4978,7 @@ static void k32src_wait(void) done = true; struct device *lf_clock = device_get_binding( - DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); LL_ASSERT(lf_clock); diff --git a/subsys/bluetooth/controller/ll_sw/ll.c b/subsys/bluetooth/controller/ll_sw/ll.c index 8c2da0b8072..5e4f9425231 100644 --- a/subsys/bluetooth/controller/ll_sw/ll.c +++ b/subsys/bluetooth/controller/ll_sw/ll.c @@ -127,7 +127,7 @@ int ll_init(struct k_sem *sem_rx) sem_recv = sem_rx; - clk_k32 = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + clk_k32 = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); if (!clk_k32) { return -ENODEV; } @@ -158,7 +158,7 @@ int ll_init(struct k_sem *sem_rx) hal_ticker_instance0_trigger_set); LL_ASSERT(!err); - clk_m16 = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_16M"); + clk_m16 = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M"); if (!clk_m16) { return -ENODEV; } diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c index 68a664c14ef..c1edafa41ec 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll.c @@ -112,7 +112,7 @@ int lll_init(void) event.curr.abort_cb = NULL; /* Initialize LF CLK */ - clk_k32 = device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + clk_k32 = device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); if (!clk_k32) { return -ENODEV; } @@ -121,7 +121,7 @@ int lll_init(void) /* Initialize HF CLK */ lll.clk_hf = - device_get_binding(DT_NORDIC_NRF_CLOCK_0_LABEL "_16M"); + device_get_binding(DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_16M"); if (!lll.clk_hf) { return -ENODEV; } diff --git a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c index 5c8eea82c38..cb6d40922c2 100644 --- a/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c +++ b/subsys/bluetooth/controller/ll_sw/nordic/lll/lll_clock.c @@ -24,7 +24,7 @@ void lll_clock_wait(void) done = true; struct device *lf_clock = device_get_binding( - DT_NORDIC_NRF_CLOCK_0_LABEL "_32K"); + DT_INST_0_NORDIC_NRF_CLOCK_LABEL "_32K"); LL_ASSERT(lf_clock); diff --git a/subsys/disk/disk_access_sdhc.c b/subsys/disk/disk_access_sdhc.c index 7460c0623df..239eaed0019 100644 --- a/subsys/disk/disk_access_sdhc.c +++ b/subsys/disk/disk_access_sdhc.c @@ -897,15 +897,15 @@ static int sdhc_init(struct device *dev) { struct sdhc_data *data = dev->driver_data; - data->spi = device_get_binding(DT_ZEPHYR_MMC_SPI_SLOT_0_BUS_NAME); + data->spi = device_get_binding(DT_INST_0_ZEPHYR_MMC_SPI_SLOT_BUS_NAME); data->cfg.frequency = SDHC_INITIAL_SPEED; data->cfg.operation = SPI_WORD_SET(8) | SPI_HOLD_ON_CS; - data->cfg.slave = DT_ZEPHYR_MMC_SPI_SLOT_0_BASE_ADDRESS; - data->cs = device_get_binding(DT_ZEPHYR_MMC_SPI_SLOT_0_CS_GPIO_CONTROLLER); + data->cfg.slave = DT_INST_0_ZEPHYR_MMC_SPI_SLOT_BASE_ADDRESS; + data->cs = device_get_binding(DT_INST_0_ZEPHYR_MMC_SPI_SLOT_CS_GPIO_CONTROLLER); __ASSERT_NO_MSG(data->cs != NULL); - data->pin = DT_ZEPHYR_MMC_SPI_SLOT_0_CS_GPIO_PIN; + data->pin = DT_INST_0_ZEPHYR_MMC_SPI_SLOT_CS_GPIO_PIN; disk_sdhc_init(dev); diff --git a/tests/boards/intel_s1000_crb/src/spi_flash.c b/tests/boards/intel_s1000_crb/src/spi_flash.c index 944d21c3246..940122f9787 100644 --- a/tests/boards/intel_s1000_crb/src/spi_flash.c +++ b/tests/boards/intel_s1000_crb/src/spi_flash.c @@ -56,7 +56,7 @@ void test_flash(void) u32_t magic[4]; int i; - flash_dev = device_get_binding(DT_JEDEC_SPI_NOR_0_LABEL); + flash_dev = device_get_binding(DT_INST_0_JEDEC_SPI_NOR_LABEL); if (!flash_dev) { LOG_ERR("SPI flash driver was not found!\n"); diff --git a/tests/drivers/adc/adc_api/src/test_adc.c b/tests/drivers/adc/adc_api/src/test_adc.c index 9a485c8ec39..6abb841a293 100644 --- a/tests/drivers/adc/adc_api/src/test_adc.c +++ b/tests/drivers/adc/adc_api/src/test_adc.c @@ -123,7 +123,7 @@ #elif defined(CONFIG_SOC_FAMILY_SAM0) #include -#define ADC_DEVICE_NAME DT_ATMEL_SAM0_ADC_0_LABEL +#define ADC_DEVICE_NAME DT_INST_0_ATMEL_SAM0_ADC_LABEL #define ADC_RESOLUTION 12 #define ADC_GAIN ADC_GAIN_1 #define ADC_REFERENCE ADC_REF_INTERNAL diff --git a/tests/drivers/build_all/dts_fixup.h b/tests/drivers/build_all/dts_fixup.h index 43ccae74135..04aa44a5ac3 100644 --- a/tests/drivers/build_all/dts_fixup.h +++ b/tests/drivers/build_all/dts_fixup.h @@ -2,217 +2,218 @@ #if defined(CONFIG_HAS_DTS_I2C) -#ifndef DT_ADI_ADT7420_0_LABEL -#define DT_ADI_ADT7420_0_LABEL "" -#define DT_ADI_ADT7420_0_BASE_ADDRESS 0 -#define DT_ADI_ADT7420_0_BUS_NAME "" -#define DT_ADI_ADT7420_0_INT_GPIOS_CONTROLLER "" -#define DT_ADI_ADT7420_0_INT_GPIOS_PIN 0 +#ifndef DT_INST_0_ADI_ADT7420_LABEL +#define DT_INST_0_ADI_ADT7420_LABEL "" +#define DT_INST_0_ADI_ADT7420_BASE_ADDRESS 0 +#define DT_INST_0_ADI_ADT7420_BUS_NAME "" +#define DT_INST_0_ADI_ADT7420_INT_GPIOS_CONTROLLER "" +#define DT_INST_0_ADI_ADT7420_INT_GPIOS_PIN 0 #endif -#ifndef DT_ADI_ADXL362_0_LABEL -#define DT_ADI_ADXL362_0_LABEL "" -#define DT_ADI_ADXL362_0_BUS_NAME "" -#define DT_ADI_ADXL362_0_BASE_ADDRESS 0 -#define DT_ADI_ADXL362_0_INT1_GPIOS_CONTROLLER "" -#define DT_ADI_ADXL362_0_INT1_GPIOS_PIN 0 -#define DT_ADI_ADXL362_0_CS_GPIO_CONTROLLER 0 -#define DT_ADI_ADXL362_0_CS_GPIO_PIN 0 -#define DT_ADI_ADXL362_0_SPI_MAX_FREQUENCY 0 +#ifndef DT_INST_0_ADI_ADXL362_LABEL +#define DT_INST_0_ADI_ADXL362_LABEL "" +#define DT_INST_0_ADI_ADXL362_BUS_NAME "" +#define DT_INST_0_ADI_ADXL362_BASE_ADDRESS 0 +#define DT_INST_0_ADI_ADXL362_INT1_GPIOS_CONTROLLER "" +#define DT_INST_0_ADI_ADXL362_INT1_GPIOS_PIN 0 +#define DT_INST_0_ADI_ADXL362_CS_GPIO_CONTROLLER 0 +#define DT_INST_0_ADI_ADXL362_CS_GPIO_PIN 0 +#define DT_INST_0_ADI_ADXL362_SPI_MAX_FREQUENCY 0 #endif -#ifndef DT_ADI_ADXL372_0_LABEL -#define DT_ADI_ADXL372_0_LABEL "" -#define DT_ADI_ADXL372_0_BUS_NAME "" -#define DT_ADI_ADXL372_0_BASE_ADDRESS 0 -#define DT_ADI_ADXL372_0_INT1_GPIOS_CONTROLLER "" -#define DT_ADI_ADXL372_0_INT1_GPIOS_PIN 0 +#ifndef DT_INST_0_ADI_ADXL372_LABEL +#define DT_INST_0_ADI_ADXL372_LABEL "" +#define DT_INST_0_ADI_ADXL372_BUS_NAME "" +#define DT_INST_0_ADI_ADXL372_BASE_ADDRESS 0 +#define DT_INST_0_ADI_ADXL372_INT1_GPIOS_CONTROLLER "" +#define DT_INST_0_ADI_ADXL372_INT1_GPIOS_PIN 0 #endif -#ifndef DT_AVAGO_APDS9960_0_LABEL -#define DT_AVAGO_APDS9960_0_LABEL "" -#define DT_AVAGO_APDS9960_0_BUS_NAME "" -#define DT_AVAGO_APDS9960_0_BASE_ADDRESS 0 -#define DT_AVAGO_APDS9960_0_INT_GPIOS_CONTROLLER "" -#define DT_AVAGO_APDS9960_0_INT_GPIOS_PIN 0 +#ifndef DT_INST_0_AVAGO_APDS9960_LABEL +#define DT_INST_0_AVAGO_APDS9960_LABEL "" +#define DT_INST_0_AVAGO_APDS9960_BUS_NAME "" +#define DT_INST_0_AVAGO_APDS9960_BASE_ADDRESS 0 +#define DT_INST_0_AVAGO_APDS9960_INT_GPIOS_CONTROLLER "" +#define DT_INST_0_AVAGO_APDS9960_INT_GPIOS_PIN 0 #endif -#ifndef DT_BOSCH_BME280_0_LABEL -#define DT_BOSCH_BME280_0_LABEL "" -#define DT_BOSCH_BME280_0_BASE_ADDRESS 0 -#define DT_BOSCH_BME280_0_BUS_NAME "" +#ifndef DT_INST_0_BOSCH_BME280_LABEL +#define DT_INST_0_BOSCH_BME280_LABEL "" +#define DT_INST_0_BOSCH_BME280_BASE_ADDRESS 0 +#define DT_INST_0_BOSCH_BME280_BUS_NAME "" #define DT_BOSCH_BME280_BUS_I2C 1 #endif -#ifndef DT_BOSCH_BME680_0_LABEL -#define DT_BOSCH_BME680_0_LABEL "" -#define DT_BOSCH_BME680_0_BASE_ADDRESS 0 -#define DT_BOSCH_BME680_0_BUS_NAME "" +#ifndef DT_INST_0_BOSCH_BME680_LABEL +#define DT_INST_0_BOSCH_BME680_LABEL "" +#define DT_INST_0_BOSCH_BME680_BASE_ADDRESS 0 +#define DT_INST_0_BOSCH_BME680_BUS_NAME "" #define DT_BOSCH_BME680_BUS_I2C 1 #endif -#ifndef DT_AMS_CCS811_0_LABEL -#define DT_AMS_CCS811_0_LABEL "" -#define DT_AMS_CCS811_0_BUS_NAME "" -#define DT_AMS_CCS811_0_BASE_ADDRESS 0 +#ifndef DT_INST_0_AMS_CCS811_LABEL +#define DT_INST_0_AMS_CCS811_LABEL "" +#define DT_INST_0_AMS_CCS811_BUS_NAME "" +#define DT_INST_0_AMS_CCS811_BASE_ADDRESS 0 #endif -#ifndef DT_NXP_FXAS21002_0_LABEL -#define DT_NXP_FXAS21002_0_LABEL "" -#define DT_NXP_FXAS21002_0_BASE_ADDRESS 0 -#define DT_NXP_FXAS21002_0_BUS_NAME "" -#define DT_NXP_FXAS21002_0_INT2_GPIOS_CONTROLLER "" -#define DT_NXP_FXAS21002_0_INT2_GPIOS_PIN 0 +#ifndef DT_INST_0_NXP_FXAS21002_LABEL +#define DT_INST_0_NXP_FXAS21002_LABEL "" +#define DT_INST_0_NXP_FXAS21002_BASE_ADDRESS 0 +#define DT_INST_0_NXP_FXAS21002_BUS_NAME "" +#define DT_INST_0_NXP_FXAS21002_INT2_GPIOS_CONTROLLER "" +#define DT_INST_0_NXP_FXAS21002_INT2_GPIOS_PIN 0 #endif -#ifndef DT_NXP_FXOS8700_0_LABEL -#define DT_NXP_FXOS8700_0_LABEL "" -#define DT_NXP_FXOS8700_0_BASE_ADDRESS 0 -#define DT_NXP_FXOS8700_0_BUS_NAME "" -#define DT_NXP_FXOS8700_0_INT1_GPIOS_CONTROLLER "" -#define DT_NXP_FXOS8700_0_INT1_GPIOS_PIN 0 -#define DT_NXP_FXOS8700_0_INT2_GPIOS_CONTROLLER "" -#define DT_NXP_FXOS8700_0_INT2_GPIOS_PIN 0 +#ifndef DT_INST_0_NXP_FXOS8700_LABEL +#define DT_INST_0_NXP_FXOS8700_LABEL "" +#define DT_INST_0_NXP_FXOS8700_BASE_ADDRESS 0 +#define DT_INST_0_NXP_FXOS8700_BUS_NAME "" +#define DT_INST_0_NXP_FXOS8700_INT1_GPIOS_CONTROLLER "" +#define DT_INST_0_NXP_FXOS8700_INT1_GPIOS_PIN 0 +#define DT_INST_0_NXP_FXOS8700_INT2_GPIOS_CONTROLLER "" +#define DT_INST_0_NXP_FXOS8700_INT2_GPIOS_PIN 0 #endif -#ifndef DT_ST_HTS221_0_LABEL -#define DT_ST_HTS221_0_LABEL "" -#define DT_ST_HTS221_0_BUS_NAME "" -#define DT_ST_HTS221_0_BASE_ADDRESS 0 -#define DT_ST_HTS221_0_DRDY_GPIOS_PIN 0 -#define DT_ST_HTS221_0_DRDY_GPIOS_CONTROLLER "" +#ifndef DT_INST_0_ST_HTS221_LABEL +#define DT_INST_0_ST_HTS221_LABEL "" +#define DT_INST_0_ST_HTS221_BUS_NAME "" +#define DT_INST_0_ST_HTS221_BASE_ADDRESS 0 +#define DT_INST_0_ST_HTS221_DRDY_GPIOS_PIN 0 +#define DT_INST_0_ST_HTS221_DRDY_GPIOS_CONTROLLER "" #endif -#ifndef DT_ST_LIS3MDL_MAGN_0_LABEL -#define DT_ST_LIS3MDL_MAGN_0_LABEL "" -#define DT_ST_LIS3MDL_MAGN_0_BUS_NAME "" -#define DT_ST_LIS3MDL_MAGN_0_BASE_ADDRESS 0x19 +#ifndef DT_INST_0_ST_LIS3MDL_MAGN_LABEL +#define DT_INST_0_ST_LIS3MDL_MAGN_LABEL "" +#define DT_INST_0_ST_LIS3MDL_MAGN_BUS_NAME "" +#define DT_INST_0_ST_LIS3MDL_MAGN_BASE_ADDRESS 0x19 #endif -#ifndef DT_ST_LPS25HB_PRESS_0_LABEL -#define DT_ST_LPS25HB_PRESS_0_LABEL "" -#define DT_ST_LPS25HB_PRESS_0_BUS_NAME "" -#define DT_ST_LPS25HB_PRESS_0_BASE_ADDRESS 0x19 +#ifndef DT_INST_0_ST_LPS25HB_PRESS_LABEL +#define DT_INST_0_ST_LPS25HB_PRESS_LABEL "" +#define DT_INST_0_ST_LPS25HB_PRESS_BUS_NAME "" +#define DT_INST_0_ST_LPS25HB_PRESS_BASE_ADDRESS 0x19 #endif -#ifndef DT_ST_LSM6DS0_0_LABEL -#define DT_ST_LSM6DS0_0_LABEL "" -#define DT_ST_LSM6DS0_0_BUS_NAME "" -#define DT_ST_LSM6DS0_0_BASE_ADDRESS 0x19 +#ifndef DT_INST_0_ST_LSM6DS0_LABEL +#define DT_INST_0_ST_LSM6DS0_LABEL "" +#define DT_INST_0_ST_LSM6DS0_BUS_NAME "" +#define DT_INST_0_ST_LSM6DS0_BASE_ADDRESS 0x19 #endif -#ifndef DT_MAX_MAX30101_0_LABEL -#define DT_MAX_MAX30101_0_BUS_NAME "" -#define DT_MAX_MAX30101_0_LABEL "" +#ifndef DT_INST_0_MAX_MAX30101_LABEL +#define DT_INST_0_MAX_MAX30101_BUS_NAME "" +#define DT_INST_0_MAX_MAX30101_LABEL "" #endif -#ifndef DT_SEMTECH_SX1509B_0_LABEL -#define DT_SEMTECH_SX1509B_0_LABEL "" -#define DT_SEMTECH_SX1509B_0_BASE_ADDRESS 0 -#define DT_SEMTECH_SX1509B_0_BUS_NAME "" +#ifndef DT_INST_0_SEMTECH_SX1509B_LABEL +#define DT_INST_0_SEMTECH_SX1509B_LABEL "" +#define DT_INST_0_SEMTECH_SX1509B_BASE_ADDRESS 0 +#define DT_INST_0_SEMTECH_SX1509B_BUS_NAME "" #endif -#ifndef DT_ST_LSM6DSL_0_LABEL -#define DT_ST_LSM6DSL_0_LABEL "" -#define DT_ST_LSM6DSL_0_BASE_ADDRESS 0x6a -#define DT_ST_LSM6DSL_0_BUS_NAME "" -#define DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LSM6DSL_LABEL +#define DT_INST_0_ST_LSM6DSL_LABEL "" +#define DT_INST_0_ST_LSM6DSL_BASE_ADDRESS 0x6a +#define DT_INST_0_ST_LSM6DSL_BUS_NAME "" +#define DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN 0 #define DT_ST_LSM6DSL_BUS_I2C 1 #endif -#ifndef DT_ST_LPS22HB_PRESS_0_LABEL -#define DT_ST_LPS22HB_PRESS_0_LABEL "" -#define DT_ST_LPS22HB_PRESS_0_BASE_ADDRESS 0 -#define DT_ST_LPS22HB_PRESS_0_BUS_NAME "" +#ifndef DT_INST_0_ST_LPS22HB_PRESS_LABEL +#define DT_INST_0_ST_LPS22HB_PRESS_LABEL "" +#define DT_INST_0_ST_LPS22HB_PRESS_BASE_ADDRESS 0 +#define DT_INST_0_ST_LPS22HB_PRESS_BUS_NAME "" #endif -#ifndef DT_ST_VL53L0X_0_LABEL -#define DT_ST_VL53L0X_0_LABEL "" -#define DT_ST_VL53L0X_0_BASE_ADDRESS 0 -#define DT_ST_VL53L0X_0_BUS_NAME "" +#ifndef DT_INST_0_ST_VL53L0X_LABEL +#define DT_INST_0_ST_VL53L0X_LABEL "" +#define DT_INST_0_ST_VL53L0X_BASE_ADDRESS 0 +#define DT_INST_0_ST_VL53L0X_BUS_NAME "" #endif -#ifndef DT_ST_LSM303DLHC_MAGN_0_LABEL -#define DT_ST_LSM303DLHC_MAGN_0_LABEL "" -#define DT_ST_LSM303DLHC_MAGN_0_BUS_NAME "" -#define DT_ST_LSM303DLHC_MAGN_0_BASE_ADDRESS 0x1e +#ifndef DT_INST_0_ST_LSM303DLHC_MAGN_LABEL +#define DT_INST_0_ST_LSM303DLHC_MAGN_LABEL "" +#define DT_INST_0_ST_LSM303DLHC_MAGN_BUS_NAME "" +#define DT_INST_0_ST_LSM303DLHC_MAGN_BASE_ADDRESS 0x1e #endif -#ifndef DT_ST_LIS2DH_0_LABEL -#define DT_ST_LIS2DH_0_LABEL "" -#define DT_ST_LIS2DH_0_BASE_ADDRESS 0x19 -#define DT_ST_LIS2DH_0_BUS_NAME "" -#define DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DH_0_IRQ_GPIOS_PIN 0 -#define DT_ST_LIS2DH_0_BUS_I2C 1 +#ifndef DT_INST_0_ST_LIS2DH_LABEL +#define DT_INST_0_ST_LIS2DH_LABEL "" +#define DT_INST_0_ST_LIS2DH_BASE_ADDRESS 0x19 +#define DT_INST_0_ST_LIS2DH_BUS_NAME "" +#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN 0 +#define DT_ST_LIS2DH_BUS_I2C 1 #endif -#ifndef DT_SENSIRION_SHT3XD_0_LABEL -#define DT_SENSIRION_SHT3XD_0_LABEL "" -#define DT_SENSIRION_SHT3XD_0_ALERT_GPIOS_CONTROLLER "" -#define DT_SENSIRION_SHT3XD_0_ALERT_GPIOS_FLAGS 0 -#define DT_SENSIRION_SHT3XD_0_ALERT_GPIOS_PIN 0 -#define DT_SENSIRION_SHT3XD_0_BASE_ADDRESS 0x44 -#define DT_SENSIRION_SHT3XD_0_BUS_NAME "" +#ifndef DT_INST_0_SENSIRION_SHT3XD_LABEL +#define DT_INST_0_SENSIRION_SHT3XD_LABEL "" +#define DT_INST_0_SENSIRION_SHT3XD_ALERT_GPIOS_CONTROLLER "" +#define DT_INST_0_SENSIRION_SHT3XD_ALERT_GPIOS_FLAGS 0 +#define DT_INST_0_SENSIRION_SHT3XD_ALERT_GPIOS_PIN 0 +#define DT_INST_0_SENSIRION_SHT3XD_BASE_ADDRESS 0x44 +#define DT_INST_0_SENSIRION_SHT3XD_BUS_NAME "" #endif -#ifndef DT_ST_LIS2DS12_0_LABEL -#define DT_ST_LIS2DS12_0_LABEL "" -#define DT_ST_LIS2DS12_0_BUS_NAME "" -#define DT_ST_LIS2DS12_0_BASE_ADDRESS 0x19 -#define DT_ST_LIS2DS12_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LIS2DS12_LABEL +#define DT_INST_0_ST_LIS2DS12_LABEL "" +#define DT_INST_0_ST_LIS2DS12_BUS_NAME "" +#define DT_INST_0_ST_LIS2DS12_BASE_ADDRESS 0x19 +#define DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN 0 #define DT_ST_LIS2DS12_BUS_I2C 1 #endif -#ifndef DT_ST_LIS2MDL_MAGN_0_LABEL -#define DT_ST_LIS2MDL_MAGN_0_LABEL "" -#define DT_ST_LIS2MDL_MAGN_0_BUS_NAME "" -#define DT_ST_LIS2MDL_MAGN_0_BASE_ADDRESS 0x19 -#define DT_ST_LIS2MDL_MAGN_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2MDL_MAGN_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LIS2MDL_MAGN_LABEL +#define DT_INST_0_ST_LIS2MDL_MAGN_LABEL "" +#define DT_INST_0_ST_LIS2MDL_MAGN_BUS_NAME "" +#define DT_INST_0_ST_LIS2MDL_MAGN_BASE_ADDRESS 0x19 +#define DT_INST_0_ST_LIS2MDL_MAGN_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2MDL_MAGN_IRQ_GPIOS_PIN 0 #endif -#ifndef DT_ST_LIS2DW12_0_LABEL -#define DT_ST_LIS2DW12_0_LABEL "" -#define DT_ST_LIS2DW12_0_BUS_NAME "" -#define DT_ST_LIS2DW12_0_BASE_ADDRESS 0x19 -#define DT_ST_LIS2DW12_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DW12_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LIS2DW12_LABEL +#define DT_INST_0_ST_LIS2DW12_LABEL "" +#define DT_INST_0_ST_LIS2DW12_BUS_NAME "" +#define DT_INST_0_ST_LIS2DW12_BASE_ADDRESS 0x19 +#define DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_PIN 0 #define DT_ST_LIS2DW12_BUS_I2C 1 #endif -#ifndef DT_LSM9DS0_MFD_DEV_NAME -#define DT_LSM9DS0_MFD_DEV_NAME "" -#define DT_LSM9DS0_MFD_I2C_ADDRESS 0x1d +#ifndef DT_INST_0_ST_LSM9DS0_MFD_LABEL +#define DT_INST_0_ST_LSM9DS0_MFD_LABEL "" +#define DT_INST_0_ST_LSM9DS0_MFD_BUS_NAME "" +#define DT_INST_0_ST_LSM9DS0_MFD_BASE_ADDRESS 0x1d #define DT_LSM9DS0_MFD_I2C_MASTER_DEV_NAME "" #endif -#ifndef DT_LSM9DS0_GYRO_DEV_NAME -#define DT_LSM9DS0_GYRO_DEV_NAME "" -#define DT_LSM9DS0_GYRO_I2C_ADDRESS 0x1d -#define DT_LSM9DS0_GYRO_I2C_MASTER_DEV_NAME "" -#define DT_LSM9DS0_GYRO_INT_GPIO_DEV_NAME "" -#define DT_LSM9DS0_GYRO_INT_GPIO_PIN 1 +#ifndef DT_INST_0_ST_LSM9DS0_GYRO_LABEL +#define DT_INST_0_ST_LSM9DS0_GYRO_LABEL "" +#define DT_INST_0_ST_LSM9DS0_GYRO_BUS_NAME "" +#define DT_INST_0_ST_LSM9DS0_GYRO_BASE_ADDRESS 0x1d +#define DT_INST_0_ST_LSM9DS0_GYRO_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LSM9DS0_GYRO_IRQ_GPIOS_PIN 1 #endif -#ifndef DT_AMS_IAQCORE_0_LABEL -#define DT_AMS_IAQCORE_0_LABEL "" -#define DT_AMS_IAQCORE_0_BUS_NAME "" -#define DT_AMS_IAQCORE_0_BASE_ADDRESS 0x00 +#ifndef DT_INST_0_AMS_IAQCORE_LABEL +#define DT_INST_0_AMS_IAQCORE_LABEL "" +#define DT_INST_0_AMS_IAQCORE_BUS_NAME "" +#define DT_INST_0_AMS_IAQCORE_BASE_ADDRESS 0x00 #endif -#ifndef DT_AMS_ENS210_0_LABEL -#define DT_AMS_ENS210_0_LABEL "" -#define DT_AMS_ENS210_0_BUS_NAME "" -#define DT_AMS_ENS210_0_BASE_ADDRESS 0x00 +#ifndef DT_INST_0_AMS_ENS210_LABEL +#define DT_INST_0_AMS_ENS210_LABEL "" +#define DT_INST_0_AMS_ENS210_BUS_NAME "" +#define DT_INST_0_AMS_ENS210_BASE_ADDRESS 0x00 #endif -#ifndef DT_TI_HDC_0_LABEL -#define DT_TI_HDC_0_LABEL "" -#define DT_TI_HDC_0_BUS_NAME "" -#define DT_TI_HDC_0_BASE_ADDRESS 0 +#ifndef DT_INST_0_TI_HDC_LABEL +#define DT_INST_0_TI_HDC_LABEL "" +#define DT_INST_0_TI_HDC_BUS_NAME "" +#define DT_INST_0_TI_HDC_BASE_ADDRESS 0 #endif #endif /* CONFIG_HAS_DTS_I2C */ @@ -226,52 +227,52 @@ #define DT_ADXL372_SPI_BUS_FREQ 8000000 #endif -#ifndef DT_BOSCH_BMI160_0_LABEL -#define DT_BOSCH_BMI160_0_LABEL "" -#define DT_BOSCH_BMI160_0_BASE_ADDRESS 0 -#define DT_BOSCH_BMI160_0_BUS_NAME "" -#define DT_BOSCH_BMI160_0_INT_GPIOS_CONTROLLER "" -#define DT_BOSCH_BMI160_0_INT_GPIOS_PIN 0 -#define DT_BOSCH_BMI160_0_SPI_MAX_FREQUENCY 6400000 +#ifndef DT_INST_0_BOSCH_BMI160_LABEL +#define DT_INST_0_BOSCH_BMI160_LABEL "" +#define DT_INST_0_BOSCH_BMI160_BASE_ADDRESS 0 +#define DT_INST_0_BOSCH_BMI160_BUS_NAME "" +#define DT_INST_0_BOSCH_BMI160_INT_GPIOS_CONTROLLER "" +#define DT_INST_0_BOSCH_BMI160_INT_GPIOS_PIN 0 +#define DT_INST_0_BOSCH_BMI160_SPI_MAX_FREQUENCY 6400000 #endif -#ifndef DT_ST_LIS2DH_0_LABEL -#define DT_ST_LIS2DH_0_LABEL "" -#define DT_ST_LIS2DH_0_BASE_ADDRESS 0 -#define DT_ST_LIS2DH_0_BUS_NAME "" -#define DT_ST_LIS2DH_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DH_0_IRQ_GPIOS_PIN 0 -#define DT_ST_LIS2DH_0_SPI_MAX_FREQUENCY 6400000 +#ifndef DT_INST_0_ST_LIS2DH_LABEL +#define DT_INST_0_ST_LIS2DH_LABEL "" +#define DT_INST_0_ST_LIS2DH_BASE_ADDRESS 0 +#define DT_INST_0_ST_LIS2DH_BUS_NAME "" +#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DH_IRQ_GPIOS_PIN 0 +#define DT_INST_0_ST_LIS2DH_SPI_MAX_FREQUENCY 6400000 #define DT_ST_LIS2DH_0_BUS_SPI 1 #endif -#ifndef DT_ST_LSM6DSL_0_LABEL -#define DT_ST_LSM6DSL_0_LABEL "" -#define DT_ST_LSM6DSL_0_BASE_ADDRESS 0 -#define DT_ST_LSM6DSL_0_BUS_NAME "" -#define DT_ST_LSM6DSL_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LSM6DSL_0_IRQ_GPIOS_PIN 0 -#define DT_ST_LSM6DSL_0_SPI_MAX_FREQUENCY 6400000 +#ifndef DT_INST_0_ST_LSM6DSL_LABEL +#define DT_INST_0_ST_LSM6DSL_LABEL "" +#define DT_INST_0_ST_LSM6DSL_BASE_ADDRESS 0 +#define DT_INST_0_ST_LSM6DSL_BUS_NAME "" +#define DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LSM6DSL_IRQ_GPIOS_PIN 0 +#define DT_INST_0_ST_LSM6DSL_SPI_MAX_FREQUENCY 6400000 #define DT_ST_LSM6DSL_BUS_SPI 1 #endif -#ifndef DT_ST_LIS2DS12_0_LABEL -#define DT_ST_LIS2DS12_0_LABEL "" -#define DT_ST_LIS2DS12_0_BUS_NAME "" -#define DT_ST_LIS2DS12_0_SPI_MAX_FREQUENCY 100000 -#define DT_ST_LIS2DS12_0_BASE_ADDRESS 1 -#define DT_ST_LIS2DS12_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DS12_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LIS2DS12_LABEL +#define DT_INST_0_ST_LIS2DS12_LABEL "" +#define DT_INST_0_ST_LIS2DS12_BUS_NAME "" +#define DT_INST_0_ST_LIS2DS12_SPI_MAX_FREQUENCY 100000 +#define DT_INST_0_ST_LIS2DS12_BASE_ADDRESS 1 +#define DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DS12_IRQ_GPIOS_PIN 0 #define DT_ST_LIS2DS12_BUS_SPI 1 #endif -#ifndef DT_ST_LIS2DW12_0_LABEL -#define DT_ST_LIS2DW12_0_LABEL "" -#define DT_ST_LIS2DW12_0_BUS_NAME "" -#define DT_ST_LIS2DW12_0_SPI_MAX_FREQUENCY 100000 -#define DT_ST_LIS2DW12_0_BASE_ADDRESS 1 -#define DT_ST_LIS2DW12_0_IRQ_GPIOS_CONTROLLER "" -#define DT_ST_LIS2DW12_0_IRQ_GPIOS_PIN 0 +#ifndef DT_INST_0_ST_LIS2DW12_LABEL +#define DT_INST_0_ST_LIS2DW12_LABEL "" +#define DT_INST_0_ST_LIS2DW12_BUS_NAME "" +#define DT_INST_0_ST_LIS2DW12_SPI_MAX_FREQUENCY 100000 +#define DT_INST_0_ST_LIS2DW12_BASE_ADDRESS 1 +#define DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_CONTROLLER "" +#define DT_INST_0_ST_LIS2DW12_IRQ_GPIOS_PIN 0 #define DT_ST_LIS2DW12_BUS_SPI 1 #endif diff --git a/tests/drivers/counter/counter_basic_api/src/test_counter.c b/tests/drivers/counter/counter_basic_api/src/test_counter.c index 968a6d5e4f5..dfab0bae79c 100644 --- a/tests/drivers/counter/counter_basic_api/src/test_counter.c +++ b/tests/drivers/counter/counter_basic_api/src/test_counter.c @@ -59,14 +59,14 @@ const char *devices[] = { #ifdef DT_RTC_MCUX_0_NAME DT_RTC_MCUX_0_NAME, #endif -#ifdef DT_ARM_CMSDK_TIMER_0_LABEL - DT_ARM_CMSDK_TIMER_0_LABEL, +#ifdef DT_INST_0_ARM_CMSDK_TIMER_LABEL + DT_INST_0_ARM_CMSDK_TIMER_LABEL, #endif -#ifdef DT_ARM_CMSDK_TIMER_1_LABEL - DT_ARM_CMSDK_TIMER_1_LABEL, +#ifdef DT_INST_1_ARM_CMSDK_TIMER_LABEL + DT_INST_1_ARM_CMSDK_TIMER_LABEL, #endif -#ifdef DT_ARM_CMSDK_DTIMER_0_LABEL - DT_ARM_CMSDK_DTIMER_0_LABEL, +#ifdef DT_INST_0_ARM_CMSDK_DTIMER_LABEL + DT_INST_0_ARM_CMSDK_DTIMER_LABEL, #endif #ifdef DT_RTC_0_NAME DT_RTC_0_NAME, diff --git a/tests/drivers/i2c/i2c_slave_api/src/main.c b/tests/drivers/i2c/i2c_slave_api/src/main.c index 565af2fcfd6..8fcb8851e65 100644 --- a/tests/drivers/i2c/i2c_slave_api/src/main.c +++ b/tests/drivers/i2c/i2c_slave_api/src/main.c @@ -139,26 +139,26 @@ void test_eeprom_slave(void) i2c_0 = device_get_binding( - DT_ATMEL_AT24_0_BUS_NAME); + DT_INST_0_ATMEL_AT24_BUS_NAME); zassert_not_null(i2c_0, "I2C device %s not found", - DT_ATMEL_AT24_0_BUS_NAME); + DT_INST_0_ATMEL_AT24_BUS_NAME); LOG_INF("Found I2C Master device %s", - DT_ATMEL_AT24_0_BUS_NAME); + DT_INST_0_ATMEL_AT24_BUS_NAME); i2c_1 = device_get_binding( - DT_ATMEL_AT24_1_BUS_NAME); + DT_INST_1_ATMEL_AT24_BUS_NAME); zassert_not_null(i2c_1, "I2C device %s not found", - DT_ATMEL_AT24_1_BUS_NAME); + DT_INST_1_ATMEL_AT24_BUS_NAME); LOG_INF("Found I2C Master device %s", - DT_ATMEL_AT24_1_BUS_NAME); + DT_INST_1_ATMEL_AT24_BUS_NAME); /* * Normal applications would interact with an EEPROM * identified by the string literal used in the binding node * label property ("EEPROM_SLAVE_0") rather than the generated - * macro DT_ATMEL_AT24_0_LABEL. There is no guarantee that + * macro DT_INST_0_ATMEL_AT24_LABEL. There is no guarantee that * the index for the compatible is persistent across builds; * for example DT_ATMEL_AT24_0 might refer to "EEPROM_SLAVE_1" * if the order of the node declarations were changed in the @@ -171,61 +171,61 @@ void test_eeprom_slave(void) * using the generated macro. */ - eeprom_0 = device_get_binding(DT_ATMEL_AT24_0_LABEL); + eeprom_0 = device_get_binding(DT_INST_0_ATMEL_AT24_LABEL); zassert_not_null(eeprom_0, "EEPROM device %s not found", - DT_ATMEL_AT24_0_LABEL); + DT_INST_0_ATMEL_AT24_LABEL); - LOG_INF("Found EEPROM device %s", DT_ATMEL_AT24_0_LABEL); + LOG_INF("Found EEPROM device %s", DT_INST_0_ATMEL_AT24_LABEL); - eeprom_1 = device_get_binding(DT_ATMEL_AT24_1_LABEL); + eeprom_1 = device_get_binding(DT_INST_1_ATMEL_AT24_LABEL); zassert_not_null(eeprom_1, "EEPROM device %s not found", - DT_ATMEL_AT24_1_LABEL); + DT_INST_1_ATMEL_AT24_LABEL); - LOG_INF("Found EEPROM device %s", DT_ATMEL_AT24_1_LABEL); + LOG_INF("Found EEPROM device %s", DT_INST_1_ATMEL_AT24_LABEL); /* Program dummy bytes */ ret = eeprom_slave_program(eeprom_0, eeprom_0_data, TEST_DATA_SIZE); zassert_equal(ret, 0, "Failed to program EEPROM %s", - DT_ATMEL_AT24_0_LABEL); + DT_INST_0_ATMEL_AT24_LABEL); ret = eeprom_slave_program(eeprom_1, eeprom_1_data, TEST_DATA_SIZE); zassert_equal(ret, 0, "Failed to program EEPROM %s", - DT_ATMEL_AT24_1_LABEL); + DT_INST_1_ATMEL_AT24_LABEL); /* Attach EEPROM */ ret = i2c_slave_driver_register(eeprom_0); zassert_equal(ret, 0, "Failed to register EEPROM %s", - DT_ATMEL_AT24_0_LABEL); + DT_INST_0_ATMEL_AT24_LABEL); - LOG_INF("EEPROM %s Attached !", DT_ATMEL_AT24_0_LABEL); + LOG_INF("EEPROM %s Attached !", DT_INST_0_ATMEL_AT24_LABEL); ret = i2c_slave_driver_register(eeprom_1); zassert_equal(ret, 0, "Failed to register EEPROM %s", - DT_ATMEL_AT24_1_LABEL); + DT_INST_1_ATMEL_AT24_LABEL); - LOG_INF("EEPROM %s Attached !", DT_ATMEL_AT24_1_LABEL); + LOG_INF("EEPROM %s Attached !", DT_INST_1_ATMEL_AT24_LABEL); /* Run Tests without bus access conflicts */ - run_full_read(i2c_0, DT_ATMEL_AT24_1_BASE_ADDRESS, eeprom_1_data); - run_full_read(i2c_1, DT_ATMEL_AT24_0_BASE_ADDRESS, eeprom_0_data); + run_full_read(i2c_0, DT_INST_1_ATMEL_AT24_BASE_ADDRESS, eeprom_1_data); + run_full_read(i2c_1, DT_INST_0_ATMEL_AT24_BASE_ADDRESS, eeprom_0_data); for (offset = 0 ; offset < TEST_DATA_SIZE-1 ; ++offset) { - run_partial_read(i2c_0, DT_ATMEL_AT24_1_BASE_ADDRESS, + run_partial_read(i2c_0, DT_INST_1_ATMEL_AT24_BASE_ADDRESS, eeprom_1_data, offset); } for (offset = 0 ; offset < TEST_DATA_SIZE-1 ; ++offset) { - run_partial_read(i2c_1, DT_ATMEL_AT24_0_BASE_ADDRESS, + run_partial_read(i2c_1, DT_INST_0_ATMEL_AT24_BASE_ADDRESS, eeprom_0_data, offset); } for (offset = 0 ; offset < TEST_DATA_SIZE-1 ; ++offset) { - run_program_read(i2c_0, DT_ATMEL_AT24_1_BASE_ADDRESS, + run_program_read(i2c_0, DT_INST_1_ATMEL_AT24_BASE_ADDRESS, offset); } for (offset = 0 ; offset < TEST_DATA_SIZE-1 ; ++offset) { - run_program_read(i2c_1, DT_ATMEL_AT24_0_BASE_ADDRESS, + run_program_read(i2c_1, DT_INST_0_ATMEL_AT24_BASE_ADDRESS, offset); } @@ -234,17 +234,17 @@ void test_eeprom_slave(void) /* Detach EEPROM */ ret = i2c_slave_driver_unregister(eeprom_0); zassert_equal(ret, 0, "Failed to unregister EEPROM %s", - DT_ATMEL_AT24_0_LABEL); + DT_INST_0_ATMEL_AT24_LABEL); LOG_INF("EEPROM %s Detached !", - DT_ATMEL_AT24_0_LABEL); + DT_INST_0_ATMEL_AT24_LABEL); ret = i2c_slave_driver_unregister(eeprom_1); zassert_equal(ret, 0, "Failed to unregister EEPROM %s", - DT_ATMEL_AT24_1_LABEL); + DT_INST_1_ATMEL_AT24_LABEL); LOG_INF("EEPROM %s Detached !", - DT_ATMEL_AT24_1_LABEL); + DT_INST_1_ATMEL_AT24_LABEL); } void test_main(void) diff --git a/tests/drivers/pwm/pwm_api/src/test_pwm.c b/tests/drivers/pwm/pwm_api/src/test_pwm.c index 9c8458d76bb..92e199345dd 100644 --- a/tests/drivers/pwm/pwm_api/src/test_pwm.c +++ b/tests/drivers/pwm/pwm_api/src/test_pwm.c @@ -37,7 +37,7 @@ #elif defined CONFIG_BOARD_COLIBRI_IMX7D_M4 #define PWM_DEV_NAME PWM_1_LABEL #elif defined CONFIG_BOARD_SAM_E70_XPLAINED -#define PWM_DEV_NAME DT_ATMEL_SAM_PWM_0_LABEL +#define PWM_DEV_NAME DT_INST_0_ATMEL_SAM_PWM_LABEL #endif #ifdef CONFIG_BOARD_COLIBRI_IMX7D_M4