Merge commit 'origin/master'

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / 85xx / mpc85xx_ads.c

diff --git a/arch/powerpc/platforms/85xx/mpc85xx_ads.c b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
index 3582c841844b377c76a1e55d53a4a10df6920080..ba498d6f2d024c118a78bd6cfa1fb49f554c064f 100644 (file)
--- a/arch/powerpc/platforms/85xx/mpc85xx_ads.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_ads.c
@@ -119,6 +119,8 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
        {3, 31, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
 
        /* SCC2 */
+       {2, 12, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
+       {2, 13, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
        {3, 26, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {3, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {3, 28, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
@@ -145,7 +147,6 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
        {1, 4, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {1, 5, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {1, 6, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
-       {1, 7, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {1, 8, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
        {1, 9, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
        {1, 10, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
@@ -156,8 +157,9 @@ static const struct cpm_pin mpc8560_ads_pins[] = {
        {1, 15, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
        {1, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
        {1, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY},
-       {2, 16, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK16 */
-       {2, 17, CPM_PIN_INPUT | CPM_PIN_SECONDARY}, /* CLK15 */
+       {2, 16, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK16 */
+       {2, 17, CPM_PIN_INPUT | CPM_PIN_PRIMARY}, /* CLK15 */
+       {2, 27, CPM_PIN_OUTPUT | CPM_PIN_PRIMARY},
 };
 
 static void __init init_ioports(void)