[1/2] pinctrl: meson: separate soc drivers

Message ID 20171009101747.16940-2-jbrunet@baylibre.com
State New
Headers show
Series
  • pinctrl: meson: prepare for new SoC
Related show

Commit Message

Jerome Brunet Oct. 9, 2017, 10:17 a.m.
When meson pinctrl is enabled, all meson platforms pinctrl drivers are
built in the kernel, with a significant amount of data.

This leads to situation where pinctrl drivers targeting an architecture
are also compiled and shipped on another one (ex: meson8 - ARM - compiled
and shipped on ARM64 builds). This is a waste of memory we can easily
avoid.

This change makes 4 pinctrl drivers (1 per SoC) out the original single
driver, allowing to compile and ship only the ones required.

Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
---
 drivers/pinctrl/Kconfig                    | 11 +------
 drivers/pinctrl/meson/Kconfig              | 36 +++++++++++++++++++++
 drivers/pinctrl/meson/Makefile             |  8 +++--
 drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 25 +++++++++++++--
 drivers/pinctrl/meson/pinctrl-meson-gxl.c  | 25 +++++++++++++--
 drivers/pinctrl/meson/pinctrl-meson.c      | 51 ++----------------------------
 drivers/pinctrl/meson/pinctrl-meson.h      | 11 ++-----
 drivers/pinctrl/meson/pinctrl-meson8.c     | 25 +++++++++++++--
 drivers/pinctrl/meson/pinctrl-meson8b.c    | 25 +++++++++++++--
 9 files changed, 140 insertions(+), 77 deletions(-)
 create mode 100644 drivers/pinctrl/meson/Kconfig

Comments

Neil Armstrong Oct. 9, 2017, 11:35 a.m. | #1
On 09/10/2017 12:17, Jerome Brunet wrote:
> When meson pinctrl is enabled, all meson platforms pinctrl drivers are
> built in the kernel, with a significant amount of data.
> 
> This leads to situation where pinctrl drivers targeting an architecture
> are also compiled and shipped on another one (ex: meson8 - ARM - compiled
> and shipped on ARM64 builds). This is a waste of memory we can easily
> avoid.
> 
> This change makes 4 pinctrl drivers (1 per SoC) out the original single
> driver, allowing to compile and ship only the ones required.
> 
> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> ---
>  drivers/pinctrl/Kconfig                    | 11 +------
>  drivers/pinctrl/meson/Kconfig              | 36 +++++++++++++++++++++
>  drivers/pinctrl/meson/Makefile             |  8 +++--
>  drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 25 +++++++++++++--
>  drivers/pinctrl/meson/pinctrl-meson-gxl.c  | 25 +++++++++++++--
>  drivers/pinctrl/meson/pinctrl-meson.c      | 51 ++----------------------------
>  drivers/pinctrl/meson/pinctrl-meson.h      | 11 ++-----
>  drivers/pinctrl/meson/pinctrl-meson8.c     | 25 +++++++++++++--
>  drivers/pinctrl/meson/pinctrl-meson8b.c    | 25 +++++++++++++--
>  9 files changed, 140 insertions(+), 77 deletions(-)
>  create mode 100644 drivers/pinctrl/meson/Kconfig
> 
> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> index 1778cf4f81c7..15b5b3b76ba9 100644
> --- a/drivers/pinctrl/Kconfig
> +++ b/drivers/pinctrl/Kconfig
> @@ -167,16 +167,6 @@ config PINCTRL_MCP23S08
>  	  This provides a GPIO interface supporting inputs and outputs.
>  	  The I2C versions of the chips can be used as interrupt-controller.
>  
> -config PINCTRL_MESON
> -	bool
> -	depends on OF
> -	select PINMUX
> -	select PINCONF
> -	select GENERIC_PINCONF
> -	select GPIOLIB
> -	select OF_GPIO
> -	select REGMAP_MMIO
> -
>  config PINCTRL_OXNAS
>  	bool
>  	depends on OF
> @@ -368,6 +358,7 @@ source "drivers/pinctrl/uniphier/Kconfig"
>  source "drivers/pinctrl/vt8500/Kconfig"
>  source "drivers/pinctrl/mediatek/Kconfig"
>  source "drivers/pinctrl/zte/Kconfig"
> +source "drivers/pinctrl/meson/Kconfig"
>  
>  config PINCTRL_XWAY
>  	bool
> diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig
> new file mode 100644
> index 000000000000..15655bfd39b6
> --- /dev/null
> +++ b/drivers/pinctrl/meson/Kconfig
> @@ -0,0 +1,36 @@
> +menuconfig PINCTRL_MESON
> +	bool "Amlogic SoC pinctrl drivers"
> +	depends on ARCH_MESON || COMPILE_TEST
> +	depends on OF
> +	select PINMUX
> +	select PINCONF
> +	select GENERIC_PINCONF
> +	select GPIOLIB
> +	select OF_GPIO
> +	select REGMAP_MMIO
> +	select PINMUX
> +	select GENERIC_PINCONF
> +
> +if PINCTRL_MESON
> +
> +config PINCTRL_MESON8
> +	bool "Meson 8 SoC pinctrl driver"
> +	depends on ARM
> +	default y
> +
> +config PINCTRL_MESON8B
> +	bool "Meson 8b SoC pinctrl driver"
> +	depends on ARM
> +	default y
> +
> +config PINCTRL_MESON_GXBB
> +	bool "Meson gxbb SoC pinctrl driver"
> +	depends on ARM64
> +	default y
> +
> +config PINCTRL_MESON_GXL
> +	bool "Meson gxl SoC pinctrl driver"
> +	depends on ARM64
> +	default y
> +
> +endif
> diff --git a/drivers/pinctrl/meson/Makefile b/drivers/pinctrl/meson/Makefile
> index 27c5b5126008..a6ef5ff4e9b1 100644
> --- a/drivers/pinctrl/meson/Makefile
> +++ b/drivers/pinctrl/meson/Makefile
> @@ -1,3 +1,5 @@
> -obj-y	+= pinctrl-meson8.o pinctrl-meson8b.o
> -obj-y	+= pinctrl-meson-gxbb.o pinctrl-meson-gxl.o
> -obj-y	+= pinctrl-meson.o
> +obj-y += pinctrl-meson.o
> +obj-$(CONFIG_PINCTRL_MESON8) += pinctrl-meson8.o
> +obj-$(CONFIG_PINCTRL_MESON8B) += pinctrl-meson8b.o
> +obj-$(CONFIG_PINCTRL_MESON_GXBB) += pinctrl-meson-gxbb.o
> +obj-$(CONFIG_PINCTRL_MESON_GXL) += pinctrl-meson-gxl.o
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> index 1881d4a0eca2..a87bdb17414b 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> @@ -824,7 +824,7 @@ static struct meson_bank meson_gxbb_aobus_banks[] = {
>  	BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>  };
>  
> -struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
> +static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>  	.name		= "periphs-banks",
>  	.pins		= meson_gxbb_periphs_pins,
>  	.groups		= meson_gxbb_periphs_groups,
> @@ -836,7 +836,7 @@ struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>  	.num_banks	= ARRAY_SIZE(meson_gxbb_periphs_banks),
>  };
>  
> -struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
> +static struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
>  	.name		= "aobus-banks",
>  	.pins		= meson_gxbb_aobus_pins,
>  	.groups		= meson_gxbb_aobus_groups,
> @@ -847,3 +847,24 @@ struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
>  	.num_funcs	= ARRAY_SIZE(meson_gxbb_aobus_functions),
>  	.num_banks	= ARRAY_SIZE(meson_gxbb_aobus_banks),
>  };
> +
> +static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {
> +	{
> +		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
> +		.data = &meson_gxbb_periphs_pinctrl_data,
> +	},
> +	{
> +		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
> +		.data = &meson_gxbb_aobus_pinctrl_data,
> +	},
> +	{ },
> +};
> +
> +static struct platform_driver meson_gxbb_pinctrl_driver = {
> +	.probe		= meson_pinctrl_probe,
> +	.driver = {
> +		.name	= "meson-gxbb-pinctrl",
> +		.of_match_table = meson_gxbb_pinctrl_dt_match,
> +	},
> +};
> +builtin_platform_driver(meson_gxbb_pinctrl_driver);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> index 3a14ecae9f31..088ac94f76b0 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> @@ -809,7 +809,7 @@ static struct meson_bank meson_gxl_aobus_banks[] = {
>  	BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>  };
>  
> -struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
> +static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>  	.name		= "periphs-banks",
>  	.pins		= meson_gxl_periphs_pins,
>  	.groups		= meson_gxl_periphs_groups,
> @@ -821,7 +821,7 @@ struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>  	.num_banks	= ARRAY_SIZE(meson_gxl_periphs_banks),
>  };
>  
> -struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
> +static struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
>  	.name		= "aobus-banks",
>  	.pins		= meson_gxl_aobus_pins,
>  	.groups		= meson_gxl_aobus_groups,
> @@ -832,3 +832,24 @@ struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
>  	.num_funcs	= ARRAY_SIZE(meson_gxl_aobus_functions),
>  	.num_banks	= ARRAY_SIZE(meson_gxl_aobus_banks),
>  };
> +
> +static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {
> +	{
> +		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
> +		.data = &meson_gxl_periphs_pinctrl_data,
> +	},
> +	{
> +		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
> +		.data = &meson_gxl_aobus_pinctrl_data,
> +	},
> +	{ },
> +};
> +
> +static struct platform_driver meson_gxl_pinctrl_driver = {
> +	.probe		= meson_pinctrl_probe,
> +	.driver = {
> +		.name	= "meson-gxl-pinctrl",
> +		.of_match_table = meson_gxl_pinctrl_dt_match,
> +	},
> +};
> +builtin_platform_driver(meson_gxl_pinctrl_driver);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
> index 71bccb7acbf8..8fc1f1b45435 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson.c
> @@ -481,42 +481,6 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
>  	return !!(val & BIT(bit));
>  }
>  
> -static const struct of_device_id meson_pinctrl_dt_match[] = {
> -	{
> -		.compatible = "amlogic,meson8-cbus-pinctrl",
> -		.data = &meson8_cbus_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson8b-cbus-pinctrl",
> -		.data = &meson8b_cbus_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson8-aobus-pinctrl",
> -		.data = &meson8_aobus_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson8b-aobus-pinctrl",
> -		.data = &meson8b_aobus_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
> -		.data = &meson_gxbb_periphs_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
> -		.data = &meson_gxbb_aobus_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
> -		.data = &meson_gxl_periphs_pinctrl_data,
> -	},
> -	{
> -		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
> -		.data = &meson_gxl_aobus_pinctrl_data,
> -	},
> -	{ },
> -};
> -
>  static int meson_gpiolib_register(struct meson_pinctrl *pc)
>  {
>  	int ret;
> @@ -624,7 +588,7 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,
>  	return 0;
>  }
>  
> -static int meson_pinctrl_probe(struct platform_device *pdev)
> +int meson_pinctrl_probe(struct platform_device *pdev)
>  {
>  	const struct of_device_id *match;
>  	struct device *dev = &pdev->dev;
> @@ -636,10 +600,10 @@ static int meson_pinctrl_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	pc->dev = dev;
> -	match = of_match_node(meson_pinctrl_dt_match, pdev->dev.of_node);
> +	match = of_match_node(dev->driver->of_match_table, dev->of_node);


Minor comment, maybe you could use of_device_get_match_data(dev) here, it will be simpler.

>  	pc->data = (struct meson_pinctrl_data *) match->data;
>  
> -	ret = meson_pinctrl_parse_dt(pc, pdev->dev.of_node);
> +	ret = meson_pinctrl_parse_dt(pc, dev->of_node);
>  	if (ret)
>  		return ret;
>  
> @@ -659,12 +623,3 @@ static int meson_pinctrl_probe(struct platform_device *pdev)
>  
>  	return meson_gpiolib_register(pc);
>  }
> -
> -static struct platform_driver meson_pinctrl_driver = {
> -	.probe		= meson_pinctrl_probe,
> -	.driver = {
> -		.name	= "meson-pinctrl",
> -		.of_match_table = meson_pinctrl_dt_match,
> -	},
> -};
> -builtin_platform_driver(meson_pinctrl_driver);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
> index 7ed0a80fd9dc..284157d43612 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson.h
> +++ b/drivers/pinctrl/meson/pinctrl-meson.h
> @@ -13,6 +13,7 @@
>  
>  #include <linux/gpio.h>
>  #include <linux/pinctrl/pinctrl.h>
> +#include <linux/platform_device.h>
>  #include <linux/regmap.h>
>  #include <linux/types.h>
>  
> @@ -165,11 +166,5 @@ struct meson_pinctrl {
>  
>  #define MESON_PIN(x) PINCTRL_PIN(x, #x)
>  
> -extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;
> -extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;
> -extern struct meson_pinctrl_data meson8b_cbus_pinctrl_data;
> -extern struct meson_pinctrl_data meson8b_aobus_pinctrl_data;
> -extern struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data;
> -extern struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data;
> -extern struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data;
> -extern struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data;
> +/* Common probe function */
> +int meson_pinctrl_probe(struct platform_device *pdev);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
> index fbf8ecd1c2b6..68b345fc105a 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson8.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson8.c
> @@ -1044,7 +1044,7 @@ static struct meson_bank meson8_aobus_banks[] = {
>  	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>  };
>  
> -struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
> +static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>  	.name		= "cbus-banks",
>  	.pins		= meson8_cbus_pins,
>  	.groups		= meson8_cbus_groups,
> @@ -1056,7 +1056,7 @@ struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>  	.num_banks	= ARRAY_SIZE(meson8_cbus_banks),
>  };
>  
> -struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
> +static struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
>  	.name		= "ao-bank",
>  	.pins		= meson8_aobus_pins,
>  	.groups		= meson8_aobus_groups,
> @@ -1067,3 +1067,24 @@ struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
>  	.num_funcs	= ARRAY_SIZE(meson8_aobus_functions),
>  	.num_banks	= ARRAY_SIZE(meson8_aobus_banks),
>  };
> +
> +static const struct of_device_id meson8_pinctrl_dt_match[] = {
> +	{
> +		.compatible = "amlogic,meson8-cbus-pinctrl",
> +		.data = &meson8_cbus_pinctrl_data,
> +	},
> +	{
> +		.compatible = "amlogic,meson8-aobus-pinctrl",
> +		.data = &meson8_aobus_pinctrl_data,
> +	},
> +	{ },
> +};
> +
> +static struct platform_driver meson8_pinctrl_driver = {
> +	.probe		= meson_pinctrl_probe,
> +	.driver = {
> +		.name	= "meson8-pinctrl",
> +		.of_match_table = meson8_pinctrl_dt_match,
> +	},
> +};
> +builtin_platform_driver(meson8_pinctrl_driver);
> diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
> index 7af296db48c8..4d61df09bc3f 100644
> --- a/drivers/pinctrl/meson/pinctrl-meson8b.c
> +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
> @@ -904,7 +904,7 @@ static struct meson_bank meson8b_aobus_banks[] = {
>  	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>  };
>  
> -struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
> +static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>  	.name		= "cbus-banks",
>  	.pins		= meson8b_cbus_pins,
>  	.groups		= meson8b_cbus_groups,
> @@ -916,7 +916,7 @@ struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>  	.num_banks	= ARRAY_SIZE(meson8b_cbus_banks),
>  };
>  
> -struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
> +static struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
>  	.name		= "aobus-banks",
>  	.pins		= meson8b_aobus_pins,
>  	.groups		= meson8b_aobus_groups,
> @@ -927,3 +927,24 @@ struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
>  	.num_funcs	= ARRAY_SIZE(meson8b_aobus_functions),
>  	.num_banks	= ARRAY_SIZE(meson8b_aobus_banks),
>  };
> +
> +static const struct of_device_id meson8b_pinctrl_dt_match[] = {
> +	{
> +		.compatible = "amlogic,meson8b-cbus-pinctrl",
> +		.data = &meson8b_cbus_pinctrl_data,
> +	},
> +	{
> +		.compatible = "amlogic,meson8b-aobus-pinctrl",
> +		.data = &meson8b_aobus_pinctrl_data,
> +	},
> +	{ },
> +};
> +
> +static struct platform_driver meson8b_pinctrl_driver = {
> +	.probe		= meson_pinctrl_probe,
> +	.driver = {
> +		.name	= "meson8b-pinctrl",
> +		.of_match_table = meson8b_pinctrl_dt_match,
> +	},
> +};
> +builtin_platform_driver(meson8b_pinctrl_driver);
> 

