diff options
author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-02-13 11:11:27 -0500 |
---|---|---|
committer | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-02-25 12:38:31 -0500 |
commit | cffa7a6b108f44c740ec316cdfd99524a86475e4 (patch) | |
tree | 207096662732c693645ca2f926d0165ff24e7f70 | |
parent | faaa8325ad36f69de365330bb32cfb19d9c6a623 (diff) |
pinctrl: mvebu: remove MPP_REG_CTRL macro
Now that each per-SoC pinctrl driver must implement its own get/set
functions, there is no point in keeping the MPP_REG_CTRL macro, whose
purpose was to let the core pinctrl mvebu driver use default get/set
functions. While at it also update the comment about mvebu_mpp_ctrl.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
-rw-r--r-- | drivers/pinctrl/mvebu/pinctrl-mvebu.h | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/drivers/pinctrl/mvebu/pinctrl-mvebu.h b/drivers/pinctrl/mvebu/pinctrl-mvebu.h index c73f4eea62ac..65a98e6f7265 100644 --- a/drivers/pinctrl/mvebu/pinctrl-mvebu.h +++ b/drivers/pinctrl/mvebu/pinctrl-mvebu.h | |||
@@ -28,10 +28,9 @@ | |||
28 | * between two or more different settings, e.g. assign mpp pin 13 to | 28 | * between two or more different settings, e.g. assign mpp pin 13 to |
29 | * uart1 or sata. | 29 | * uart1 or sata. |
30 | * | 30 | * |
31 | * If optional mpp_get/_set functions are set these are used to get/set | 31 | * The mpp_get/_set functions are mandatory and are used to get/set a |
32 | * a specific mode. Otherwise it is assumed that the mpp control is based | 32 | * specific mode. The optional mpp_gpio_req/_dir functions can be used |
33 | * on 4-bit groups in subsequent registers. The optional mpp_gpio_req/_dir | 33 | * to allow pin settings with varying gpio pins. |
34 | * functions can be used to allow pin settings with varying gpio pins. | ||
35 | */ | 34 | */ |
36 | struct mvebu_mpp_ctrl { | 35 | struct mvebu_mpp_ctrl { |
37 | const char *name; | 36 | const char *name; |
@@ -114,18 +113,6 @@ struct mvebu_pinctrl_soc_info { | |||
114 | int ngpioranges; | 113 | int ngpioranges; |
115 | }; | 114 | }; |
116 | 115 | ||
117 | #define MPP_REG_CTRL(_idl, _idh) \ | ||
118 | { \ | ||
119 | .name = NULL, \ | ||
120 | .pid = _idl, \ | ||
121 | .npins = _idh - _idl + 1, \ | ||
122 | .pins = (unsigned[_idh - _idl + 1]) { }, \ | ||
123 | .mpp_get = NULL, \ | ||
124 | .mpp_set = NULL, \ | ||
125 | .mpp_gpio_req = NULL, \ | ||
126 | .mpp_gpio_dir = NULL, \ | ||
127 | } | ||
128 | |||
129 | #define MPP_FUNC_CTRL(_idl, _idh, _name, _func) \ | 116 | #define MPP_FUNC_CTRL(_idl, _idh, _name, _func) \ |
130 | { \ | 117 | { \ |
131 | .name = _name, \ | 118 | .name = _name, \ |