diff options
Diffstat (limited to 'zephyr/shim/src/adc.c')
| -rw-r--r-- | zephyr/shim/src/adc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/zephyr/shim/src/adc.c b/zephyr/shim/src/adc.c index 80cf60391d..e14ef9f20f 100644 --- a/zephyr/shim/src/adc.c +++ b/zephyr/shim/src/adc.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -18,10 +18,10 @@ LOG_MODULE_REGISTER(shim_adc, LOG_LEVEL_ERR); #define HAS_NAMED_ADC_CHANNELS DT_NODE_EXISTS(DT_INST(0, named_adc_channels)) #if HAS_NAMED_ADC_CHANNELS -#define ADC_CHANNEL_COMMA(node_id) \ +#define ADC_CHANNEL_INIT(node_id) \ [ZSHIM_ADC_ID(node_id)] = { \ - .name = DT_LABEL(node_id), \ - .dev = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(node_id)), \ + .name = DT_NODE_FULL_NAME(node_id), \ + .dev = DEVICE_DT_GET(DT_IO_CHANNELS_CTLR(node_id)), \ .input_ch = DT_IO_CHANNELS_INPUT(node_id), \ .factor_mul = DT_PROP(node_id, mul), \ .factor_div = DT_PROP(node_id, div), \ @@ -35,11 +35,11 @@ LOG_MODULE_REGISTER(shim_adc, LOG_LEVEL_ERR); }, \ }, #ifdef CONFIG_ADC_CHANNELS_RUNTIME_CONFIG -struct adc_t adc_channels[] = { DT_FOREACH_CHILD( - DT_INST(0, named_adc_channels), ADC_CHANNEL_COMMA) }; +struct adc_t adc_channels[] = { DT_FOREACH_CHILD(DT_INST(0, named_adc_channels), + ADC_CHANNEL_INIT) }; #else const struct adc_t adc_channels[] = { DT_FOREACH_CHILD( - DT_INST(0, named_adc_channels), ADC_CHANNEL_COMMA) }; + DT_INST(0, named_adc_channels), ADC_CHANNEL_INIT) }; #endif #endif /* named_adc_channels */ |