Apart the comment on of_device_get_match_data() :

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jerome Brunet Oct. 9, 2017, 1:11 p.m. | #2
On Mon, 2017-10-09 at 13:35 +0200, Neil Armstrong wrote:
> On 09/10/2017 12:17, Jerome Brunet wrote:
> > When meson pinctrl is enabled, all meson platforms pinctrl drivers are
> > built in the kernel, with a significant amount of data.
> > 
> > This leads to situation where pinctrl drivers targeting an architecture
> > are also compiled and shipped on another one (ex: meson8 - ARM - compiled
> > and shipped on ARM64 builds). This is a waste of memory we can easily
> > avoid.
> > 
> > This change makes 4 pinctrl drivers (1 per SoC) out the original single
> > driver, allowing to compile and ship only the ones required.
> > 
> > Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
> > ---
> >  drivers/pinctrl/Kconfig                    | 11 +------
> >  drivers/pinctrl/meson/Kconfig              | 36 +++++++++++++++++++++
> >  drivers/pinctrl/meson/Makefile             |  8 +++--
> >  drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 25 +++++++++++++--
> >  drivers/pinctrl/meson/pinctrl-meson-gxl.c  | 25 +++++++++++++--
> >  drivers/pinctrl/meson/pinctrl-meson.c      | 51 ++-------------------------
> > ---
> >  drivers/pinctrl/meson/pinctrl-meson.h      | 11 ++-----
> >  drivers/pinctrl/meson/pinctrl-meson8.c     | 25 +++++++++++++--
> >  drivers/pinctrl/meson/pinctrl-meson8b.c    | 25 +++++++++++++--
> >  9 files changed, 140 insertions(+), 77 deletions(-)
> >  create mode 100644 drivers/pinctrl/meson/Kconfig
> > 
> > diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
> > index 1778cf4f81c7..15b5b3b76ba9 100644
> > --- a/drivers/pinctrl/Kconfig
> > +++ b/drivers/pinctrl/Kconfig
> > @@ -167,16 +167,6 @@ config PINCTRL_MCP23S08
> >  	  This provides a GPIO interface supporting inputs and outputs.
> >  	  The I2C versions of the chips can be used as interrupt-
> > controller.
> >  
> > -config PINCTRL_MESON
> > -	bool
> > -	depends on OF
> > -	select PINMUX
> > -	select PINCONF
> > -	select GENERIC_PINCONF
> > -	select GPIOLIB
> > -	select OF_GPIO
> > -	select REGMAP_MMIO
> > -
> >  config PINCTRL_OXNAS
> >  	bool
> >  	depends on OF
> > @@ -368,6 +358,7 @@ source "drivers/pinctrl/uniphier/Kconfig"
> >  source "drivers/pinctrl/vt8500/Kconfig"
> >  source "drivers/pinctrl/mediatek/Kconfig"
> >  source "drivers/pinctrl/zte/Kconfig"
> > +source "drivers/pinctrl/meson/Kconfig"
> >  
> >  config PINCTRL_XWAY
> >  	bool
> > diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig
> > new file mode 100644
> > index 000000000000..15655bfd39b6
> > --- /dev/null
> > +++ b/drivers/pinctrl/meson/Kconfig
> > @@ -0,0 +1,36 @@
> > +menuconfig PINCTRL_MESON
> > +	bool "Amlogic SoC pinctrl drivers"
> > +	depends on ARCH_MESON || COMPILE_TEST
> > +	depends on OF
> > +	select PINMUX
> > +	select PINCONF
> > +	select GENERIC_PINCONF
> > +	select GPIOLIB
> > +	select OF_GPIO
> > +	select REGMAP_MMIO
> > +	select PINMUX
> > +	select GENERIC_PINCONF
> > +
> > +if PINCTRL_MESON
> > +
> > +config PINCTRL_MESON8
> > +	bool "Meson 8 SoC pinctrl driver"
> > +	depends on ARM
> > +	default y
> > +
> > +config PINCTRL_MESON8B
> > +	bool "Meson 8b SoC pinctrl driver"
> > +	depends on ARM
> > +	default y
> > +
> > +config PINCTRL_MESON_GXBB
> > +	bool "Meson gxbb SoC pinctrl driver"
> > +	depends on ARM64
> > +	default y
> > +
> > +config PINCTRL_MESON_GXL
> > +	bool "Meson gxl SoC pinctrl driver"
> > +	depends on ARM64
> > +	default y
> > +
> > +endif
> > diff --git a/drivers/pinctrl/meson/Makefile b/drivers/pinctrl/meson/Makefile
> > index 27c5b5126008..a6ef5ff4e9b1 100644
> > --- a/drivers/pinctrl/meson/Makefile
> > +++ b/drivers/pinctrl/meson/Makefile
> > @@ -1,3 +1,5 @@
> > -obj-y	+= pinctrl-meson8.o pinctrl-meson8b.o
> > -obj-y	+= pinctrl-meson-gxbb.o pinctrl-meson-gxl.o
> > -obj-y	+= pinctrl-meson.o
> > +obj-y += pinctrl-meson.o
> > +obj-$(CONFIG_PINCTRL_MESON8) += pinctrl-meson8.o
> > +obj-$(CONFIG_PINCTRL_MESON8B) += pinctrl-meson8b.o
> > +obj-$(CONFIG_PINCTRL_MESON_GXBB) += pinctrl-meson-gxbb.o
> > +obj-$(CONFIG_PINCTRL_MESON_GXL) += pinctrl-meson-gxl.o
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> > b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> > index 1881d4a0eca2..a87bdb17414b 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> > +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
> > @@ -824,7 +824,7 @@ static struct meson_bank meson_gxbb_aobus_banks[] = {
> >  	BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  0,  0,
> > 16,  0,  0,  0, 16,  1,  0),
> >  };
> >  
> > -struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
> > +static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
> >  	.name		= "periphs-banks",
> >  	.pins		= meson_gxbb_periphs_pins,
> >  	.groups		= meson_gxbb_periphs_groups,
> > @@ -836,7 +836,7 @@ struct meson_pinctrl_data
> > meson_gxbb_periphs_pinctrl_data = {
> >  	.num_banks	= ARRAY_SIZE(meson_gxbb_periphs_banks),
> >  };
> >  
> > -struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
> >  	.name		= "aobus-banks",
> >  	.pins		= meson_gxbb_aobus_pins,
> >  	.groups		= meson_gxbb_aobus_groups,
> > @@ -847,3 +847,24 @@ struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data
> > = {
> >  	.num_funcs	= ARRAY_SIZE(meson_gxbb_aobus_functions),
> >  	.num_banks	= ARRAY_SIZE(meson_gxbb_aobus_banks),
> >  };
> > +
> > +static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {
> > +	{
> > +		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
> > +		.data = &meson_gxbb_periphs_pinctrl_data,
> > +	},
> > +	{
> > +		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
> > +		.data = &meson_gxbb_aobus_pinctrl_data,
> > +	},
> > +	{ },
> > +};
> > +
> > +static struct platform_driver meson_gxbb_pinctrl_driver = {
> > +	.probe		= meson_pinctrl_probe,
> > +	.driver = {
> > +		.name	= "meson-gxbb-pinctrl",
> > +		.of_match_table = meson_gxbb_pinctrl_dt_match,
> > +	},
> > +};
> > +builtin_platform_driver(meson_gxbb_pinctrl_driver);
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> > b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> > index 3a14ecae9f31..088ac94f76b0 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> > +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
> > @@ -809,7 +809,7 @@ static struct meson_bank meson_gxl_aobus_banks[] = {
> >  	BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  0,  0, 16,  0,  0,  0,
> > 16,  1,  0),
> >  };
> >  
> > -struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
> > +static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
> >  	.name		= "periphs-banks",
> >  	.pins		= meson_gxl_periphs_pins,
> >  	.groups		= meson_gxl_periphs_groups,
> > @@ -821,7 +821,7 @@ struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data
> > = {
> >  	.num_banks	= ARRAY_SIZE(meson_gxl_periphs_banks),
> >  };
> >  
> > -struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
> >  	.name		= "aobus-banks",
> >  	.pins		= meson_gxl_aobus_pins,
> >  	.groups		= meson_gxl_aobus_groups,
> > @@ -832,3 +832,24 @@ struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data
> > = {
> >  	.num_funcs	= ARRAY_SIZE(meson_gxl_aobus_functions),
> >  	.num_banks	= ARRAY_SIZE(meson_gxl_aobus_banks),
> >  };
> > +
> > +static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {
> > +	{
> > +		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
> > +		.data = &meson_gxl_periphs_pinctrl_data,
> > +	},
> > +	{
> > +		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
> > +		.data = &meson_gxl_aobus_pinctrl_data,
> > +	},
> > +	{ },
> > +};
> > +
> > +static struct platform_driver meson_gxl_pinctrl_driver = {
> > +	.probe		= meson_pinctrl_probe,
> > +	.driver = {
> > +		.name	= "meson-gxl-pinctrl",
> > +		.of_match_table = meson_gxl_pinctrl_dt_match,
> > +	},
> > +};
> > +builtin_platform_driver(meson_gxl_pinctrl_driver);
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson.c
> > b/drivers/pinctrl/meson/pinctrl-meson.c
> > index 71bccb7acbf8..8fc1f1b45435 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson.c
> > +++ b/drivers/pinctrl/meson/pinctrl-meson.c
> > @@ -481,42 +481,6 @@ static int meson_gpio_get(struct gpio_chip *chip,
> > unsigned gpio)
> >  	return !!(val & BIT(bit));
> >  }
> >  
> > -static const struct of_device_id meson_pinctrl_dt_match[] = {
> > -	{
> > -		.compatible = "amlogic,meson8-cbus-pinctrl",
> > -		.data = &meson8_cbus_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson8b-cbus-pinctrl",
> > -		.data = &meson8b_cbus_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson8-aobus-pinctrl",
> > -		.data = &meson8_aobus_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson8b-aobus-pinctrl",
> > -		.data = &meson8b_aobus_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
> > -		.data = &meson_gxbb_periphs_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
> > -		.data = &meson_gxbb_aobus_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
> > -		.data = &meson_gxl_periphs_pinctrl_data,
> > -	},
> > -	{
> > -		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
> > -		.data = &meson_gxl_aobus_pinctrl_data,
> > -	},
> > -	{ },
> > -};
> > -
> >  static int meson_gpiolib_register(struct meson_pinctrl *pc)
> >  {
> >  	int ret;
> > @@ -624,7 +588,7 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl
> > *pc,
> >  	return 0;
> >  }
> >  
> > -static int meson_pinctrl_probe(struct platform_device *pdev)
> > +int meson_pinctrl_probe(struct platform_device *pdev)
> >  {
> >  	const struct of_device_id *match;
> >  	struct device *dev = &pdev->dev;
> > @@ -636,10 +600,10 @@ static int meson_pinctrl_probe(struct platform_device
> > *pdev)
> >  		return -ENOMEM;
> >  
> >  	pc->dev = dev;
> > -	match = of_match_node(meson_pinctrl_dt_match, pdev->dev.of_node);
> > +	match = of_match_node(dev->driver->of_match_table, dev->of_node);
> 
> 
> Minor comment, maybe you could use of_device_get_match_data(dev) here, it will
> be simpler.

Indeed, I missed this particular helper. Thx !

> 
> >  	pc->data = (struct meson_pinctrl_data *) match->data;
> >  
> > -	ret = meson_pinctrl_parse_dt(pc, pdev->dev.of_node);
> > +	ret = meson_pinctrl_parse_dt(pc, dev->of_node);
> >  	if (ret)
> >  		return ret;
> >  
> > @@ -659,12 +623,3 @@ static int meson_pinctrl_probe(struct platform_device
> > *pdev)
> >  
> >  	return meson_gpiolib_register(pc);
> >  }
> > -
> > -static struct platform_driver meson_pinctrl_driver = {
> > -	.probe		= meson_pinctrl_probe,
> > -	.driver = {
> > -		.name	= "meson-pinctrl",
> > -		.of_match_table = meson_pinctrl_dt_match,
> > -	},
> > -};
> > -builtin_platform_driver(meson_pinctrl_driver);
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson.h
> > b/drivers/pinctrl/meson/pinctrl-meson.h
> > index 7ed0a80fd9dc..284157d43612 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson.h
> > +++ b/drivers/pinctrl/meson/pinctrl-meson.h
> > @@ -13,6 +13,7 @@
> >  
> >  #include <linux/gpio.h>
> >  #include <linux/pinctrl/pinctrl.h>
> > +#include <linux/platform_device.h>
> >  #include <linux/regmap.h>
> >  #include <linux/types.h>
> >  
> > @@ -165,11 +166,5 @@ struct meson_pinctrl {
> >  
> >  #define MESON_PIN(x) PINCTRL_PIN(x, #x)
> >  
> > -extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;
> > -extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;
> > -extern struct meson_pinctrl_data meson8b_cbus_pinctrl_data;
> > -extern struct meson_pinctrl_data meson8b_aobus_pinctrl_data;
> > -extern struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data;
> > -extern struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data;
> > -extern struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data;
> > -extern struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data;
> > +/* Common probe function */
> > +int meson_pinctrl_probe(struct platform_device *pdev);
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c
> > b/drivers/pinctrl/meson/pinctrl-meson8.c
> > index fbf8ecd1c2b6..68b345fc105a 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson8.c
> > +++ b/drivers/pinctrl/meson/pinctrl-meson8.c
> > @@ -1044,7 +1044,7 @@ static struct meson_bank meson8_aobus_banks[] = {
> >  	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0,
> > 16,  0,  0,  0, 16,  1,  0),
> >  };
> >  
> > -struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
> >  	.name		= "cbus-banks",
> >  	.pins		= meson8_cbus_pins,
> >  	.groups		= meson8_cbus_groups,
> > @@ -1056,7 +1056,7 @@ struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
> >  	.num_banks	= ARRAY_SIZE(meson8_cbus_banks),
> >  };
> >  
> > -struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
> >  	.name		= "ao-bank",
> >  	.pins		= meson8_aobus_pins,
> >  	.groups		= meson8_aobus_groups,
> > @@ -1067,3 +1067,24 @@ struct meson_pinctrl_data meson8_aobus_pinctrl_data =
> > {
> >  	.num_funcs	= ARRAY_SIZE(meson8_aobus_functions),
> >  	.num_banks	= ARRAY_SIZE(meson8_aobus_banks),
> >  };
> > +
> > +static const struct of_device_id meson8_pinctrl_dt_match[] = {
> > +	{
> > +		.compatible = "amlogic,meson8-cbus-pinctrl",
> > +		.data = &meson8_cbus_pinctrl_data,
> > +	},
> > +	{
> > +		.compatible = "amlogic,meson8-aobus-pinctrl",
> > +		.data = &meson8_aobus_pinctrl_data,
> > +	},
> > +	{ },
> > +};
> > +
> > +static struct platform_driver meson8_pinctrl_driver = {
> > +	.probe		= meson_pinctrl_probe,
> > +	.driver = {
> > +		.name	= "meson8-pinctrl",
> > +		.of_match_table = meson8_pinctrl_dt_match,
> > +	},
> > +};
> > +builtin_platform_driver(meson8_pinctrl_driver);
> > diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c
> > b/drivers/pinctrl/meson/pinctrl-meson8b.c
> > index 7af296db48c8..4d61df09bc3f 100644
> > --- a/drivers/pinctrl/meson/pinctrl-meson8b.c
> > +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
> > @@ -904,7 +904,7 @@ static struct meson_bank meson8b_aobus_banks[] = {
> >  	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0,
> > 16,  0,  0,  0, 16,  1,  0),
> >  };
> >  
> > -struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
> >  	.name		= "cbus-banks",
> >  	.pins		= meson8b_cbus_pins,
> >  	.groups		= meson8b_cbus_groups,
> > @@ -916,7 +916,7 @@ struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
> >  	.num_banks	= ARRAY_SIZE(meson8b_cbus_banks),
> >  };
> >  
> > -struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
> > +static struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
> >  	.name		= "aobus-banks",
> >  	.pins		= meson8b_aobus_pins,
> >  	.groups		= meson8b_aobus_groups,
> > @@ -927,3 +927,24 @@ struct meson_pinctrl_data meson8b_aobus_pinctrl_data =
> > {
> >  	.num_funcs	= ARRAY_SIZE(meson8b_aobus_functions),
> >  	.num_banks	= ARRAY_SIZE(meson8b_aobus_banks),
> >  };
> > +
> > +static const struct of_device_id meson8b_pinctrl_dt_match[] = {
> > +	{
> > +		.compatible = "amlogic,meson8b-cbus-pinctrl",
> > +		.data = &meson8b_cbus_pinctrl_data,
> > +	},
> > +	{
> > +		.compatible = "amlogic,meson8b-aobus-pinctrl",
> > +		.data = &meson8b_aobus_pinctrl_data,
> > +	},
> > +	{ },
> > +};
> > +
> > +static struct platform_driver meson8b_pinctrl_driver = {
> > +	.probe		= meson_pinctrl_probe,
> > +	.driver = {
> > +		.name	= "meson8b-pinctrl",
> > +		.of_match_table = meson8b_pinctrl_dt_match,
> > +	},
> > +};
> > +builtin_platform_driver(meson8b_pinctrl_driver);
> > 
> 
> Apart the comment on of_device_get_match_data() :
> 
> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>

