pinctrl: meson: separate soc drivers

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.

Reviewed-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Jerome Brunet <jbrunet@baylibre.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/Kconfig b/drivers/pinctrl/Kconfig
index 034822c7144d1f956996bdb069b0135fe5c87790..c0294958405d9c855d7e5651cdeef9cda601d529 100644 (file)
--- 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
@@ -369,6 +359,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 (file)
index 0000000..2795a31
--- /dev/null
+++ b/drivers/pinctrl/meson/Kconfig
@@ -0,0 +1,34 @@
+menuconfig PINCTRL_MESON
+       bool "Amlogic SoC pinctrl drivers"
+       depends on ARCH_MESON
+       depends on OF
+       select PINMUX
+       select PINCONF
+       select GENERIC_PINCONF
+       select GPIOLIB
+       select OF_GPIO
+       select REGMAP_MMIO
+
+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 27c5b5126008b4336175417e1e075f63a6beb957..dc3b73f8039ad0e897e742b4bec82425ff975a94 100644 (file)
--- 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-$(CONFIG_PINCTRL_MESON) += 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 1881d4a0eca239d5ac44f1ee971729ec4cd55389..a87bdb17414b83f3afc1004d2718f144e11e31d1 100644 (file)
--- 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 3a14ecae9f318894920a10f179c4dfebc1be6f5c..088ac94f76b0d3fedf6029d6da9806d1877d1fd8 100644 (file)
--- 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 71bccb7acbf84241c11ebfd6b53e7c2779394b5e..525e8b17d471268f74ee05e7f4b9436ac2e177ef 100644 (file)
--- a/drivers/pinctrl/meson/pinctrl-meson.c
+++ b/drivers/pinctrl/meson/pinctrl-meson.c
@@ -50,6 +50,7 @@
 #include <linux/io.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
+#include <linux/of_device.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinctrl.h>
@@ -481,42 +482,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,9 +589,8 @@ 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;
        struct meson_pinctrl *pc;
        int ret;
@@ -636,10 +600,9 @@ 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);
-       pc->data = (struct meson_pinctrl_data *) match->data;
+       pc->data = (struct meson_pinctrl_data *) of_device_get_match_data(dev);
 
-       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 +622,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 7ed0a80fd9dc25458c31de59f0a982879101ab5f..284157d43612800ce5272836f28065c4f454a60b 100644 (file)
--- 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 fbf8ecd1c2b6801e586e57346dd7254f0d371307..68b345fc105ae60c25fc526a77651cf7aa469679 100644 (file)
--- 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 7af296db48c8d56af79616f0d6feae8ca57be5d3..4d61df09bc3fbb23ea7bc0220be895601991c279 100644 (file)
--- 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);