Skip to content

Commit

Permalink
pinctrl: mediatek: use generic EINT register maps for each SoC
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Sean Wang authored and Linus Walleij committed May 24, 2018
1 parent e6dabd3 commit e6612a6
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 102 deletions.
20 changes: 0 additions & 20 deletions drivers/pinctrl/mediatek/pinctrl-mt2701.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 0 additions & 20 deletions drivers/pinctrl/mediatek/pinctrl-mt2712.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 0 additions & 20 deletions drivers/pinctrl/mediatek/pinctrl-mt8127.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 0 additions & 20 deletions drivers/pinctrl/mediatek/pinctrl-mt8135.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 0 additions & 20 deletions drivers/pinctrl/mediatek/pinctrl-mt8173.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 5 additions & 1 deletion drivers/pinctrl/mediatek/pinctrl-mtk-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pinctrl/mediatek/pinctrl-mtk-common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit e6612a6

Please sign in to comment.