rockchip-pinctrl fixes
Subsystems (3)
v3 cover rockchip-pinctrl fixes
These patches are required by GKI.
Jianqun Xu (3):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping in gpio_to_irq
drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 43 +++++++++++++++++++----------- 2 files changed, 28 insertions(+), 17 deletions(-)
Signature · 9 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 1/3 pinctrl: rockchip: make driver be tristate module
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
drivers/pinctrl/Kconfig +1 -1
@@ -207,7 +207,7 @@ config PINCTRL_OXNAS select MFD_SYSCON config PINCTRL_ROCKCHIP - bool + tristate "Rockchip gpio and pinctrl driver" depends on OF select PINMUX select GENERIC_PINCONF
drivers/pinctrl/pinctrl-rockchip.c +13 -0
@@ -16,10 +16,12 @@*/ #include <linux/init.h> +#include <linux/module.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/bitops.h> #include <linux/gpio/driver.h> +#include <linux/of_device.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/pinctrl/machine.h>
@@ -4258,3 +4260,14 @@ static int __init rockchip_pinctrl_drv_register(void)return platform_driver_register (&rockchip_pinctrl_driver); }postcore_initcall (rockchip_pinctrl_drv_register); + +static void __exit rockchip_pinctrl_drv_unregister(void) +{ +platform_driver_unregister (&rockchip_pinctrl_driver); +} +module_exit (rockchip_pinctrl_drv_unregister); + +MODULE_DESCRIPTION ("ROCKCHIP Pin Controller Driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:pinctrl-rockchip" ); +MODULE_DEVICE_TABLE (of, rockchip_pinctrl_dt_match);
Signature · 9 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 1/3] pinctrl: rockchip: make driver be tristate module【请注意,邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】
Quoted 45 lines · Jianqun Xu
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Reviewed-by Heiko Stuebner <[email protected]>Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)drivers/pinctrl/Kconfig +1
-1@@ -207,7 +207,7 @@ config PINCTRL_OXNAS select MFD_SYSCON config PINCTRL_ROCKCHIP - bool + tristate "Rockchip gpio and pinctrl driver" depends on OF select PINMUX select GENERIC_PINCONFdrivers/pinctrl/pinctrl-rockchip.c +3
-0@@ -16,10 +16,12 @@*/ #include <linux/init.h> +#include <linux/module.h> #include <linux/platform_device.h> #include <linux/io.h> #include <linux/bitops.h> #include <linux/gpio/driver.h> +#include <linux/of_device.h> #include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/pinctrl/machine.h> @@ -4258,3 +4260,14 @@ static int __init rockchip_pinctrl_drv_register(void)return platform_driver_register (&rockchip_pinctrl_driver); }postcore_initcall (rockchip_pinctrl_drv_register); +
drivers/pinctrl/pinctrl-rockchip.c static int __init rockchip_pinctrl_drv_register(void) · line 4273
Quoted 10 lines
drivers/pinctrl/pinctrl-rockchip.c +10
-0+static void __exit rockchip_pinctrl_drv_unregister(void) +{ +platform_driver_unregister (&rockchip_pinctrl_driver); +} +module_exit (rockchip_pinctrl_drv_unregister); + +MODULE_DESCRIPTION ("ROCKCHIP Pin Controller Driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:pinctrl-rockchip" ); +MODULE_DEVICE_TABLE (of, rockchip_pinctrl_dt_match);
Looks good to me,
Thanks,
- Kever
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 2/3 pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
In reply to Jianqun XuThere need to enable pclk_gpio when do irq_create_mapping, since it will do access to gpio controller.
--- drivers/pinctrl/pinctrl-rockchip.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/pinctrl-rockchip.c +2 -0
@@ -3157,7 +3157,9 @@ static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset)if (!bank->domain)return -ENXIO ; +clk_enable (bank->clk); virq =irq_create_mapping (bank->domain, offset); +clk_disable (bank->clk);return (virq) ? : -ENXIO ; }
Signature · 9 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 2/3] pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq【请注意,邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】
Quoted 14 lines · Jianqun Xu
There need to enable
pclk_gpiowhen doirq_create_mapping, since it will do access to gpio controller.Reviewed-by Heiko Stuebner <[email protected]>Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/pinctrl-rockchip.c | 2 ++ 1 file changed, 2 insertions(+)drivers/pinctrl/pinctrl-rockchip.c +0
-0
drivers/pinctrl/pinctrl-rockchip.c static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset) · line 3165
Quoted 9 lines
drivers/pinctrl/pinctrl-rockchip.c +2
-0@@ -3157,7 +3157,9 @@ static int rockchip_gpio_to_irq(struct gpio_chip *gc, unsigned offset)if (!bank->domain)return -ENXIO ; +clk_enable (bank->clk); virq =irq_create_mapping (bank->domain, offset); +clk_disable (bank->clk);return (virq) ? : -ENXIO ; }
Looks good to me,
Thanks,
- Kever
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v3 3/3 pinctrl: rockchip: create irq mapping in gpio_to_irq
In reply to Jianqun XuRemove totally irq mappings create in probe, the gpio irq mapping will be created when do
gpio_to_irq ->
rockchip_gpio_to_irq ->
irq_create_mappingThis patch can speed up system boot on, also abandon many unused irq mappings' create.
--- drivers/pinctrl/pinctrl-rockchip.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +12 -16
@@ -3198,7 +3198,7 @@ static void rockchip_irq_demux(struct irq_desc *desc) irq =__ffs (pend); pend &= ~BIT (irq); - virq =irq_linear_revmap (bank->domain, irq); + virq =irq_find_mapping (bank->domain, irq);if (!virq) {dev_err (bank->drvdata->dev,"unmapped irq %d\n" , irq);
@@ -3377,7 +3377,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev,unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i, j; +int i;for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) {if (!bank->valid) {
@@ -3404,7 +3404,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev, ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 ,"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,IRQ_GC_INIT_MASK_CACHE ); + clr,0 ,0 );if (ret) {dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , bank->name);
@@ -3413,14 +3413,6 @@ static int rockchip_interrupts_register(struct platform_device *pdev,continue ; } -/* -* Linux assumes that all interrupts start out disabled/masked. -* Our driver only uses the concept of masked and always keeps -* things enabled, so for us that's all masked and all enabled. -*/ -writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTMASK ); -writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTEN ); - gc =irq_get_domain_generic_chip (bank->domain,0 ); gc->reg_base = bank->reg_base; gc->private = bank;
@@ -3437,13 +3429,17 @@ static int rockchip_interrupts_register(struct platform_device *pdev, gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; gc->wake_enabled =IRQ_MSK (bank->nr_pins); +/* +* Linux assumes that all interrupts start out disabled/masked. +* Our driver only uses the concept of masked and always keeps +* things enabled, so for us that's all masked and all enabled. +*/ +writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTMASK ); +writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTEN ); + gc->mask_cache =0xffffffff ; +irq_set_chained_handler_and_data (bank->irq, rockchip_irq_demux, bank); - -/* map the gpio irqs here, when the clock is still running */ -for (j =0 ; j <32 ; j++) -irq_create_mapping (bank->domain, j); -clk_disable (bank->clk); }
Signature · 9 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH v3 3/3] pinctrl: rockchip: create irq mapping in gpio_to_irq【请注意,邮件由linux-rockchip-bounces+kever.yang=rock-chips.com@lists.infradead.org代发】
Quoted 74 lines · Jianqun Xu
Remove totally irq mappings create in probe, the gpio irq mapping will be created when do
gpio_to_irq -> rockchip_gpio_to_irq -> irq_create_mappingThis patch can speed up system boot on, also abandon many unused irq mappings' create.
Reviewed-by Heiko Stuebner <[email protected]>Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/pinctrl-rockchip.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)drivers/pinctrl/pinctrl-rockchip.c +12
-11@@ -3198,7 +3198,7 @@ static void rockchip_irq_demux(struct irq_desc *desc) irq =__ffs (pend); pend &= ~BIT (irq); - virq =irq_linear_revmap (bank->domain, irq); + virq =irq_find_mapping (bank->domain, irq);if (!virq) {dev_err (bank->drvdata->dev,"unmapped irq %d\n" , irq);@@ -3377,7 +3377,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev,unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i, j; +int i;for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) {if (!bank->valid) {@@ -3404,7 +3404,7 @@ static int rockchip_interrupts_register(struct platform_device *pdev, ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 ,"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,IRQ_GC_INIT_MASK_CACHE ); + clr,0 ,0 );if (ret) {dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , bank->name);@@ -3413,14 +3413,6 @@ static int rockchip_interrupts_register(struct platform_device *pdev,continue ; } -/* -* Linux assumes that all interrupts start out disabled/masked. -* Our driver only uses the concept of masked and always keeps -* things enabled, so for us that's all masked and all enabled. -*/ -writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTMASK ); -writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTEN ); - gc =irq_get_domain_generic_chip (bank->domain,0 ); gc->reg_base = bank->reg_base; gc->private = bank;@@ -3437,13 +3429,17 @@ static int rockchip_interrupts_register(struct platform_device *pdev, gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; gc->wake_enabled =IRQ_MSK (bank->nr_pins); +/* +* Linux assumes that all interrupts start out disabled/masked. +* Our driver only uses the concept of masked and always keeps +* things enabled, so for us that's all masked and all enabled. +*/ +writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTMASK ); +writel_relaxed (0xffffffff , bank->reg_base +GPIO_INTEN ); + gc->mask_cache =0xffffffff ; +
drivers/pinctrl/pinctrl-rockchip.c static int rockchip_interrupts_register(struct platform_device *pdev, · line 3445
Quoted 10 lines
drivers/pinctrl/pinctrl-rockchip.c +0
-5irq_set_chained_handler_and_data (bank->irq, rockchip_irq_demux, bank); - -/* map the gpio irqs here, when the clock is still running */ -for (j =0 ; j <32 ; j++) -irq_create_mapping (bank->domain, j); -clk_disable (bank->clk); }
Looks good to me,
Thanks,
- Kever
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerHi Jianqun,
Am Dienstag, 13. Oktober 2020, 08:37:28 CEST schrieb Jianqun Xu:
Quoted 6 lines
These patches are required by GKI.
Jianqun Xu (3):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk forrockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping ingpio_to_irq
looks good to go as fixes.
What happenend to the "populate platform device for rockchip gpio" patch though - more out of cursiosity.
Heiko
Quoted 6 lines · Heiko Stübner
Quoted 4 lines
Jianqun Xu (3):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk forrockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping ingpio_to_irqlooks good to go as fixes.
I record that as Acked-by :)
Yours,
Linus Walleij
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 10 lines · Linus Walleij
Quoted 6 lines · Heiko Stübner
Quoted 4 lines
Jianqun Xu (3):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk forrockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping ingpio_to_irqlooks good to go as fixes.
I record that as Acked-by :)
Aha they are already reviewed-by in the patches. OK then, sorry for the confusion.
Yours,
Linus Walleij
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 6 lines · Jianqun Xu
These patches are required by GKI.
Jianqun Xu (3):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk forrockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping ingpio_to_irq
Patches applied for fixes.
Yours,
Linus Walleij
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip