diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-08-25 22:44:12 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-08-25 22:44:12 +0800 |
| commit | 0de48f949a2d3ed1e4b745e9dd612f072aaee77e (patch) | |
| tree | ff17f1af062e4d97e9fa2c67bb00c864dc209ab6 /drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | |
| parent | db5bc601e46abbb8fc4c17a6bc848c560e80fe57 (diff) | |
| parent | 2d24df0e84490d49a5211468e8793ecf9ad8a5bb (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.08-android
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 862a096c5dba..be5c71df148d 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c @@ -811,6 +811,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), |