diff options
| author | Peter Johanson <[email protected]> | 2023-10-16 06:11:21 +0000 |
|---|---|---|
| committer | Pete Johanson <[email protected]> | 2024-02-09 14:32:46 -0800 |
| commit | bd9c71ab0af29f22eda516b3c3541e83aa51b908 (patch) | |
| tree | d9bc1df6ff95d6afdcb123ac71251d47006e30ba | |
| parent | 0b5afbf9c0f752138d533cf52b1458d4e7c90f77 (diff) | |
| download | zmk-bd9c71ab0af29f22eda516b3c3541e83aa51b908.tar.gz zmk-bd9c71ab0af29f22eda516b3c3541e83aa51b908.zip | |
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.
| -rw-r--r-- | app/module/drivers/sensor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | app/module/drivers/sensor/max17048/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | app/module/drivers/sensor/max17048/Kconfig | 10 | ||||
| -rw-r--r-- | app/module/drivers/sensor/max17048/max17048.c | 2 | ||||
| -rw-r--r-- | app/module/dts/bindings/sensor/zmk,maxim-max17048.yml (renamed from app/module/dts/bindings/sensor/maxim,max17048.yml) | 2 |
5 files changed, 9 insertions, 11 deletions
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/zmk,maxim-max17048.yml index 786f4b8686..765aeee565 100644 --- a/app/module/dts/bindings/sensor/maxim,max17048.yml +++ b/app/module/dts/bindings/sensor/zmk,maxim-max17048.yml @@ -7,6 +7,6 @@ description: > This is a representation of the Maxim max17048 I2C Fuel Gauge. -compatible: "maxim,max17048" +compatible: "zmk,maxim-max17048" include: [i2c-device.yaml] |