From bd9c71ab0af29f22eda516b3c3541e83aa51b908 Mon Sep 17 00:00:00 2001
From: Peter Johanson <peter@peterjohanson.com>
Date: Mon, 16 Oct 2023 06:11:21 +0000
Subject: fix(sensors): Avoid duplicate Kconfig/DTS name.

* Upstream added an equivalent fuel gauge driver, so namespace
  our Kconfig symbol and DTS compatible for the MAX17048 driver.
---
 app/module/drivers/sensor/CMakeLists.txt              |  2 +-
 app/module/drivers/sensor/max17048/CMakeLists.txt     |  4 ++--
 app/module/drivers/sensor/max17048/Kconfig            | 10 ++++------
 app/module/drivers/sensor/max17048/max17048.c         |  2 +-
 app/module/dts/bindings/sensor/maxim,max17048.yml     | 12 ------------
 app/module/dts/bindings/sensor/zmk,maxim-max17048.yml | 12 ++++++++++++
 6 files changed, 20 insertions(+), 22 deletions(-)
 delete mode 100644 app/module/dts/bindings/sensor/maxim,max17048.yml
 create mode 100644 app/module/dts/bindings/sensor/zmk,maxim-max17048.yml

diff --git a/app/module/drivers/sensor/CMakeLists.txt b/app/module/drivers/sensor/CMakeLists.txt
index 9654600a75..cd1a1c4506 100644
--- a/app/module/drivers/sensor/CMakeLists.txt
+++ b/app/module/drivers/sensor/CMakeLists.txt
@@ -3,4 +3,4 @@
 
 add_subdirectory_ifdef(CONFIG_ZMK_BATTERY battery)
 add_subdirectory_ifdef(CONFIG_EC11 ec11)
-add_subdirectory_ifdef(CONFIG_MAX17048 max17048)
+add_subdirectory_ifdef(CONFIG_ZMK_MAX17048 max17048)
diff --git a/app/module/drivers/sensor/max17048/CMakeLists.txt b/app/module/drivers/sensor/max17048/CMakeLists.txt
index e895fa11fb..43b7af4d09 100644
--- a/app/module/drivers/sensor/max17048/CMakeLists.txt
+++ b/app/module/drivers/sensor/max17048/CMakeLists.txt
@@ -5,5 +5,5 @@ zephyr_include_directories(.)
 
 zephyr_library()
 
-zephyr_library_sources_ifdef(CONFIG_MAX17048  max17048.c)
-zephyr_library_sources_ifndef(CONFIG_MAX17048 ${ZEPHYR_BASE}/misc/empty_file.c)
+zephyr_library_sources_ifdef(CONFIG_ZMK_MAX17048  max17048.c)
+zephyr_library_sources_ifndef(CONFIG_ZMK_MAX17048 ${ZEPHYR_BASE}/misc/empty_file.c)
diff --git a/app/module/drivers/sensor/max17048/Kconfig b/app/module/drivers/sensor/max17048/Kconfig
index 8a7ec16e85..432949a2f5 100644
--- a/app/module/drivers/sensor/max17048/Kconfig
+++ b/app/module/drivers/sensor/max17048/Kconfig
@@ -1,18 +1,16 @@
 # Copyright (c) 2022 The ZMK Contributors
 # SPDX-License-Identifier: MIT
 
-DT_COMPAT_MAXIM_MAX17048 := maxim,max17048
-
-menuconfig MAX17048
+menuconfig ZMK_MAX17048
     bool "MAX17048/9 I2C-based Fuel Gauge"
-    default $(dt_compat_enabled,$(DT_COMPAT_MAXIM_MAX17048))
-    depends on I2C
+    default y
+    depends on DT_HAS_ZMK_MAXIM_MAX17048_ENABLED && I2C
     select ZMK_BATTERY
     help
       Enable driver for MAX17048/9 I2C-based Fuel Gauge. Supports measuring
       battery voltage and state-of-charge.
 
-if MAX17048
+if ZMK_MAX17048
 
 config SENSOR_MAX17048_INIT_PRIORITY
     int "Init priority"
diff --git a/app/module/drivers/sensor/max17048/max17048.c b/app/module/drivers/sensor/max17048/max17048.c
index 24cfe093f4..43b30af1a3 100644
--- a/app/module/drivers/sensor/max17048/max17048.c
+++ b/app/module/drivers/sensor/max17048/max17048.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-#define DT_DRV_COMPAT maxim_max17048
+#define DT_DRV_COMPAT zmk_maxim_max17048
 
 #include <zephyr/device.h>
 #include <zephyr/kernel.h>
diff --git a/app/module/dts/bindings/sensor/maxim,max17048.yml b/app/module/dts/bindings/sensor/maxim,max17048.yml
deleted file mode 100644
index 786f4b8686..0000000000
--- a/app/module/dts/bindings/sensor/maxim,max17048.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Copyright (c) 2022 The ZMK Contributors
-#
-# SPDX-License-Identifier: MIT
-#
-
-description: >
-  This is a representation of the Maxim max17048 I2C Fuel Gauge.
-
-compatible: "maxim,max17048"
-
-include: [i2c-device.yaml]
diff --git a/app/module/dts/bindings/sensor/zmk,maxim-max17048.yml b/app/module/dts/bindings/sensor/zmk,maxim-max17048.yml
new file mode 100644
index 0000000000..765aeee565
--- /dev/null
+++ b/app/module/dts/bindings/sensor/zmk,maxim-max17048.yml
@@ -0,0 +1,12 @@
+#
+# Copyright (c) 2022 The ZMK Contributors
+#
+# SPDX-License-Identifier: MIT
+#
+
+description: >
+  This is a representation of the Maxim max17048 I2C Fuel Gauge.
+
+compatible: "zmk,maxim-max17048"
+
+include: [i2c-device.yaml]
-- 
cgit v1.2.3