From e6bbc49a7a45c3244e6ad8ebba4583c10aa8212a Mon Sep 17 00:00:00 2001 From: Daniel Leung Date: Fri, 1 Nov 2019 13:19:02 -0700 Subject: [PATCH] gpio: pca95xx: convert kconfig to DTS This converts configuration of the driver to DTS. Signed-off-by: Daniel Leung --- drivers/gpio/Kconfig.pca95xx | 128 ----------------------------------- drivers/gpio/gpio_pca95xx.c | 48 ++++++------- 2 files changed, 24 insertions(+), 152 deletions(-) diff --git a/drivers/gpio/Kconfig.pca95xx b/drivers/gpio/Kconfig.pca95xx index e898c4ed3a2..d07ccfa39a4 100644 --- a/drivers/gpio/Kconfig.pca95xx +++ b/drivers/gpio/Kconfig.pca95xx @@ -17,132 +17,4 @@ config GPIO_PCA95XX_INIT_PRIORITY help Device driver initialization priority. -config GPIO_PCA95XX_0 - bool "PCA95XX GPIO chip #0" - help - Enable config options for the PCA95XX I2C-based GPIO chip #0. - -config GPIO_PCA95XX_0_DEV_NAME - string "PCA95XX GPIO chip #0 Device Name" - depends on GPIO_PCA95XX_0 - default "GPIO_P0" - help - Specify the device name for the PCA95XX I2C-based GPIO chip #0. - -config GPIO_PCA95XX_0_I2C_ADDR - hex "PCA95XX GPIO chip #0 I2C slave address" - depends on GPIO_PCA95XX_0 - help - Specify the I2C slave address for the PCA95XX I2C-based GPIO chip #0. - -config GPIO_PCA95XX_0_I2C_MASTER_DEV_NAME - string "I2C Master where PCA95XX GPIO chip #0 is connected" - depends on GPIO_PCA95XX_0 - help - Specify the device name of the I2C master device to which this - PCA95XX chip #0 is binded. - -config GPIO_PCA95XX_0_HAS_PUD - bool "PCA95XX GPIO chip #0 supports pull-up/pull-down" - depends on GPIO_PCA95XX_0 - help - Enable if the PCA95XX I2C-based GPIO chip #0 supports - pull-up/pull-down. - -config GPIO_PCA95XX_1 - bool "PCA95XX GPIO chip #1" - help - Enable config options for the PCA95XX I2C-based GPIO chip #1. - -config GPIO_PCA95XX_1_DEV_NAME - string "PCA95XX GPIO chip #1 Device Name" - depends on GPIO_PCA95XX_1 - default "GPIO_P1" - help - Specify the device name for the PCA95XX I2C-based GPIO chip #1. - -config GPIO_PCA95XX_1_I2C_ADDR - hex "PCA95XX GPIO chip #1 I2C slave address" - depends on GPIO_PCA95XX_1 - help - Specify the I2C slave address for the PCA95XX I2C-based GPIO chip #1. - -config GPIO_PCA95XX_1_I2C_MASTER_DEV_NAME - string "I2C Master where PCA95XX GPIO chip #1 is connected" - depends on GPIO_PCA95XX_1 - help - Specify the device name of the I2C master device to which this - PCA95XX chip #1 is binded. - -config GPIO_PCA95XX_1_HAS_PUD - bool "PCA95XX GPIO chip #1 supports pull-up/pull-down" - depends on GPIO_PCA95XX_1 - help - Enable if the PCA95XX I2C-based GPIO chip #1 supports - pull-up/pull-down. - -config GPIO_PCA95XX_2 - bool "PCA95XX GPIO chip #2" - help - Enable config options for the PCA95XX I2C-based GPIO chip #2. - -config GPIO_PCA95XX_2_DEV_NAME - string "PCA95XX GPIO chip #2 Device Name" - depends on GPIO_PCA95XX_2 - default "GPIO_P2" - help - Specify the device name for the PCA95XX I2C-based GPIO chip #2. - -config GPIO_PCA95XX_2_I2C_ADDR - hex "PCA95XX GPIO chip #2 I2C slave address" - depends on GPIO_PCA95XX_2 - help - Specify the I2C slave address for the PCA95XX I2C-based GPIO chip #2. - -config GPIO_PCA95XX_2_I2C_MASTER_DEV_NAME - string "I2C Master where PCA95XX GPIO chip #2 is connected" - depends on GPIO_PCA95XX_2 - help - Specify the device name of the I2C master device to which this - PCA95XX chip #2 is binded. - -config GPIO_PCA95XX_2_HAS_PUD - bool "PCA95XX GPIO chip #2 supports pull-up/pull-down" - depends on GPIO_PCA95XX_2 - help - Enable if the PCA95XX I2C-based GPIO chip #2 supports - pull-up/pull-down. - -config GPIO_PCA95XX_3 - bool "PCA95XX GPIO chip #3" - help - Enable config options for the PCA95XX I2C-based GPIO chip #3. - -config GPIO_PCA95XX_3_DEV_NAME - string "PCA95XX GPIO chip #3 Device Name" - depends on GPIO_PCA95XX_3 - default "GPIO_P3" - help - Specify the device name for the PCA95XX I2C-based GPIO chip #3. - -config GPIO_PCA95XX_3_I2C_ADDR - hex "PCA95XX GPIO chip #3 I2C slave address" - depends on GPIO_PCA95XX_3 - help - Specify the I2C slave address for the PCA95XX I2C-based GPIO chip #3. - -config GPIO_PCA95XX_3_I2C_MASTER_DEV_NAME - string "I2C Master where PCA95XX GPIO chip #3 is connected" - depends on GPIO_PCA95XX_3 - help - Specify the device name of the I2C master device to which this - PCA95XX chip #3 is binded. - -config GPIO_PCA95XX_3_HAS_PUD - bool "PCA95XX GPIO chip #3 supports pull-up/pull-down" - depends on GPIO_PCA95XX_3 - help - Enable if the PCA95XX I2C-based GPIO chip #3 supports - pull-up/pull-down. - endif # GPIO_PCA95XX diff --git a/drivers/gpio/gpio_pca95xx.c b/drivers/gpio/gpio_pca95xx.c index bfc1e4bbd45..56f3a0845e2 100644 --- a/drivers/gpio/gpio_pca95xx.c +++ b/drivers/gpio/gpio_pca95xx.c @@ -588,12 +588,12 @@ static int gpio_pca95xx_init(struct device *dev) } /* Initialization for PCA95XX_0 */ -#ifdef CONFIG_GPIO_PCA95XX_0 +#ifdef DT_INST_0_NXP_PCA95XX static const struct gpio_pca95xx_config gpio_pca95xx_0_cfg = { - .i2c_master_dev_name = CONFIG_GPIO_PCA95XX_0_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = CONFIG_GPIO_PCA95XX_0_I2C_ADDR, + .i2c_master_dev_name = DT_INST_0_NXP_PCA95XX_BUS_NAME, + .i2c_slave_addr = DT_INST_0_NXP_PCA95XX_BASE_ADDRESS, .capabilities = - (CONFIG_GPIO_PCA95XX_0_HAS_PUD ? PCA_HAS_PUD : 0) | + (DT_INST_0_NXP_PCA95XX_HAS_PUD ? PCA_HAS_PUD : 0) | 0, }; @@ -606,21 +606,21 @@ static struct gpio_pca95xx_drv_data gpio_pca95xx_0_drvdata = { }; /* This has to init after I2C master */ -DEVICE_AND_API_INIT(gpio_pca95xx_0, CONFIG_GPIO_PCA95XX_0_DEV_NAME, +DEVICE_AND_API_INIT(gpio_pca95xx_0, DT_INST_0_NXP_PCA95XX_LABEL, gpio_pca95xx_init, &gpio_pca95xx_0_drvdata, &gpio_pca95xx_0_cfg, POST_KERNEL, CONFIG_GPIO_PCA95XX_INIT_PRIORITY, &gpio_pca95xx_drv_api_funcs); -#endif /* CONFIG_GPIO_PCA95XX_0 */ +#endif /* DT_INST_0_NXP_PCA95XX */ /* Initialization for PCA95XX_1 */ -#ifdef CONFIG_GPIO_PCA95XX_1 +#ifdef DT_INST_1_NXP_PCA95XX static const struct gpio_pca95xx_config gpio_pca95xx_1_cfg = { - .i2c_master_dev_name = CONFIG_GPIO_PCA95XX_1_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = CONFIG_GPIO_PCA95XX_1_I2C_ADDR, + .i2c_master_dev_name = DT_INST_1_NXP_PCA95XX_BUS_NAME, + .i2c_slave_addr = DT_INST_1_NXP_PCA95XX_BASE_ADDRESS, .capabilities = - (CONFIG_GPIO_PCA95XX_1_HAS_PUD ? PCA_HAS_PUD : 0) | + (DT_INST_1_NXP_PCA95XX_HAS_PUD ? PCA_HAS_PUD : 0) | 0, }; @@ -633,21 +633,21 @@ static struct gpio_pca95xx_drv_data gpio_pca95xx_1_drvdata = { }; /* This has to init after I2C master */ -DEVICE_AND_API_INIT(gpio_pca95xx_1, CONFIG_GPIO_PCA95XX_1_DEV_NAME, +DEVICE_AND_API_INIT(gpio_pca95xx_1, DT_INST_1_NXP_PCA95XX_LABEL, gpio_pca95xx_init, &gpio_pca95xx_1_drvdata, &gpio_pca95xx_1_cfg, POST_KERNEL, CONFIG_GPIO_PCA95XX_INIT_PRIORITY, &gpio_pca95xx_drv_api_funcs); -#endif /* CONFIG_GPIO_PCA95XX_1 */ +#endif /* DT_INST_1_NXP_PCA95XX */ /* Initialization for PCA95XX_2 */ -#ifdef CONFIG_GPIO_PCA95XX_2 +#ifdef DT_INST_2_NXP_PCA95XX static const struct gpio_pca95xx_config gpio_pca95xx_2_cfg = { - .i2c_master_dev_name = CONFIG_GPIO_PCA95XX_2_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = CONFIG_GPIO_PCA95XX_2_I2C_ADDR, + .i2c_master_dev_name = DT_INST_2_NXP_PCA95XX_BUS_NAME, + .i2c_slave_addr = DT_INST_2_NXP_PCA95XX_BASE_ADDRESS, .capabilities = - (CONFIG_GPIO_PCA95XX_2_HAS_PUD ? PCA_HAS_PUD : 0) | + (DT_INST_2_NXP_PCA95XX_HAS_PUD ? PCA_HAS_PUD : 0) | 0, }; @@ -660,21 +660,21 @@ static struct gpio_pca95xx_drv_data gpio_pca95xx_2_drvdata = { }; /* This has to init after I2C master */ -DEVICE_AND_API_INIT(gpio_pca95xx_2, CONFIG_GPIO_PCA95XX_2_DEV_NAME, +DEVICE_AND_API_INIT(gpio_pca95xx_2, DT_INST_2_NXP_PCA95XX_LABEL, gpio_pca95xx_init, &gpio_pca95xx_2_drvdata, &gpio_pca95xx_2_cfg, POST_KERNEL, CONFIG_GPIO_PCA95XX_INIT_PRIORITY, &gpio_pca95xx_drv_api_funcs); -#endif /* CONFIG_GPIO_PCA95XX_2 */ +#endif /* DT_INST_2_NXP_PCA95XX */ /* Initialization for PCA95XX_3 */ -#ifdef CONFIG_GPIO_PCA95XX_3 +#ifdef DT_INST_3_NXP_PCA95XX static const struct gpio_pca95xx_config gpio_pca95xx_3_cfg = { - .i2c_master_dev_name = CONFIG_GPIO_PCA95XX_3_I2C_MASTER_DEV_NAME, - .i2c_slave_addr = CONFIG_GPIO_PCA95XX_3_I2C_ADDR, + .i2c_master_dev_name = DT_INST_3_NXP_PCA95XX_BUS_NAME, + .i2c_slave_addr = DT_INST_3_NXP_PCA95XX_BASE_ADDRESS, .capabilities = - (CONFIG_GPIO_PCA95XX_3_HAS_PUD ? PCA_HAS_PUD : 0) | + (DT_INST_3_NXP_PCA95XX_HAS_PUD ? PCA_HAS_PUD : 0) | 0, }; @@ -687,10 +687,10 @@ static struct gpio_pca95xx_drv_data gpio_pca95xx_3_drvdata = { }; /* This has to init after I2C master */ -DEVICE_AND_API_INIT(gpio_pca95xx_3, CONFIG_GPIO_PCA95XX_3_DEV_NAME, +DEVICE_AND_API_INIT(gpio_pca95xx_3, DT_INST_3_NXP_PCA95XX_LABEL, gpio_pca95xx_init, &gpio_pca95xx_3_drvdata, &gpio_pca95xx_3_cfg, POST_KERNEL, CONFIG_GPIO_PCA95XX_INIT_PRIORITY, &gpio_pca95xx_drv_api_funcs); -#endif /* CONFIG_GPIO_PCA95XX_3 */ +#endif /* DT_INST_3_NXP_PCA95XX */