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 3d74ef13210285516835996dc0f2c5214aa92105..a6a55eef4918a165eb27d64a26a3839020e1ec94 100644 (file)
--- a/board/logicpd/am3517evm/am3517evm.h
+++ b/board/logicpd/am3517evm/am3517evm.h
@@ -8,19 +8,7 @@
  * Copyright (C) 2010
  * Texas Instruments Incorporated - http://www.ti.com/
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef _AM3517EVM_H_
@@ -31,46 +19,6 @@ const omap3_sysinfo sysinfo = {
        "AM3517EVM Board",
        "NAND",
 };
-/* AM3517 specific mux configuration */
-#define CONTROL_PADCONF_SYS_NRESWARM   0x0A08
-/* CCDC */
-#define CONTROL_PADCONF_CCDC_PCLK      0x01E4
-#define CONTROL_PADCONF_CCDC_FIELD     0x01E6
-#define CONTROL_PADCONF_CCDC_HD                0x01E8
-#define CONTROL_PADCONF_CCDC_VD                0x01EA
-#define CONTROL_PADCONF_CCDC_WEN       0x01EC
-#define CONTROL_PADCONF_CCDC_DATA0     0x01EE
-#define CONTROL_PADCONF_CCDC_DATA1     0x01F0
-#define CONTROL_PADCONF_CCDC_DATA2     0x01F2
-#define CONTROL_PADCONF_CCDC_DATA3     0x01F4
-#define CONTROL_PADCONF_CCDC_DATA4     0x01F6
-#define CONTROL_PADCONF_CCDC_DATA5     0x01F8
-#define CONTROL_PADCONF_CCDC_DATA6     0x01FA
-#define CONTROL_PADCONF_CCDC_DATA7     0x01FC
-/* RMII */
-#define CONTROL_PADCONF_RMII_MDIO_DATA 0x01FE
-#define CONTROL_PADCONF_RMII_MDIO_CLK  0x0200
-#define CONTROL_PADCONF_RMII_RXD0      0x0202
-#define CONTROL_PADCONF_RMII_RXD1      0x0204
-#define CONTROL_PADCONF_RMII_CRS_DV    0x0206
-#define CONTROL_PADCONF_RMII_RXER      0x0208
-#define CONTROL_PADCONF_RMII_TXD0      0x020A
-#define CONTROL_PADCONF_RMII_TXD1      0x020C
-#define CONTROL_PADCONF_RMII_TXEN      0x020E
-#define CONTROL_PADCONF_RMII_50MHZ_CLK 0x0210
-#define CONTROL_PADCONF_USB0_DRVBUS    0x0212
-/* CAN */
-#define CONTROL_PADCONF_HECC1_TXD      0x0214
-#define CONTROL_PADCONF_HECC1_RXD      0x0216
-
-#define CONTROL_PADCONF_SYS_BOOT7      0x0218
-#define CONTROL_PADCONF_SDRC_DQS0N     0x021A
-#define CONTROL_PADCONF_SDRC_DQS1N     0x021C
-#define CONTROL_PADCONF_SDRC_DQS2N     0x021E
-#define CONTROL_PADCONF_SDRC_DQS3N     0x0220
-#define CONTROL_PADCONF_STRBEN_DLY0    0x0222
-#define CONTROL_PADCONF_STRBEN_DLY1    0x0224
-#define CONTROL_PADCONF_SYS_BOOT8      0x0226
 
 /*
  * IEN  - Input Enable
@@ -367,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 */\
@@ -385,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)) \