diff options
| author | John Crispin <john@openwrt.org> | 2015-03-21 21:47:20 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2015-03-21 21:47:20 +0000 |
| commit | 35c52bc261e06b3b24ad5d6a3c8316fb0bf555b0 (patch) | |
| tree | 8a4d572fce62ca94d3270b3ed1d0106b8aa2500f /target/linux/oxnas | |
| parent | 3256194aff475c16a0804690eff105a384e7307b (diff) | |
| download | master-31e0f0ae-35c52bc261e06b3b24ad5d6a3c8316fb0bf555b0.tar.gz master-31e0f0ae-35c52bc261e06b3b24ad5d6a3c8316fb0bf555b0.tar.bz2 master-31e0f0ae-35c52bc261e06b3b24ad5d6a3c8316fb0bf555b0.zip | |
oxnas: remove pre kernel 3.18 support from pinctrl driver
just some pruning...
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 44923
Diffstat (limited to 'target/linux/oxnas')
| -rw-r--r-- | target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c index 6cc8f72c60..fa5f3a9431 100644 --- a/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c +++ b/target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c @@ -9,7 +9,6 @@ #include <linux/err.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/of.h> #include <linux/of_device.h> #include <linux/of_address.h> @@ -563,30 +562,6 @@ static int oxnas_pmx_set_mux(struct pinctrl_dev *pctldev, unsigned selector, return 0; } -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)) -static void oxnas_pmx_disable(struct pinctrl_dev *pctldev, unsigned selector, - unsigned group) -{ - struct oxnas_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); - const struct oxnas_pmx_pin *pins_conf = info->groups[group].pins_conf; - const struct oxnas_pmx_pin *pin; - uint32_t npins = info->groups[group].npins; - int i; - unsigned mask; - void __iomem *pio; - void __iomem *cio; - - for (i = 0; i < npins; i++) { - pin = &pins_conf[i]; - oxnas_pin_dbg(info->dev, pin); - pio = pin_to_gpioctrl(info, pin->bank); - cio = pin_to_muxctrl(info, pin->bank); - mask = pin_to_mask(pin->pin); - oxnas_mux_gpio_enable(cio, pio, mask, 1); - } -} -#endif - static int oxnas_pmx_get_funcs_count(struct pinctrl_dev *pctldev) { struct oxnas_pinctrl *info = pinctrl_dev_get_drvdata(pctldev); @@ -660,14 +635,7 @@ static const struct pinmux_ops oxnas_pmx_ops = { .get_functions_count = oxnas_pmx_get_funcs_count, .get_function_name = oxnas_pmx_get_func_name, .get_function_groups = oxnas_pmx_get_groups, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0)) .set_mux = oxnas_pmx_set_mux, -#else - .enable = oxnas_pmx_set_mux, -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 16, 0)) - .disable = oxnas_pmx_disable, -#endif .gpio_request_enable = oxnas_gpio_request_enable, .gpio_disable_free = oxnas_gpio_disable_free, }; |