[PATCH v4 2/2] pinctrl: make MediaTek MT6765 pinctrl ready for buidling loadable module

[Light Hsieh]

Hi, Light

This patch make pinctrl-mt6765 ready for building as loadable module.

s/building/building/
I got build error after when those two patches are being applied
'mtk_pinconf_bias_set_gev1' undeclared here (not in a function)

OK. I will fix it.

---
drivers/pinctrl/mediatek/Kconfig | 2 +-
drivers/pinctrl/mediatek/pinctrl-mt6765.c | 4 ++++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 4cd1109..c645fdb 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -89,7 +89,7 @@ config PINCTRL_MT2712
select PINCTRL_MTK
config PINCTRL_MT6765
- bool "Mediatek MT6765 pin control"
+ tristate "Mediatek MT6765 pin control"
depends on OF
depends on ARM64 || COMPILE_TEST
default ARM64 && ARCH_MEDIATEK
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6765.c b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
index 905dae8c..2c59d39 100644
--- a/drivers/pinctrl/mediatek/pinctrl-mt6765.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6765.c
@@ -6,6 +6,7 @@
*
*/
+#include <linux/module.h>
#include "pinctrl-mtk-mt6765.h"
#include "pinctrl-paris.h"
@@ -1103,3 +1104,6 @@ static int __init mt6765_pinctrl_init(void)
return platform_driver_register(&mt6765_pinctrl_driver);
}
arch_initcall(mt6765_pinctrl_init);
+
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("MediaTek MT6765 Pinctrl

[Sean Wang]

Hi, Light

Hi, Light
Correct the prefix of the subject with "pinctrl: mediatek".

In the future we want to be able to build the MediaTek pinctrl driver,
based on paris, as kernel module. This patch allows pinctrl-paris.c, the
external interrupt controller mtk-eint.c, and pinctrl-mtk-common-v2.c to
be loadable as module.
---
drivers/pinctrl/mediatek/Kconfig | 13 +++++++++++--
drivers/pinctrl/mediatek/Makefile | 5 +++--
drivers/pinctrl/mediatek/mtk-eint.c | 9 +++++++++
drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 24 ++++++++++++++++++++++++
drivers/pinctrl/mediatek/pinctrl-paris.c | 6 ++++++
drivers/pinctrl/pinconf-generic.c | 1 +

Separate the patches for the device driver and for the core respectively.

Since the patch for pinconf-generic.c had been done in b88d145191ad
("pinctrl: Export some needed symbols at module load time").
I will remove patch for pinconf-generic.c.

6 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/drivers/pinctrl/mediatek/Kconfig b/drivers/pinctrl/mediatek/Kconfig
index 701f9af..4cd1109 100644
--- a/drivers/pinctrl/mediatek/Kconfig
+++ b/drivers/pinctrl/mediatek/Kconfig
@@ -3,10 +3,12 @@ menu "MediaTek pinctrl drivers"
depends on ARCH_MEDIATEK || COMPILE_TEST
config EINT_MTK
- bool "MediaTek External Interrupt Support"
+ tristate "MediaTek External Interrupt Support"
depends on PINCTRL_MTK || PINCTRL_MTK_MOORE || PINCTRL_MTK_PARIS || COMPILE_TEST
select GPIOLIB
select IRQ_DOMAIN
+ default y if PINCTRL_MTK || PINCTRL_MTK_MOORE
+ default PINCTRL_MTK_PARIS
config PINCTRL_MTK
bool
@@ -17,23 +19,30 @@ config PINCTRL_MTK
select EINT_MTK
select OF_GPIO
+config PINCTRL_MTK_V2
+ tristate
+ depends on PINCTRL_MTK_MOORE || PINCTRL_MTK_PARIS

PINCTRL_MTK_V2 doesn't have to depend on PINCTRL_MTK_MOORE or
PINCTRL_MTK_PARIS to work and it can build on it own so that lets us
remove the dependency.

1.4 PINCTRL_MTK_V2: add this tristate config which depends on
PINCTRL_MTK_PARIS and PINCTRL_MTK_MOORE. No need to specify in
defconfig file.
* PINCTRL_MTK_V2 will be y if either PINCTRL_MTK_PARIS or
PINCTRL_MTK_MOORE is y.
* PINCTRL_MTK_V2 will be n if both PINCTRL_MTK_PARIS and
PINCTRL_MTK_MOORE are n.
* PINCTRL_MTK_V2 will be m if PINCTRL_MTK_PARIS is m and
PINCTRL_MTK_MOORE is n.
Without PINCTRL_MTK_V2, we cannot specify whether
pinctrl-mtk-common-v2.c is built-in or loadable kernel module.

What I was actually meaning is

config PINCTRL_MTK_V2
tristate

with that should work for your case.

+
config PINCTRL_MTK_MOORE
bool
depends on OF
select GENERIC_PINCONF
select GENERIC_PINCTRL_GROUPS
select GENERIC_PINMUX_FUNCTIONS
+ select EINT_MTK

The original design of PINCTRL_MTK_MOORE doesn't have to work with
EINT_MTK coupled tightly so that let us remove the reverse dependency.

mtk_moore_pinctrl_probe() -> mtk_build_eint() -> mtk_eint_do_init().
mtk_eint_do_init() is defined in mtk-eint.c.

CONFIG_EINT_MTK is actually an option to Moore pinctrl since Moore
pinctrl has already carefully considered the condition with
CONFIG_EINT_MTK=n in mtk_build_eint.

select GPIOLIB
select OF_GPIO
+ select PINCTRL_MTK_V2