michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: npcx: convert NPCX drivers clock client to DEVICE_DT_GET

Browse source 
Convert the various device_get_binding() calls used to get the device
clock node to use DEVICE_DT_GET. The latter is processed at link time,
so it should be a bit more efficient.

Signed-off-by: Fabio Baltieri <fabiobaltieri@google.com>
This commit is contained in:
Fabio Baltieri 2021-06-25 15:56:58 +00:00 • committed by Anas Nashif
commit 3af832868c
10 changed files with 12 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/adc/adc_npcx.c
View file

@ -333,8 +333,7 @@ static int adc_npcx_init(const struct device *dev)
const struct adc_npcx_config *const config = DRV_CONFIG(dev); const struct adc_npcx_config *const config = DRV_CONFIG(dev);
struct adc_npcx_data *const data = DRV_DATA(dev); struct adc_npcx_data *const data = DRV_DATA(dev);
struct adc_reg *const inst = HAL_INSTANCE(dev); struct adc_reg *const inst = HAL_INSTANCE(dev);
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
int prescaler = 0, ret; int prescaler = 0, ret;
/* Save ADC device in data */ /* Save ADC device in data */

6
drivers/clock_control/clock_control_npcx.c
View file

@ -109,8 +109,7 @@ static int npcx_clock_control_get_subsys_rate(const struct device *dev,
#if defined(CONFIG_PM) #if defined(CONFIG_PM)
void npcx_clock_control_turn_on_system_sleep(bool is_deep, bool is_instant) void npcx_clock_control_turn_on_system_sleep(bool is_deep, bool is_instant)
{ {
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
struct pmc_reg *const inst_pmc = HAL_PMC_INST(clk_dev); struct pmc_reg *const inst_pmc = HAL_PMC_INST(clk_dev);
/* Configure that ec enters system sleep mode if receiving 'wfi' */ /* Configure that ec enters system sleep mode if receiving 'wfi' */
uint8_t pm_flags = BIT(NPCX_PMCSR_IDLE); uint8_t pm_flags = BIT(NPCX_PMCSR_IDLE);
@ -128,8 +127,7 @@ void npcx_clock_control_turn_on_system_sleep(bool is_deep, bool is_instant)
void npcx_clock_control_turn_off_system_sleep(void) void npcx_clock_control_turn_off_system_sleep(void)
{ {
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
struct pmc_reg *const inst_pmc = HAL_PMC_INST(clk_dev); struct pmc_reg *const inst_pmc = HAL_PMC_INST(clk_dev);
inst_pmc->PMCSR = 0; inst_pmc->PMCSR = 0;

2
drivers/espi/espi_npcx.c
View file

@ -853,7 +853,7 @@ static int espi_npcx_init(const struct device *dev)
const struct espi_npcx_config *const config = DRV_CONFIG(dev); const struct espi_npcx_config *const config = DRV_CONFIG(dev);
struct espi_npcx_data *const data = DRV_DATA(dev); struct espi_npcx_data *const data = DRV_DATA(dev);
struct espi_reg *const inst = HAL_INSTANCE(dev); struct espi_reg *const inst = HAL_INSTANCE(dev);
const struct device *clk_dev = device_get_binding(NPCX_CLK_CTRL_NAME); const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
int i, ret; int i, ret;
/* Turn on eSPI device clock first */ /* Turn on eSPI device clock first */

3
drivers/espi/host_subs_npcx.c
View file

@ -979,8 +979,7 @@ int npcx_host_init_subs_core_domain(const struct device *host_bus_dev,
{ {
struct mswc_reg *const inst_mswc = host_sub_cfg.inst_mswc; struct mswc_reg *const inst_mswc = host_sub_cfg.inst_mswc;
struct shm_reg *const inst_shm = host_sub_cfg.inst_shm; struct shm_reg *const inst_shm = host_sub_cfg.inst_shm;
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
int i; int i;
uint8_t shm_sts; uint8_t shm_sts;

3
drivers/i2c/i2c_npcx_controller.c
View file

@ -859,8 +859,7 @@ static int i2c_ctrl_init(const struct device *dev)
{ {
const struct i2c_ctrl_config *const config = DRV_CONFIG(dev); const struct i2c_ctrl_config *const config = DRV_CONFIG(dev);
struct i2c_ctrl_data *const data = DRV_DATA(dev); struct i2c_ctrl_data *const data = DRV_DATA(dev);
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
uint32_t i2c_rate; uint32_t i2c_rate;
/* Turn on device clock first and get source clock freq. */ /* Turn on device clock first and get source clock freq. */

3
drivers/pwm/pwm_npcx.c
View file

@ -168,8 +168,7 @@ static int pwm_npcx_init(const struct device *dev)
const struct pwm_npcx_config *const config = DRV_CONFIG(dev); const struct pwm_npcx_config *const config = DRV_CONFIG(dev);
struct pwm_npcx_data *const data = DRV_DATA(dev); struct pwm_npcx_data *const data = DRV_DATA(dev);
struct pwm_reg *const inst = HAL_INSTANCE(dev); struct pwm_reg *const inst = HAL_INSTANCE(dev);
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
int ret; int ret;
/* /*

3
drivers/sensor/nuvoton_tach_npcx/tach_nuvoton_npcx.c
View file

@ -316,8 +316,7 @@ static int tach_npcx_init(const struct device *dev)
{ {
const struct tach_npcx_config *const config = DRV_CONFIG(dev); const struct tach_npcx_config *const config = DRV_CONFIG(dev);
struct tach_npcx_data *const data = DRV_DATA(dev); struct tach_npcx_data *const data = DRV_DATA(dev);
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
int ret; int ret;
/* Turn on device clock first and get source clock freq. */ /* Turn on device clock first and get source clock freq. */

3
drivers/serial/uart_npcx.c
View file

@ -357,8 +357,7 @@ static int uart_npcx_init(const struct device *dev)
const struct uart_npcx_config *const config = DRV_CONFIG(dev); const struct uart_npcx_config *const config = DRV_CONFIG(dev);
struct uart_npcx_data *const data = DRV_DATA(dev); struct uart_npcx_data *const data = DRV_DATA(dev);
struct uart_reg *const inst = HAL_INSTANCE(dev); struct uart_reg *const inst = HAL_INSTANCE(dev);
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
uint32_t uart_rate; uint32_t uart_rate;
int ret; int ret;

3
drivers/timer/npcx_itim_timer.c
View file

@ -272,8 +272,7 @@ int sys_clock_driver_init(const struct device *dev)
ARG_UNUSED(dev); ARG_UNUSED(dev);
int ret; int ret;
uint32_t sys_tmr_rate; uint32_t sys_tmr_rate;
const struct device *const clk_dev = const struct device *const clk_dev = DEVICE_DT_GET(NPCX_CLK_CTRL_NODE);
device_get_binding(NPCX_CLK_CTRL_NAME);
/* Turn on all itim module clocks used for counting */ /* Turn on all itim module clocks used for counting */
for (int i = 0; i < ARRAY_SIZE(itim_clk_cfg); i++) { for (int i = 0; i < ARRAY_SIZE(itim_clk_cfg); i++) {

4
soc/arm/nuvoton_npcx/common/soc_clock.h
View file

@ -11,8 +11,8 @@
extern "C" { extern "C" {
#endif #endif
/* Common clock control device name for all NPCX series */ /* Common clock control device node for all NPCX series */
#define NPCX_CLK_CTRL_NAME DT_LABEL(DT_NODELABEL(pcc)) #define NPCX_CLK_CTRL_NODE DT_NODELABEL(pcc)
/** /**
* @brief NPCX clock configuration structure * @brief NPCX clock configuration structure