--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Yixun Lan Oct. 11, 2017, 2:55 a.m. | #3
hi jerome:


On Mon, Oct 9, 2017 at 7:35 PM, Neil Armstrong <narmstrong@baylibre.com> wrote:
> On 09/10/2017 12:17, Jerome Brunet wrote:
>> When meson pinctrl is enabled, all meson platforms pinctrl drivers are
>> built in the kernel, with a significant amount of data.
>>
>> This leads to situation where pinctrl drivers targeting an architecture
>> are also compiled and shipped on another one (ex: meson8 - ARM - compiled
>> and shipped on ARM64 builds). This is a waste of memory we can easily
>> avoid.
>>
>> This change makes 4 pinctrl drivers (1 per SoC) out the original single
>> driver, allowing to compile and ship only the ones required.
>>
>> Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
>> ---
>>  drivers/pinctrl/Kconfig                    | 11 +------
>>  drivers/pinctrl/meson/Kconfig              | 36 +++++++++++++++++++++
>>  drivers/pinctrl/meson/Makefile             |  8 +++--
>>  drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 25 +++++++++++++--
>>  drivers/pinctrl/meson/pinctrl-meson-gxl.c  | 25 +++++++++++++--
>>  drivers/pinctrl/meson/pinctrl-meson.c      | 51 ++----------------------------
>>  drivers/pinctrl/meson/pinctrl-meson.h      | 11 ++-----
>>  drivers/pinctrl/meson/pinctrl-meson8.c     | 25 +++++++++++++--
>>  drivers/pinctrl/meson/pinctrl-meson8b.c    | 25 +++++++++++++--
>>  9 files changed, 140 insertions(+), 77 deletions(-)
>>  create mode 100644 drivers/pinctrl/meson/Kconfig
>>
>> diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
>> index 1778cf4f81c7..15b5b3b76ba9 100644
>> --- a/drivers/pinctrl/Kconfig
>> +++ b/drivers/pinctrl/Kconfig
>> @@ -167,16 +167,6 @@ config PINCTRL_MCP23S08
>>         This provides a GPIO interface supporting inputs and outputs.
>>         The I2C versions of the chips can be used as interrupt-controller.
>>
>> -config PINCTRL_MESON
>> -     bool
>> -     depends on OF
>> -     select PINMUX
>> -     select PINCONF
>> -     select GENERIC_PINCONF
>> -     select GPIOLIB
>> -     select OF_GPIO
>> -     select REGMAP_MMIO
>> -
>>  config PINCTRL_OXNAS
>>       bool
>>       depends on OF
>> @@ -368,6 +358,7 @@ source "drivers/pinctrl/uniphier/Kconfig"
>>  source "drivers/pinctrl/vt8500/Kconfig"
>>  source "drivers/pinctrl/mediatek/Kconfig"
>>  source "drivers/pinctrl/zte/Kconfig"
>> +source "drivers/pinctrl/meson/Kconfig"
>>
>>  config PINCTRL_XWAY
>>       bool
>> diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig
>> new file mode 100644
>> index 000000000000..15655bfd39b6
>> --- /dev/null
>> +++ b/drivers/pinctrl/meson/Kconfig
>> @@ -0,0 +1,36 @@
>> +menuconfig PINCTRL_MESON
>> +     bool "Amlogic SoC pinctrl drivers"
>> +     depends on ARCH_MESON || COMPILE_TEST
>> +     depends on OF
>> +     select PINMUX
>> +     select PINCONF
>> +     select GENERIC_PINCONF
>> +     select GPIOLIB
>> +     select OF_GPIO
>> +     select REGMAP_MMIO
>> +     select PINMUX
>> +     select GENERIC_PINCONF
>> +
>> +if PINCTRL_MESON
>> +
>> +config PINCTRL_MESON8
>> +     bool "Meson 8 SoC pinctrl driver"
>> +     depends on ARM
>> +     default y
>> +
>> +config PINCTRL_MESON8B
>> +     bool "Meson 8b SoC pinctrl driver"
>> +     depends on ARM
>> +     default y
>> +
>> +config PINCTRL_MESON_GXBB
>> +     bool "Meson gxbb SoC pinctrl driver"
>> +     depends on ARM64
>> +     default y
>> +
>> +config PINCTRL_MESON_GXL
>> +     bool "Meson gxl SoC pinctrl driver"
>> +     depends on ARM64
>> +     default y
>> +
>> +endif
>> diff --git a/drivers/pinctrl/meson/Makefile b/drivers/pinctrl/meson/Makefile
>> index 27c5b5126008..a6ef5ff4e9b1 100644
>> --- a/drivers/pinctrl/meson/Makefile
>> +++ b/drivers/pinctrl/meson/Makefile
>> @@ -1,3 +1,5 @@
>> -obj-y        += pinctrl-meson8.o pinctrl-meson8b.o
>> -obj-y        += pinctrl-meson-gxbb.o pinctrl-meson-gxl.o
>> -obj-y        += pinctrl-meson.o
>> +obj-y += pinctrl-meson.o
>> +obj-$(CONFIG_PINCTRL_MESON8) += pinctrl-meson8.o
>> +obj-$(CONFIG_PINCTRL_MESON8B) += pinctrl-meson8b.o
>> +obj-$(CONFIG_PINCTRL_MESON_GXBB) += pinctrl-meson-gxbb.o
>> +obj-$(CONFIG_PINCTRL_MESON_GXL) += pinctrl-meson-gxl.o
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> index 1881d4a0eca2..a87bdb17414b 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
>> @@ -824,7 +824,7 @@ static struct meson_bank meson_gxbb_aobus_banks[] = {
>>       BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>>  };
>>
>> -struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>> +static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>>       .name           = "periphs-banks",
>>       .pins           = meson_gxbb_periphs_pins,
>>       .groups         = meson_gxbb_periphs_groups,
>> @@ -836,7 +836,7 @@ struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
>>       .num_banks      = ARRAY_SIZE(meson_gxbb_periphs_banks),
>>  };
>>
>> -struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
>>       .name           = "aobus-banks",
>>       .pins           = meson_gxbb_aobus_pins,
>>       .groups         = meson_gxbb_aobus_groups,
>> @@ -847,3 +847,24 @@ struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
>>       .num_funcs      = ARRAY_SIZE(meson_gxbb_aobus_functions),
>>       .num_banks      = ARRAY_SIZE(meson_gxbb_aobus_banks),
>>  };
>> +
>> +static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {
>> +     {
>> +             .compatible = "amlogic,meson-gxbb-periphs-pinctrl",
>> +             .data = &meson_gxbb_periphs_pinctrl_data,
>> +     },
>> +     {
>> +             .compatible = "amlogic,meson-gxbb-aobus-pinctrl",
>> +             .data = &meson_gxbb_aobus_pinctrl_data,
>> +     },
>> +     { },
>> +};
>> +
>> +static struct platform_driver meson_gxbb_pinctrl_driver = {
>> +     .probe          = meson_pinctrl_probe,
>> +     .driver = {
>> +             .name   = "meson-gxbb-pinctrl",
>> +             .of_match_table = meson_gxbb_pinctrl_dt_match,
>> +     },
>> +};
>> +builtin_platform_driver(meson_gxbb_pinctrl_driver);
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> index 3a14ecae9f31..088ac94f76b0 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
>> @@ -809,7 +809,7 @@ static struct meson_bank meson_gxl_aobus_banks[] = {
>>       BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>>  };
>>
>> -struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>> +static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>>       .name           = "periphs-banks",
>>       .pins           = meson_gxl_periphs_pins,
>>       .groups         = meson_gxl_periphs_groups,
>> @@ -821,7 +821,7 @@ struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
>>       .num_banks      = ARRAY_SIZE(meson_gxl_periphs_banks),
>>  };
>>
>> -struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
>>       .name           = "aobus-banks",
>>       .pins           = meson_gxl_aobus_pins,
>>       .groups         = meson_gxl_aobus_groups,
>> @@ -832,3 +832,24 @@ struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
>>       .num_funcs      = ARRAY_SIZE(meson_gxl_aobus_functions),
>>       .num_banks      = ARRAY_SIZE(meson_gxl_aobus_banks),
>>  };
>> +
>> +static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {
>> +     {
>> +             .compatible = "amlogic,meson-gxl-periphs-pinctrl",
>> +             .data = &meson_gxl_periphs_pinctrl_data,
>> +     },
>> +     {
>> +             .compatible = "amlogic,meson-gxl-aobus-pinctrl",
>> +             .data = &meson_gxl_aobus_pinctrl_data,
>> +     },
>> +     { },
>> +};
>> +
>> +static struct platform_driver meson_gxl_pinctrl_driver = {
>> +     .probe          = meson_pinctrl_probe,
>> +     .driver = {
>> +             .name   = "meson-gxl-pinctrl",
>> +             .of_match_table = meson_gxl_pinctrl_dt_match,
>> +     },
>> +};
>> +builtin_platform_driver(meson_gxl_pinctrl_driver);
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
>> index 71bccb7acbf8..8fc1f1b45435 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson.c
>> @@ -481,42 +481,6 @@ static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
>>       return !!(val & BIT(bit));
>>  }
>>
>> -static const struct of_device_id meson_pinctrl_dt_match[] = {
>> -     {
>> -             .compatible = "amlogic,meson8-cbus-pinctrl",
>> -             .data = &meson8_cbus_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson8b-cbus-pinctrl",
>> -             .data = &meson8b_cbus_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson8-aobus-pinctrl",
>> -             .data = &meson8_aobus_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson8b-aobus-pinctrl",
>> -             .data = &meson8b_aobus_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson-gxbb-periphs-pinctrl",
>> -             .data = &meson_gxbb_periphs_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson-gxbb-aobus-pinctrl",
>> -             .data = &meson_gxbb_aobus_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson-gxl-periphs-pinctrl",
>> -             .data = &meson_gxl_periphs_pinctrl_data,
>> -     },
>> -     {
>> -             .compatible = "amlogic,meson-gxl-aobus-pinctrl",
>> -             .data = &meson_gxl_aobus_pinctrl_data,
>> -     },
>> -     { },
>> -};
>> -
>>  static int meson_gpiolib_register(struct meson_pinctrl *pc)
>>  {
>>       int ret;
>> @@ -624,7 +588,7 @@ static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,
>>       return 0;
>>  }
>>
>> -static int meson_pinctrl_probe(struct platform_device *pdev)
>> +int meson_pinctrl_probe(struct platform_device *pdev)
>>  {
>>       const struct of_device_id *match;
>>       struct device *dev = &pdev->dev;
>> @@ -636,10 +600,10 @@ static int meson_pinctrl_probe(struct platform_device *pdev)
>>               return -ENOMEM;
>>
>>       pc->dev = dev;
>> -     match = of_match_node(meson_pinctrl_dt_match, pdev->dev.of_node);
>> +     match = of_match_node(dev->driver->of_match_table, dev->of_node);
>
>
> Minor comment, maybe you could use of_device_get_match_data(dev) here, it will be simpler.
>
with the of_device_get_match_data() been used, I've got this error, probably
you should add "#include <linux/of_device.h>" ?

 AR      drivers/base/built-in.o
drivers/pinctrl/meson/pinctrl-meson.c: In function ‘meson_pinctrl_probe’:
drivers/pinctrl/meson/pinctrl-meson.c:520:43: error: implicit
declaration of function ‘of_device_get_match_data’
[-Werror=implicit-function-declaration]
  pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev);
                                           ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/meson/pinctrl-meson.c:520:13: warning: cast to pointer
