Merge branch 'master' of git://git.denx.de/u-boot-imx

[karo-tx-uboot.git] / board / logicpd / am3517evm / am3517evm.h

diff --git a/board/logicpd/am3517evm/am3517evm.h b/board/logicpd/am3517evm/am3517evm.h
index 704af847a739fcf9e9c88d5954d3df6aa296a70a..a6a55eef4918a165eb27d64a26a3839020e1ec94 100644 (file)
--- a/board/logicpd/am3517evm/am3517evm.h
+++ b/board/logicpd/am3517evm/am3517evm.h
@@ -315,7 +315,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(SYS_CLKREQ),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(SYS_NIRQ),           (IEN  | PTU | EN  | M0)) \
        /*SYS_nRESWARM */\
-       MUX_VAL(CP(SYS_NRESWARM),       (IDIS | PTU | DIS | M4)) \
+       MUX_VAL(CP(SYS_NRESWARM),       (IDIS | PTU | EN | M4)) \
                                                        /* - GPIO30 */\
        MUX_VAL(CP(SYS_BOOT0),          (IEN  | PTD | DIS | M4)) /*GPIO_2*/\
                                                         /* - PEN_IRQ */\
@@ -333,7 +333,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(SYS_CLKOUT1),        (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(SYS_CLKOUT2),        (IEN  | PTU | EN  | M0)) \
        /* JTAG */\
-       MUX_VAL(CP(JTAG_nTRST),         (IEN  | PTD | DIS | M0)) \
+       MUX_VAL(CP(JTAG_NTRST),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(JTAG_TCK),           (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(JTAG_TMS),           (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(JTAG_TDI),           (IEN  | PTD | DIS | M0)) \