diff options
author | Hans de Goede <hdegoede@redhat.com> | 2014-12-17 12:18:12 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-14 08:21:52 -0500 |
commit | c5abe62b76491d437ed9ff6bf4f2b36388057ccc (patch) | |
tree | 68f487d070c1721b4c9544a7bb8d4e6806825576 | |
parent | 5a7d2efdd93f6c4bb6cd3d5df3d2f5611c9b87ac (diff) |
pinctrl: sun6i: Add some missing functions
While working on pinctrl for the A31s, I noticed that function 4 of
PA15 - PA18 was missing, add these.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c index f42858eaca28..18038f0d6b52 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | |||
@@ -134,24 +134,28 @@ static const struct sunxi_desc_pin sun6i_a31_pins[] = { | |||
134 | SUNXI_FUNCTION(0x1, "gpio_out"), | 134 | SUNXI_FUNCTION(0x1, "gpio_out"), |
135 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD4 */ | 135 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD4 */ |
136 | SUNXI_FUNCTION(0x3, "lcd1"), /* D15 */ | 136 | SUNXI_FUNCTION(0x3, "lcd1"), /* D15 */ |
137 | SUNXI_FUNCTION(0x4, "clk_out_a"), | ||
137 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 15)), /* PA_EINT15 */ | 138 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 15)), /* PA_EINT15 */ |
138 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 16), | 139 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 16), |
139 | SUNXI_FUNCTION(0x0, "gpio_in"), | 140 | SUNXI_FUNCTION(0x0, "gpio_in"), |
140 | SUNXI_FUNCTION(0x1, "gpio_out"), | 141 | SUNXI_FUNCTION(0x1, "gpio_out"), |
141 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD5 */ | 142 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD5 */ |
142 | SUNXI_FUNCTION(0x3, "lcd1"), /* D16 */ | 143 | SUNXI_FUNCTION(0x3, "lcd1"), /* D16 */ |
144 | SUNXI_FUNCTION(0x4, "dmic"), /* CLK */ | ||
143 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 16)), /* PA_EINT16 */ | 145 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 16)), /* PA_EINT16 */ |
144 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 17), | 146 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 17), |
145 | SUNXI_FUNCTION(0x0, "gpio_in"), | 147 | SUNXI_FUNCTION(0x0, "gpio_in"), |
146 | SUNXI_FUNCTION(0x1, "gpio_out"), | 148 | SUNXI_FUNCTION(0x1, "gpio_out"), |
147 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD6 */ | 149 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD6 */ |
148 | SUNXI_FUNCTION(0x3, "lcd1"), /* D17 */ | 150 | SUNXI_FUNCTION(0x3, "lcd1"), /* D17 */ |
151 | SUNXI_FUNCTION(0x4, "dmic"), /* DIN */ | ||
149 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 17)), /* PA_EINT17 */ | 152 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 17)), /* PA_EINT17 */ |
150 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 18), | 153 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 18), |
151 | SUNXI_FUNCTION(0x0, "gpio_in"), | 154 | SUNXI_FUNCTION(0x0, "gpio_in"), |
152 | SUNXI_FUNCTION(0x1, "gpio_out"), | 155 | SUNXI_FUNCTION(0x1, "gpio_out"), |
153 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD7 */ | 156 | SUNXI_FUNCTION(0x2, "gmac"), /* RXD7 */ |
154 | SUNXI_FUNCTION(0x3, "lcd1"), /* D18 */ | 157 | SUNXI_FUNCTION(0x3, "lcd1"), /* D18 */ |
158 | SUNXI_FUNCTION(0x4, "clk_out_b"), | ||
155 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 18)), /* PA_EINT18 */ | 159 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 18)), /* PA_EINT18 */ |
156 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 19), | 160 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 19), |
157 | SUNXI_FUNCTION(0x0, "gpio_in"), | 161 | SUNXI_FUNCTION(0x0, "gpio_in"), |
@@ -207,6 +211,7 @@ static const struct sunxi_desc_pin sun6i_a31_pins[] = { | |||
207 | SUNXI_FUNCTION(0x1, "gpio_out"), | 211 | SUNXI_FUNCTION(0x1, "gpio_out"), |
208 | SUNXI_FUNCTION(0x2, "gmac"), /* MDC */ | 212 | SUNXI_FUNCTION(0x2, "gmac"), /* MDC */ |
209 | SUNXI_FUNCTION(0x3, "lcd1"), /* HSYNC */ | 213 | SUNXI_FUNCTION(0x3, "lcd1"), /* HSYNC */ |
214 | SUNXI_FUNCTION(0x4, "clk_out_c"), | ||
210 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 26)), /* PA_EINT26 */ | 215 | SUNXI_FUNCTION_IRQ_BANK(0x6, 0, 26)), /* PA_EINT26 */ |
211 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 27), | 216 | SUNXI_PIN(SUNXI_PINCTRL_PIN(A, 27), |
212 | SUNXI_FUNCTION(0x0, "gpio_in"), | 217 | SUNXI_FUNCTION(0x0, "gpio_in"), |