ADS5121: Fix NOR and CPLD ALE timing for rev 2 silicon

MPC5121 rev 2 silicon has a new register for controlling how long
CS is asserted after deassertion of ALE in multiplexed mode.

The default is to assert CS together with ALE.  The alternative
is to assert CS (ALEN+1)*LPC_CLK clocks after deassertion of ALE.

The default is wrong for the NOR flash and CPLD on the ADS5121.

This patch turns on the alternative for CS0 (NOR) and CS2 (CPLD)
it does so conditionally based on silicon rev 2.0 or greater.

Signed-off-by: Martha J Marx <mmarx@silicontkx.com>
Signed-off-by: John Rigby <jrigby@freescale.com>

diff --git a/board/ads5121/ads5121.c b/board/ads5121/ads5121.c
index ba3d7d2a0d5547788c5bb4b6b44c9bceed12f77b..deaa292b9af60ff893195c3f6688333ac5e579fa 100644 (file)
--- a/board/ads5121/ads5121.c
+++ b/board/ads5121/ads5121.c
@@ -25,6 +25,7 @@
 #include <mpc512x.h>
 #include <asm/bitops.h>
 #include <command.h>
+#include <asm/processor.h>
 #include <fdt_support.h>
 #ifdef CONFIG_MISC_INIT_R
 #include <i2c.h>
@@ -92,6 +93,9 @@ int board_early_init_f (void)
         * Configure Flash Speed
         */
        *((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS0_CONFIG)) = CFG_CS0_CFG;
+       if (SVR_MJREV (im->sysconf.spridr) >= 2) {
+               *((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS_ALE_TIMING_CONFIG)) = CFG_CS_ALETIMING;
+       }
        /*
         * Enable clocks
         */

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index 5f74afb0d783096d6474a76ece7164df4b99353d..f516c4602c2c396e0cb1a0562b054cf451bdd9b8 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -210,6 +210,7 @@
 
 #define CFG_CS0_CFG            0x05059310      /* ALE active low, data size 4bytes */
 #define CFG_CS2_CFG            0x05059010      /* ALE active low, data size 1byte */
+#define CFG_CS_ALETIMING       0x00000005      /* Use alternative CS timing for CS0 and CS2 */
 
 /* Use SRAM for initial stack */
 #define CFG_INIT_RAM_ADDR      CFG_SRAM_BASE           /* Initial RAM address */

diff --git a/include/mpc512x.h b/include/mpc512x.h
index a76b1ca2143f06d2f94687bea2c9e2d97a1d331f..cb418d1e91fdc03c99a22062d8257938d0129ffd 100644 (file)
--- a/include/mpc512x.h
+++ b/include/mpc512x.h
@@ -58,6 +58,7 @@
 #define CS5_CONFIG             0x00014
 #define CS6_CONFIG             0x00018
 #define CS7_CONFIG             0x0001C
+#define CS_ALE_TIMING_CONFIG   0x00034
 
 #define CS_CTRL                        0x00020
 #define CS_CTRL_ME             0x01000000      /* CS Master Enable bit */