rockchip-pinctrl fixes for GKI
Subsystems (3)
cover rockchip-pinctrl fixes for GKI
Fix rockchip pinctrl driver for GKI
Jianqun Xu (6):
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
pinctrl: rockchip: do not set gpio if bank invalid
pinctrl: rockchip: fix crash caused by invalid gpio bank
pinctrl: rockchip: populate platform device for rockchip gpio
drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 289 +++++++++++++++++------------ 2 files changed, 171 insertions(+), 120 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/6 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 | 7 +++++++ 2 files changed, 8 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" select PINMUX select GENERIC_PINCONF select GENERIC_IRQ_CHIP
drivers/pinctrl/pinctrl-rockchip.c +7 -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>
@@ -4256,3 +4258,8 @@ static int __init rockchip_pinctrl_drv_register(void)return platform_driver_register (&rockchip_pinctrl_driver); }postcore_initcall (rockchip_pinctrl_drv_register); + +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
kernel test robot
build botRe: [PATCH 1/6] pinctrl: rockchip: make driver be tristate module
Thank you for the patch! Yet something to improve:
Hi Jianqun,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rockchip/for-next]
[also build test ERROR on pinctrl/devel v5.9-rc3 next-20200828] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianqun-Xu/rockchip-pinctrl-fixes-for-GKI/20200831-165040 base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next config: x86_64-randconfig-m031-20200901 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=x86_64
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_pinctrl_parse_groups':
>> drivers/pinctrl/pinctrl-rockchip.c:2881:9: error: implicit declaration of function 'pinconf_generic_parse_dt_config'; did you mean 'pinconf_generic_dump_config'? [-Werror=implicit-function-declaration]
2881 | ret = pinconf_generic_parse_dt_config(np_config, NULL,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| pinconf_generic_dump_config
drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_gpiolib_register':
>> drivers/pinctrl/pinctrl-rockchip.c:3473:5: error: 'struct gpio_chip' has no member named 'of_node'
3473 | gc->of_node = bank->of_node;
| ^~
At top level:
drivers/pinctrl/pinctrl-rockchip.c:2804:34: warning: 'rockchip_bank_match' defined but not used [-Wunused-const-variable=]
2804 | static const struct of_device_id rockchip_bank_match[] = {
| ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
# https://github.com/0day-ci/linux/commit/38fa905767d010bbbc1035b48494d4a83bb72410
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianqun-Xu/rockchip-pinctrl-fixes-for-GKI/20200831-165040 git checkout 38fa905767d010bbbc1035b48494d4a83bb72410
vim +2881 drivers/pinctrl/pinctrl-rockchip.c
d3e5116119bd02 Heiko Stübner 2013-06-10 2823
d3e5116119bd02 Heiko Stübner 2013-06-10 2824 static int rockchip_pinctrl_parse_groups(struct device_node *np,
d3e5116119bd02 Heiko Stübner 2013-06-10 2825 struct rockchip_pin_group *grp,
d3e5116119bd02 Heiko Stübner 2013-06-10 2826 struct rockchip_pinctrl *info,
d3e5116119bd02 Heiko Stübner 2013-06-10 2827 u32 index)
d3e5116119bd02 Heiko Stübner 2013-06-10 2828 {
d3e5116119bd02 Heiko Stübner 2013-06-10 2829 struct rockchip_pin_bank *bank;
d3e5116119bd02 Heiko Stübner 2013-06-10 2830 int size;
d3e5116119bd02 Heiko Stübner 2013-06-10 2831 const __be32 *list;
d3e5116119bd02 Heiko Stübner 2013-06-10 2832 int num;
d3e5116119bd02 Heiko Stübner 2013-06-10 2833 int i, j;
d3e5116119bd02 Heiko Stübner 2013-06-10 2834 int ret;
d3e5116119bd02 Heiko Stübner 2013-06-10 2835
94f4e54cecaf3e Rob Herring 2018-08-27 2836 dev_dbg(info->dev, "group(%d): %pOFn\n", index, np);
d3e5116119bd02 Heiko Stübner 2013-06-10 2837
d3e5116119bd02 Heiko Stübner 2013-06-10 2838 /* Initialise group */
d3e5116119bd02 Heiko Stübner 2013-06-10 2839 grp->name = np->name;
d3e5116119bd02 Heiko Stübner 2013-06-10 2840
d3e5116119bd02 Heiko Stübner 2013-06-10 2841 /*
d3e5116119bd02 Heiko Stübner 2013-06-10 2842 * the binding format is rockchip,pins = <bank pin mux CONFIG>,
d3e5116119bd02 Heiko Stübner 2013-06-10 2843 * do sanity check and calculate pins number
d3e5116119bd02 Heiko Stübner 2013-06-10 2844 */
d3e5116119bd02 Heiko Stübner 2013-06-10 2845 list = of_get_property(np, "rockchip,pins", &size);
d3e5116119bd02 Heiko Stübner 2013-06-10 2846 /* we do not check return since it's safe node passed down */
d3e5116119bd02 Heiko Stübner 2013-06-10 2847 size /= sizeof(*list);
d3e5116119bd02 Heiko Stübner 2013-06-10 2848 if (!size || size % 4) {
d3e5116119bd02 Heiko Stübner 2013-06-10 2849 dev_err(info->dev, "wrong pins number or pins and configs should be by 4\n");
d3e5116119bd02 Heiko Stübner 2013-06-10 2850 return -EINVAL;
d3e5116119bd02 Heiko Stübner 2013-06-10 2851 }
d3e5116119bd02 Heiko Stübner 2013-06-10 2852
d3e5116119bd02 Heiko Stübner 2013-06-10 2853 grp->npins = size / 4;
d3e5116119bd02 Heiko Stübner 2013-06-10 2854
a86854d0c599b3 Kees Cook 2018-06-12 2855 grp->pins = devm_kcalloc(info->dev, grp->npins, sizeof(unsigned int),
d3e5116119bd02 Heiko Stübner 2013-06-10 2856 GFP_KERNEL);
a86854d0c599b3 Kees Cook 2018-06-12 2857 grp->data = devm_kcalloc(info->dev,
a86854d0c599b3 Kees Cook 2018-06-12 2858 grp->npins,
d3e5116119bd02 Heiko Stübner 2013-06-10 2859 sizeof(struct rockchip_pin_config),
d3e5116119bd02 Heiko Stübner 2013-06-10 2860 GFP_KERNEL);
d3e5116119bd02 Heiko Stübner 2013-06-10 2861 if (!grp->pins || !grp->data)
d3e5116119bd02 Heiko Stübner 2013-06-10 2862 return -ENOMEM;
d3e5116119bd02 Heiko Stübner 2013-06-10 2863
d3e5116119bd02 Heiko Stübner 2013-06-10 2864 for (i = 0, j = 0; i < size; i += 4, j++) {
d3e5116119bd02 Heiko Stübner 2013-06-10 2865 const __be32 *phandle;
d3e5116119bd02 Heiko Stübner 2013-06-10 2866 struct device_node *np_config;
d3e5116119bd02 Heiko Stübner 2013-06-10 2867
d3e5116119bd02 Heiko Stübner 2013-06-10 2868 num = be32_to_cpu(*list++);
d3e5116119bd02 Heiko Stübner 2013-06-10 2869 bank = bank_num_to_bank(info, num);
d3e5116119bd02 Heiko Stübner 2013-06-10 2870 if (IS_ERR(bank))
d3e5116119bd02 Heiko Stübner 2013-06-10 2871 return PTR_ERR(bank);
d3e5116119bd02 Heiko Stübner 2013-06-10 2872
d3e5116119bd02 Heiko Stübner 2013-06-10 2873 grp->pins[j] = bank->pin_base + be32_to_cpu(*list++);
d3e5116119bd02 Heiko Stübner 2013-06-10 2874 grp->data[j].func = be32_to_cpu(*list++);
d3e5116119bd02 Heiko Stübner 2013-06-10 2875
d3e5116119bd02 Heiko Stübner 2013-06-10 2876 phandle = list++;
d3e5116119bd02 Heiko Stübner 2013-06-10 2877 if (!phandle)
d3e5116119bd02 Heiko Stübner 2013-06-10 2878 return -EINVAL;
d3e5116119bd02 Heiko Stübner 2013-06-10 2879
d3e5116119bd02 Heiko Stübner 2013-06-10 2880 np_config = of_find_node_by_phandle(be32_to_cpup(phandle));
dd4d01f7bad886 Soren Brinkmann 2015-01-09 @2881 ret = pinconf_generic_parse_dt_config(np_config, NULL,
d3e5116119bd02 Heiko Stübner 2013-06-10 2882 &grp->data[j].configs, &grp->data[j].nconfigs);
d3e5116119bd02 Heiko Stübner 2013-06-10 2883 if (ret)
d3e5116119bd02 Heiko Stübner 2013-06-10 2884 return ret;
d3e5116119bd02 Heiko Stübner 2013-06-10 2885 }
d3e5116119bd02 Heiko Stübner 2013-06-10 2886
d3e5116119bd02 Heiko Stübner 2013-06-10 2887 return 0;
d3e5116119bd02 Heiko Stübner 2013-06-10 2888 }
d3e5116119bd02 Heiko Stübner 2013-06-10 2889 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Heiko Stübner
maintainerRe: [PATCH 1/6] pinctrl: rockchip: make driver be tristate module
Hi,
Am Dienstag, 1. September 2020, 12:13:16 CEST schrieb kernel test robot:
Quoted 29 lines
Hi Jianqun,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rockchip/for-next]
[also build test ERROR on pinctrl/devel v5.9-rc3 next-20200828] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]url: https://github.com/0day-ci/linux/commits/Jianqun-Xu/rockchip-pinctrl-fixes-for-GKI/20200831-165040 base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next config: x86_64-randconfig-m031-20200901 (attached as .config) compiler: gcc-9 (Debian 9.3.0-15) 9.3.0 reproduce (this is a W=1 build): # save the attached .config to linux build tree make W=1 ARCH=x86_64If you fix the issue, kindly add following tag as appropriate
Reported-by kernel test robot <[email protected]>All errors (new ones prefixed by >>):
drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_pinctrl_parse_groups':Quoted 1 line
Quoted 1 line
drivers/pinctrl/pinctrl-rockchip.c:2881:9: error: implicit declaration of function 'pinconf_generic_parse_dt_config'; did you mean 'pinconf_generic_dump_config'? [-Werror=implicit-function-declaration]2881 | ret = pinconf_generic_parse_dt_config(np_config, NULL, | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | pinconf_generic_dump_config
drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_gpiolib_register':
Quoted 8 lines
Quoted 1 line
Quoted 1 line
drivers/pinctrl/pinctrl-rockchip.c:3473:5: error: 'structgpio_chip' has no member named 'of_node'3473 | gc->of_node = bank->of_node; | ^~ At top level: drivers/pinctrl/pinctrl-rockchip.c:2804:34: warning: 'rockchip_bank_match' defined but not used [-Wunused-const-variable=] 2804 | static const struct of_device_id rockchip_bank_match[] = { | ^~~~~~~~~~~~~~~~~~~cc1: some warnings being treated as errors
these errors are unrelated to this patch, and I addressed them in [PATCH] pinctrl: rockchip: depend on OF [0]
Heiko
[0] http://lore.kernel.org/r/20200905214955.907950-1-heiko(a)sntech.de
Quoted 79 lines
# https://github.com/0day-ci/linux/commit/38fa905767d010bbbc1035b48494d4a83bb72410
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Jianqun-Xu/rockchip-pinctrl-fixes-for-GKI/20200831-165040 git checkout38fa905767d010bbbc1035b48494d4a83bb72410
vim +2881drivers/pinctrl/pinctrl-rockchip.cd3e5116119bd02 Heiko Stübner 2013-06-10 2823 d3e5116119bd02 Heiko Stübner 2013-06-10 2824 static int rockchip_pinctrl_parse_groups(struct device_node *np, d3e5116119bd02 Heiko Stübner 2013-06-10 2825 struct rockchip_pin_group *grp, d3e5116119bd02 Heiko Stübner 2013-06-10 2826 struct rockchip_pinctrl *info, d3e5116119bd02 Heiko Stübner 2013-06-10 2827 u32 index) d3e5116119bd02 Heiko Stübner 2013-06-10 2828 { d3e5116119bd02 Heiko Stübner 2013-06-10 2829 struct rockchip_pin_bank *bank; d3e5116119bd02 Heiko Stübner 2013-06-10 2830 int size; d3e5116119bd02 Heiko Stübner 2013-06-10 2831 const __be32 *list; d3e5116119bd02 Heiko Stübner 2013-06-10 2832 int num; d3e5116119bd02 Heiko Stübner 2013-06-10 2833 int i, j; d3e5116119bd02 Heiko Stübner 2013-06-10 2834 int ret; d3e5116119bd02 Heiko Stübner 2013-06-10 2835 94f4e54cecaf3e Rob Herring 2018-08-27 2836 dev_dbg(info->dev, "group(%d): %pOFn\n", index, np); d3e5116119bd02 Heiko Stübner 2013-06-10 2837 d3e5116119bd02 Heiko Stübner 2013-06-10 2838 /* Initialise group */ d3e5116119bd02 Heiko Stübner 2013-06-10 2839 grp->name = np->name; d3e5116119bd02 Heiko Stübner 2013-06-10 2840 d3e5116119bd02 Heiko Stübner 2013-06-10 2841 /* d3e5116119bd02 Heiko Stübner 2013-06-10 2842 * the binding format is rockchip,pins = <bank pin mux CONFIG>, d3e5116119bd02 Heiko Stübner 2013-06-10 2843 * do sanity check and calculate pins number d3e5116119bd02 Heiko Stübner 2013-06-10 2844 */ d3e5116119bd02 Heiko Stübner 2013-06-10 2845 list = of_get_property(np, "rockchip,pins", &size); d3e5116119bd02 Heiko Stübner 2013-06-10 2846 /* we do not check return since it's safe node passed down */ d3e5116119bd02 Heiko Stübner 2013-06-10 2847 size /= sizeof(*list); d3e5116119bd02 Heiko Stübner 2013-06-10 2848 if (!size || size % 4) { d3e5116119bd02 Heiko Stübner 2013-06-10 2849 dev_err(info->dev, "wrong pins number or pins and configs should be by 4\n"); d3e5116119bd02 Heiko Stübner 2013-06-10 2850 return -EINVAL; d3e5116119bd02 Heiko Stübner 2013-06-10 2851 } d3e5116119bd02 Heiko Stübner 2013-06-10 2852 d3e5116119bd02 Heiko Stübner 2013-06-10 2853 grp->npins = size / 4; d3e5116119bd02 Heiko Stübner 2013-06-10 2854 a86854d0c599b3 Kees Cook 2018-06-12 2855 grp->pins = devm_kcalloc(info->dev, grp->npins, sizeof(unsigned int), d3e5116119bd02 Heiko Stübner 2013-06-10 2856 GFP_KERNEL); a86854d0c599b3 Kees Cook 2018-06-12 2857 grp->data = devm_kcalloc(info->dev, a86854d0c599b3 Kees Cook 2018-06-12 2858 grp->npins, d3e5116119bd02 Heiko Stübner 2013-06-10 2859 sizeof(struct rockchip_pin_config), d3e5116119bd02 Heiko Stübner 2013-06-10 2860 GFP_KERNEL); d3e5116119bd02 Heiko Stübner 2013-06-10 2861 if (!grp->pins || !grp->data) d3e5116119bd02 Heiko Stübner 2013-06-10 2862 return -ENOMEM; d3e5116119bd02 Heiko Stübner 2013-06-10 2863 d3e5116119bd02 Heiko Stübner 2013-06-10 2864 for (i = 0, j = 0; i < size; i += 4, j++) { d3e5116119bd02 Heiko Stübner 2013-06-10 2865 const __be32 *phandle; d3e5116119bd02 Heiko Stübner 2013-06-10 2866 struct device_node *np_config; d3e5116119bd02 Heiko Stübner 2013-06-10 2867 d3e5116119bd02 Heiko Stübner 2013-06-10 2868 num = be32_to_cpu(*list++); d3e5116119bd02 Heiko Stübner 2013-06-10 2869 bank = bank_num_to_bank(info, num); d3e5116119bd02 Heiko Stübner 2013-06-10 2870 if (IS_ERR(bank)) d3e5116119bd02 Heiko Stübner 2013-06-10 2871 return PTR_ERR(bank); d3e5116119bd02 Heiko Stübner 2013-06-10 2872 d3e5116119bd02 Heiko Stübner 2013-06-10 2873 grp->pins[j] = bank->pin_base + be32_to_cpu(*list++); d3e5116119bd02 Heiko Stübner 2013-06-10 2874 grp->data[j].func = be32_to_cpu(*list++); d3e5116119bd02 Heiko Stübner 2013-06-10 2875 d3e5116119bd02 Heiko Stübner 2013-06-10 2876 phandle = list++; d3e5116119bd02 Heiko Stübner 2013-06-10 2877 if (!phandle) d3e5116119bd02 Heiko Stübner 2013-06-10 2878 return -EINVAL; d3e5116119bd02 Heiko Stübner 2013-06-10 2879 d3e5116119bd02 Heiko Stübner 2013-06-10 2880 np_config = of_find_node_by_phandle(be32_to_cpup(phandle)); dd4d01f7bad886 Soren Brinkmann 2015-01-09 @2881 ret = pinconf_generic_parse_dt_config(np_config, NULL, d3e5116119bd02 Heiko Stübner 2013-06-10 2882 &grp->data[j].configs, &grp->data[j].nconfigs); d3e5116119bd02 Heiko Stübner 2013-06-10 2883 if (ret) d3e5116119bd02 Heiko Stübner 2013-06-10 2884 return ret; d3e5116119bd02 Heiko Stübner 2013-06-10 2885 } d3e5116119bd02 Heiko Stübner 2013-06-10 2886 d3e5116119bd02 Heiko Stübner 2013-06-10 2887 return 0; d3e5116119bd02 Heiko Stübner 2013-06-10 2888 } d3e5116119bd02 Heiko Stübner 2013-06-10 2889---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH 1/6] pinctrl: rockchip: make driver be tristate module
In reply to Jianqun XuAm Montag, 31. August 2020, 10:47:48 CEST schrieb Jianqun Xu:
Quoted 4 lines
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Signed-off-by Jianqun Xu <[email protected]>
Quoted 45 lines
--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 7 +++++++ 2 files changed, 8 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" select PINMUX select GENERIC_PINCONF select GENERIC_IRQ_CHIPdrivers/pinctrl/pinctrl-rockchip.c +7
-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> @@ -4256,3 +4258,8 @@ static int __init rockchip_pinctrl_drv_register(void)return platform_driver_register (&rockchip_pinctrl_driver); }postcore_initcall (rockchip_pinctrl_drv_register); + +MODULE_DESCRIPTION ("ROCKCHIP Pin Controller Driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:pinctrl-rockchip" ); +MODULE_DEVICE_TABLE (of, rockchip_pinctrl_dt_match);
Heiko Stübner
maintainerRe: [PATCH 1/6] pinctrl: rockchip: make driver be tristate module
Am Sonntag, 6. September 2020, 00:01:55 CEST schrieb Heiko Stübner:
Quoted 7 lines
Am Montag, 31. August 2020, 10:47:48 CEST schrieb Jianqun Xu:
Quoted 4 lines
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Signed-off-by Jianqun Xu <[email protected]>Reviewed-by Heiko Stuebner <[email protected]>
I take this back.
What happens when you actually unload the module now?
I checked and all the pinctrl stuff itself is using devm-functions so should be safe, but you're missing the
platform_driver_unregister part that should happen as well.
Heiko
Quoted 47 lines
Quoted 45 lines
--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 7 +++++++ 2 files changed, 8 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" select PINMUX select GENERIC_PINCONF select GENERIC_IRQ_CHIPdrivers/pinctrl/pinctrl-rockchip.c +7
-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> @@ -4256,3 +4258,8 @@ static int __init rockchip_pinctrl_drv_register(void)return platform_driver_register (&rockchip_pinctrl_driver); }postcore_initcall (rockchip_pinctrl_drv_register); + +MODULE_DESCRIPTION ("ROCKCHIP Pin Controller Driver" ); +MODULE_LICENSE ("GPL" ); +MODULE_ALIAS ("platform:pinctrl-rockchip" ); +MODULE_DEVICE_TABLE (of, rockchip_pinctrl_dt_match);
PATCH 2/6 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
@@ -3155,7 +3155,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 · 1 line
2.17.1
Re: [PATCH 2/6] pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq
Am Montag, 31. August 2020, 10:47:49 CEST schrieb Jianqun Xu:
Quoted 4 lines
There need to enable
pclk_gpiowhen doirq_create_mapping, since it will do access to gpio controller.Signed-off-by Jianqun Xu <[email protected]>
Quoted 19 lines
--- drivers/pinctrl/pinctrl-rockchip.c | 2 ++ 1 file changed, 2 insertions(+)drivers/pinctrl/pinctrl-rockchip.c +2
-0@@ -3155,7 +3155,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 ; }
PATCH 3/6 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
@@ -3196,7 +3196,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);
@@ -3375,7 +3375,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) {
@@ -3402,7 +3402,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);
@@ -3411,14 +3411,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;
@@ -3435,13 +3427,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 3/6] pinctrl: rockchip: create irq mapping in gpio_to_irq
Am Montag, 31. August 2020, 10:47:50 CEST schrieb Jianqun Xu:
Quoted 10 lines
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.
Signed-off-by Jianqun Xu <[email protected]>
Quoted 74 lines
--- drivers/pinctrl/pinctrl-rockchip.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-)drivers/pinctrl/pinctrl-rockchip.c +12
-16@@ -3196,7 +3196,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);@@ -3375,7 +3375,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) {@@ -3402,7 +3402,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);@@ -3411,14 +3411,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;@@ -3435,13 +3427,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); }
PATCH 4/6 pinctrl: rockchip: do not set gpio if bank invalid
In reply to Jianqun XuAdd valid check for gpio bank.
--- drivers/pinctrl/pinctrl-rockchip.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/pinctrl/pinctrl-rockchip.c +6 -0
@@ -2687,6 +2687,9 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,return rc;break ;case PIN_CONFIG_OUTPUT : +if (!bank->valid) +return -ENOTSUPP ; +rockchip_gpio_set (&bank->gpio_chip, pin - bank->pin_base, arg); rc = _rockchip_pmx_gpio_set_direction(&bank->gpio_chip,
@@ -2752,6 +2755,9 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, arg =1 ;break ;case PIN_CONFIG_OUTPUT : +if (!bank->valid) +return -ENOTSUPP ; + rc =rockchip_get_mux (bank, pin - bank->pin_base);if (rc !=RK_FUNC_GPIO )return -EINVAL ;
Signature · 1 line
2.17.1
Heiko Stübner
maintainerRe: [PATCH 4/6] pinctrl: rockchip: do not set gpio if bank invalid
Am Montag, 31. August 2020, 10:47:51 CEST schrieb Jianqun Xu:
Quoted 1 line
Add valid check for gpio bank.
As this obviously fixes a problem you encountered please elaborate a bit more. Just so that people reading the log later understand when this issue surfaced.
Also - maybe even more important - why is this limited to PIN_CONFIG_OUTPUT? Like when the whole bank is not valid, you should be able to return the -ENOTSUPP even before entering the "for" loop in these functions.
Quoted 1 line
Change-Id: Ib03e2910a7316bd61df18236151e371c4d04077a
Please remove the changeId.
Thanks
Heiko
Quoted 30 lines
Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/pinctrl-rockchip.c | 6 ++++++ 1 file changed, 6 insertions(+)drivers/pinctrl/pinctrl-rockchip.c +6
-0@@ -2687,6 +2687,9 @@ static int rockchip_pinconf_set(struct pinctrl_dev *pctldev, unsigned int pin,return rc;break ;case PIN_CONFIG_OUTPUT : +if (!bank->valid) +return -ENOTSUPP ; +rockchip_gpio_set (&bank->gpio_chip, pin - bank->pin_base, arg); rc = _rockchip_pmx_gpio_set_direction(&bank->gpio_chip,@@ -2752,6 +2755,9 @@ static int rockchip_pinconf_get(struct pinctrl_dev *pctldev, unsigned int pin, arg =1 ;break ;case PIN_CONFIG_OUTPUT : +if (!bank->valid) +return -ENOTSUPP ; + rc =rockchip_get_mux (bank, pin - bank->pin_base);if (rc !=RK_FUNC_GPIO )return -EINVAL ;
PATCH 5/6 pinctrl: rockchip: fix crash caused by invalid gpio bank
In reply to Jianqun XuAdd valid check for gpio bank.
--- drivers/pinctrl/pinctrl-rockchip.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +8 -2
@@ -2526,9 +2526,9 @@ static int rockchip_pmx_set(struct pinctrl_dev *pctldev, unsigned selector,break ; } -if (ret) { +if (ret && cnt) {/* revert the already done pin settings */ -for (cnt--; cnt >=0 ; cnt--) +for (cnt--; cnt >=0 && !data[cnt].func; cnt--)rockchip_set_mux (bank, pins[cnt] - bank->pin_base,0 );return ret;
@@ -2599,9 +2599,13 @@ static int rockchip_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, unsigned offset, bool input) {struct rockchip_pinctrl *info =pinctrl_dev_get_drvdata (pctldev); +struct rockchip_pin_bank *bank = &info->ctrl->pin_banks[offset /32 ];struct gpio_chip *chip;int pin; +if (!bank || !bank->valid) +return 0 ; + chip = range->gc; pin = offset - chip->base; dev_dbg(info->dev, "gpio_direction for pin %u as %s-%d to %s\n",
@@ -3022,6 +3026,8 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,for (bank =0 ; bank < info->ctrl->nr_banks; ++bank) { pin_bank = &info->ctrl->pin_banks[bank]; +if (!pin_bank->valid) +continue ; pin_bank->grange.name = pin_bank->name; pin_bank->grange.id = bank; pin_bank->grange.pin_base = pin_bank->pin_base;
Signature · 1 line
2.17.1
Heiko Stübner
maintainerRe: [PATCH 5/6] pinctrl: rockchip: fix crash caused by invalid gpio bank
Hi,
Am Montag, 31. August 2020, 10:50:10 CEST schrieb Jianqun Xu:
Quoted 1 line
Add valid check for gpio bank.
Please add more description on where this happened.
Quoted 1 line
Change-Id: Ia4609c3045b5df7879beab3c15d791ff54a1f49b
Please drop the change-id.
Quoted 10 lines
Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/pinctrl-rockchip.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)drivers/pinctrl/pinctrl-rockchip.c +0
-0
drivers/pinctrl/pinctrl-rockchip.c static int rockchip_pmx_set(struct pinctrl_dev *pctldev, unsigned selector, · line 2531
Quoted 8 lines
drivers/pinctrl/pinctrl-rockchip.c +2
-2@@ -2526,9 +2526,9 @@ static int rockchip_pmx_set(struct pinctrl_dev *pctldev, unsigned selector,break ; } -if (ret) { +if (ret && cnt) {/* revert the already done pin settings */ -for (cnt--; cnt >=0 ; cnt--) +for (cnt--; cnt >=0 && !data[cnt].func; cnt--)
This looks unrelated and as it's not a "check for a valid gpio-bank" it should become a separate patch with a commit message describing it nicely.
Quoted 18 lines
drivers/pinctrl/pinctrl-rockchip.c +4
-0rockchip_set_mux (bank, pins[cnt] - bank->pin_base,0 );return ret;@@ -2599,9 +2599,13 @@ static int rockchip_pmx_gpio_set_direction(struct pinctrl_dev *pctldev, unsigned offset, bool input) {struct rockchip_pinctrl *info =pinctrl_dev_get_drvdata (pctldev); +struct rockchip_pin_bank *bank = &info->ctrl->pin_banks[offset /32 ];struct gpio_chip *chip;int pin; +if (!bank || !bank->valid) +return 0 ; + chip = range->gc; pin = offset - chip->base; dev_dbg(info->dev, "gpio_direction for pin %u as %s-%d to %s\n",
drivers/pinctrl/pinctrl-rockchip.c static int rockchip_pinctrl_register(struct platform_device *pdev, · line 3030
Quoted 5 lines
drivers/pinctrl/pinctrl-rockchip.c +2
-0@@ -3022,6 +3026,8 @@ static int rockchip_pinctrl_register(struct platform_device *pdev,for (bank =0 ; bank < info->ctrl->nr_banks; ++bank) { pin_bank = &info->ctrl->pin_banks[bank]; +if (!pin_bank->valid) +continue ;
Please add a blank line here
drivers/pinctrl/pinctrl-rockchip.c static int rockchip_pinctrl_register(struct platform_device *pdev, · line 3033
Quoted 4 lines
drivers/pinctrl/pinctrl-rockchip.c +0
-0pin_bank->grange.name = pin_bank->name; pin_bank->grange.id = bank; pin_bank->grange.pin_base = pin_bank->pin_base;
Thanks
Heiko
PATCH 6/6 pinctrl: rockchip: populate platform device for rockchip gpio
In reply to Jianqun XuRegister both gpio driver and device as part of driver model, so that the '-gpio'/'-gpios' dependency in dts can be correctly handled by of_devlink/of_fwlink.
--- drivers/pinctrl/pinctrl-rockchip.c | 256 ++++++++++++++++------------- 1 file changed, 145 insertions(+), 111 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +145 -111
@@ -3380,139 +3380,121 @@ static void rockchip_irq_disable(struct irq_data *d) }static int rockchip_interrupts_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_warn (&pdev->dev,"bank %s is not valid\n" , + bank->name); +return -EINVAL ; + } - ret =clk_enable (bank->clk); -if (ret) { -dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , - bank->name); -continue ; - } + ret =clk_enable (bank->clk); +if (ret) { +dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , + bank->name); +return ret; + } - bank->domain =irq_domain_add_linear (bank->of_node,32 , - &irq_generic_chip_ops,NULL ); -if (!bank->domain) { -dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , - bank->name); -clk_disable (bank->clk); -continue ; - } + bank->domain =irq_domain_add_linear (bank->of_node,32 , + &irq_generic_chip_ops,NULL ); +if (!bank->domain) { +dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , + bank->name); +clk_disable (bank->clk); +return -EINVAL ; + } - ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , -"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,0 ); -if (ret) { -dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , - bank->name); -irq_domain_remove (bank->domain); -clk_disable (bank->clk); -continue ; - } + ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , +"rockchip_gpio_irq" , handle_level_irq, + clr,0 ,0 ); +if (ret) { +dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , + bank->name); +irq_domain_remove (bank->domain); +clk_disable (bank->clk); +return ret; + } - gc =irq_get_domain_generic_chip (bank->domain,0 ); - gc->reg_base = bank->reg_base; - gc->private = bank; - gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; - gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; - gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; - gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; - gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; - gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; - gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; - gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; - gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; - gc->wake_enabled =IRQ_MSK (bank->nr_pins); + gc =irq_get_domain_generic_chip (bank->domain,0 ); + gc->reg_base = bank->reg_base; + gc->private = bank; + gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; + gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; + gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; + gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; + gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; + gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; + gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; + gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; + 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 ; +/* +* 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); -clk_disable (bank->clk); - } +irq_set_chained_handler_and_data (bank->irq, + rockchip_irq_demux, bank); +clk_disable (bank->clk);return 0 ; }static int rockchip_gpiolib_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;struct gpio_chip *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_err (&pdev->dev,"bank %s is not valid\n" , bank->name); +return -EINVAL ; + } - bank->gpio_chip = rockchip_gpiolib_chip; + bank->gpio_chip = rockchip_gpiolib_chip; - gc = &bank->gpio_chip; - gc->base = bank->pin_base; - gc->ngpio = bank->nr_pins; - gc->parent = &pdev->dev; - gc->of_node = bank->of_node; - gc->label = bank->name; + gc = &bank->gpio_chip; + gc->base = bank->pin_base; + gc->ngpio = bank->nr_pins; + gc->parent = &pdev->dev; + gc->of_node = bank->of_node; + gc->label = bank->name; - ret =gpiochip_add_data (gc, bank); -if (ret) { -dev_err (&pdev->dev,"failed to register gpio_chip %s, error code: %d\n" , - gc->label, ret); - goto fail; - } + ret =gpiochip_add_data (gc, bank); +if (ret) { +dev_err (&pdev->dev,"failed to register %s (%d)\n" , gc->label, ret); +return ret; } -rockchip_interrupts_register (pdev, info); +if (!of_property_read_bool (bank->of_node,"gpio-ranges" )) { +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct pinctrl_dev *pctldev; -return 0 ; +if (!info) +return -ENODATA ; -fail: -for (--i, --bank; i >=0 ; --i, --bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); - } -return ret; -} - -static int rockchip_gpiolib_unregister (struct platform_device *pdev, -struct rockchip_pinctrl *info) -{ -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks; -int i; + pctldev = info->pctl_dev; +if (!pctldev) +return -ENODEV ; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); + ret =gpiochip_add_pin_range (gc,dev_name (pctldev->dev),0 , gc->base, gc->ngpio); +if (ret) { +dev_err (&pdev->dev,"Failed to add pin range\n" ); +gpiochip_remove (&bank->gpio_chip); +return ret; + } }return 0 ;
@@ -3752,6 +3734,46 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend, rockchip_pinctrl_resume); +static int rockchip_gpio_probe (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) :NULL ; +struct rockchip_pin_bank *bank; +int ret, i; + +if (!info || !ctrl) +return -EINVAL ; + +if (!of_find_property (np,"gpio-controller" ,NULL )) +return -ENODEV ; + + bank = ctrl->pin_banks; +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +if (!strcmp (bank->name, np->name)) { + bank->of_node = np; + +if (!rockchip_get_bank_data (bank, info)) + bank->valid = true; + +break ; + } + } + + bank->of_node = pdev->dev.of_node; + + ret =rockchip_gpiolib_register (pdev, bank); +if (ret) +return ret; + + ret =rockchip_interrupts_register (pdev, bank); +if (ret) +return ret; + +return 0 ; +} +static int rockchip_pinctrl_probe (struct platform_device *pdev) {struct rockchip_pinctrl *info;
@@ -3823,18 +3845,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (info->regmap_pmu); } - ret =rockchip_gpiolib_register (pdev, info); -if (ret) -return ret; - ret =rockchip_pinctrl_register (pdev, info);if (ret) { -rockchip_gpiolib_unregister (pdev, info); +dev_err (&pdev->dev,"failed to register pinctrl device\n" );return ret; }platform_set_drvdata (pdev, info); + ret =of_platform_populate (np, rockchip_bank_match,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to register gpio device\n" ); +return ret; + } +return 0 ; }
@@ -4254,6 +4278,14 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { {}, }; +static struct platform_driver rockchip_gpio_driver = { + .probe = rockchip_gpio_probe, + .driver = { + .name ="rockchip-gpio" , + .of_match_table = rockchip_bank_match, + }, +}; +static struct platform_driver rockchip_pinctrl_driver = { .probe = rockchip_pinctrl_probe, .driver = {
@@ -4265,7 +4297,9 @@ static struct platform_driver rockchip_pinctrl_driver = {static int __init rockchip_pinctrl_drv_register (void ) { -return platform_driver_register (&rockchip_pinctrl_driver); +platform_driver_register (&rockchip_pinctrl_driver); + +return platform_driver_register (&rockchip_gpio_driver); }postcore_initcall (rockchip_pinctrl_drv_register);
Signature · 1 line
2.17.1
Heiko Stübner
maintainerRe: [PATCH 6/6] pinctrl: rockchip: populate platform device for rockchip gpio
Hi Jianqun,
Am Montag, 31. August 2020, 10:50:21 CEST schrieb Jianqun Xu:
Quoted 5 lines
Register both gpio driver and device as part of driver model, so that the '-gpio'/'-gpios' dependency in dts can be correctly handled by of_devlink/of_fwlink.
Signed-off-by Jianqun Xu <[email protected]>
[...]
Quoted 112 lines
drivers/pinctrl/pinctrl-rockchip.c +64
-15-static int rockchip_gpiolib_unregister (struct platform_device *pdev, -struct rockchip_pinctrl *info) -{ -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks; -int i; + pctldev = info->pctl_dev; +if (!pctldev) +return -ENODEV ; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); + ret =gpiochip_add_pin_range (gc,dev_name (pctldev->dev),0 , gc->base, gc->ngpio); +if (ret) { +dev_err (&pdev->dev,"Failed to add pin range\n" ); +gpiochip_remove (&bank->gpio_chip); +return ret; + } }return 0 ;@@ -3752,6 +3734,46 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend, rockchip_pinctrl_resume); +static int rockchip_gpio_probe (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) :NULL ; +struct rockchip_pin_bank *bank; +int ret, i; + +if (!info || !ctrl) +return -EINVAL ; + +if (!of_find_property (np,"gpio-controller" ,NULL )) +return -ENODEV ; + + bank = ctrl->pin_banks; +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +if (!strcmp (bank->name, np->name)) { + bank->of_node = np; + +if (!rockchip_get_bank_data (bank, info)) + bank->valid = true; + +break ; + } + } + + bank->of_node = pdev->dev.of_node; + + ret =rockchip_gpiolib_register (pdev, bank); +if (ret) +return ret; + + ret =rockchip_interrupts_register (pdev, bank); +if (ret) +return ret; + +return 0 ; +} +static int rockchip_pinctrl_probe (struct platform_device *pdev) {struct rockchip_pinctrl *info;@@ -3823,18 +3845,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (info->regmap_pmu); } - ret =rockchip_gpiolib_register (pdev, info); -if (ret) -return ret; - ret =rockchip_pinctrl_register (pdev, info);if (ret) { -rockchip_gpiolib_unregister (pdev, info); +dev_err (&pdev->dev,"failed to register pinctrl device\n" );return ret; }platform_set_drvdata (pdev, info); + ret =of_platform_populate (np, rockchip_bank_match,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to register gpio device\n" ); +return ret; + } +return 0 ; }@@ -4254,6 +4278,14 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { {}, }; +static struct platform_driver rockchip_gpio_driver = { + .probe = rockchip_gpio_probe, + .driver = { + .name ="rockchip-gpio" , + .of_match_table = rockchip_bank_match, + }, +}; +static struct platform_driver rockchip_pinctrl_driver = { .probe = rockchip_pinctrl_probe, .driver = {
drivers/pinctrl/pinctrl-rockchip.c static struct platform_driver rockchip_pinctrl_driver = { · line 4304
Quoted 9 lines
drivers/pinctrl/pinctrl-rockchip.c +3
-1@@ -4265,7 +4297,9 @@ static struct platform_driver rockchip_pinctrl_driver = {static int __init rockchip_pinctrl_drv_register (void ) { -return platform_driver_register (&rockchip_pinctrl_driver); +platform_driver_register (&rockchip_pinctrl_driver); + +return platform_driver_register (&rockchip_gpio_driver); }postcore_initcall (rockchip_pinctrl_drv_register);
This also seems to miss the whole unloading of module paths? I'd expect a gpiochip_remove etc in some _remove function and of course a platform_driver_unregister.
Heiko
v2 cover rockchip-pinctrl fixes for GKI
In reply to Jianqun XuThese patches will fix some issues and modify for GKI.
Heiko Stuebner (1):
pinctrl: rockchip: depend on OF
Jianqun Xu (4):
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
pinctrl: rockchip: populate platform device for rockchip gpio
drivers/pinctrl/Kconfig | 4 +- drivers/pinctrl/pinctrl-rockchip.c | 289 +++++++++++++++++------------ 2 files changed, 175 insertions(+), 118 deletions(-)
Signature · 9 lines
2.17.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v2 1/5 pinctrl: rockchip: depend on OF
From: Heiko Stuebner <[email protected]>
The Rockchip pinctrl driver needs to handle information from Devicetree so only makes sense getting compiled on systems with CONFIG_OF enabled.
This also fixes a problem found by the "kernel-test-robot" when compiling the driver on test-builds that do not have CONFIG_OF enabled:
drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_pinctrl_parse_groups':
Quoted 1 line
Quoted 1 line
drivers/pinctrl/pinctrl-rockchip.c:2881:9: error: implicit declaration of function 'pinconf_generic_parse_dt_config'; did you mean 'pinconf_generic_dump_config'? [-Werror=implicit-function-declaration]
2881 | ret = pinconf_generic_parse_dt_config(np_config, NULL,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| pinconf_generic_dump_config drivers/pinctrl/pinctrl-rockchip.c: In function 'rockchip_gpiolib_register':
Quoted 1 line
Quoted 1 line
drivers/pinctrl/pinctrl-rockchip.c:3473:5: error: 'structgpio_chip' has no member named 'of_node'
3473 | gc->of_node = bank->of_node;
--- drivers/pinctrl/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
drivers/pinctrl/Kconfig +2 -0
@@ -208,10 +208,12 @@ config PINCTRL_OXNAS config PINCTRL_ROCKCHIP bool + depends on OF select PINMUX select GENERIC_PINCONF select GENERIC_IRQ_CHIP select MFD_SYSCON + select OF_GPIO config PINCTRL_RZA1 bool "Renesas RZ/A1 gpio and pinctrl driver"
Signature · 1 line
2.17.1
PATCH v2 2/5 pinctrl: rockchip: make driver be tristate module
In reply to Jianqun XuMake 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 | 18 ++++++++++++++++++ 2 files changed, 19 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 +18 -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>
@@ -4257,4 +4259,20 @@ static int __init rockchip_pinctrl_drv_register(void) {return platform_driver_register (&rockchip_pinctrl_driver); } + +static void __exit rockchip_pinctrl_drv_unregister(void) +{ +platform_driver_unregister (&rockchip_pinctrl_driver); +} + +#ifdef CONFIG_PINCTRL_ROCKCHIP_MODULE +module_init (rockchip_pinctrl_drv_register); +#else postcore_initcall (rockchip_pinctrl_drv_register); +#endif +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 · 1 line
2.17.1
kernel test robot
build botRe: [PATCH 2/5] pinctrl: rockchip: make driver be tristate module
Thank you for the patch! Yet something to improve:
Hi Jianqun,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on rockchip/for-next]
[also build test ERROR on pinctrl/devel v5.9-rc4 next-20200903] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Jianqun-Xu/rockchip-pinctrl-fixes-for-GKI/20200907-114025 base: https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git for-next config: riscv-allmodconfig (attached as .config) compiler: riscv64-linux-gcc (GCC) 9.3.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-9.3.0 make.cross ARCH=riscv
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "irq_gc_set_wake" [drivers/pinctrl/pinctrl-rockchip.ko] undefined!
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Heiko Stübner
maintainerRe: [PATCH 2/5] pinctrl: rockchip: make driver be tristate module
In reply to Jianqun XuHi,
Am Montag, 7. September 2020, 04:59:24 CEST schrieb Jianqun Xu:
Quoted 27 lines
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Signed-off-by Jianqun Xu <[email protected]>--- drivers/pinctrl/Kconfig | 2 +- drivers/pinctrl/pinctrl-rockchip.c | 18 ++++++++++++++++++ 2 files changed, 19 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 +0
-0
drivers/pinctrl/pinctrl-rockchip.c line 24
Quoted 9 lines
drivers/pinctrl/pinctrl-rockchip.c +2
-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>
of_device.h below of_address.h please
Quoted 8 lines
drivers/pinctrl/pinctrl-rockchip.c +1
-0#include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/pinctrl/machine.h> @@ -4257,4 +4259,20 @@ static int __init rockchip_pinctrl_drv_register(void) {return platform_driver_register (&rockchip_pinctrl_driver); } +
drivers/pinctrl/pinctrl-rockchip.c static int __init rockchip_pinctrl_drv_register(void) · line 4272
Quoted 10 lines
drivers/pinctrl/pinctrl-rockchip.c +9
-0+static void __exit rockchip_pinctrl_drv_unregister(void) +{ +platform_driver_unregister (&rockchip_pinctrl_driver); +} + +#ifdef CONFIG_PINCTRL_ROCKCHIP_MODULE +module_init (rockchip_pinctrl_drv_register); +#else postcore_initcall (rockchip_pinctrl_drv_register); +#endif
You definitly don't need this hack. For modules postcore_initcall already points to module_init ... see
https://elixir.bootlin.com/linux/latest/source/include/linux/module.h#L114
Heiko
PATCH 2/2 pinctrl: rockchip: make driver be tristate module
In reply to Jianqun XuMake 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 · 1 line
2.17.1
Re: [PATCH 2/2] pinctrl: rockchip: make driver be tristate module
Am Montag, 14. September 2020, 02:38:47 CEST schrieb Jianqun Xu:
Quoted 4 lines
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Signed-off-by Jianqun Xu <[email protected]>
Quoted 41 lines
--- 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);
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerRe: [PATCH 2/2] pinctrl: rockchip: make driver be tristate module
Hi Jay,
Am Montag, 21. September 2020, 00:14:11 CEST schrieb Heiko Stübner:
Quoted 7 lines
Am Montag, 14. September 2020, 02:38:47 CEST schrieb Jianqun Xu:
Quoted 4 lines
Make pinctrl-rockchip driver to be tristate module, support to build as a module, this is useful for GKI.
Signed-off-by Jianqun Xu <[email protected]>Reviewed-by Heiko Stuebner <[email protected]>
It seems I've reviewed all patches of this series now, but I think you might want to resend the series a final time as v3 in a cleaned up state (drop patch1 and just post patches 2-5 in a full series) so that we don't confuse Linus too much with the reposted patches we currently have.
Thanks
Heiko
Quoted 44 lines
Quoted 44 lines
--- 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 +6
-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);
Quoted 10 lines
drivers/pinctrl/pinctrl-rockchip.c static int __init rockchip_pinctrl_drv_register(void) · line 4273
Quoted 8 lines
drivers/pinctrl/pinctrl-rockchip.c +7
-0+} +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);
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Re: [PATCH 2/2] pinctrl: rockchip: make driver be tristate module
Quoted 5 lines · Heiko Stübner
It seems I've reviewed all patches of this series now, but I think you might want to resend the series a final time as v3 in a cleaned up state (drop patch1 and just post patches 2-5 in a full series) so that we don't confuse Linus too much with the reposted patches we currently have.
Yes please send a v3 like that so I can apply it!
Yours,
Linus Walleij
Re: Re: [PATCH 2/2] pinctrl: rockchip: make driver be tristate module
Dear Walleij and Heiko
The patch "[PATCH] pinctrl: rockchip: populate platform device for rockchip gpio" has been remove outof the patches, since we have a new patch to move gpio related codes to a separated driver.
So please ignore it for now. thanks very much.
--------------
[email protected]
Quoted 8 lines · Heiko Stübner
Quoted 6 lines
It seems I've reviewed all patches of this series now, but I think you might want to resend the series a final time as v3 in a cleaned up state (drop patch1 and just post patches 2-5 in a full series) so that we don't confuse Linus too much with the reposted patches we currently have.
Quoted 7 lines
Yes please send a v3 like that so I can apply it!
Yours,
Linus Walleij
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
PATCH v2 3/5 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
PATCH v2 4/5 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 · 1 line
2.17.1
PATCH v2 5/5 pinctrl: rockchip: populate platform device for rockchip gpio
In reply to Jianqun XuRegister both gpio driver and device as part of driver model, so that the '-gpio'/'-gpios' dependency in dts can be correctly handled by of_devlink/of_fwlink.
--- drivers/pinctrl/pinctrl-rockchip.c | 261 +++++++++++++++++------------ 1 file changed, 150 insertions(+), 111 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +150 -111
@@ -3370,139 +3370,121 @@ static void rockchip_irq_disable(struct irq_data *d) }static int rockchip_interrupts_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_warn (&pdev->dev,"bank %s is not valid\n" , + bank->name); +return -EINVAL ; + } - ret =clk_enable (bank->clk); -if (ret) { -dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , - bank->name); -continue ; - } + ret =clk_enable (bank->clk); +if (ret) { +dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , + bank->name); +return ret; + } - bank->domain =irq_domain_add_linear (bank->of_node,32 , - &irq_generic_chip_ops,NULL ); -if (!bank->domain) { -dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , - bank->name); -clk_disable (bank->clk); -continue ; - } + bank->domain =irq_domain_add_linear (bank->of_node,32 , + &irq_generic_chip_ops,NULL ); +if (!bank->domain) { +dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , + bank->name); +clk_disable (bank->clk); +return -EINVAL ; + } - ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , -"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,0 ); -if (ret) { -dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , - bank->name); -irq_domain_remove (bank->domain); -clk_disable (bank->clk); -continue ; - } + ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , +"rockchip_gpio_irq" , handle_level_irq, + clr,0 ,0 ); +if (ret) { +dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , + bank->name); +irq_domain_remove (bank->domain); +clk_disable (bank->clk); +return ret; + } - gc =irq_get_domain_generic_chip (bank->domain,0 ); - gc->reg_base = bank->reg_base; - gc->private = bank; - gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; - gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; - gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; - gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; - gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; - gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; - gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; - gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; - gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; - gc->wake_enabled =IRQ_MSK (bank->nr_pins); + gc =irq_get_domain_generic_chip (bank->domain,0 ); + gc->reg_base = bank->reg_base; + gc->private = bank; + gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; + gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; + gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; + gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; + gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; + gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; + gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; + gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; + 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 ; +/* +* 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); -clk_disable (bank->clk); - } +irq_set_chained_handler_and_data (bank->irq, + rockchip_irq_demux, bank); +clk_disable (bank->clk);return 0 ; }static int rockchip_gpiolib_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;struct gpio_chip *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_err (&pdev->dev,"bank %s is not valid\n" , bank->name); +return -EINVAL ; + } - bank->gpio_chip = rockchip_gpiolib_chip; + bank->gpio_chip = rockchip_gpiolib_chip; - gc = &bank->gpio_chip; - gc->base = bank->pin_base; - gc->ngpio = bank->nr_pins; - gc->parent = &pdev->dev; - gc->of_node = bank->of_node; - gc->label = bank->name; + gc = &bank->gpio_chip; + gc->base = bank->pin_base; + gc->ngpio = bank->nr_pins; + gc->parent = &pdev->dev; + gc->of_node = bank->of_node; + gc->label = bank->name; - ret =gpiochip_add_data (gc, bank); -if (ret) { -dev_err (&pdev->dev,"failed to register gpio_chip %s, error code: %d\n" , - gc->label, ret); - goto fail; - } + ret =gpiochip_add_data (gc, bank); +if (ret) { +dev_err (&pdev->dev,"failed to register %s (%d)\n" , gc->label, ret); +return ret; } -rockchip_interrupts_register (pdev, info); +if (!of_property_read_bool (bank->of_node,"gpio-ranges" )) { +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct pinctrl_dev *pctldev; -return 0 ; +if (!info) +return -ENODATA ; -fail: -for (--i, --bank; i >=0 ; --i, --bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); - } -return ret; -} + pctldev = info->pctl_dev; +if (!pctldev) +return -ENODEV ; -static int rockchip_gpiolib_unregister (struct platform_device *pdev, -struct rockchip_pinctrl *info) -{ -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks; -int i; - -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); + ret =gpiochip_add_pin_range (gc,dev_name (pctldev->dev),0 , gc->base, gc->ngpio); +if (ret) { +dev_err (&pdev->dev,"Failed to add pin range\n" ); +gpiochip_remove (&bank->gpio_chip); +return ret; + } }return 0 ;
@@ -3742,6 +3724,46 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend, rockchip_pinctrl_resume); +static int rockchip_gpio_probe (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) :NULL ; +struct rockchip_pin_bank *bank; +int ret, i; + +if (!info || !ctrl) +return -EINVAL ; + +if (!of_find_property (np,"gpio-controller" ,NULL )) +return -ENODEV ; + + bank = ctrl->pin_banks; +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +if (!strcmp (bank->name, np->name)) { + bank->of_node = np; + +if (!rockchip_get_bank_data (bank, info)) + bank->valid = true; + +break ; + } + } + + bank->of_node = pdev->dev.of_node; + + ret =rockchip_gpiolib_register (pdev, bank); +if (ret) +return ret; + + ret =rockchip_interrupts_register (pdev, bank); +if (ret) +return ret; + +return 0 ; +} +static int rockchip_pinctrl_probe (struct platform_device *pdev) {struct rockchip_pinctrl *info;
@@ -3813,18 +3835,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (info->regmap_pmu); } - ret =rockchip_gpiolib_register (pdev, info); -if (ret) -return ret; - ret =rockchip_pinctrl_register (pdev, info);if (ret) { -rockchip_gpiolib_unregister (pdev, info); +dev_err (&pdev->dev,"failed to register pinctrl device\n" );return ret; }platform_set_drvdata (pdev, info); + ret =of_platform_populate (np, rockchip_bank_match,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to register gpio device\n" ); +return ret; + } +return 0 ; }
@@ -4244,6 +4268,14 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { {}, }; +static struct platform_driver rockchip_gpio_driver = { + .probe = rockchip_gpio_probe, + .driver = { + .name ="rockchip-gpio" , + .of_match_table = rockchip_bank_match, + }, +}; +static struct platform_driver rockchip_pinctrl_driver = { .probe = rockchip_pinctrl_probe, .driver = {
@@ -4255,11 +4287,18 @@ static struct platform_driver rockchip_pinctrl_driver = {static int __init rockchip_pinctrl_drv_register (void ) { -return platform_driver_register (&rockchip_pinctrl_driver); +int ret; + + ret =platform_driver_register (&rockchip_pinctrl_driver); +if (ret) +return ret; + +return platform_driver_register (&rockchip_gpio_driver); } static void __exit rockchip_pinctrl_drv_unregister(void) { +platform_driver_unregister (&rockchip_gpio_driver);platform_driver_unregister (&rockchip_pinctrl_driver); }
Signature · 1 line
2.17.1
PATCH 1/1 pinctrl: rockchip: populate platform device for rockchip gpio
Register both gpio driver and device as part of driver model, so that the '-gpio'/'-gpios' dependency in dts can be correctly handled by of_devlink/of_fwlink.
--- drivers/pinctrl/pinctrl-rockchip.c | 305 +++++++++++++++++------------ 1 file changed, 175 insertions(+), 130 deletions(-)
drivers/pinctrl/pinctrl-rockchip.c +175 -130
@@ -3370,139 +3370,121 @@ static void rockchip_irq_disable(struct irq_data *d) }static int rockchip_interrupts_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_warn (&pdev->dev,"bank %s is not valid\n" , + bank->name); +return -EINVAL ; + } - ret =clk_enable (bank->clk); -if (ret) { -dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , - bank->name); -continue ; - } + ret =clk_enable (bank->clk); +if (ret) { +dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , + bank->name); +return ret; + } - bank->domain =irq_domain_add_linear (bank->of_node,32 , - &irq_generic_chip_ops,NULL ); -if (!bank->domain) { -dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , - bank->name); -clk_disable (bank->clk); -continue ; - } + bank->domain =irq_domain_add_linear (bank->of_node,32 , + &irq_generic_chip_ops,NULL ); +if (!bank->domain) { +dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , + bank->name); +clk_disable (bank->clk); +return -EINVAL ; + } - ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , -"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,0 ); -if (ret) { -dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , - bank->name); -irq_domain_remove (bank->domain); -clk_disable (bank->clk); -continue ; - } + ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , +"rockchip_gpio_irq" , handle_level_irq, + clr,0 ,0 ); +if (ret) { +dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , + bank->name); +irq_domain_remove (bank->domain); +clk_disable (bank->clk); +return ret; + } - gc =irq_get_domain_generic_chip (bank->domain,0 ); - gc->reg_base = bank->reg_base; - gc->private = bank; - gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; - gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; - gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; - gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; - gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; - gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; - gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; - gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; - gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; - gc->wake_enabled =IRQ_MSK (bank->nr_pins); + gc =irq_get_domain_generic_chip (bank->domain,0 ); + gc->reg_base = bank->reg_base; + gc->private = bank; + gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; + gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; + gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; + gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; + gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; + gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; + gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; + gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; + 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 ; +/* +* 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); -clk_disable (bank->clk); - } +irq_set_chained_handler_and_data (bank->irq, + rockchip_irq_demux, bank); +clk_disable (bank->clk);return 0 ; }static int rockchip_gpiolib_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;struct gpio_chip *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_err (&pdev->dev,"bank %s is not valid\n" , bank->name); +return -EINVAL ; + } - bank->gpio_chip = rockchip_gpiolib_chip; + bank->gpio_chip = rockchip_gpiolib_chip; - gc = &bank->gpio_chip; - gc->base = bank->pin_base; - gc->ngpio = bank->nr_pins; - gc->parent = &pdev->dev; - gc->of_node = bank->of_node; - gc->label = bank->name; + gc = &bank->gpio_chip; + gc->base = bank->pin_base; + gc->ngpio = bank->nr_pins; + gc->parent = &pdev->dev; + gc->of_node = bank->of_node; + gc->label = bank->name; - ret =gpiochip_add_data (gc, bank); -if (ret) { -dev_err (&pdev->dev,"failed to register gpio_chip %s, error code: %d\n" , - gc->label, ret); - goto fail; - } + ret =gpiochip_add_data (gc, bank); +if (ret) { +dev_err (&pdev->dev,"failed to register %s (%d)\n" , gc->label, ret); +return ret; } -rockchip_interrupts_register (pdev, info); +if (!of_property_read_bool (bank->of_node,"gpio-ranges" )) { +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct pinctrl_dev *pctldev; -return 0 ; +if (!info) +return -ENODATA ; -fail: -for (--i, --bank; i >=0 ; --i, --bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); - } -return ret; -} - -static int rockchip_gpiolib_unregister (struct platform_device *pdev, -struct rockchip_pinctrl *info) -{ -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks; -int i; + pctldev = info->pctl_dev; +if (!pctldev) +return -ENODEV ; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); + ret =gpiochip_add_pin_range (gc,dev_name (pctldev->dev),0 , gc->base, gc->ngpio); +if (ret) { +dev_err (&pdev->dev,"Failed to add pin range\n" ); +gpiochip_remove (&bank->gpio_chip); +return ret; + } }return 0 ;
@@ -3571,7 +3553,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( {const struct of_device_id *match;struct device_node *node = pdev->dev.of_node; -struct device_node *np;struct rockchip_pin_ctrl *ctrl;struct rockchip_pin_bank *bank;int grf_offs, pmu_offs, drv_grf_offs, drv_pmu_offs, i, j;
@@ -3579,23 +3560,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( match =of_match_node (rockchip_pinctrl_dt_match, node); ctrl = (struct rockchip_pin_ctrl *)match->data; -for_each_child_of_node (node, np) { -if (!of_find_property (np,"gpio-controller" ,NULL )) -continue ; - - bank = ctrl->pin_banks; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!strcmp (bank->name, np->name)) { - bank->of_node = np; - -if (!rockchip_get_bank_data (bank, d)) - bank->valid = true; - -break ; - } - } - } - grf_offs = ctrl->grf_mux_offset; pmu_offs = ctrl->pmu_mux_offset; drv_pmu_offs = ctrl->pmu_drv_offset;
@@ -3742,6 +3706,68 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend, rockchip_pinctrl_resume); +static int rockchip_gpio_probe (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) :NULL ; +struct rockchip_pin_bank *bank; +int ret, i; + +if (!info || !ctrl) +return -EINVAL ; + +if (!of_find_property (np,"gpio-controller" ,NULL )) +return -ENODEV ; + + bank = ctrl->pin_banks; +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +if (!strcmp (bank->name, np->name)) { + bank->of_node = np; + +if (!rockchip_get_bank_data (bank, info)) + bank->valid = true; + +break ; + } + } + +if (!bank->valid) { +dev_info (parent,"gpio%d probed\n" , bank->bank_num); +return -EINVAL ; + } + + bank->of_node = pdev->dev.of_node; + + ret =rockchip_gpiolib_register (pdev, bank); +if (ret) +return ret; + + ret =rockchip_interrupts_register (pdev, bank); +if (ret) { +gpiochip_remove (&bank->gpio_chip); +return ret; + } + +platform_set_drvdata (pdev, bank); +dev_info (parent,"gpio%d probed\n" , bank->bank_num); + +return 0 ; +} + +static int rockchip_gpio_remove (struct platform_device *pdev) +{ +struct rockchip_pin_bank *bank =platform_get_drvdata (pdev); + +if (!bank) +return -EINVAL ; + +gpiochip_remove (&bank->gpio_chip); + +return 0 ; +} +static int rockchip_pinctrl_probe (struct platform_device *pdev) {struct rockchip_pinctrl *info;
@@ -3813,17 +3839,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (info->regmap_pmu); } - ret =rockchip_gpiolib_register (pdev, info); -if (ret) -return ret; - ret =rockchip_pinctrl_register (pdev, info);if (ret) { -rockchip_gpiolib_unregister (pdev, info); +dev_err (&pdev->dev,"failed to register pinctrl device\n" );return ret; }platform_set_drvdata (pdev, info); +dev_info (&pdev->dev,"pinctrl probed\n" ); + + ret =of_platform_populate (np, rockchip_bank_match,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to register gpio device\n" ); +return ret; + }return 0 ; }
@@ -4244,8 +4273,17 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { {}, }; +static struct platform_driver rockchip_gpio_driver = { + .probe = rockchip_gpio_probe, + .remove = rockchip_gpio_remove, + .driver = { + .name ="rockchip-gpio" , + .of_match_table = rockchip_bank_match, + }, +}; +static struct platform_driver rockchip_pinctrl_driver = { - .probe = rockchip_pinctrl_probe, + .probe = rockchip_pinctrl_probe, .driver = { .name ="rockchip-pinctrl" , .pm = &rockchip_pinctrl_dev_pm_ops,
@@ -4255,11 +4293,18 @@ static struct platform_driver rockchip_pinctrl_driver = {static int __init rockchip_pinctrl_drv_register (void ) { -return platform_driver_register (&rockchip_pinctrl_driver); +int ret; + + ret =platform_driver_register (&rockchip_pinctrl_driver); +if (ret) +return ret; + +return platform_driver_register (&rockchip_gpio_driver); } static void __exit rockchip_pinctrl_drv_unregister(void) { +platform_driver_unregister (&rockchip_gpio_driver);platform_driver_unregister (&rockchip_pinctrl_driver); }
Signature · 1 line
2.17.1
Re: [PATCH] pinctrl: rockchip: populate platform device for rockchip gpio
Am Dienstag, 8. September 2020, 04:19:13 CEST schrieb Jianqun Xu:
Quoted 5 lines
Register both gpio driver and device as part of driver model, so that the '-gpio'/'-gpios' dependency in dts can be correctly handled by of_devlink/of_fwlink.
Signed-off-by Jianqun Xu <[email protected]>
Quoted 392 lines
--- drivers/pinctrl/pinctrl-rockchip.c | 305 +++++++++++++++++------------ 1 file changed, 175 insertions(+), 130 deletions(-)drivers/pinctrl/pinctrl-rockchip.c +172
-130@@ -3370,139 +3370,121 @@ static void rockchip_irq_disable(struct irq_data *d) }static int rockchip_interrupts_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;unsigned int clr =IRQ_NOREQUEST |IRQ_NOPROBE |IRQ_NOAUTOEN ;struct irq_chip_generic *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_warn (&pdev->dev,"bank %s is not valid\n" , + bank->name); +return -EINVAL ; + } - ret =clk_enable (bank->clk); -if (ret) { -dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , - bank->name); -continue ; - } + ret =clk_enable (bank->clk); +if (ret) { +dev_err (&pdev->dev,"failed to enable clock for bank %s\n" , + bank->name); +return ret; + } - bank->domain =irq_domain_add_linear (bank->of_node,32 , - &irq_generic_chip_ops,NULL ); -if (!bank->domain) { -dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , - bank->name); -clk_disable (bank->clk); -continue ; - } + bank->domain =irq_domain_add_linear (bank->of_node,32 , + &irq_generic_chip_ops,NULL ); +if (!bank->domain) { +dev_warn (&pdev->dev,"could not initialize irq domain for bank %s\n" , + bank->name); +clk_disable (bank->clk); +return -EINVAL ; + } - ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , -"rockchip_gpio_irq" , handle_level_irq, - clr,0 ,0 ); -if (ret) { -dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , - bank->name); -irq_domain_remove (bank->domain); -clk_disable (bank->clk); -continue ; - } + ret =irq_alloc_domain_generic_chips (bank->domain,32 ,1 , +"rockchip_gpio_irq" , handle_level_irq, + clr,0 ,0 ); +if (ret) { +dev_err (&pdev->dev,"could not alloc generic chips for bank %s\n" , + bank->name); +irq_domain_remove (bank->domain); +clk_disable (bank->clk); +return ret; + } - gc =irq_get_domain_generic_chip (bank->domain,0 ); - gc->reg_base = bank->reg_base; - gc->private = bank; - gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; - gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; - gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; - gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; - gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; - gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; - gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; - gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; - gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; - gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; - gc->chip_types[0 ].chip.irq_set_type = rockchip_irq_set_type; - gc->wake_enabled =IRQ_MSK (bank->nr_pins); + gc =irq_get_domain_generic_chip (bank->domain,0 ); + gc->reg_base = bank->reg_base; + gc->private = bank; + gc->chip_types[0 ].regs.mask =GPIO_INTMASK ; + gc->chip_types[0 ].regs.ack =GPIO_PORTS_EOI ; + gc->chip_types[0 ].chip.irq_ack = irq_gc_ack_set_bit; + gc->chip_types[0 ].chip.irq_mask = irq_gc_mask_set_bit; + gc->chip_types[0 ].chip.irq_unmask = irq_gc_mask_clr_bit; + gc->chip_types[0 ].chip.irq_enable = rockchip_irq_enable; + gc->chip_types[0 ].chip.irq_disable = rockchip_irq_disable; + gc->chip_types[0 ].chip.irq_set_wake = irq_gc_set_wake; + gc->chip_types[0 ].chip.irq_suspend = rockchip_irq_suspend; + gc->chip_types[0 ].chip.irq_resume = rockchip_irq_resume; + 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 ; +/* +* 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); -clk_disable (bank->clk); - } +irq_set_chained_handler_and_data (bank->irq, + rockchip_irq_demux, bank); +clk_disable (bank->clk);return 0 ; }static int rockchip_gpiolib_register (struct platform_device *pdev, -struct rockchip_pinctrl *info) +struct rockchip_pin_bank *bank) { -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks;struct gpio_chip *gc;int ret; -int i; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) { -dev_warn (&pdev->dev,"bank %s is not valid\n" , - bank->name); -continue ; - } +if (!bank->valid) { +dev_err (&pdev->dev,"bank %s is not valid\n" , bank->name); +return -EINVAL ; + } - bank->gpio_chip = rockchip_gpiolib_chip; + bank->gpio_chip = rockchip_gpiolib_chip; - gc = &bank->gpio_chip; - gc->base = bank->pin_base; - gc->ngpio = bank->nr_pins; - gc->parent = &pdev->dev; - gc->of_node = bank->of_node; - gc->label = bank->name; + gc = &bank->gpio_chip; + gc->base = bank->pin_base; + gc->ngpio = bank->nr_pins; + gc->parent = &pdev->dev; + gc->of_node = bank->of_node; + gc->label = bank->name; - ret =gpiochip_add_data (gc, bank); -if (ret) { -dev_err (&pdev->dev,"failed to register gpio_chip %s, error code: %d\n" , - gc->label, ret); - goto fail; - } + ret =gpiochip_add_data (gc, bank); +if (ret) { +dev_err (&pdev->dev,"failed to register %s (%d)\n" , gc->label, ret); +return ret; } -rockchip_interrupts_register (pdev, info); +if (!of_property_read_bool (bank->of_node,"gpio-ranges" )) { +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct pinctrl_dev *pctldev; -return 0 ; +if (!info) +return -ENODATA ; -fail: -for (--i, --bank; i >=0 ; --i, --bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); - } -return ret; -} - -static int rockchip_gpiolib_unregister (struct platform_device *pdev, -struct rockchip_pinctrl *info) -{ -struct rockchip_pin_ctrl *ctrl = info->ctrl; -struct rockchip_pin_bank *bank = ctrl->pin_banks; -int i; + pctldev = info->pctl_dev; +if (!pctldev) +return -ENODEV ; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!bank->valid) -continue ; -gpiochip_remove (&bank->gpio_chip); + ret =gpiochip_add_pin_range (gc,dev_name (pctldev->dev),0 , gc->base, gc->ngpio); +if (ret) { +dev_err (&pdev->dev,"Failed to add pin range\n" ); +gpiochip_remove (&bank->gpio_chip); +return ret; + } }return 0 ;@@ -3571,7 +3553,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( {const struct of_device_id *match;struct device_node *node = pdev->dev.of_node; -struct device_node *np;struct rockchip_pin_ctrl *ctrl;struct rockchip_pin_bank *bank;int grf_offs, pmu_offs, drv_grf_offs, drv_pmu_offs, i, j;@@ -3579,23 +3560,6 @@ static struct rockchip_pin_ctrl *rockchip_pinctrl_get_soc_data( match =of_match_node (rockchip_pinctrl_dt_match, node); ctrl = (struct rockchip_pin_ctrl *)match->data; -for_each_child_of_node (node, np) { -if (!of_find_property (np,"gpio-controller" ,NULL )) -continue ; - - bank = ctrl->pin_banks; -for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { -if (!strcmp (bank->name, np->name)) { - bank->of_node = np; - -if (!rockchip_get_bank_data (bank, d)) - bank->valid = true; - -break ; - } - } - } - grf_offs = ctrl->grf_mux_offset; pmu_offs = ctrl->pmu_mux_offset; drv_pmu_offs = ctrl->pmu_drv_offset;@@ -3742,6 +3706,68 @@ static int __maybe_unused rockchip_pinctrl_resume(struct device *dev) static SIMPLE_DEV_PM_OPS(rockchip_pinctrl_dev_pm_ops, rockchip_pinctrl_suspend, rockchip_pinctrl_resume); +static int rockchip_gpio_probe (struct platform_device *pdev) +{ +struct device_node *np = pdev->dev.of_node; +struct device *parent = pdev->dev.parent; +struct rockchip_pinctrl *info =dev_get_drvdata (parent); +struct rockchip_pin_ctrl *ctrl = info ? (info->ctrl) :NULL ; +struct rockchip_pin_bank *bank; +int ret, i; + +if (!info || !ctrl) +return -EINVAL ; + +if (!of_find_property (np,"gpio-controller" ,NULL )) +return -ENODEV ; + + bank = ctrl->pin_banks; +for (i =0 ; i < ctrl->nr_banks; ++i, ++bank) { +if (!strcmp (bank->name, np->name)) { + bank->of_node = np; + +if (!rockchip_get_bank_data (bank, info)) + bank->valid = true; + +break ; + } + } + +if (!bank->valid) { +dev_info (parent,"gpio%d probed\n" , bank->bank_num); +return -EINVAL ; + } + + bank->of_node = pdev->dev.of_node; + + ret =rockchip_gpiolib_register (pdev, bank); +if (ret) +return ret; + + ret =rockchip_interrupts_register (pdev, bank); +if (ret) { +gpiochip_remove (&bank->gpio_chip); +return ret; + } + +platform_set_drvdata (pdev, bank); +dev_info (parent,"gpio%d probed\n" , bank->bank_num); + +return 0 ; +} + +static int rockchip_gpio_remove (struct platform_device *pdev) +{ +struct rockchip_pin_bank *bank =platform_get_drvdata (pdev); + +if (!bank) +return -EINVAL ; + +gpiochip_remove (&bank->gpio_chip); + +return 0 ; +} +static int rockchip_pinctrl_probe (struct platform_device *pdev) {struct rockchip_pinctrl *info;@@ -3813,17 +3839,20 @@ static int rockchip_pinctrl_probe(struct platform_device *pdev)return PTR_ERR (info->regmap_pmu); } - ret =rockchip_gpiolib_register (pdev, info); -if (ret) -return ret; - ret =rockchip_pinctrl_register (pdev, info);if (ret) { -rockchip_gpiolib_unregister (pdev, info); +dev_err (&pdev->dev,"failed to register pinctrl device\n" );return ret; }platform_set_drvdata (pdev, info); +dev_info (&pdev->dev,"pinctrl probed\n" ); + + ret =of_platform_populate (np, rockchip_bank_match,NULL , dev); +if (ret) { +dev_err (&pdev->dev,"failed to register gpio device\n" ); +return ret; + }return 0 ; }@@ -4244,8 +4273,17 @@ static const struct of_device_id rockchip_pinctrl_dt_match[] = { {}, }; +static struct platform_driver rockchip_gpio_driver = { + .probe = rockchip_gpio_probe, + .remove = rockchip_gpio_remove, + .driver = { + .name ="rockchip-gpio" , + .of_match_table = rockchip_bank_match, + }, +}; +static struct platform_driver rockchip_pinctrl_driver = { - .probe = rockchip_pinctrl_probe, + .probe = rockchip_pinctrl_probe, .driver = { .name ="rockchip-pinctrl" , .pm = &rockchip_pinctrl_dev_pm_ops,@@ -4255,11 +4293,18 @@ static struct platform_driver rockchip_pinctrl_driver = {static int __init rockchip_pinctrl_drv_register (void ) { -return platform_driver_register (&rockchip_pinctrl_driver); +int ret; + + ret =platform_driver_register (&rockchip_pinctrl_driver); +if (ret) +return ret;
drivers/pinctrl/pinctrl-rockchip.c static struct platform_driver rockchip_pinctrl_driver = { · line 4310
Quoted 10 lines
drivers/pinctrl/pinctrl-rockchip.c +3
-0+ +return platform_driver_register (&rockchip_gpio_driver); } static void __exit rockchip_pinctrl_drv_unregister(void) { +platform_driver_unregister (&rockchip_gpio_driver);platform_driver_unregister (&rockchip_pinctrl_driver); }
_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
Quoted 1 line · Jianqun Xu
These patches will fix some issues and modify for GKI.
I am sorry that responses and review is slow. The GKI thing is a bit controversial leading to slowdowns in the community because it is unclear how this should be dealt with in some cases.
Quoted 2 lines
Heiko Stuebner (1):
pinctrl: rockchip: depend on OF
I already applied this patch separately.
Quoted 5 lines
Jianqun Xu (4):
pinctrl: rockchip: make driver be tristate module
pinctrl: rockchip: enable gpio pclk forrockchip_gpio_to_irq
pinctrl: rockchip: create irq mapping ingpio_to_irq
pinctrl: rockchip: populate platform device for rockchip gpio
Why have the big series of 13 patches from july been cut down to this?
I would prefer the "big" fix I even tried applying the old (13 patches) series but it didn't work :(
We can apply this once they are reviewed, but I'd like the rest of the 13 patches as well I think.
Yours,
Linus Walleij