tgrosinger/zmk
1
0
Fork 0
Code Actions Packages

fix(sensors): Avoid duplicate Kconfig/DTS name.

Browse Source 
* Upstream added an equivalent fuel gauge driver, so namespace
  our Kconfig symbol and DTS compatible for the MAX17048 driver.
This commit is contained in:
Peter Johanson 2023-10-16 06:11:21 +00:00 committed by Pete Johanson
parent 0b5afbf9c0
commit bd9c71ab0a
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/module/drivers/sensor/CMakeLists.txt
View File

@ -3,4 +3,4 @@
add_subdirectory_ifdef(CONFIG_ZMK_BATTERY battery) add_subdirectory_ifdef(CONFIG_ZMK_BATTERY battery)
add_subdirectory_ifdef(CONFIG_EC11 ec11) add_subdirectory_ifdef(CONFIG_EC11 ec11)
add_subdirectory_ifdef(CONFIG_MAX17048 max17048) add_subdirectory_ifdef(CONFIG_ZMK_MAX17048 max17048)

4
app/module/drivers/sensor/max17048/CMakeLists.txt
View File

@ -5,5 +5,5 @@ zephyr_include_directories(.)
zephyr_library() zephyr_library()
zephyr_library_sources_ifdef(CONFIG_MAX17048 max17048.c) zephyr_library_sources_ifdef(CONFIG_ZMK_MAX17048 max17048.c)
zephyr_library_sources_ifndef(CONFIG_MAX17048 ${ZEPHYR_BASE}/misc/empty_file.c) zephyr_library_sources_ifndef(CONFIG_ZMK_MAX17048 ${ZEPHYR_BASE}/misc/empty_file.c)

10
app/module/drivers/sensor/max17048/Kconfig
View File

@ -1,18 +1,16 @@
# Copyright (c) 2022 The ZMK Contributors # Copyright (c) 2022 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
DT_COMPAT_MAXIM_MAX17048 := maxim,max17048 menuconfig ZMK_MAX17048
menuconfig MAX17048
bool "MAX17048/9 I2C-based Fuel Gauge" bool "MAX17048/9 I2C-based Fuel Gauge"
default $(dt_compat_enabled,$(DT_COMPAT_MAXIM_MAX17048)) default y
depends on I2C depends on DT_HAS_ZMK_MAXIM_MAX17048_ENABLED && I2C
select ZMK_BATTERY select ZMK_BATTERY
help help
Enable driver for MAX17048/9 I2C-based Fuel Gauge. Supports measuring Enable driver for MAX17048/9 I2C-based Fuel Gauge. Supports measuring
battery voltage and state-of-charge. battery voltage and state-of-charge.
if MAX17048 if ZMK_MAX17048
config SENSOR_MAX17048_INIT_PRIORITY config SENSOR_MAX17048_INIT_PRIORITY
int "Init priority" int "Init priority"

2
app/module/drivers/sensor/max17048/max17048.c
View File

@ -4,7 +4,7 @@
* SPDX-License-Identifier: MIT * SPDX-License-Identifier: MIT
*/ */
#define DT_DRV_COMPAT maxim_max17048 #define DT_DRV_COMPAT zmk_maxim_max17048
#include <zephyr/device.h> #include <zephyr/device.h>
#include <zephyr/kernel.h> #include <zephyr/kernel.h>

2
app/module/dts/bindings/sensor/maxim,max17048.yml → app/module/dts/bindings/sensor/zmk,maxim-max17048.yml
View File

@ -7,6 +7,6 @@
description: > description: >
This is a representation of the Maxim max17048 I2C Fuel Gauge. This is a representation of the Maxim max17048 I2C Fuel Gauge.
compatible: "maxim,max17048" compatible: "zmk,maxim-max17048"
include: [i2c-device.yaml] include: [i2c-device.yaml]