sh-pfc: Split pins and functions definition tables

[deliverable/linux.git] / drivers / pinctrl / sh-pfc / pfc-shx3.c

diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c
index e59da79993481fe889d546e5d72fa78efe3065ac..eeecffc562c10c36c2d03054d55daa5c165da8b6 100644 (file)
--- a/drivers/pinctrl/sh-pfc/pfc-shx3.c
+++ b/drivers/pinctrl/sh-pfc/pfc-shx3.c
@@ -306,7 +306,7 @@ static pinmux_enum_t shx3_pinmux_data[] = {
        PINMUX_DATA(IRQOUT_MARK,        PH0_FN),
 };
 
-static struct pinmux_gpio shx3_pinmux_gpios[] = {
+static struct pinmux_pin shx3_pinmux_pins[] = {
        /* PA */
        PINMUX_GPIO(GPIO_PA7, PA7_DATA),
        PINMUX_GPIO(GPIO_PA6, PA6_DATA),
@@ -384,7 +384,11 @@ static struct pinmux_gpio shx3_pinmux_gpios[] = {
        PINMUX_GPIO(GPIO_PH2, PH2_DATA),
        PINMUX_GPIO(GPIO_PH1, PH1_DATA),
        PINMUX_GPIO(GPIO_PH0, PH0_DATA),
+};
+
+#define PINMUX_FN_BASE ARRAY_SIZE(shx3_pinmux_pins)
 
+static struct pinmux_func shx3_pinmux_func_gpios[] = {
        /* FN */
        GPIO_FN(D31),
        GPIO_FN(D30),
@@ -569,9 +573,10 @@ struct sh_pfc_soc_info shx3_pinmux_info = {
                            PINMUX_INPUT_PULLUP_END },
        .output         = { PINMUX_OUTPUT_BEGIN,   PINMUX_OUTPUT_END },
        .function       = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END },
-       .gpios          = shx3_pinmux_gpios,
-       .nr_pins        = GPIO_PH0 + 1,
-       .nr_gpios       = ARRAY_SIZE(shx3_pinmux_gpios),
+       .pins           = shx3_pinmux_pins,
+       .nr_pins        = ARRAY_SIZE(shx3_pinmux_pins),
+       .func_gpios     = shx3_pinmux_func_gpios,
+       .nr_func_gpios  = ARRAY_SIZE(shx3_pinmux_func_gpios),
        .gpio_data      = shx3_pinmux_data,
        .gpio_data_size = ARRAY_SIZE(shx3_pinmux_data),
        .cfg_regs       = shx3_pinmux_config_regs,