|
35 | 35 | PIN_NOGP_CFG(EXTALR, "EXTALR", fn, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ |
36 | 36 | PIN_NOGP_CFG(FSCLKST, "FSCLKST", fn, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ |
37 | 37 | PIN_NOGP_CFG(FSCLKST_N, "FSCLKST#", fn, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ |
38 | | - PIN_NOGP_CFG(PRESETOUT_N, "PRESETOUT#", fn, SH_PFC_PIN_CFG_PULL_UP_DOWN) |
| 38 | + PIN_NOGP_CFG(PRESETOUT_N, "PRESETOUT#", fn, SH_PFC_PIN_CFG_PULL_UP_DOWN), \ |
| 39 | + PIN_NOGP_CFG(VDDQ_AVB, "VDDQ_AVB", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_25_33), \ |
| 40 | + PIN_NOGP_CFG(VDDQ_GE, "VDDQ_GE", fn, SH_PFC_PIN_CFG_IO_VOLTAGE_25_33) |
39 | 41 |
|
40 | 42 | /* |
41 | 43 | * F_() : just information |
@@ -2837,24 +2839,39 @@ static int r8a77980_pin_to_pocctrl(unsigned int pin, u32 *pocctrl) |
2837 | 2839 | { |
2838 | 2840 | int bit = pin & 0x1f; |
2839 | 2841 |
|
2840 | | - *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg; |
2841 | | - if (pin >= RCAR_GP_PIN(0, 0) && pin <= RCAR_GP_PIN(0, 21)) |
| 2842 | + switch (pin) { |
| 2843 | + case RCAR_GP_PIN(0, 0) ... RCAR_GP_PIN(0, 21): |
| 2844 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg; |
2842 | 2845 | return bit; |
2843 | | - else if (pin >= RCAR_GP_PIN(2, 0) && pin <= RCAR_GP_PIN(2, 9)) |
| 2846 | + |
| 2847 | + case RCAR_GP_PIN(2, 0) ... RCAR_GP_PIN(2, 9): |
| 2848 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL0].reg; |
2844 | 2849 | return bit + 22; |
2845 | 2850 |
|
2846 | | - *pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg; |
2847 | | - if (pin >= RCAR_GP_PIN(2, 10) && pin <= RCAR_GP_PIN(2, 16)) |
| 2851 | + case RCAR_GP_PIN(2, 10) ... RCAR_GP_PIN(2, 16): |
| 2852 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg; |
2848 | 2853 | return bit - 10; |
2849 | | - if ((pin >= RCAR_GP_PIN(2, 17) && pin <= RCAR_GP_PIN(2, 24)) || |
2850 | | - (pin >= RCAR_GP_PIN(3, 0) && pin <= RCAR_GP_PIN(3, 16))) |
| 2854 | + |
| 2855 | + case RCAR_GP_PIN(2, 17) ... RCAR_GP_PIN(2, 24): |
| 2856 | + case RCAR_GP_PIN(3, 0) ... RCAR_GP_PIN(3, 16): |
| 2857 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL1].reg; |
2851 | 2858 | return bit + 7; |
2852 | 2859 |
|
2853 | | - *pocctrl = pinmux_ioctrl_regs[POCCTRL2].reg; |
2854 | | - if (pin >= RCAR_GP_PIN(2, 25) && pin <= RCAR_GP_PIN(2, 29)) |
| 2860 | + case RCAR_GP_PIN(2, 25) ... RCAR_GP_PIN(2, 29): |
| 2861 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL2].reg; |
2855 | 2862 | return pin - 25; |
2856 | 2863 |
|
2857 | | - return -EINVAL; |
| 2864 | + case PIN_VDDQ_AVB: |
| 2865 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL3].reg; |
| 2866 | + return 0; |
| 2867 | + |
| 2868 | + case PIN_VDDQ_GE: |
| 2869 | + *pocctrl = pinmux_ioctrl_regs[POCCTRL3].reg; |
| 2870 | + return 1; |
| 2871 | + |
| 2872 | + default: |
| 2873 | + return -EINVAL; |
| 2874 | + } |
2858 | 2875 | } |
2859 | 2876 |
|
2860 | 2877 | static const struct pinmux_bias_reg pinmux_bias_regs[] = { |
|
0 commit comments