diff options
| author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-08 20:43:54 +0400 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2013-03-15 16:33:53 +0400 |
| commit | 1a0039dce269317a843d4fc85c4a3430b484bc2d (patch) | |
| tree | cb22db8e8b78b04c9ce13891a1685244b1c0cbac /drivers/pinctrl/sh-pfc/sh_pfc.h | |
| parent | 51cb226b359bc48fed4a92b9bbd9af34640b1be8 (diff) | |
| download | linux-1a0039dce269317a843d4fc85c4a3430b484bc2d.tar.xz | |
sh-pfc: Don't modify sh_pfc_pin SoC data
The sh_pfc_pin structure supplied in SoC data contains information about
pin configuration and name. It's abused to store GPIO data registers
information and pin config type. Move those fields out of the
pinmux_data_reg structure into the new sh_pfc_gpio_pin and
sh_pfc_pin_config structures.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sh-pfc/sh_pfc.h')
| -rw-r--r-- | drivers/pinctrl/sh-pfc/sh_pfc.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h index e6a51a9e47ba..6a4a62fd39ec 100644 --- a/drivers/pinctrl/sh-pfc/sh_pfc.h +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h @@ -31,14 +31,8 @@ enum { PINMUX_FLAG_TYPE, /* must be last */ }; -#define PINMUX_FLAG_DBIT_SHIFT 5 -#define PINMUX_FLAG_DBIT (0x1f << PINMUX_FLAG_DBIT_SHIFT) -#define PINMUX_FLAG_DREG_SHIFT 10 -#define PINMUX_FLAG_DREG (0x3f << PINMUX_FLAG_DREG_SHIFT) - struct sh_pfc_pin { const pinmux_enum_t enum_id; - unsigned short flags; const char *name; }; @@ -79,7 +73,6 @@ struct pinmux_func { [gpio] = { \ .name = __stringify(gpio), \ .enum_id = data_or_mark, \ - .flags = PINMUX_TYPE_GPIO \ } #define PINMUX_GPIO_FN(gpio, base, data_or_mark) \ [gpio - (base)] = { \ |