From 27bb8b951373b9b69543e7ead42bb53eea53f13c Mon Sep 17 00:00:00 2001
From: Kumar Gala <kumar.gala@linaro.org>
Date: Wed, 25 Mar 2020 11:05:35 -0500
Subject: [PATCH] drivers: led: ht16k33: Convert to new DT_INST macros

Convert older DT_INST_ macro use the new include/devicetree.h
DT_INST macro APIs.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
---
 drivers/led/ht16k33.c | 52 ++++++++++++++++++++++---------------------
 1 file changed, 27 insertions(+), 25 deletions(-)

diff --git a/drivers/led/ht16k33.c b/drivers/led/ht16k33.c
index 2d64dbdfca7..0361250e81c 100644
--- a/drivers/led/ht16k33.c
+++ b/drivers/led/ht16k33.c
@@ -4,6 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
+#define DT_DRV_COMPAT holtek_ht16k33
+
 /**
  * @file
  * @brief LED driver for the HT16K33 I2C LED driver with keyscan
@@ -461,14 +463,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_INST_##id##_HOLTEK_HT16K33_BUS_NAME,	\
-		.i2c_addr     = DT_INST_##id##_HOLTEK_HT16K33_BASE_ADDRESS,	\
+		.i2c_dev_name = DT_INST_BUS_LABEL(id),	\
+		.i2c_addr     = DT_INST_REG_ADDR(id),	\
 		.irq_enabled  = false,					\
 	};								\
 									\
 static struct ht16k33_data ht16k33_##id##_data;				\
 									\
-DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL,	\
+DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_LABEL(id),	\
 		    &ht16k33_init, &ht16k33_##id##_data,		\
 		    &ht16k33_##id##_cfg, POST_KERNEL,			\
 		    CONFIG_LED_INIT_PRIORITY, &ht16k33_leds_api)
@@ -476,19 +478,19 @@ DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL,	\
 #ifdef CONFIG_HT16K33_KEYSCAN
 #define HT16K33_DEVICE_WITH_IRQ(id)					\
 	static const struct ht16k33_cfg ht16k33_##id##_cfg = {		\
-		.i2c_dev_name = DT_INST_##id##_HOLTEK_HT16K33_BUS_NAME,	\
-		.i2c_addr     = DT_INST_##id##_HOLTEK_HT16K33_BASE_ADDRESS,	\
+		.i2c_dev_name = DT_INST_BUS_LABEL(id),	\
+		.i2c_addr     = DT_INST_REG_ADDR(id),	\
 		.irq_enabled  = true,					\
 		.irq_dev_name =						\
-			DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER,	\
-		.irq_pin      = DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_PIN,	\
+			DT_INST_GPIO_LABEL(id, irq_gpios),	\
+		.irq_pin      = DT_INST_GPIO_PIN(id, irq_gpios),	\
 		.irq_flags    =						\
-			DT_INST_##id##_HOLTEK_HT16K33_IRQ_GPIOS_FLAGS,	\
+			DT_INST_GPIO_FLAGS(id, irq_gpios),	\
 	};								\
 									\
 static struct ht16k33_data ht16k33_##id##_data;				\
 									\
-DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL,	\
+DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_LABEL(id),	\
 		    &ht16k33_init, &ht16k33_##id##_data,		\
 		    &ht16k33_##id##_cfg, POST_KERNEL,			\
 		    CONFIG_LED_INIT_PRIORITY, &ht16k33_leds_api)
@@ -498,64 +500,64 @@ DEVICE_AND_API_INIT(ht16k33_##id, DT_INST_##id##_HOLTEK_HT16K33_LABEL,	\
 
 /* Support up to eight HT16K33 devices */
 
-#ifdef DT_INST_0_HOLTEK_HT16K33
-#ifdef DT_INST_0_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(0)
+#if DT_INST_NODE_HAS_PROP(0, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(0);
 #else
 HT16K33_DEVICE(0);
 #endif
 #endif
 
-#ifdef DT_INST_1_HOLTEK_HT16K33
-#ifdef DT_INST_1_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(1)
+#if DT_INST_NODE_HAS_PROP(1, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(1);
 #else
 HT16K33_DEVICE(1);
 #endif
 #endif
 
-#ifdef DT_INST_2_HOLTEK_HT16K33
-#ifdef DT_INST_2_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(2)
+#if DT_INST_NODE_HAS_PROP(2, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(2);
 #else
 HT16K33_DEVICE(2);
 #endif
 #endif
 
-#ifdef DT_INST_3_HOLTEK_HT16K33
-#ifdef DT_INST_3_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(3)
+#if DT_INST_NODE_HAS_PROP(3, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(3);
 #else
 HT16K33_DEVICE(3);
 #endif
 #endif
 
-#ifdef DT_INST_4_HOLTEK_HT16K33
-#ifdef DT_INST_4_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(4)
+#if DT_INST_NODE_HAS_PROP(4, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(4);
 #else
 HT16K33_DEVICE(4);
 #endif
 #endif
 
-#ifdef DT_INST_5_HOLTEK_HT16K33
-#ifdef DT_INST_5_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(5)
+#if DT_INST_NODE_HAS_PROP(5, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(5);
 #else
 HT16K33_DEVICE(5);
 #endif
 #endif
 
-#ifdef DT_INST_6_HOLTEK_HT16K33
-#ifdef DT_INST_6_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(6)
+#if DT_INST_NODE_HAS_PROP(6, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(6);
 #else
 HT16K33_DEVICE(6);
 #endif
 #endif
 
-#ifdef DT_INST_7_HOLTEK_HT16K33
-#ifdef DT_INST_7_HOLTEK_HT16K33_IRQ_GPIOS_CONTROLLER
+#if DT_HAS_DRV_INST(7)
+#if DT_INST_NODE_HAS_PROP(7, irq_gpios)
 HT16K33_DEVICE_WITH_IRQ(7);
 #else
 HT16K33_DEVICE(7);