mtd: spi: Correct parameters for s25fs512s flash

[u-boot] / board / htkw / mcx / mcx.h

diff --git a/board/htkw/mcx/mcx.h b/board/htkw/mcx/mcx.h
index 1003bfddd929fdd308a18ba34ce1b1315acf2aa7..f9ff50f8a7053d735ac548a890120771be8c0c21 100644 (file)
--- a/board/htkw/mcx/mcx.h
+++ b/board/htkw/mcx/mcx.h
@@ -1,21 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2011 Ilya Yanok, Emcraft Systems
  *
  * Based on ti/evm/evm.h
- *
- * 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.
  */
 
 #ifndef _AM3517EVM_H_
@@ -96,7 +83,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(GPMC_A7),            (IEN | PTU | EN  | M4)) \
        MUX_VAL(CP(GPMC_A8),            (IEN | PTU | EN  | M4)) \
        MUX_VAL(CP(GPMC_A9),            (IEN | PTU | EN  | M4)) \
-       MUX_VAL(CP(GPMC_A10),           (IDIS | PTU | DIS | M4)) \
+       MUX_VAL(CP(GPMC_A10),           (IEN | PTU | EN | M4)) \
                                        /* GPIO_43 LCD buffer enable */ \
        MUX_VAL(CP(GPMC_D0),            (IEN  | PTU | EN  | M0)) \
        MUX_VAL(CP(GPMC_D1),            (IEN  | PTU | EN  | M0)) \
@@ -264,6 +251,8 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(I2C3_SDA),           (IEN  | PTU | EN  | M0)) \
        MUX_VAL(CP(I2C4_SCL),           (IEN  | PTU | EN  | M0)) \
        MUX_VAL(CP(I2C4_SDA),           (IEN  | PTU | EN  | M0)) \
+       MUX_VAL(CP(HDQ_SIO),            (IEN  | PTU | EN  | M4)) \
+                                       /* GPIO_170 Touchscreen ISR */\
        /* McSPI */\
        MUX_VAL(CP(MCSPI1_CLK),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(MCSPI1_SIMO),        (IEN  | PTD | DIS | M0)) \
@@ -335,8 +324,6 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(SYS_32K),            (IEN  | PTD | EN  | M4)) \
        MUX_VAL(CP(SYS_CLKREQ),         (IEN  | PTD | DIS | M0)) \
        MUX_VAL(CP(SYS_NIRQ),           (IEN  | PTD | EN  | M4)) \
-       MUX_VAL(CP(SYS_NRESWARM),       (IEN | PTU | DIS | M4)) \
-                                       /* SYS_nRESWARM */\
        MUX_VAL(CP(SYS_BOOT0),          (IEN  | PTD | DIS | M4)) \
        MUX_VAL(CP(SYS_BOOT1),          (IEN  | PTD | DIS | M4)) \
        MUX_VAL(CP(SYS_BOOT2),          (IEN  | PTD | DIS | M4)) \
@@ -351,7 +338,7 @@ const omap3_sysinfo sysinfo = {
        MUX_VAL(CP(SYS_CLKOUT1),        (IEN  | PTD | DIS | M4))\
        MUX_VAL(CP(SYS_CLKOUT2),        (IDIS | PTU | DIS | M4))\
        /* JTAG */\
-       MUX_VAL(CP(JTAG_nTRST),         (IEN | PTU | EN  | M4)) \
+       MUX_VAL(CP(JTAG_NTRST),         (IEN | PTU | EN  | M4)) \
        MUX_VAL(CP(JTAG_TCK),           (IEN | PTU | EN  | M4)) \
        MUX_VAL(CP(JTAG_TMS),           (IEN | PTU | EN  | M4)) \
        MUX_VAL(CP(JTAG_TDI),           (IEN | PTU | EN  | M4)) \