from integer of different size [-Wint-to-pointer-cast]
  pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev);
             ^


>>       pc->data = (struct meson_pinctrl_data *) match->data;
>>
>> -     ret = meson_pinctrl_parse_dt(pc, pdev->dev.of_node);
>> +     ret = meson_pinctrl_parse_dt(pc, dev->of_node);
>>       if (ret)
>>               return ret;
>>
>> @@ -659,12 +623,3 @@ static int meson_pinctrl_probe(struct platform_device *pdev)
>>
>>       return meson_gpiolib_register(pc);
>>  }
>> -
>> -static struct platform_driver meson_pinctrl_driver = {
>> -     .probe          = meson_pinctrl_probe,
>> -     .driver = {
>> -             .name   = "meson-pinctrl",
>> -             .of_match_table = meson_pinctrl_dt_match,
>> -     },
>> -};
>> -builtin_platform_driver(meson_pinctrl_driver);
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
>> index 7ed0a80fd9dc..284157d43612 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson.h
>> +++ b/drivers/pinctrl/meson/pinctrl-meson.h
>> @@ -13,6 +13,7 @@
>>
>>  #include <linux/gpio.h>
>>  #include <linux/pinctrl/pinctrl.h>
>> +#include <linux/platform_device.h>
>>  #include <linux/regmap.h>
>>  #include <linux/types.h>
>>
>> @@ -165,11 +166,5 @@ struct meson_pinctrl {
>>
>>  #define MESON_PIN(x) PINCTRL_PIN(x, #x)
>>
>> -extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;
>> -extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;
>> -extern struct meson_pinctrl_data meson8b_cbus_pinctrl_data;
>> -extern struct meson_pinctrl_data meson8b_aobus_pinctrl_data;
>> -extern struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data;
>> -extern struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data;
>> -extern struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data;
>> -extern struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data;
>> +/* Common probe function */
>> +int meson_pinctrl_probe(struct platform_device *pdev);
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
>> index fbf8ecd1c2b6..68b345fc105a 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson8.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson8.c
>> @@ -1044,7 +1044,7 @@ static struct meson_bank meson8_aobus_banks[] = {
>>       BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>>  };
>>
>> -struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>>       .name           = "cbus-banks",
>>       .pins           = meson8_cbus_pins,
>>       .groups         = meson8_cbus_groups,
>> @@ -1056,7 +1056,7 @@ struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
>>       .num_banks      = ARRAY_SIZE(meson8_cbus_banks),
>>  };
>>
>> -struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
>>       .name           = "ao-bank",
>>       .pins           = meson8_aobus_pins,
>>       .groups         = meson8_aobus_groups,
>> @@ -1067,3 +1067,24 @@ struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
>>       .num_funcs      = ARRAY_SIZE(meson8_aobus_functions),
>>       .num_banks      = ARRAY_SIZE(meson8_aobus_banks),
>>  };
>> +
>> +static const struct of_device_id meson8_pinctrl_dt_match[] = {
>> +     {
>> +             .compatible = "amlogic,meson8-cbus-pinctrl",
>> +             .data = &meson8_cbus_pinctrl_data,
>> +     },
>> +     {
>> +             .compatible = "amlogic,meson8-aobus-pinctrl",
>> +             .data = &meson8_aobus_pinctrl_data,
>> +     },
>> +     { },
>> +};
>> +
>> +static struct platform_driver meson8_pinctrl_driver = {
>> +     .probe          = meson_pinctrl_probe,
>> +     .driver = {
>> +             .name   = "meson8-pinctrl",
>> +             .of_match_table = meson8_pinctrl_dt_match,
>> +     },
>> +};
>> +builtin_platform_driver(meson8_pinctrl_driver);
>> diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
>> index 7af296db48c8..4d61df09bc3f 100644
>> --- a/drivers/pinctrl/meson/pinctrl-meson8b.c
>> +++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
>> @@ -904,7 +904,7 @@ static struct meson_bank meson8b_aobus_banks[] = {
>>       BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
>>  };
>>
>> -struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>>       .name           = "cbus-banks",
>>       .pins           = meson8b_cbus_pins,
>>       .groups         = meson8b_cbus_groups,
>> @@ -916,7 +916,7 @@ struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
>>       .num_banks      = ARRAY_SIZE(meson8b_cbus_banks),
>>  };
>>
>> -struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
>> +static struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
>>       .name           = "aobus-banks",
>>       .pins           = meson8b_aobus_pins,
>>       .groups         = meson8b_aobus_groups,
>> @@ -927,3 +927,24 @@ struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
>>       .num_funcs      = ARRAY_SIZE(meson8b_aobus_functions),
>>       .num_banks      = ARRAY_SIZE(meson8b_aobus_banks),
>>  };
>> +
>> +static const struct of_device_id meson8b_pinctrl_dt_match[] = {
>> +     {
>> +             .compatible = "amlogic,meson8b-cbus-pinctrl",
>> +             .data = &meson8b_cbus_pinctrl_data,
>> +     },
>> +     {
>> +             .compatible = "amlogic,meson8b-aobus-pinctrl",
>> +             .data = &meson8b_aobus_pinctrl_data,
>> +     },
>> +     { },
>> +};
>> +
>> +static struct platform_driver meson8b_pinctrl_driver = {
>> +     .probe          = meson_pinctrl_probe,
>> +     .driver = {
>> +             .name   = "meson8b-pinctrl",
>> +             .of_match_table = meson8b_pinctrl_dt_match,
>> +     },
>> +};
>> +builtin_platform_driver(meson8b_pinctrl_driver);
>>
>
> Apart the comment on of_device_get_match_data() :
>
> Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
>
> _______________________________________________
> linux-amlogic mailing list
> linux-amlogic@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-amlogic
--
To unsubscribe from this list: send the line "unsubscribe linux-gpio" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
kbuild test robot Oct. 12, 2017, 6:09 a.m. | #4
Hi Jerome,

