Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-16 17:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

sh-pfc: Rename struct pinmux_pin to struct sh_pfc_pin

Browse Source 
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>
This commit is contained in:
Laurent Pinchart 2013-01-02 14:53:37 +01:00
parent 16883814ec
commit a3db40a68a
19 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/sh-pfc/core.c
View File

@ -235,7 +235,7 @@ static void sh_pfc_write_config_reg(struct sh_pfc *pfc,
static int sh_pfc_setup_data_reg(struct sh_pfc *pfc, unsigned gpio) static int sh_pfc_setup_data_reg(struct sh_pfc *pfc, unsigned gpio)
{ {
struct pinmux_pin *gpiop = &pfc->info->pins[gpio]; struct sh_pfc_pin *gpiop = &pfc->info->pins[gpio];
struct pinmux_data_reg *data_reg; struct pinmux_data_reg *data_reg;
int k, n; int k, n;
@ -292,7 +292,7 @@ static void sh_pfc_setup_data_regs(struct sh_pfc *pfc)
int sh_pfc_get_data_reg(struct sh_pfc *pfc, unsigned gpio, int sh_pfc_get_data_reg(struct sh_pfc *pfc, unsigned gpio,
struct pinmux_data_reg **drp, int *bitp) struct pinmux_data_reg **drp, int *bitp)
{ {
struct pinmux_pin *gpiop = &pfc->info->pins[gpio]; struct sh_pfc_pin *gpiop = &pfc->info->pins[gpio];
int k, n; int k, n;
if (!sh_pfc_gpio_is_pin(pfc, gpio)) if (!sh_pfc_gpio_is_pin(pfc, gpio))

2
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
View File

@ -1654,7 +1654,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(TRACEAUD_FROM_MEMC_MARK, MSEL5CR_30_1, MSEL5CR_29_0), PINMUX_DATA(TRACEAUD_FROM_MEMC_MARK, MSEL5CR_30_1, MSEL5CR_29_0),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
GPIO_PORT_ALL(), GPIO_PORT_ALL(),
}; };

2
drivers/pinctrl/sh-pfc/pfc-r8a7779.c
View File

@ -1450,7 +1450,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_IPSR_MODSEL_DATA(IP12_17_15, SCK4_B, SEL_SCIF4_1), PINMUX_IPSR_MODSEL_DATA(IP12_17_15, SCK4_B, SEL_SCIF4_1),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
PINMUX_GPIO_GP_ALL(), PINMUX_GPIO_GP_ALL(),
}; };

2
drivers/pinctrl/sh-pfc/pfc-sh7203.c
View File

@ -703,7 +703,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SSCK0_PF_MARK, PF0MD_11), PINMUX_DATA(SSCK0_PF_MARK, PF0MD_11),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PA */ /* PA */
PINMUX_GPIO(GPIO_PA7, PA7_DATA), PINMUX_GPIO(GPIO_PA7, PA7_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7264.c
View File

@ -1072,7 +1072,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SD_D2_MARK, PK0MD_10), PINMUX_DATA(SD_D2_MARK, PK0MD_10),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* Port A */ /* Port A */
PINMUX_GPIO(GPIO_PA3, PA3_DATA), PINMUX_GPIO(GPIO_PA3, PA3_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7269.c
View File

@ -1452,7 +1452,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(PWM1A_MARK, PJ0MD_100), PINMUX_DATA(PWM1A_MARK, PJ0MD_100),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* Port A */ /* Port A */
PINMUX_GPIO(GPIO_PA1, PA1_DATA), PINMUX_GPIO(GPIO_PA1, PA1_DATA),
PINMUX_GPIO(GPIO_PA0, PA0_DATA), PINMUX_GPIO(GPIO_PA0, PA0_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7372.c
View File

@ -929,7 +929,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(MFIv4_MARK, MSEL4CR_6_1), PINMUX_DATA(MFIv4_MARK, MSEL4CR_6_1),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
GPIO_PORT_ALL(), GPIO_PORT_ALL(),
}; };

