1 From 3eeb897a627e26083472f14e7512f53276a5e7ce Mon Sep 17 00:00:00 2001
2 From: Yingjoe Chen <yingjoe.chen@mediatek.com>
3 Date: Mon, 18 May 2015 23:11:14 -0700
4 Subject: [PATCH 50/76] pinctrl: mediatek: data struct optimize and remove
7 struct mtk_desc_pin.chip, mtk_pinctrl_devdata.invser_offset
8 and mtk_pinctrl_devdata.chip_type are never used in code.
11 Some per-pin data are using int for pin number and offsets.
12 Change to short and rearrange to reduce const data size.
14 Signed-off-by: Yingjoe Chen <yingjoe.chen@mediatek.com>
15 Signed-off-by: Hongzhou Yang <hongzhou.yang@mediatek.com>
17 drivers/pinctrl/mediatek/pinctrl-mt8135.c | 10 ++++------
18 drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 10 ++--------
19 2 files changed, 6 insertions(+), 14 deletions(-)
21 diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8135.c b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
22 index f1e1e18..8e6abd5 100644
23 --- a/drivers/pinctrl/mediatek/pinctrl-mt8135.c
24 +++ b/drivers/pinctrl/mediatek/pinctrl-mt8135.c
26 #define R1_BASE2 0x250
28 struct mtk_spec_pull_set {
30 - unsigned int pupd_offset;
32 unsigned char pupd_bit;
33 - unsigned int r0_offset;
34 + unsigned short pupd_offset;
35 + unsigned short r0_offset;
36 + unsigned short r1_offset;
38 - unsigned int r1_offset;
42 @@ -305,7 +305,6 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
43 .pullen_offset = 0x0200,
45 .pullsel_offset = 0x0400,
46 - .invser_offset = 0x0600,
47 .dout_offset = 0x0800,
49 .pinmux_offset = 0x0C00,
50 @@ -314,7 +313,6 @@ static const struct mtk_pinctrl_devdata mt8135_pinctrl_data = {
54 - .chip_type = MTK_CHIP_TYPE_BASE,
56 .name = "mt8135_eint",
58 diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
59 index 375771d..1508849 100644
60 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
61 +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.h
63 #include <linux/regmap.h>
65 #define NO_EINT_SUPPORT 255
66 -#define MTK_CHIP_TYPE_BASE 0
67 -#define MTK_CHIP_TYPE_PMIC 1
68 #define MT_EDGE_SENSITIVE 0
69 #define MT_LEVEL_SENSITIVE 1
70 #define EINT_DBNC_SET_DBNC_BITS 4
71 @@ -39,7 +37,6 @@ struct mtk_desc_eint {
74 struct pinctrl_pin_desc pin;
76 const struct mtk_desc_eint eint;
77 const struct mtk_desc_function *functions;
79 @@ -47,7 +44,6 @@ struct mtk_desc_pin {
80 #define MTK_PIN(_pin, _pad, _chip, _eint, ...) \
85 .functions = (struct mtk_desc_function[]){ \
87 @@ -107,8 +103,8 @@ struct mtk_drv_group_desc {
88 * @grp: The group for this pin belongs to.
90 struct mtk_pin_drv_grp {
92 - unsigned int offset;
94 + unsigned short offset;
98 @@ -193,7 +189,6 @@ struct mtk_pinctrl_devdata {
99 unsigned int pullen_offset;
100 unsigned int pullsel_offset;
101 unsigned int drv_offset;
102 - unsigned int invser_offset;
103 unsigned int dout_offset;
104 unsigned int din_offset;
105 unsigned int pinmux_offset;
106 @@ -202,7 +197,6 @@ struct mtk_pinctrl_devdata {
107 unsigned char port_shf;
108 unsigned char port_mask;
109 unsigned char port_align;
110 - unsigned char chip_type;
111 struct mtk_eint_offsets eint_offsets;