[auto build test ERROR on pinctrl/devel]
[also build test ERROR on v4.14-rc4 next-20171009]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Jerome-Brunet/pinctrl-meson-prepare-for-new-SoC/20171012-094645
base:   https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel
config: i386-allmodconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All error/warnings (new ones prefixed by >>):

   In file included from arch/x86/include/asm/bitops.h:513:0,
                    from include/linux/bitops.h:37,
                    from include/linux/kernel.h:10,
                    from include/linux/list.h:8,
                    from include/linux/kobject.h:20,
                    from include/linux/device.h:17,
                    from drivers/pinctrl/meson/pinctrl-meson.c:47:
>> arch/x86/include/asm/arch_hweight.h:17:17: error: expected identifier before string constant
    #define REG_OUT "a"
                    ^
>> drivers/pinctrl/meson/pinctrl-meson.h:74:2: note: in expansion of macro 'REG_OUT'
     REG_OUT,
     ^~~~~~~
   In file included from drivers/pinctrl/meson/pinctrl-meson.c:63:0:
>> drivers/pinctrl/meson/pinctrl-meson.h:99:29: error: 'NUM_REG' undeclared here (not in a function)
     struct meson_reg_desc regs[NUM_REG];
                                ^~~~~~~
   In file included from arch/x86/include/asm/bitops.h:513:0,
                    from include/linux/bitops.h:37,
                    from include/linux/kernel.h:10,
                    from include/linux/list.h:8,
                    from include/linux/kobject.h:20,
                    from include/linux/device.h:17,
                    from drivers/pinctrl/meson/pinctrl-meson.c:47:
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_direction_output':
>> arch/x86/include/asm/arch_hweight.h:17:17: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
    #define REG_OUT "a"
                    ^