2
drivers/pinctrl/sh-pfc/pfc-sh73a0.c
View File

@ -1539,7 +1539,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(FSIAISLD_PU_MARK, PORT55_FN1, PORT55_IN_PU), PINMUX_DATA(FSIAISLD_PU_MARK, PORT55_FN1, PORT55_IN_PU),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
GPIO_PORT_ALL(), GPIO_PORT_ALL(),
}; };

2
drivers/pinctrl/sh-pfc/pfc-sh7720.c
View File

@ -606,7 +606,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SIM_CLK_MARK, PSELD_1_0_10, PTV0_FN), PINMUX_DATA(SIM_CLK_MARK, PSELD_1_0_10, PTV0_FN),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PTA */ /* PTA */
PINMUX_GPIO(GPIO_PTA7, PTA7_DATA), PINMUX_GPIO(GPIO_PTA7, PTA7_DATA),
PINMUX_GPIO(GPIO_PTA6, PTA6_DATA), PINMUX_GPIO(GPIO_PTA6, PTA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7722.c
View File

@ -787,7 +787,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(KEYOUT5_IN5_MARK, HIZA14_KEYSC, KEYOUT5_IN5), PINMUX_DATA(KEYOUT5_IN5_MARK, HIZA14_KEYSC, KEYOUT5_IN5),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PTA */ /* PTA */
PINMUX_GPIO(GPIO_PTA7, PTA7_DATA), PINMUX_GPIO(GPIO_PTA7, PTA7_DATA),
PINMUX_GPIO(GPIO_PTA6, PTA6_DATA), PINMUX_GPIO(GPIO_PTA6, PTA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7723.c
View File

@ -923,7 +923,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SIUBISLD_MARK, PSD1_PSD0_FN2, PTZ0_FN), PINMUX_DATA(SIUBISLD_MARK, PSD1_PSD0_FN2, PTZ0_FN),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PTA */ /* PTA */
PINMUX_GPIO(GPIO_PTA7, PTA7_DATA), PINMUX_GPIO(GPIO_PTA7, PTA7_DATA),
PINMUX_GPIO(GPIO_PTA6, PTA6_DATA), PINMUX_GPIO(GPIO_PTA6, PTA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7724.c
View File

@ -1192,7 +1192,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SCIF3_I_TXD_MARK, PSB14_1, PTZ3_FN), PINMUX_DATA(SCIF3_I_TXD_MARK, PSB14_1, PTZ3_FN),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PTA */ /* PTA */
PINMUX_GPIO(GPIO_PTA7, PTA7_DATA), PINMUX_GPIO(GPIO_PTA7, PTA7_DATA),
PINMUX_GPIO(GPIO_PTA6, PTA6_DATA), PINMUX_GPIO(GPIO_PTA6, PTA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7734.c
View File

@ -1384,7 +1384,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_IPSR_DATA(IP11_28, ST_CLKOUT), PINMUX_IPSR_DATA(IP11_28, ST_CLKOUT),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
PINMUX_GPIO_GP_ALL(), PINMUX_GPIO_GP_ALL(),
}; };

2
drivers/pinctrl/sh-pfc/pfc-sh7757.c
View File

