diff options
author | Qipan Li <Qipan.Li@csr.com> | 2013-08-19 04:15:49 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2013-08-23 02:56:27 -0400 |
commit | 031b8ce01b93aca6f3fb8982994f7015a9f73953 (patch) | |
tree | a633b1b418cda7b9ff2d48df65a2a7e385d8f738 /drivers/pinctrl/sirf | |
parent | 8f903f8a342e466f3da33b21ae60f1b11626b81a (diff) |
pinctrl: sirf: add lost atlas6 uart0-no-stream-control pingroup
the old codes defined uart0_nostreamctrl_pins, but missed pingroup
and padmux definition for it. this patch fixes it.
Signed-off-by: Qipan Li <Qipan.Li@csr.com>
Signed-off-by: Barry Song <Baohua.Song@csr.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/pinctrl/sirf')
-rw-r--r-- | drivers/pinctrl/sirf/pinctrl-atlas6.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/pinctrl/sirf/pinctrl-atlas6.c b/drivers/pinctrl/sirf/pinctrl-atlas6.c index 1fa39a444171..73725f86af49 100644 --- a/drivers/pinctrl/sirf/pinctrl-atlas6.c +++ b/drivers/pinctrl/sirf/pinctrl-atlas6.c | |||
@@ -818,6 +818,7 @@ static const struct sirfsoc_pin_group sirfsoc_pin_groups[] = { | |||
818 | SIRFSOC_PIN_GROUP("lcd_24bitsgrp", lcd_24bits_pins), | 818 | SIRFSOC_PIN_GROUP("lcd_24bitsgrp", lcd_24bits_pins), |
819 | SIRFSOC_PIN_GROUP("lcdrom_grp", lcdrom_pins), | 819 | SIRFSOC_PIN_GROUP("lcdrom_grp", lcdrom_pins), |
820 | SIRFSOC_PIN_GROUP("uart0grp", uart0_pins), | 820 | SIRFSOC_PIN_GROUP("uart0grp", uart0_pins), |
821 | SIRFSOC_PIN_GROUP("uart0_nostreamctrlgrp", uart0_nostreamctrl_pins), | ||
821 | SIRFSOC_PIN_GROUP("uart1grp", uart1_pins), | 822 | SIRFSOC_PIN_GROUP("uart1grp", uart1_pins), |
822 | SIRFSOC_PIN_GROUP("uart2grp", uart2_pins), | 823 | SIRFSOC_PIN_GROUP("uart2grp", uart2_pins), |
823 | SIRFSOC_PIN_GROUP("uart2_nostreamctrlgrp", uart2_nostreamctrl_pins), | 824 | SIRFSOC_PIN_GROUP("uart2_nostreamctrlgrp", uart2_nostreamctrl_pins), |
@@ -859,6 +860,7 @@ static const char * const lcd_18bitsgrp[] = { "lcd_18bitsgrp" }; | |||
859 | static const char * const lcd_24bitsgrp[] = { "lcd_24bitsgrp" }; | 860 | static const char * const lcd_24bitsgrp[] = { "lcd_24bitsgrp" }; |
860 | static const char * const lcdromgrp[] = { "lcdromgrp" }; | 861 | static const char * const lcdromgrp[] = { "lcdromgrp" }; |
861 | static const char * const uart0grp[] = { "uart0grp" }; | 862 | static const char * const uart0grp[] = { "uart0grp" }; |
863 | static const char * const uart0_nostreamctrlgrp[] = { "uart0_nostreamctrlgrp" }; | ||
862 | static const char * const uart1grp[] = { "uart1grp" }; | 864 | static const char * const uart1grp[] = { "uart1grp" }; |
863 | static const char * const uart2grp[] = { "uart2grp" }; | 865 | static const char * const uart2grp[] = { "uart2grp" }; |
864 | static const char * const uart2_nostreamctrlgrp[] = { "uart2_nostreamctrlgrp" }; | 866 | static const char * const uart2_nostreamctrlgrp[] = { "uart2_nostreamctrlgrp" }; |
@@ -900,6 +902,8 @@ static const struct sirfsoc_pmx_func sirfsoc_pmx_functions[] = { | |||
900 | SIRFSOC_PMX_FUNCTION("lcd_24bits", lcd_24bitsgrp, lcd_24bits_padmux), | 902 | SIRFSOC_PMX_FUNCTION("lcd_24bits", lcd_24bitsgrp, lcd_24bits_padmux), |
901 | SIRFSOC_PMX_FUNCTION("lcdrom", lcdromgrp, lcdrom_padmux), | 903 | SIRFSOC_PMX_FUNCTION("lcdrom", lcdromgrp, lcdrom_padmux), |
902 | SIRFSOC_PMX_FUNCTION("uart0", uart0grp, uart0_padmux), | 904 | SIRFSOC_PMX_FUNCTION("uart0", uart0grp, uart0_padmux), |
905 | SIRFSOC_PMX_FUNCTION("uart0_nostreamctrl", uart0_nostreamctrlgrp, | ||
906 | uart0_nostreamctrl_padmux), | ||
903 | SIRFSOC_PMX_FUNCTION("uart1", uart1grp, uart1_padmux), | 907 | SIRFSOC_PMX_FUNCTION("uart1", uart1grp, uart1_padmux), |
904 | SIRFSOC_PMX_FUNCTION("uart2", uart2grp, uart2_padmux), | 908 | SIRFSOC_PMX_FUNCTION("uart2", uart2grp, uart2_padmux), |
905 | SIRFSOC_PMX_FUNCTION("uart2_nostreamctrl", uart2_nostreamctrlgrp, uart2_nostreamctrl_padmux), | 909 | SIRFSOC_PMX_FUNCTION("uart2_nostreamctrl", uart2_nostreamctrlgrp, uart2_nostreamctrl_padmux), |