diff options
author | Padmavathi Venna <padma.v@samsung.com> | 2014-12-19 08:10:58 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2015-01-19 05:04:47 -0500 |
commit | ac5a186ebea86dde09d5407a14c3c67f537c9b2b (patch) | |
tree | 5aa22bd49233dd89007bcdb3f6aed98cdd61a703 | |
parent | e29a4c3a1c573b251723583ec396e5c9d5126ed2 (diff) |
pinctrl: exynos: Add AUDIO pin controller for exynos7
Audio IPs on Exynos7 require gpios available in AUDIO
pin controller block. So adding the AUDIO pinctrl support.
Signed-off-by: Padmavathi Venna <padma.v@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt | 1 | ||||
-rw-r--r-- | drivers/pinctrl/samsung/pinctrl-exynos.c | 10 |
2 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt index c88ba35bef26..9d2a995293e6 100644 --- a/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt | |||
@@ -181,6 +181,7 @@ Aliases for controllers compatible with "samsung,exynos7-pinctrl": | |||
181 | - pinctrl6: pin controller of FSYS0 block, | 181 | - pinctrl6: pin controller of FSYS0 block, |
182 | - pinctrl7: pin controller of FSYS1 block, | 182 | - pinctrl7: pin controller of FSYS1 block, |
183 | - pinctrl8: pin controller of BUS1 block, | 183 | - pinctrl8: pin controller of BUS1 block, |
184 | - pinctrl9: pin controller of AUDIO block, | ||
184 | 185 | ||
185 | Example: A pin-controller node with pin banks: | 186 | Example: A pin-controller node with pin banks: |
186 | 187 | ||
diff --git a/drivers/pinctrl/samsung/pinctrl-exynos.c b/drivers/pinctrl/samsung/pinctrl-exynos.c index 2a85cb442f9b..c8f83f96546c 100644 --- a/drivers/pinctrl/samsung/pinctrl-exynos.c +++ b/drivers/pinctrl/samsung/pinctrl-exynos.c | |||
@@ -1314,6 +1314,11 @@ static const struct samsung_pin_bank_data exynos7_pin_banks8[] __initconst = { | |||
1314 | EXYNOS_PIN_BANK_EINTG(3, 0x140, "gpv6", 0x24), | 1314 | EXYNOS_PIN_BANK_EINTG(3, 0x140, "gpv6", 0x24), |
1315 | }; | 1315 | }; |
1316 | 1316 | ||
1317 | static const struct samsung_pin_bank_data exynos7_pin_banks9[] __initconst = { | ||
1318 | EXYNOS_PIN_BANK_EINTG(7, 0x000, "gpz0", 0x00), | ||
1319 | EXYNOS_PIN_BANK_EINTG(4, 0x020, "gpz1", 0x04), | ||
1320 | }; | ||
1321 | |||
1317 | const struct samsung_pin_ctrl exynos7_pin_ctrl[] __initconst = { | 1322 | const struct samsung_pin_ctrl exynos7_pin_ctrl[] __initconst = { |
1318 | { | 1323 | { |
1319 | /* pin-controller instance 0 Alive data */ | 1324 | /* pin-controller instance 0 Alive data */ |
@@ -1361,5 +1366,10 @@ const struct samsung_pin_ctrl exynos7_pin_ctrl[] __initconst = { | |||
1361 | .pin_banks = exynos7_pin_banks8, | 1366 | .pin_banks = exynos7_pin_banks8, |
1362 | .nr_banks = ARRAY_SIZE(exynos7_pin_banks8), | 1367 | .nr_banks = ARRAY_SIZE(exynos7_pin_banks8), |
1363 | .eint_gpio_init = exynos_eint_gpio_init, | 1368 | .eint_gpio_init = exynos_eint_gpio_init, |
1369 | }, { | ||
1370 | /* pin-controller instance 9 AUD data */ | ||
1371 | .pin_banks = exynos7_pin_banks9, | ||
1372 | .nr_banks = ARRAY_SIZE(exynos7_pin_banks9), | ||
1373 | .eint_gpio_init = exynos_eint_gpio_init, | ||
1364 | }, | 1374 | }, |
1365 | }; | 1375 | }; |