| From 761c3d73e73e404c86765afe4cb3797e6b246b30 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 16 Jul 2013 01:54:13 +0200 |
| Subject: sh-pfc: sh7723: Remove unused input_pu range |
| |
| The PFC SH7723 SoC data contains a input_pu range used to configure |
| pull-up resistors using the legacy non-pinconf API. That API has been |
| removed from the driver, the range is thus not used anymore. Remove it. |
| |
| If required, configuring pull-up resistors for the SH7723 can be |
| implemented using the pinconf API, as done for the SH-Mobile, R-Mobile |
| and R-Car platforms. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| (cherry picked from commit 52331350b47daf0d7718cb9ee983f9e4b0318758) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pinctrl/sh-pfc/pfc-sh7723.c | 39 +++++++++++++++---------------------- |
| 1 file changed, 16 insertions(+), 23 deletions(-) |
| |
| diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/sh-pfc/pfc-sh7723.c |
| index 07ad1d8d..da0dbb0b 100644 |
| --- a/drivers/pinctrl/sh-pfc/pfc-sh7723.c |
| +++ b/drivers/pinctrl/sh-pfc/pfc-sh7723.c |
| @@ -102,12 +102,6 @@ enum { |
| PTZ3_IN, PTZ2_IN, PTZ1_IN, PTZ0_IN, |
| PINMUX_INPUT_END, |
| |
| - PINMUX_INPUT_PULLUP_BEGIN, |
| - PTA4_IN_PU, PTA3_IN_PU, PTA2_IN_PU, PTA1_IN_PU, PTA0_IN_PU, |
| - PTB2_IN_PU, PTB1_IN_PU, |
| - PTR2_IN_PU, |
| - PINMUX_INPUT_PULLUP_END, |
| - |
| PINMUX_OUTPUT_BEGIN, |
| PTA7_OUT, PTA6_OUT, PTA5_OUT, PTA4_OUT, |
| PTA3_OUT, PTA2_OUT, PTA1_OUT, PTA0_OUT, |
| @@ -355,11 +349,11 @@ static const pinmux_enum_t pinmux_data[] = { |
| PINMUX_DATA(PTA7_DATA, PTA7_IN, PTA7_OUT), |
| PINMUX_DATA(PTA6_DATA, PTA6_IN, PTA6_OUT), |
| PINMUX_DATA(PTA5_DATA, PTA5_IN, PTA5_OUT), |
| - PINMUX_DATA(PTA4_DATA, PTA4_IN, PTA4_OUT, PTA4_IN_PU), |
| - PINMUX_DATA(PTA3_DATA, PTA3_IN, PTA3_OUT, PTA3_IN_PU), |
| - PINMUX_DATA(PTA2_DATA, PTA2_IN, PTA2_OUT, PTA2_IN_PU), |
| - PINMUX_DATA(PTA1_DATA, PTA1_IN, PTA1_OUT, PTA1_IN_PU), |
| - PINMUX_DATA(PTA0_DATA, PTA0_IN, PTA0_OUT, PTA0_IN_PU), |
| + PINMUX_DATA(PTA4_DATA, PTA4_IN, PTA4_OUT), |
| + PINMUX_DATA(PTA3_DATA, PTA3_IN, PTA3_OUT), |
| + PINMUX_DATA(PTA2_DATA, PTA2_IN, PTA2_OUT), |
| + PINMUX_DATA(PTA1_DATA, PTA1_IN, PTA1_OUT), |
| + PINMUX_DATA(PTA0_DATA, PTA0_IN, PTA0_OUT), |
| |
| /* PTB GPIO */ |
| PINMUX_DATA(PTB7_DATA, PTB7_IN, PTB7_OUT), |
| @@ -367,8 +361,8 @@ static const pinmux_enum_t pinmux_data[] = { |
| PINMUX_DATA(PTB5_DATA, PTB5_IN, PTB5_OUT), |
| PINMUX_DATA(PTB4_DATA, PTB4_IN, PTB4_OUT), |
| PINMUX_DATA(PTB3_DATA, PTB3_IN, PTB3_OUT), |
| - PINMUX_DATA(PTB2_DATA, PTB2_IN, PTB2_OUT, PTB2_IN_PU), |
| - PINMUX_DATA(PTB1_DATA, PTB1_IN, PTB1_OUT, PTB1_IN_PU), |
| + PINMUX_DATA(PTB2_DATA, PTB2_IN, PTB2_OUT), |
| + PINMUX_DATA(PTB1_DATA, PTB1_IN, PTB1_OUT), |
| PINMUX_DATA(PTB0_DATA, PTB0_IN, PTB0_OUT), |
| |
| /* PTC GPIO */ |
| @@ -487,7 +481,7 @@ static const pinmux_enum_t pinmux_data[] = { |
| PINMUX_DATA(PTR5_DATA, PTR5_IN, PTR5_OUT), |
| PINMUX_DATA(PTR4_DATA, PTR4_IN, PTR4_OUT), |
| PINMUX_DATA(PTR3_DATA, PTR3_IN), |
| - PINMUX_DATA(PTR2_DATA, PTR2_IN, PTR2_IN_PU), |
| + PINMUX_DATA(PTR2_DATA, PTR2_IN), |
| PINMUX_DATA(PTR1_DATA, PTR1_IN, PTR1_OUT), |
| PINMUX_DATA(PTR0_DATA, PTR0_IN, PTR0_OUT), |
| |
| @@ -1520,11 +1514,11 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
| PTA7_FN, PTA7_OUT, 0, PTA7_IN, |
| PTA6_FN, PTA6_OUT, 0, PTA6_IN, |
| PTA5_FN, PTA5_OUT, 0, PTA5_IN, |
| - PTA4_FN, PTA4_OUT, PTA4_IN_PU, PTA4_IN, |
| - PTA3_FN, PTA3_OUT, PTA3_IN_PU, PTA3_IN, |
| - PTA2_FN, PTA2_OUT, PTA2_IN_PU, PTA2_IN, |
| - PTA1_FN, PTA1_OUT, PTA1_IN_PU, PTA1_IN, |
| - PTA0_FN, PTA0_OUT, PTA0_IN_PU, PTA0_IN } |
| + PTA4_FN, PTA4_OUT, 0, PTA4_IN, |
| + PTA3_FN, PTA3_OUT, 0, PTA3_IN, |
| + PTA2_FN, PTA2_OUT, 0, PTA2_IN, |
| + PTA1_FN, PTA1_OUT, 0, PTA1_IN, |
| + PTA0_FN, PTA0_OUT, 0, PTA0_IN } |
| }, |
| { PINMUX_CFG_REG("PBCR", 0xa4050102, 16, 2) { |
| PTB7_FN, PTB7_OUT, 0, PTB7_IN, |
| @@ -1532,8 +1526,8 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
| PTB5_FN, PTB5_OUT, 0, PTB5_IN, |
| PTB4_FN, PTB4_OUT, 0, PTB4_IN, |
| PTB3_FN, PTB3_OUT, 0, PTB3_IN, |
| - PTB2_FN, PTB2_OUT, PTB2_IN_PU, PTB2_IN, |
| - PTB1_FN, PTB1_OUT, PTB1_IN_PU, PTB1_IN, |
| + PTB2_FN, PTB2_OUT, 0, PTB2_IN, |
| + PTB1_FN, PTB1_OUT, 0, PTB1_IN, |
| PTB0_FN, PTB0_OUT, 0, PTB0_IN } |
| }, |
| { PINMUX_CFG_REG("PCCR", 0xa4050104, 16, 2) { |
| @@ -1662,7 +1656,7 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { |
| PTR5_FN, PTR5_OUT, 0, PTR5_IN, |
| PTR4_FN, PTR4_OUT, 0, PTR4_IN, |
| PTR3_FN, 0, 0, PTR3_IN, |
| - PTR2_FN, 0, PTR2_IN_PU, PTR2_IN, |
| + PTR2_FN, 0, 0, PTR2_IN, |
| PTR1_FN, PTR1_OUT, 0, PTR1_IN, |
| PTR0_FN, PTR0_OUT, 0, PTR0_IN } |
| }, |
| @@ -1888,7 +1882,6 @@ static const struct pinmux_data_reg pinmux_data_regs[] = { |
| const struct sh_pfc_soc_info sh7723_pinmux_info = { |
| .name = "sh7723_pfc", |
| .input = { PINMUX_INPUT_BEGIN, PINMUX_INPUT_END }, |
| - .input_pu = { PINMUX_INPUT_PULLUP_BEGIN, PINMUX_INPUT_PULLUP_END }, |
| .output = { PINMUX_OUTPUT_BEGIN, PINMUX_OUTPUT_END }, |
| .function = { PINMUX_FUNCTION_BEGIN, PINMUX_FUNCTION_END }, |
| |
| -- |
| 1.8.4.3.gca3854a |
| |