Merge branch 'u-boot/master'
[karo-tx-uboot.git] / arch / arm / cpu / tegra124-common / funcmux.c
index d19fda0..cced787 100644 (file)
@@ -20,20 +20,20 @@ int funcmux_select(enum periph_id id, int config)
        case PERIPH_ID_UART4:
                switch (config) {
                case FUNCMUX_UART4_GPIO: /* TXD,RXD,CTS,RTS */
-                       pinmux_set_func(PINGRP_GPIO_PJ7, PMUX_FUNC_UARTD);
-                       pinmux_set_func(PINGRP_GPIO_PB0, PMUX_FUNC_UARTD);
-                       pinmux_set_func(PINGRP_GPIO_PB1, PMUX_FUNC_UARTD);
-                       pinmux_set_func(PINGRP_GPIO_PK7, PMUX_FUNC_UARTD);
+                       pinmux_set_func(PMUX_PINGRP_PJ7, PMUX_FUNC_UARTD);
+                       pinmux_set_func(PMUX_PINGRP_PB0, PMUX_FUNC_UARTD);
+                       pinmux_set_func(PMUX_PINGRP_PB1, PMUX_FUNC_UARTD);
+                       pinmux_set_func(PMUX_PINGRP_PK7, PMUX_FUNC_UARTD);
 
-                       pinmux_set_io(PINGRP_GPIO_PJ7, PMUX_PIN_OUTPUT);
-                       pinmux_set_io(PINGRP_GPIO_PB0, PMUX_PIN_INPUT);
-                       pinmux_set_io(PINGRP_GPIO_PB1, PMUX_PIN_INPUT);
-                       pinmux_set_io(PINGRP_GPIO_PK7, PMUX_PIN_OUTPUT);
+                       pinmux_set_io(PMUX_PINGRP_PJ7, PMUX_PIN_OUTPUT);
+                       pinmux_set_io(PMUX_PINGRP_PB0, PMUX_PIN_INPUT);
+                       pinmux_set_io(PMUX_PINGRP_PB1, PMUX_PIN_INPUT);
+                       pinmux_set_io(PMUX_PINGRP_PK7, PMUX_PIN_OUTPUT);
 
-                       pinmux_tristate_disable(PINGRP_GPIO_PJ7);
-                       pinmux_tristate_disable(PINGRP_GPIO_PB0);
-                       pinmux_tristate_disable(PINGRP_GPIO_PB1);
-                       pinmux_tristate_disable(PINGRP_GPIO_PK7);
+                       pinmux_tristate_disable(PMUX_PINGRP_PJ7);
+                       pinmux_tristate_disable(PMUX_PINGRP_PB0);
+                       pinmux_tristate_disable(PMUX_PINGRP_PB1);
+                       pinmux_tristate_disable(PMUX_PINGRP_PK7);
                        break;
                }
                break;
@@ -41,14 +41,16 @@ int funcmux_select(enum periph_id id, int config)
        case PERIPH_ID_UART1:
                switch (config) {
                case FUNCMUX_UART1_KBC:
-                       pinmux_set_func(PINGRP_KB_ROW9, PMUX_FUNC_UARTA);
-                       pinmux_set_func(PINGRP_KB_ROW10, PMUX_FUNC_UARTA);
+                       pinmux_set_func(PMUX_PINGRP_KB_ROW9_PS1,
+                                       PMUX_FUNC_UARTA);
+                       pinmux_set_func(PMUX_PINGRP_KB_ROW10_PS2,
+                                       PMUX_FUNC_UARTA);
 
-                       pinmux_set_io(PINGRP_KB_ROW9, PMUX_PIN_OUTPUT);
-                       pinmux_set_io(PINGRP_KB_ROW10, PMUX_PIN_INPUT);
+                       pinmux_set_io(PMUX_PINGRP_KB_ROW9_PS1, PMUX_PIN_OUTPUT);
+                       pinmux_set_io(PMUX_PINGRP_KB_ROW10_PS2, PMUX_PIN_INPUT);
 
-                       pinmux_tristate_disable(PINGRP_KB_ROW9);
-                       pinmux_tristate_disable(PINGRP_KB_ROW10);
+                       pinmux_tristate_disable(PMUX_PINGRP_KB_ROW9_PS1);
+                       pinmux_tristate_disable(PMUX_PINGRP_KB_ROW10_PS2);
                        break;
                }
                break;