@ -1114,7 +1114,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(ON_DQ0_MARK, PS8_8_FN2, PTZ0_FN), PINMUX_DATA(ON_DQ0_MARK, PS8_8_FN2, PTZ0_FN),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PTA */ /* PTA */
PINMUX_GPIO(GPIO_PTA7, PTA7_DATA), PINMUX_GPIO(GPIO_PTA7, PTA7_DATA),
PINMUX_GPIO(GPIO_PTA6, PTA6_DATA), PINMUX_GPIO(GPIO_PTA6, PTA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7785.c
View File

@ -702,7 +702,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(IRQOUT_MARK, P2MSEL2_1), PINMUX_DATA(IRQOUT_MARK, P2MSEL2_1),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PA */ /* PA */
PINMUX_GPIO(GPIO_PA7, PA7_DATA), PINMUX_GPIO(GPIO_PA7, PA7_DATA),
PINMUX_GPIO(GPIO_PA6, PA6_DATA), PINMUX_GPIO(GPIO_PA6, PA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-sh7786.c
View File

@ -427,7 +427,7 @@ static pinmux_enum_t pinmux_data[] = {
PINMUX_DATA(SSI3_SCK_MARK, P2MSEL6_1, P2MSEL5_1, PJ1_FN), PINMUX_DATA(SSI3_SCK_MARK, P2MSEL6_1, P2MSEL5_1, PJ1_FN),
}; };
static struct pinmux_pin pinmux_pins[] = { static struct sh_pfc_pin pinmux_pins[] = {
/* PA */ /* PA */
PINMUX_GPIO(GPIO_PA7, PA7_DATA), PINMUX_GPIO(GPIO_PA7, PA7_DATA),
PINMUX_GPIO(GPIO_PA6, PA6_DATA), PINMUX_GPIO(GPIO_PA6, PA6_DATA),

2
drivers/pinctrl/sh-pfc/pfc-shx3.c
View File

@ -306,7 +306,7 @@ static pinmux_enum_t shx3_pinmux_data[] = {
PINMUX_DATA(IRQOUT_MARK, PH0_FN), PINMUX_DATA(IRQOUT_MARK, PH0_FN),
}; };
static struct pinmux_pin shx3_pinmux_pins[] = { static struct sh_pfc_pin shx3_pinmux_pins[] = {
/* PA */ /* PA */
PINMUX_GPIO(GPIO_PA7, PA7_DATA), PINMUX_GPIO(GPIO_PA7, PA7_DATA),
PINMUX_GPIO(GPIO_PA6, PA6_DATA), PINMUX_GPIO(GPIO_PA6, PA6_DATA),

2
drivers/pinctrl/sh-pfc/pinctrl.c
View File

@ -307,7 +307,7 @@ static int sh_pfc_map_gpios(struct sh_pfc *pfc, struct sh_pfc_pinctrl *pmx)
for (i = 0; i < pmx->nr_pads; i++) { for (i = 0; i < pmx->nr_pads; i++) {
struct pinctrl_pin_desc *pin = pmx->pads + i; struct pinctrl_pin_desc *pin = pmx->pads + i;
struct pinmux_pin *gpio = pfc->info->pins + i; struct sh_pfc_pin *gpio = pfc->info->pins + i;
pin->number = i; pin->number = i;
pin->name = gpio->name; pin->name = gpio->name;

7
drivers/pinctrl/sh-pfc/sh_pfc.h
View File

@ -15,7 +15,6 @@
#include <asm-generic/gpio.h> #include <asm-generic/gpio.h>
typedef unsigned short pinmux_enum_t; typedef unsigned short pinmux_enum_t;
typedef unsigned short pinmux_flag_t;
enum { enum {
PINMUX_TYPE_NONE, PINMUX_TYPE_NONE,
@ -35,9 +34,9 @@ enum {
#define PINMUX_FLAG_DREG_SHIFT 10 #define PINMUX_FLAG_DREG_SHIFT 10
#define PINMUX_FLAG_DREG (0x3f << PINMUX_FLAG_DREG_SHIFT) #define PINMUX_FLAG_DREG (0x3f << PINMUX_FLAG_DREG_SHIFT)
struct pinmux_pin { struct sh_pfc_pin {
const pinmux_enum_t enum_id; const pinmux_enum_t enum_id;
pinmux_flag_t flags; unsigned short flags;
const char *name; const char *name;
}; };
@ -110,7 +109,7 @@ struct sh_pfc_soc_info {
struct pinmux_range output; struct pinmux_range output;
struct pinmux_range function; struct pinmux_range function;
struct pinmux_pin *pins; struct sh_pfc_pin *pins;
unsigned int nr_pins; unsigned int nr_pins;
struct pinmux_func *func_gpios; struct pinmux_func *func_gpios;
unsigned int nr_func_gpios; unsigned int nr_func_gpios;