>> drivers/pinctrl/meson/pinctrl-meson.c:446:37: note: in expansion of macro 'REG_OUT'
     meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
                                        ^~~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~
   In file included from arch/x86/include/asm/bitops.h:513:0,
                    from include/linux/bitops.h:37,
                    from include/linux/kernel.h:10,
                    from include/linux/list.h:8,
                    from include/linux/kobject.h:20,
                    from include/linux/device.h:17,
                    from drivers/pinctrl/meson/pinctrl-meson.c:47:
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_set':
>> arch/x86/include/asm/arch_hweight.h:17:17: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
    #define REG_OUT "a"
                    ^
   drivers/pinctrl/meson/pinctrl-meson.c:462:37: note: in expansion of macro 'REG_OUT'
     meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
                                        ^~~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~
   In file included from arch/x86/include/asm/bitops.h:513:0,
                    from include/linux/bitops.h:37,
                    from include/linux/kernel.h:10,
                    from include/linux/list.h:8,
                    from include/linux/kobject.h:20,
                    from include/linux/device.h:17,
                    from drivers/pinctrl/meson/pinctrl-meson.c:47:
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_get':
   arch/x86/include/asm/arch_hweight.h:16:16: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
    #define REG_IN "a"
                   ^
>> drivers/pinctrl/meson/pinctrl-meson.c:478:37: note: in expansion of macro 'REG_IN'
     meson_calc_reg_and_bit(bank, gpio, REG_IN, &reg, &bit);
                                        ^~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~

vim +/NUM_REG +99 drivers/pinctrl/meson/pinctrl-meson.h

6ac73095 Beniamino Galvani 2015-01-17   66  
6ac73095 Beniamino Galvani 2015-01-17   67  /**
6ac73095 Beniamino Galvani 2015-01-17   68   * enum meson_reg_type - type of registers encoded in @meson_reg_desc
6ac73095 Beniamino Galvani 2015-01-17   69   */
6ac73095 Beniamino Galvani 2015-01-17   70  enum meson_reg_type {
6ac73095 Beniamino Galvani 2015-01-17   71  	REG_PULLEN,
6ac73095 Beniamino Galvani 2015-01-17   72  	REG_PULL,
6ac73095 Beniamino Galvani 2015-01-17   73  	REG_DIR,
6ac73095 Beniamino Galvani 2015-01-17  @74  	REG_OUT,
6ac73095 Beniamino Galvani 2015-01-17   75  	REG_IN,
6ac73095 Beniamino Galvani 2015-01-17   76  	NUM_REG,
6ac73095 Beniamino Galvani 2015-01-17   77  };
6ac73095 Beniamino Galvani 2015-01-17   78  
6ac73095 Beniamino Galvani 2015-01-17   79  /**
6ac73095 Beniamino Galvani 2015-01-17   80   * struct meson bank
6ac73095 Beniamino Galvani 2015-01-17   81   *
6ac73095 Beniamino Galvani 2015-01-17   82   * @name:	bank name
6ac73095 Beniamino Galvani 2015-01-17   83   * @first:	first pin of the bank
6ac73095 Beniamino Galvani 2015-01-17   84   * @last:	last pin of the bank
6c9dc843 Jerome Brunet     2017-06-08   85   * @irq:	hwirq base number of the bank
6ac73095 Beniamino Galvani 2015-01-17   86   * @regs:	array of register descriptors
6ac73095 Beniamino Galvani 2015-01-17   87   *
6ac73095 Beniamino Galvani 2015-01-17   88   * A bank represents a set of pins controlled by a contiguous set of
6ac73095 Beniamino Galvani 2015-01-17   89   * bits in the domain registers. The structure specifies which bits in
6ac73095 Beniamino Galvani 2015-01-17   90   * the regmap control the different functionalities. Each member of
6ac73095 Beniamino Galvani 2015-01-17   91   * the @regs array refers to the first pin of the bank.
6ac73095 Beniamino Galvani 2015-01-17   92   */
6ac73095 Beniamino Galvani 2015-01-17   93  struct meson_bank {
6ac73095 Beniamino Galvani 2015-01-17   94  	const char *name;
6ac73095 Beniamino Galvani 2015-01-17   95  	unsigned int first;
6ac73095 Beniamino Galvani 2015-01-17   96  	unsigned int last;
6c9dc843 Jerome Brunet     2017-06-08   97  	int irq_first;
6c9dc843 Jerome Brunet     2017-06-08   98  	int irq_last;
6ac73095 Beniamino Galvani 2015-01-17  @99  	struct meson_reg_desc regs[NUM_REG];
6ac73095 Beniamino Galvani 2015-01-17  100  };
6ac73095 Beniamino Galvani 2015-01-17  101  

