DTS: flash: spi_nor: use DT_ for freq and other parameters

Use DT_ instead of CONFIG_ for spi freq, spi bus name, flash device name and flash base address. Signed-off-by: Rajavardhan Gundi <[email protected]>
dagar · Jan 17, 2019 · f885fd1 · f885fd1
1 parent 0dc0c9d
commit f885fd1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/boards/xtensa/intel_s1000_crb/dts_fixup.h b/boards/xtensa/intel_s1000_crb/dts_fixup.h
@@ -24,15 +24,15 @@
 #define DT_CODEC_RESET_GPIO_PIN		\
 	DT_SNPS_DESIGNWARE_I2C_80400_TI_TLV320DAC_18_RESET_GPIOS_PIN
 
-#define CONFIG_SPI_NOR_SPI_NAME			\
+#define DT_SPI_NOR_SPI_NAME		\
 	DT_SNPS_DESIGNWARE_SPI_E000_SPI_FLASH_0_BUS_NAME
 
-#define CONFIG_SPI_NOR_SPI_FREQ_0		\
+#define DT_SPI_NOR_SPI_FREQ_0		\
 	DT_SNPS_DESIGNWARE_SPI_E000_SPI_FLASH_0_SPI_MAX_FREQUENCY
 
-#define CONFIG_SPI_NOR_DRV_NAME			\
+#define DT_SPI_NOR_DRV_NAME		\
 	DT_SNPS_DESIGNWARE_SPI_E000_SPI_FLASH_0_LABEL
 
-#define CONFIG_SPI_NOR_SPI_SLAVE		\
+#define DT_SPI_NOR_SPI_SLAVE		\
 	DT_SNPS_DESIGNWARE_SPI_E000_SPI_FLASH_0_BASE_ADDRESS
 /* End of Board Level DTS fixup file */
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
@@ -338,14 +338,14 @@ 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(CONFIG_SPI_NOR_SPI_NAME);
+	data->spi = device_get_binding(DT_SPI_NOR_SPI_NAME);
 	if (!data->spi) {
 		return -EINVAL;
 	}
 
-	data->spi_cfg.frequency = CONFIG_SPI_NOR_SPI_FREQ_0;
+	data->spi_cfg.frequency = DT_SPI_NOR_SPI_FREQ_0;
 	data->spi_cfg.operation = SPI_WORD_SET(8);
-	data->spi_cfg.slave = CONFIG_SPI_NOR_SPI_SLAVE;
+	data->spi_cfg.slave = DT_SPI_NOR_SPI_SLAVE;
 
 #if defined(CONFIG_SPI_NOR_GPIO_SPI_CS)
 	data->cs_ctrl.gpio_dev =
@@ -402,7 +402,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, CONFIG_SPI_NOR_DRV_NAME,
+DEVICE_AND_API_INIT(spi_flash_memory, DT_SPI_NOR_DRV_NAME,
 		    &spi_nor_init, &spi_nor_memory_data,
 		    &flash_id, POST_KERNEL, CONFIG_SPI_NOR_INIT_PRIORITY,
 		    &spi_nor_api);
diff --git a/tests/boards/intel_s1000_crb/src/spi_flash.c b/tests/boards/intel_s1000_crb/src/spi_flash.c
@@ -23,7 +23,7 @@ void test_flash(void)
 	u8_t buf[TEST_DATA_LEN];
 	int i;
 
-	flash_dev = device_get_binding(CONFIG_SPI_NOR_DRV_NAME);
+	flash_dev = device_get_binding(DT_SPI_NOR_DRV_NAME);
 
 	if (!flash_dev) {
 		LOG_ERR("SPI flash driver was not found!\n");