summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc/sh_pfc.h
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-01-02 14:53:37 +0100
committerLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>2013-03-15 13:33:38 +0100
commita3db40a68a5b2f3ed2190f586bdaf3904f4933b2 (patch)
tree13e82237c07c0cf1302ad1f184e33b134100f926 /drivers/pinctrl/sh-pfc/sh_pfc.h
parent16883814eca229506cd2a4e447b2b5a2338fa35e (diff)
sh-pfc: Rename struct pinmux_pin to struct sh_pfc_pin
And drop the pinmux_flag_t typedef. 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.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 940170a4c64..dae9e155be1 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -15,7 +15,6 @@
#include <asm-generic/gpio.h>
typedef unsigned short pinmux_enum_t;
-typedef unsigned short pinmux_flag_t;
enum {
PINMUX_TYPE_NONE,
@@ -35,9 +34,9 @@ enum {
#define PINMUX_FLAG_DREG_SHIFT 10
#define PINMUX_FLAG_DREG (0x3f << PINMUX_FLAG_DREG_SHIFT)
-struct pinmux_pin {
+struct sh_pfc_pin {
const pinmux_enum_t enum_id;
- pinmux_flag_t flags;
+ unsigned short flags;
const char *name;
};
@@ -110,7 +109,7 @@ struct sh_pfc_soc_info {
struct pinmux_range output;
struct pinmux_range function;
- struct pinmux_pin *pins;
+ struct sh_pfc_pin *pins;
unsigned int nr_pins;
struct pinmux_func *func_gpios;
unsigned int nr_func_gpios;