:::::: The code at line 99 was first introduced by commit
:::::: 6ac730951104a437bf828683bcf9ba66336c4fa7 pinctrl: add driver for Amlogic Meson SoCs

:::::: TO: Beniamino Galvani <b.galvani@gmail.com>
:::::: CC: Linus Walleij <linus.walleij@linaro.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
kbuild test robot Oct. 12, 2017, 11:12 a.m. | #5
Hi Jerome,

[auto build test ERROR on pinctrl/devel]
[also build test ERROR on v4.14-rc4 next-20171009]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Jerome-Brunet/pinctrl-meson-prepare-for-new-SoC/20171012-094645
base:   https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git devel
config: i386-allyesconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        # save the attached .config to linux build tree
        make ARCH=i386 

All errors (new ones prefixed by >>):

   In file included from drivers/pinctrl/meson/pinctrl-meson.c:63:0:
>> drivers/pinctrl/meson/pinctrl-meson.h:74:2: error: expected identifier before string constant
     REG_OUT,
     ^~~
   In file included from drivers/pinctrl/meson/pinctrl-meson.c:63:0:
   drivers/pinctrl/meson/pinctrl-meson.h:99:29: error: 'NUM_REG' undeclared here (not in a function)
     struct meson_reg_desc regs[NUM_REG];
                                ^~~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_direction_output':
