pinctrl: mediatek: use generic EINT register maps for each SoC

So far, EINT on each SoC all used exactly identical register map and thus
it's better that we apply generic register map already supported in EINT
library and stop copy-n-pasting the same data block and filling into its
platform data.

Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2701.c b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
index e0963c615686fe7853886b45c6e47b2acb828222..db22250d5a282a2036f260df6dd22df584880f72 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2701.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
@@ -538,26 +538,6 @@ static const struct mtk_pinctrl_devdata mt2701_pinctrl_data = {
                .ap_num    = 169,
                .db_cnt    = 16,
        },
-       .eint_regs = {
-               .stat      = 0x000,
-               .ack       = 0x040,
-               .mask      = 0x080,
-               .mask_set  = 0x0c0,
-               .mask_clr  = 0x100,
-               .sens      = 0x140,
-               .sens_set  = 0x180,
-               .sens_clr  = 0x1c0,
-               .soft      = 0x200,
-               .soft_set  = 0x240,
-               .soft_clr  = 0x280,
-               .pol       = 0x300,
-               .pol_set   = 0x340,
-               .pol_clr   = 0x380,
-               .dom_en    = 0x400,
-               .dbnc_ctrl = 0x500,
-               .dbnc_set  = 0x600,
-               .dbnc_clr  = 0x700,
-       },
 };
 
 static int mt2701_pinctrl_probe(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2712.c b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
index 02aff2802224b48270a83b671cf978aa1c3668ef..6e2acef69fb881e20b0548699dda3a675bfeadf2 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2712.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
@@ -583,26 +583,6 @@ static const struct mtk_pinctrl_devdata mt2712_pinctrl_data = {
                .ap_num    = 229,
                .db_cnt    = 40,
        },
-       .eint_regs = {
-               .stat      = 0x000,
-               .ack       = 0x040,
-               .mask      = 0x080,
-               .mask_set  = 0x0c0,
-               .mask_clr  = 0x100,
-               .sens      = 0x140,
-               .sens_set  = 0x180,
-               .sens_clr  = 0x1c0,
-               .soft      = 0x200,
-               .soft_set  = 0x240,
-               .soft_clr  = 0x280,
-               .pol       = 0x300,
-               .pol_set   = 0x340,
-               .pol_clr   = 0x380,
-               .dom_en    = 0x400,
-               .dbnc_ctrl = 0x500,
-               .dbnc_set  = 0x600,
-               .dbnc_clr  = 0x700,
-       },
 };
 
 static int mt2712_pinctrl_probe(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8127.c b/drivers/pinctrl/mediatek/pinctrl-mt8127.c
index 71f6258ea96ce00d355877b37beede586217b0f0..949a235f28821d43b383d9c4253db7d89659b31a 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8127.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8127.c
@@ -307,26 +307,6 @@ static const struct mtk_pinctrl_devdata mt8127_pinctrl_data = {
                .ap_num    = 143,
                .db_cnt    = 16,
        },
-       .eint_regs = {
-               .stat      = 0x000,
-               .ack       = 0x040,
-               .mask      = 0x080,
-               .mask_set  = 0x0c0,
-               .mask_clr  = 0x100,
-               .sens      = 0x140,
-               .sens_set  = 0x180,
-               .sens_clr  = 0x1c0,
-               .soft      = 0x200,
-               .soft_set  = 0x240,
-               .soft_clr  = 0x280,
-               .pol       = 0x300,
-               .pol_set   = 0x340,
-               .pol_clr   = 0x380,
-               .dom_en    = 0x400,
-               .dbnc_ctrl = 0x500,
-               .dbnc_set  = 0x600,
-               .dbnc_clr  = 0x700,
-       },
 };
 
 static int mt8127_pinctrl_probe(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8135.c b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
index fdfa357d681f6ec9633842dfdf653cc77b87fc6b..974a1f439a1122f36acc6a2f0b7d5d2567020ed2 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8135.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
@@ -320,26 +320,6 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
                .ap_num    = 192,
                .db_cnt    = 16,
        },
-       .eint_regs = {
-               .stat      = 0x000,
-               .ack       = 0x040,
-               .mask      = 0x080,
-               .mask_set  = 0x0c0,
-               .mask_clr  = 0x100,
-               .sens      = 0x140,
-               .sens_set  = 0x180,
-               .sens_clr  = 0x1c0,
-               .soft      = 0x200,
-               .soft_set  = 0x240,
-               .soft_clr  = 0x280,
-               .pol       = 0x300,
-               .pol_set   = 0x340,
-               .pol_clr   = 0x380,
-               .dom_en    = 0x400,
-               .dbnc_ctrl = 0x500,
-               .dbnc_set  = 0x600,
-               .dbnc_clr  = 0x700,
-       },
 };
 
 static int mt8135_pinctrl_probe(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8173.c b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
index 1466c95fde8712a468099e94e5e683e463e4d5a7..a836cee30640813e47f6ada1d4b362b4938be0a5 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8173.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
@@ -347,26 +347,6 @@ static const struct mtk_pinctrl_devdata mt8173_pinctrl_data = {
                .ap_num    = 224,
                .db_cnt    = 16,
        },
-       .eint_regs = {
-               .stat      = 0x000,
-               .ack       = 0x040,
-               .mask      = 0x080,
-               .mask_set  = 0x0c0,
-               .mask_clr  = 0x100,
-               .sens      = 0x140,
-               .sens_set  = 0x180,
-               .sens_clr  = 0x1c0,
-               .soft      = 0x200,
-               .soft_set  = 0x240,
-               .soft_clr  = 0x280,
-               .pol       = 0x300,
-               .pol_set   = 0x340,
-               .pol_clr   = 0x380,
-               .dom_en    = 0x400,
-               .dbnc_ctrl = 0x500,
-               .dbnc_set  = 0x600,
-               .dbnc_clr  = 0x700,
-       },
 };
 
 static int mt8173_pinctrl_probe(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index 11e0d0fdf43bcef0d22b815ceff6b647905dac5e..b3799695d8db8264ce917232cb3b1439793fe845 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -1014,7 +1014,11 @@ static int mtk_eint_init(struct mtk_pinctrl *pctl, struct platform_device *pdev)
                return -EINVAL;
 
        pctl->eint->dev = &pdev->dev;
-       pctl->eint->regs = &pctl->devdata->eint_regs;
+       /*
+        * If pctl->eint->regs == NULL, it would fall back into using a generic
+        * register map in mtk_eint_do_init calls.
+        */
+       pctl->eint->regs = pctl->devdata->eint_regs;
        pctl->eint->hw = &pctl->devdata->eint_hw;
        pctl->eint->pctl = pctl;
        pctl->eint->gpio_xlate = &mtk_eint_xt;

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
index 346e3dbe800bc237f33be8f60ff56b26b4ef0fb9..bf13eb0a68d6243e51971c5a389f5cb579df3a94 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
@@ -261,7 +261,7 @@ struct mtk_pinctrl_devdata {
        unsigned char  port_mask;
        unsigned char  port_align;
        struct mtk_eint_hw eint_hw;
-       struct mtk_eint_regs eint_regs;
+       struct mtk_eint_regs *eint_regs;
 };
 
 struct mtk_pinctrl {