pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor: Move to newer API for IO channels.

Browse source 
See: https://docs.zephyrproject.org/latest/releases/release-notes-2.6.html#api-changes
This commit is contained in:
Peter Johanson 2021-11-05 04:18:03 +00:00 committed by Pete Johanson
parent 40d8470664
commit 3528e1b497
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/drivers/sensor/battery/battery_voltage_divider.c
View file

@ -18,7 +18,6 @@
LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
struct io_channel_config { struct io_channel_config {
const char *label;
uint8_t channel; uint8_t channel;
}; };
@ -119,10 +118,8 @@ static int bvd_init(const struct device *dev) {
struct bvd_data *drv_data = dev->data; struct bvd_data *drv_data = dev->data;
const struct bvd_config *drv_cfg = dev->config; const struct bvd_config *drv_cfg = dev->config;
drv_data->adc = device_get_binding(drv_cfg->io_channel.label);
if (drv_data->adc == NULL) { if (drv_data->adc == NULL) {
LOG_ERR("ADC %s failed to retrieve", drv_cfg->io_channel.label); LOG_ERR("ADC failed to retrieve ADC driver");
return -ENODEV; return -ENODEV;
} }
@ -170,12 +167,12 @@ static int bvd_init(const struct device *dev) {
return rc; return rc;
} }
static struct bvd_data bvd_data; static struct bvd_data bvd_data = {.adc = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(DT_DRV_INST(0)))};
static const struct bvd_config bvd_cfg = { static const struct bvd_config bvd_cfg = {
.io_channel = .io_channel =
{ {
DT_INST_IO_CHANNELS_LABEL(0), DT_IO_CHANNELS_INPUT(DT_DRV_INST(0)),
DT_INST_IO_CHANNELS_INPUT(0),
}, },
#if DT_INST_NODE_HAS_PROP(0, power_gpios) #if DT_INST_NODE_HAS_PROP(0, power_gpios)
.power_gpios = .power_gpios =