[PATCH v2 1/1] gpio: rockchip: Switch to use fwnode instead of of_node
jay.xu at rock-chips.com
jay.xu at rock-chips.com
Wed Aug 31 18:47:39 PDT 2022
Hi
--------------
jay.xu at rock-chips.com
>On Wed, Aug 31, 2022 at 3:45 PM Andy Shevchenko
><andriy.shevchenko at linux.intel.com> wrote:
>>
>> GPIO library now accepts fwnode as a firmware node, so
>> switch the driver to use it.
>>
>> Signed-off-by: Andy Shevchenko <andriy.shevchenko at linux.intel.com>
>> ---
>> v2: fixed compilation errors (LKP), replace some OF calls (Bart)
>> drivers/gpio/gpio-rockchip.c | 38 +++++++++++-------------------
>> drivers/pinctrl/pinctrl-rockchip.h | 2 --
>> 2 files changed, 14 insertions(+), 26 deletions(-)
>>
>> diff --git a/drivers/gpio/gpio-rockchip.c b/drivers/gpio/gpio-rockchip.c
>> index bb50335239ac..e8fa99fd4c80 100644
>> --- a/drivers/gpio/gpio-rockchip.c
>> +++ b/drivers/gpio/gpio-rockchip.c
>> @@ -14,12 +14,11 @@
>> #include <linux/init.h>
>> #include <linux/interrupt.h>
>> #include <linux/io.h>
>> +#include <linux/mod_devicetable.h>
>> #include <linux/module.h>
>> #include <linux/of.h>
>> -#include <linux/of_address.h>
>> -#include <linux/of_device.h>
>> -#include <linux/of_irq.h>
>> #include <linux/pinctrl/pinconf-generic.h>
>> +#include <linux/property.h>
>> #include <linux/regmap.h>
>>
>> #include "../pinctrl/core.h"
>> @@ -518,7 +517,7 @@ static int rockchip_interrupts_register(struct rockchip_pin_bank *bank)
>> struct irq_chip_generic *gc;
>> int ret;
>>
>> - bank->domain = irq_domain_add_linear(bank->of_node, 32,
>> + bank->domain = irq_domain_create_linear(dev_fwnode(bank->dev), 32,
>> &irq_generic_chip_ops, NULL);
>> if (!bank->domain) {
>> dev_warn(bank->dev, "could not init irq domain for bank %s\n",
>> @@ -606,14 +605,10 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
>> * files which don't set the "gpio-ranges" property or systems that
>> * utilize ACPI the driver has to call gpiochip_add_pin_range().
>> */
>> - if (!of_property_read_bool(bank->of_node, "gpio-ranges")) {
>> - struct device_node *pctlnp = of_get_parent(bank->of_node);
>> + if (!device_property_read_bool(bank->dev, "gpio-ranges")) {
>> struct pinctrl_dev *pctldev = NULL;
>>
>> - if (!pctlnp)
>> - return -ENODATA;
>> -
>> - pctldev = of_pinctrl_get(pctlnp);
>> + pctldev = pinctrl_get(bank->dev->parent);
>> if (!pctldev)
>> return -ENODEV;
>>
>> @@ -641,23 +636,20 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank)
>>
>> static int rockchip_get_bank_data(struct rockchip_pin_bank *bank)
>> {
>> + struct platform_device *pdev = to_platform_device(bank->dev);
>> + struct device_node *np = bank->dev->of_node;
>> struct resource res;
>> int id = 0;
>>
>> - if (of_address_to_resource(bank->of_node, 0, &res)) {
>> - dev_err(bank->dev, "cannot find IO resource for bank\n");
>> - return -ENOENT;
>> - }
>> -
>> - bank->reg_base = devm_ioremap_resource(bank->dev, &res);
>> + bank->reg_base = devm_platform_ioremap_resource(pdev, 0);
>> if (IS_ERR(bank->reg_base))
>> return PTR_ERR(bank->reg_base);
>>
>> - bank->irq = irq_of_parse_and_map(bank->of_node, 0);
>> + bank->irq = platform_get_irq(pdev, 0);
>> if (!bank->irq)
>> return -EINVAL;
>>
>> - bank->clk = of_clk_get(bank->of_node, 0);
>> + bank->clk = of_clk_get(np, 0);
>
>Why did you stop above? Why not regular clk_get here?
>
>> if (IS_ERR(bank->clk))
>> return PTR_ERR(bank->clk);
>>
>> @@ -668,7 +660,7 @@ static int rockchip_get_bank_data(struct rockchip_pin_bank *bank)
>> if (id == GPIO_TYPE_V2 || id == GPIO_TYPE_V2_1) {
>> bank->gpio_regs = &gpio_regs_v2;
>> bank->gpio_type = GPIO_TYPE_V2;
>> - bank->db_clk = of_clk_get(bank->of_node, 1);
>> + bank->db_clk = of_clk_get(np, 1);
>
>Ah, the clocks don't have names in DT? That's unfortunate...
The patch add 'clock-names' property for gpio dt node, after that, the driver can change to
devm_clk_get(dev, "bus");
devm_clk_get(dev, "db");
https://patchwork.kernel.org/project/linux-rockchip/patch/20220901013101.2634480-2-jay.xu@rock-chips.com
>
>Bart
>
>> if (IS_ERR(bank->db_clk)) {
>> dev_err(bank->dev, "cannot find debounce clk\n");
>> clk_disable_unprepare(bank->clk);
>> @@ -705,17 +697,16 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
>> {
>> struct device *dev = &pdev->dev;
>> struct device_node *np = dev->of_node;
>> - struct device_node *pctlnp = of_get_parent(np);
>> struct pinctrl_dev *pctldev = NULL;
>> struct rockchip_pin_bank *bank = NULL;
>> struct rockchip_pin_deferred *cfg;
>> static int gpio;
>> int id, ret;
>>
>> - if (!np || !pctlnp)
>> + if (!dev->parent)
>> return -ENODEV;
>>
>> - pctldev = of_pinctrl_get(pctlnp);
>> + pctldev = pinctrl_get(dev->parent);
>> if (!pctldev)
>> return -EPROBE_DEFER;
>>
>> @@ -728,7 +719,6 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
>> return -EINVAL;
>>
>> bank->dev = dev;
>> - bank->of_node = np;
>>
>> raw_spin_lock_init(&bank->slock);
>>
>> @@ -776,7 +766,7 @@ static int rockchip_gpio_probe(struct platform_device *pdev)
>> mutex_unlock(&bank->deferred_lock);
>>
>> platform_set_drvdata(pdev, bank);
>> - dev_info(dev, "probed %pOF\n", np);
>> + dev_info(dev, "probed %pfw\n", dev_fwnode(dev));
>>
>> return 0;
>> }
>> diff --git a/drivers/pinctrl/pinctrl-rockchip.h b/drivers/pinctrl/pinctrl-rockchip.h
>> index 4759f336941e..37a0501bcc03 100644
>> --- a/drivers/pinctrl/pinctrl-rockchip.h
>> +++ b/drivers/pinctrl/pinctrl-rockchip.h
>> @@ -299,7 +299,6 @@ struct rockchip_drv {
>> * @drv: array describing the 4 drive strength sources of the bank
>> * @pull_type: array describing the 4 pull type sources of the bank
>> * @valid: is all necessary information present
>> - * @of_node: dt node of this bank
>> * @drvdata: common pinctrl basedata
>> * @domain: irqdomain of the gpio bank
>> * @gpio_chip: gpiolib chip
>> @@ -327,7 +326,6 @@ struct rockchip_pin_bank {
>> struct rockchip_drv drv[4];
>> enum rockchip_pin_pull_type pull_type[4];
>> bool valid;
>> - struct device_node *of_node;
>> struct rockchip_pinctrl *drvdata;
>> struct irq_domain *domain;
>> struct gpio_chip gpio_chip;
>> --
>> 2.35.1
>>
More information about the Linux-rockchip
mailing list