>> drivers/pinctrl/meson/pinctrl-meson.c:446:37: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
     meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
                                        ^~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_set':
   drivers/pinctrl/meson/pinctrl-meson.c:462:37: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
     meson_calc_reg_and_bit(bank, gpio, REG_OUT, &reg, &bit);
                                        ^~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~
   drivers/pinctrl/meson/pinctrl-meson.c: In function 'meson_gpio_get':
   drivers/pinctrl/meson/pinctrl-meson.c:478:37: error: incompatible type for argument 3 of 'meson_calc_reg_and_bit'
     meson_calc_reg_and_bit(bank, gpio, REG_IN, &reg, &bit);
                                        ^~~
   drivers/pinctrl/meson/pinctrl-meson.c:99:13: note: expected 'enum meson_reg_type' but argument is of type 'char *'
    static void meson_calc_reg_and_bit(struct meson_bank *bank, unsigned int pin,
                ^~~~~~~~~~~~~~~~~~~~~~

vim +74 drivers/pinctrl/meson/pinctrl-meson.h

6ac73095 Beniamino Galvani 2015-01-17  66  
6ac73095 Beniamino Galvani 2015-01-17  67  /**
6ac73095 Beniamino Galvani 2015-01-17  68   * enum meson_reg_type - type of registers encoded in @meson_reg_desc
6ac73095 Beniamino Galvani 2015-01-17  69   */
6ac73095 Beniamino Galvani 2015-01-17  70  enum meson_reg_type {
6ac73095 Beniamino Galvani 2015-01-17  71  	REG_PULLEN,
6ac73095 Beniamino Galvani 2015-01-17  72  	REG_PULL,
6ac73095 Beniamino Galvani 2015-01-17  73  	REG_DIR,
6ac73095 Beniamino Galvani 2015-01-17 @74  	REG_OUT,
6ac73095 Beniamino Galvani 2015-01-17  75  	REG_IN,
6ac73095 Beniamino Galvani 2015-01-17  76  	NUM_REG,
6ac73095 Beniamino Galvani 2015-01-17  77  };
6ac73095 Beniamino Galvani 2015-01-17  78  

:::::: The code at line 74 was first introduced by commit
:::::: 6ac730951104a437bf828683bcf9ba66336c4fa7 pinctrl: add driver for Amlogic Meson SoCs

:::::: TO: Beniamino Galvani <b.galvani@gmail.com>
:::::: CC: Linus Walleij <linus.walleij@linaro.org>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Patch

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 1778cf4f81c7..15b5b3b76ba9 100644
--- a/drivers/pinctrl/Kconfig
+++ b/drivers/pinctrl/Kconfig
@@ -167,16 +167,6 @@  config PINCTRL_MCP23S08
 	  This provides a GPIO interface supporting inputs and outputs.
 	  The I2C versions of the chips can be used as interrupt-controller.
 
-config PINCTRL_MESON
-	bool
-	depends on OF
-	select PINMUX
-	select PINCONF
-	select GENERIC_PINCONF
-	select GPIOLIB
-	select OF_GPIO
-	select REGMAP_MMIO
-
 config PINCTRL_OXNAS
 	bool
 	depends on OF
@@ -368,6 +358,7 @@  source "drivers/pinctrl/uniphier/Kconfig"
 source "drivers/pinctrl/vt8500/Kconfig"
 source "drivers/pinctrl/mediatek/Kconfig"
 source "drivers/pinctrl/zte/Kconfig"
+source "drivers/pinctrl/meson/Kconfig"
 
 config PINCTRL_XWAY
 	bool
diff --git a/drivers/pinctrl/meson/Kconfig b/drivers/pinctrl/meson/Kconfig
new file mode 100644
index 000000000000..15655bfd39b6
--- /dev/null
+++ b/drivers/pinctrl/meson/Kconfig
@@ -0,0 +1,36 @@ 
+menuconfig PINCTRL_MESON
+	bool "Amlogic SoC pinctrl drivers"
+	depends on ARCH_MESON || COMPILE_TEST
+	depends on OF
+	select PINMUX
+	select PINCONF
+	select GENERIC_PINCONF
+	select GPIOLIB
+	select OF_GPIO
+	select REGMAP_MMIO
+	select PINMUX
+	select GENERIC_PINCONF
+
+if PINCTRL_MESON
+
+config PINCTRL_MESON8
+	bool "Meson 8 SoC pinctrl driver"
+	depends on ARM
+	default y
+
+config PINCTRL_MESON8B
+	bool "Meson 8b SoC pinctrl driver"
+	depends on ARM
+	default y
+
+config PINCTRL_MESON_GXBB
+	bool "Meson gxbb SoC pinctrl driver"
+	depends on ARM64
+	default y
+
+config PINCTRL_MESON_GXL
+	bool "Meson gxl SoC pinctrl driver"
+	depends on ARM64
+	default y
+
+endif
diff --git a/drivers/pinctrl/meson/Makefile b/drivers/pinctrl/meson/Makefile
index 27c5b5126008..a6ef5ff4e9b1 100644
--- a/drivers/pinctrl/meson/Makefile
+++ b/drivers/pinctrl/meson/Makefile
@@ -1,3 +1,5 @@ 
-obj-y	+= pinctrl-meson8.o pinctrl-meson8b.o
-obj-y	+= pinctrl-meson-gxbb.o pinctrl-meson-gxl.o
-obj-y	+= pinctrl-meson.o
+obj-y += pinctrl-meson.o
+obj-$(CONFIG_PINCTRL_MESON8) += pinctrl-meson8.o
+obj-$(CONFIG_PINCTRL_MESON8B) += pinctrl-meson8b.o
+obj-$(CONFIG_PINCTRL_MESON_GXBB) += pinctrl-meson-gxbb.o
+obj-$(CONFIG_PINCTRL_MESON_GXL) += pinctrl-meson-gxl.o
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
index 1881d4a0eca2..a87bdb17414b 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c
@@ -824,7 +824,7 @@  static struct meson_bank meson_gxbb_aobus_banks[] = {
 	BANK("AO",   GPIOAO_0,  GPIOAO_13, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
 };
 
-struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
+static struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
 	.name		= "periphs-banks",
 	.pins		= meson_gxbb_periphs_pins,
 	.groups		= meson_gxbb_periphs_groups,
@@ -836,7 +836,7 @@  struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data = {
 	.num_banks	= ARRAY_SIZE(meson_gxbb_periphs_banks),
 };
 
-struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
+static struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
 	.name		= "aobus-banks",
 	.pins		= meson_gxbb_aobus_pins,
 	.groups		= meson_gxbb_aobus_groups,
@@ -847,3 +847,24 @@  struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data = {
 	.num_funcs	= ARRAY_SIZE(meson_gxbb_aobus_functions),
 	.num_banks	= ARRAY_SIZE(meson_gxbb_aobus_banks),
 };
+
+static const struct of_device_id meson_gxbb_pinctrl_dt_match[] = {
+	{
+		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
+		.data = &meson_gxbb_periphs_pinctrl_data,
+	},
+	{
+		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
+		.data = &meson_gxbb_aobus_pinctrl_data,
+	},
+	{ },
+};
+
+static struct platform_driver meson_gxbb_pinctrl_driver = {
+	.probe		= meson_pinctrl_probe,
+	.driver = {
+		.name	= "meson-gxbb-pinctrl",
+		.of_match_table = meson_gxbb_pinctrl_dt_match,
+	},
+};
+builtin_platform_driver(meson_gxbb_pinctrl_driver);
diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxl.c b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
index 3a14ecae9f31..088ac94f76b0 100644
--- a/drivers/pinctrl/meson/pinctrl-meson-gxl.c
+++ b/drivers/pinctrl/meson/pinctrl-meson-gxl.c
@@ -809,7 +809,7 @@  static struct meson_bank meson_gxl_aobus_banks[] = {
 	BANK("AO",   GPIOAO_0,  GPIOAO_9, 0, 9, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
 };
 
-struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
+static struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
 	.name		= "periphs-banks",
 	.pins		= meson_gxl_periphs_pins,
 	.groups		= meson_gxl_periphs_groups,
@@ -821,7 +821,7 @@  struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data = {
 	.num_banks	= ARRAY_SIZE(meson_gxl_periphs_banks),
 };
 
-struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
+static struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
 	.name		= "aobus-banks",
 	.pins		= meson_gxl_aobus_pins,
 	.groups		= meson_gxl_aobus_groups,
@@ -832,3 +832,24 @@  struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data = {
 	.num_funcs	= ARRAY_SIZE(meson_gxl_aobus_functions),
 	.num_banks	= ARRAY_SIZE(meson_gxl_aobus_banks),
 };
+
+static const struct of_device_id meson_gxl_pinctrl_dt_match[] = {
+	{
+		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
+		.data = &meson_gxl_periphs_pinctrl_data,
+	},
+	{
+		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
+		.data = &meson_gxl_aobus_pinctrl_data,
+	},
+	{ },
+};
+
+static struct platform_driver meson_gxl_pinctrl_driver = {
+	.probe		= meson_pinctrl_probe,
+	.driver = {
+		.name	= "meson-gxl-pinctrl",
+		.of_match_table = meson_gxl_pinctrl_dt_match,
+	},
+};
+builtin_platform_driver(meson_gxl_pinctrl_driver);
diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c
index 71bccb7acbf8..8fc1f1b45435 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -481,42 +481,6 @@  static int meson_gpio_get(struct gpio_chip *chip, unsigned gpio)
 	return !!(val & BIT(bit));
 }
 
-static const struct of_device_id meson_pinctrl_dt_match[] = {
-	{
-		.compatible = "amlogic,meson8-cbus-pinctrl",
-		.data = &meson8_cbus_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson8b-cbus-pinctrl",
-		.data = &meson8b_cbus_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson8-aobus-pinctrl",
-		.data = &meson8_aobus_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson8b-aobus-pinctrl",
-		.data = &meson8b_aobus_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson-gxbb-periphs-pinctrl",
-		.data = &meson_gxbb_periphs_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson-gxbb-aobus-pinctrl",
-		.data = &meson_gxbb_aobus_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson-gxl-periphs-pinctrl",
-		.data = &meson_gxl_periphs_pinctrl_data,
-	},
-	{
-		.compatible = "amlogic,meson-gxl-aobus-pinctrl",
-		.data = &meson_gxl_aobus_pinctrl_data,
-	},
-	{ },
-};
-
 static int meson_gpiolib_register(struct meson_pinctrl *pc)
 {
 	int ret;
@@ -624,7 +588,7 @@  static int meson_pinctrl_parse_dt(struct meson_pinctrl *pc,
 	return 0;
 }
 
-static int meson_pinctrl_probe(struct platform_device *pdev)
+int meson_pinctrl_probe(struct platform_device *pdev)
 {
 	const struct of_device_id *match;
 	struct device *dev = &pdev->dev;
@@ -636,10 +600,10 @@  static int meson_pinctrl_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	pc->dev = dev;
-	match = of_match_node(meson_pinctrl_dt_match, pdev->dev.of_node);
+	match = of_match_node(dev->driver->of_match_table, dev->of_node);
 	pc->data = (struct meson_pinctrl_data *) match->data;
 
-	ret = meson_pinctrl_parse_dt(pc, pdev->dev.of_node);
+	ret = meson_pinctrl_parse_dt(pc, dev->of_node);
 	if (ret)
 		return ret;
 
@@ -659,12 +623,3 @@  static int meson_pinctrl_probe(struct platform_device *pdev)
 
 	return meson_gpiolib_register(pc);
 }
-
-static struct platform_driver meson_pinctrl_driver = {
-	.probe		= meson_pinctrl_probe,
-	.driver = {
-		.name	= "meson-pinctrl",
-		.of_match_table = meson_pinctrl_dt_match,
-	},
-};
-builtin_platform_driver(meson_pinctrl_driver);
diff --git a/drivers/pinctrl/meson/pinctrl-meson.h b/drivers/pinctrl/meson/pinctrl-meson.h
index 7ed0a80fd9dc..284157d43612 100644
--- a/drivers/pinctrl/meson/pinctrl-meson.h
+++ b/drivers/pinctrl/meson/pinctrl-meson.h
@@ -13,6 +13,7 @@ 
 
 #include <linux/gpio.h>
 #include <linux/pinctrl/pinctrl.h>
+#include <linux/platform_device.h>
 #include <linux/regmap.h>
 #include <linux/types.h>
 
@@ -165,11 +166,5 @@  struct meson_pinctrl {
 
 #define MESON_PIN(x) PINCTRL_PIN(x, #x)
 
-extern struct meson_pinctrl_data meson8_cbus_pinctrl_data;
-extern struct meson_pinctrl_data meson8_aobus_pinctrl_data;
-extern struct meson_pinctrl_data meson8b_cbus_pinctrl_data;
-extern struct meson_pinctrl_data meson8b_aobus_pinctrl_data;
-extern struct meson_pinctrl_data meson_gxbb_periphs_pinctrl_data;
-extern struct meson_pinctrl_data meson_gxbb_aobus_pinctrl_data;
-extern struct meson_pinctrl_data meson_gxl_periphs_pinctrl_data;
-extern struct meson_pinctrl_data meson_gxl_aobus_pinctrl_data;
+/* Common probe function */
+int meson_pinctrl_probe(struct platform_device *pdev);
diff --git a/drivers/pinctrl/meson/pinctrl-meson8.c b/drivers/pinctrl/meson/pinctrl-meson8.c
index fbf8ecd1c2b6..68b345fc105a 100644
--- a/drivers/pinctrl/meson/pinctrl-meson8.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8.c
@@ -1044,7 +1044,7 @@  static struct meson_bank meson8_aobus_banks[] = {
 	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
 };
 
-struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
+static struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
 	.name		= "cbus-banks",
 	.pins		= meson8_cbus_pins,
 	.groups		= meson8_cbus_groups,
@@ -1056,7 +1056,7 @@  struct meson_pinctrl_data meson8_cbus_pinctrl_data = {
 	.num_banks	= ARRAY_SIZE(meson8_cbus_banks),
 };
 
-struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
+static struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
 	.name		= "ao-bank",
 	.pins		= meson8_aobus_pins,
 	.groups		= meson8_aobus_groups,
@@ -1067,3 +1067,24 @@  struct meson_pinctrl_data meson8_aobus_pinctrl_data = {
 	.num_funcs	= ARRAY_SIZE(meson8_aobus_functions),
 	.num_banks	= ARRAY_SIZE(meson8_aobus_banks),
 };
+
+static const struct of_device_id meson8_pinctrl_dt_match[] = {
+	{
+		.compatible = "amlogic,meson8-cbus-pinctrl",
+		.data = &meson8_cbus_pinctrl_data,
+	},
+	{
+		.compatible = "amlogic,meson8-aobus-pinctrl",
+		.data = &meson8_aobus_pinctrl_data,
+	},
+	{ },
+};
+
+static struct platform_driver meson8_pinctrl_driver = {
+	.probe		= meson_pinctrl_probe,
+	.driver = {
+		.name	= "meson8-pinctrl",
+		.of_match_table = meson8_pinctrl_dt_match,
+	},
+};
+builtin_platform_driver(meson8_pinctrl_driver);
diff --git a/drivers/pinctrl/meson/pinctrl-meson8b.c b/drivers/pinctrl/meson/pinctrl-meson8b.c
index 7af296db48c8..4d61df09bc3f 100644
--- a/drivers/pinctrl/meson/pinctrl-meson8b.c
+++ b/drivers/pinctrl/meson/pinctrl-meson8b.c
@@ -904,7 +904,7 @@  static struct meson_bank meson8b_aobus_banks[] = {
 	BANK("AO",   GPIOAO_0, GPIO_TEST_N, 0, 13, 0,  0,  0, 16,  0,  0,  0, 16,  1,  0),
 };
 
-struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
+static struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
 	.name		= "cbus-banks",
 	.pins		= meson8b_cbus_pins,
 	.groups		= meson8b_cbus_groups,
@@ -916,7 +916,7 @@  struct meson_pinctrl_data meson8b_cbus_pinctrl_data = {
 	.num_banks	= ARRAY_SIZE(meson8b_cbus_banks),
 };
 
-struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
+static struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
 	.name		= "aobus-banks",
 	.pins		= meson8b_aobus_pins,
 	.groups		= meson8b_aobus_groups,
@@ -927,3 +927,24 @@  struct meson_pinctrl_data meson8b_aobus_pinctrl_data = {
 	.num_funcs	= ARRAY_SIZE(meson8b_aobus_functions),
 	.num_banks	= ARRAY_SIZE(meson8b_aobus_banks),
 };
+
+static const struct of_device_id meson8b_pinctrl_dt_match[] = {
+	{
+		.compatible = "amlogic,meson8b-cbus-pinctrl",
+		.data = &meson8b_cbus_pinctrl_data,
+	},
+	{
+		.compatible = "amlogic,meson8b-aobus-pinctrl",
+		.data = &meson8b_aobus_pinctrl_data,
+	},
+	{ },
+};
+
+static struct platform_driver meson8b_pinctrl_driver = {
+	.probe		= meson_pinctrl_probe,
+	.driver = {
+		.name	= "meson8b-pinctrl",
+		.of_match_table = meson8b_pinctrl_dt_match,
+	},
+};
+builtin_platform_driver(meson8b_pinctrl_driver);