diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:11 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-24 19:27:11 +0800 |
| commit | 65169f9517a93e80fd1512445095b036c375d1a5 (patch) | |
| tree | 5bb5d9366469add9591986a169898e0846239ee6 /drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | |
| parent | 1eb314e8eeb554ca18de638b5be6e94606e1a0de (diff) | |
| parent | a82d5fd0c3a5f303b0e5f8fca834a1cce0655070 (diff) | |
Merge tag 'v3.18.66' into linux-linaro-lsk-v3.18lsk-v3.18-17.08
This is the 3.18.66 stable release
Diffstat (limited to 'drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c')
| -rw-r--r-- | drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c index 86b608bedca6..a30d1cdacf5b 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c @@ -800,6 +800,7 @@ static const struct sunxi_desc_pin sun4i_a10_pins[] = { SUNXI_FUNCTION(0x2, "lcd1"), /* D16 */ SUNXI_FUNCTION(0x3, "pata"), /* ATAD12 */ SUNXI_FUNCTION(0x4, "keypad"), /* IN6 */ + SUNXI_FUNCTION(0x5, "sim"), /* DET */ SUNXI_FUNCTION_IRQ(0x6, 16), /* EINT16 */ SUNXI_FUNCTION(0x7, "csi1")), /* D16 */ SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 17), |