diff options
| author | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2018-11-05 19:20:22 +0530 |
|---|---|---|
| committer | Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> | 2018-11-05 21:46:06 +0530 |
| commit | eddb6d29e674a90481f4870b2e44e0c05fe22e4a (patch) | |
| tree | 7078edac8aff1f5a55a93e7a2dcdaf29d42ae446 | |
| parent | 9e00c21b94b08124b7838a05b8d3c2934baaef2e (diff) | |
| download | 96b-common-eddb6d29e674a90481f4870b2e44e0c05fe22e4a.tar.gz | |
pinctrl: mediatek: Move commonly used macros to platform header
PIN_FIELD_BASE and PINS_FIELD_BASE macros are used across several SoCs.
So it makes sense to move these definitions to the v2 platform header
to avoid code duplication.
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mt6765.c | 8 | ||||
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mt8183.c | 8 | ||||
| -rw-r--r-- | drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 8 |
3 files changed, 8 insertions, 16 deletions
diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6765.c b/drivers/pinctrl/mediatek/pinctrl-mt6765.c index 32451e8693be..e8f0dc31e546 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt6765.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt6765.c @@ -16,14 +16,6 @@ * _i_base could be used to indicate what base the pin should be mapped into. */ -#define PIN_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ - PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ - _x_bits, 32, 0) - -#define PINS_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ - PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ - _x_bits, 32, 1) - static const struct mtk_pin_field_calc mt6765_pin_mode_range[] = { PIN_FIELD(0, 202, 0x300, 0x10, 0, 4), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c index 6262fd3678ea..dbb7f8cff763 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mt8183.c +++ b/drivers/pinctrl/mediatek/pinctrl-mt8183.c @@ -16,14 +16,6 @@ * _i_based could be used to indicate what base the pin should be mapped into. */ -#define PIN_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ - PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ - _x_bits, 32, 0) - -#define PINS_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ - PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ - _x_bits, 32, 1) - static const struct mtk_pin_field_calc mt8183_pin_mode_range[] = { PIN_FIELD(0, 192, 0x300, 0x10, 0, 4), }; diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h index 991c1c56670c..2a359f74e354 100644 --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h @@ -42,6 +42,14 @@ PIN_FIELD_CALC(_s_pin, _e_pin, 0, _s_addr, _x_addrs, _s_bit, \ _x_bits, 32, 1) +#define PIN_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ + PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ + _x_bits, 32, 0) + +#define PINS_FIELD_BASE(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, _x_bits) \ + PIN_FIELD_CALC(_s_pin, _e_pin, _i_base, _s_addr, _x_addrs, _s_bit, \ + _x_bits, 32, 1) + /* List these attributes which could be modified for the pin */ enum { PINCTRL_PIN_REG_MODE, |