ADS5121 Rev 3 Configuration Changes

PATCH New Martha J Marx 3 participants 3 messages May 3, 2008 Kbuild

Share & tools

Martha J Marx

author

2008-05-03 21:14 UTC #0 lore raw

PATCH 1/1 ADS5121 Rev 3 Configuration Changes

Configuration changes added to support ADS5121 Rev 3 version of the board. This includes changes to the ref clock, memory size (from 256 to 512), the addition of PCI functionality and Makefile options to build either the Rev 3 or Rev 2 U-Boot. The new README explains these options.

Signed-off-by Martha J Marx <mmarx@si...>

---
 Makefile                  |    9 ++++-----
 board/ads5121/README      |    9 +++++++++
 board/ads5121/ads5121.c   |   34 ++++++++++++++++++++++++++++++----
 cpu/mpc512x/cpu.c         |    8 ++++++--
 include/configs/ads5121.h |   27 +++++++++++++++++++++++----
 5 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 board/ads5121/README

Makefile +4 -5

index ac0a17f..f91c75b 100644
@@ -742,12 +742,11 @@ motionpro_config:	unconfig
 ## MPC512x Systems
 #########################################################################
 ads5121_config \
-ads5121_PCI_config \
-	:		 unconfig
+ads5121_256_config	\
+	: unconfig
 	@mkdir -p $(obj)include
-	@if [ "$(findstring _PCI_,$@)" ] ; then \
-		echo "#define CONFIG_PCI"  >>$(obj)include/config.h ; \
-		$(XECHO) "... with PCI enabled" ; \
+	@if [ "$(findstring 256,$@)" ] ; then \
+		echo "#define CONFIG_ADS5121_256 1" >

$(obj)include/config.h; \
fi
@$(MKCONFIG) -a ads5121 ppc mpc512x ads5121

board/ads5121/README new file +9 -0

new file mode 100644
index 0000000..ec49ba8
@@ -0,0 +1,9 @@
+To configure for the Rev 3.x ADS5121 type
+make ads5121_config
+This will automatically include PCI and the Real Time CLock abilities, 
+and set the correct frequency and memory configuration.
+
+To configure for the Rev 2 ADS5121 type
+make ads5121_256_config
+
+

board/ads5121/ads5121.c +3 -2

index 8629b03..35544f1 100644
@@ -26,7 +26,9 @@
 #include <asm/bitops.h>
 #include <command.h>
 #include <fdt_support.h>
-
+#ifdef CONFIG_MISC_INIT_R
+#include <i2c.h>
+#endif
 /* Clocks in use */
 #define SCCR1_CLOCKS_EN	(CLOCK_SCCR1_CFG_EN |
\
 			 CLOCK_SCCR1_LPC_EN |				\

@@ -50,7 +52,6 @@ int board_early_init_f (void)
 {
 	volatile immap_t *im = (immap_t *) CFG_IMMR;
 	u32 lpcaw;
-
 	/*
 	 * Initialize Local Window for the CPLD registers access (CS2

selects
* the CPLD chip)
@@ -58,7 +59,6 @@ int board_early_init_f (void)
im->sysconf.lpcs2aw = CSAW_START(CFG_CPLD_BASE) |
CSAW_STOP(CFG_CPLD_BASE, CFG_CPLD_SIZE);
im->lpc.cs_cfg[2] = CFG_CS2_CFG;
-
/*
* According to MPC5121e RM, configuring local access windows should
* be followed by a dummy read of the config register that was
@@ -73,8 +73,22 @@ int board_early_init_f (void)
* Without this the flash identification routine fails, as it needs
to issue
* write commands in order to establish the device ID. */
- *((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;

+#ifdef CONFIG_ADS5121_256
+ *((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+#else
+ if (*((u8 *)(CFG_CPLD_BASE + 0x08)) & 0x04) {
+
+ *((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+ } else {
+ /* running from Backup flash */
+ *((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0x32;
+ }
+#endif
+ /*
+ * Configure Flash Speed
+ */
+ *((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS0_CONFIG)) =
CFG_CS0_CFG;
/*
* Enable clocks
*/
@@ -203,6 +217,18 @@ int checkboard (void)
reg[i] |= 0x00000003;
return 0;
}
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+ /*
+ * I2C writes to turn on DVI
+ */
+ static uchar buf[1] = {0xbf};
+ i2c_set_bus_num(2);
+ i2c_write(0x38, 0x8, 1, buf, 1);
+ return 0;
+}
+#endif

#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) void ft_board_setup(void *blob, bd_t *bd)

cpu/mpc512x/cpu.c +3 -2

index bed77ac..3b45bfe 100644
@@ -133,8 +133,9 @@ void watchdog_reset (void)
 #ifdef CONFIG_OF_LIBFDT
 void ft_cpu_setup(void *blob, bd_t *bd)
 {
-	char * cpu_path = "/cpus/" OF_CPU;
-	char * eth_path = "/" OF_SOC "/ethernet at 2800";
+	char *cpu_path = "/cpus/" OF_CPU;
+	char *eth_path = "/" OF_SOC "/ethernet at 2800";
+	char *eth_path_old = "/" OF_SOC_OLD "/ethernet at 2800";
 
 	do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK,

1);
do_fixup_by_path_u32(blob, cpu_path, "bus-frequency",
bd->bi_busfreq, 1);
@@ -143,6 +144,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
do_fixup_by_path(blob, eth_path, "local-mac-address",
bd->bi_enetaddr, 6, 0);

/* this is so old kernels with old device trees will boot */
+
do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency",
bd->bi_ipsfreq, 0);
+ do_fixup_by_path(blob, eth_path_old, "local-mac-address",
bd->bi_enetaddr, 6, 0);
+ do_fixup_by_path(blob, eth_path_old, "address", bd->bi_enetaddr, 6,
0);
}
#endif

include/configs/ads5121.h +5 -0

index 81e7c1e..5f82855 100644
@@ -48,9 +48,15 @@
 
 /* CONFIG_PCI is defined at config time */
 
+#ifdef CONFIG_ADS5121_256
 #define CFG_MPC512X_CLKIN	66000000	/* in Hz */
+#else
+#define CFG_MPC512X_CLKIN	33333333	/* in Hz */
+#define CONFIG_PCI
+#endif
 
 #define CONFIG_BOARD_EARLY_INIT_F		/* call board_early_init_f()

*/
+#define CONFIG_MISC_INIT_R /* call
board_last_stage_init() */

#define CFG_IMMR 0x80000000

@@ -60,7 +66,11 @@
/*
* DDR Setup - manually set all parameters as there's no SPD etc. */
+#ifdef CONFIG_ADS5121_256
#define CFG_DDR_SIZE 256 /* MB */
+#else
+#define CFG_DDR_SIZE 512 /* MB */
+#endif
#define CFG_DDR_BASE 0x00000000 /* DDR is system memory*/
#define CFG_SDRAM_BASE CFG_DDR_BASE

@@ -108,14 +118,20 @@
* [09:05] DRAM tRP:
* [04:00] DRAM tRPA
*/
-
+#ifdef CONFIG_ADS5121_256
#define CFG_MDDRC_SYS_CFG 0xF8604A00
#define CFG_MDDRC_SYS_CFG_RUN 0xE8604A00
+#define CFG_MDDRC_TIME_CFG1 0x54EC1168
+#define CFG_MDDRC_TIME_CFG2 0x35210864
+#else
+#define CFG_MDDRC_SYS_CFG 0xFA804A00
+#define CFG_MDDRC_SYS_CFG_RUN 0xEA804A00
+#define CFG_MDDRC_TIME_CFG1 0x68EC1168
+#define CFG_MDDRC_TIME_CFG2 0x34310864
+#endif
#define CFG_MDDRC_SYS_CFG_EN 0xF0000000
#define CFG_MDDRC_TIME_CFG0 0x00003D2E
#define CFG_MDDRC_TIME_CFG0_RUN 0x06183D2E
-#define CFG_MDDRC_TIME_CFG1 0x54EC1168
-#define CFG_MDDRC_TIME_CFG2 0x35210864

#define CFG_MICRON_NOP 0x01380000
#define CFG_MICRON_PCHG_ALL 0x01100400
@@ -175,8 +191,11 @@

#define CFG_SRAM_BASE 0x30000000
#define CFG_SRAM_SIZE 0x00020000 /* 128 KB */
-
+#ifdef ADS5121_256_CONFIG
#define CFG_CS0_CFG 0x05059310 /* ALE active low, data size
4bytes */
+#else
+#define CFG_CS0_CFG 0x05059310 /* ALE active low, data size
4bytes */
+#endif
#define CFG_CS2_CFG 0x05059010 /* ALE active low, data size
1byte */

/* Use SRAM for initial stack */

Signature · 1 line

1.5.2.4

Jean-Christophe PLAGNIOL-VILLARD

2008-05-03 22:27 UTC #1 lore raw

PATCH 1/1 ADS5121 Rev 3 Configuration Changes

Quoted 7 lines · Martha J Marx

Configuration changes added to support ADS5121 Rev 3 version of the board. This includes changes to the ref clock, memory size (from 256 to 512), the addition of PCI functionality and Makefile options to build either the Rev 3 or Rev 2 U-Boot. The new README explains these options.
Signed-off-by Martha J Marx <mmarx@si...>

same as previous patch

plus some coding style issue

pLease fix and resubmit
Best Regards,
J.

Quoted 28 lines

+++ b/board/ads5121/README

board/ads5121/README new file +9 -0

@@ -0,0 +1,9 @@
+To configure for the Rev 3.x ADS5121 type
+make ads5121_config
+This will automatically include PCI and the Real Time CLock abilities, 
+and set the correct frequency and memory configuration.
+
+To configure for the Rev 2 ADS5121 type
+make ads5121_256_config
+
+

board/ads5121/ads5121.c +3 -1

index 8629b03..35544f1 100644
@@ -26,7 +26,9 @@
 #include <asm/bitops.h>
 #include <command.h>
 #include <fdt_support.h>
-
+#ifdef CONFIG_MISC_INIT_R
+#include <i2c.h>
+#endif
 /* Clocks in use */
 #define SCCR1_CLOCKS_EN	(CLOCK_SCCR1_CFG_EN |
 \

board/ads5121/ads5121.c +0 -0

 			 CLOCK_SCCR1_LPC_EN |				\

board/ads5121/ads5121.c int board_early_init_f (void) · line 53

Quoted 4 lines

board/ads5121/ads5121.c +0 -1

@@ -50,7 +52,6 @@ int board_early_init_f (void)
 {
 	volatile immap_t *im = (immap_t *) CFG_IMMR;
 	u32 lpcaw;
-

do not remove please

Quoted 15 lines

board/ads5121/ads5121.c +0 -0

 	/*
 	 * Initialize Local Window for the CPLD registers access (CS2

selects

board/ads5121/ads5121.c +0 -1

 	 * the CPLD chip)

@@ -58,7 +59,6 @@ int board_early_init_f (void)
 	im->sysconf.lpcs2aw = CSAW_START(CFG_CPLD_BASE) |
 			      CSAW_STOP(CFG_CPLD_BASE, CFG_CPLD_SIZE);
 	im->lpc.cs_cfg[2] = CFG_CS2_CFG;
-
 	/*
 	 * According to MPC5121e RM, configuring local access windows should
 	 * be followed by a dummy read of the config register that was

@@ -73,8 +73,22 @@ int board_early_init_f (void)
 	 * Without this the flash identification routine fails, as it needs

to issue

board/ads5121/ads5121.c

Quoted 9 lines

board/ads5121/ads5121.c +5 -1

 	 * write commands in order to establish the device ID.
 	 */
-	*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
 
+#ifdef CONFIG_ADS5121_256
+	*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+#else
+	if (*((u8 *)(CFG_CPLD_BASE + 0x08)) & 0x04) {
+

please remove empty line

Quoted 15 lines

board/ads5121/ads5121.c +10 -0

+		*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+	} else {
+	/* running from Backup flash */
+		*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0x32;
+	}
+#endif
+	/*
+	 * Configure Flash Speed
+	 */
+	*((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS0_CONFIG)) =

CFG_CS0_CFG;

board/ads5121/ads5121.c +0 -0

 	/*
 	 * Enable clocks
 	 */

board/ads5121/ads5121.c int checkboard (void) · line 226

Quoted 10 lines

board/ads5121/ads5121.c +7 -0

@@ -203,6 +217,18 @@ int checkboard (void)
 		reg[i] |= 0x00000003;
 	return 0;
 }
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+	/*
+	 * I2C writes to turn on DVI
+	 */
+	static 	uchar buf[1] = {0xbf};

whitespace
add an empty line

Quoted 13 lines

board/ads5121/ads5121.c +5 -0

+	i2c_set_bus_num(2);
+	i2c_write(0x38, 0x8, 1, buf, 1);
+	return 0;
+}
+#endif
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
 void ft_board_setup(void *blob, bd_t *bd)

cpu/mpc512x/cpu.c +0 -0

index bed77ac..3b45bfe 100644
@@ -133,8 +133,9 @@ void watchdog_reset (void)

Wolfgang Denk

2008-05-03 22:50 UTC #2 lore raw

PATCH 1/1 ADS5121 Rev 3 Configuration Changes

In reply to Martha J Marx

Quoted 4 lines · In message <200805031714718.SM04052@cw4mb41> you wrote:

Configuration changes added to support ADS5121 Rev 3 version of the board. This includes changes to the ref clock, memory size (from 256 to 512), the addition of PCI functionality and Makefile options to build either the Rev 3 or Rev 2 U-Boot. The new README explains these options.

Do we really need a separate Makefile target and thus separate images for this? Isn't there a way to detect the hardware revision automatically in the software?

Quoted 3 lines

Signed-off-by Martha J Marx <mmarx@si...>
---

 Makefile                  |    9 ++++-----

Quoted 6 lines

 board/ads5121/README      |    9 +++++++++
 board/ads5121/ads5121.c   |   34 ++++++++++++++++++++++++++++++----
 cpu/mpc512x/cpu.c         |    8 ++++++--
 include/configs/ads5121.h |   27 +++++++++++++++++++++++----
 5 files changed, 72 insertions(+), 15 deletions(-)
 create mode 100644 board/ads5121/README

Your patch cannot be applied because it was corrupted (line wrapped) by your mailer (if that is a valid name for something as Outlook). I strongly recommend to use git-send-email to post patches.

Quoted 11 lines

Makefile +1 -2

index ac0a17f..f91c75b 100644
@@ -742,12 +742,11 @@ motionpro_config:	unconfig
 ## MPC512x Systems
 #########################################################################
 ads5121_config \
-ads5121_PCI_config \
-	:		 unconfig
+ads5121_256_config	\

...

Makefile

Quoted 2 lines

Makefile +2 -0

+To configure for the Rev 2 ADS5121 type
+make ads5121_256_config

That's not exactly intuitive - when you call it "Rev 2" hadrware, then also use that name as the make target.

Quoted 8 lines

Makefile +0 -1

@@ -50,7 +52,6 @@ int board_early_init_f (void)
 {
 	volatile immap_t *im = (immap_t *) CFG_IMMR;
 	u32 lpcaw;
-
 	/*
 	 * Initialize Local Window for the CPLD registers access (CS2

selects

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Makefile int board_early_init_f (void) · line 64

Quoted 9 lines

Makefile +0 -1

 	 * the CPLD chip)

@@ -58,7 +59,6 @@ int board_early_init_f (void)
 	im->sysconf.lpcs2aw = CSAW_START(CFG_CPLD_BASE) |
 			      CSAW_STOP(CFG_CPLD_BASE, CFG_CPLD_SIZE);
 	im->lpc.cs_cfg[2] = CFG_CS2_CFG;
-
 	/*
 	 * According to MPC5121e RM, configuring local access windows should
 	 * be followed by a dummy read of the config register that was

I don't like these white space changes. Please leave the blank lines as it was before.

Quoted 2 lines

* Without this the flash identification routine fails, as it needs
to issue

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Makefile

Quoted 9 lines

Makefile +8 -0

+#ifdef CONFIG_ADS5121_256
+	*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+#else
+	if (*((u8 *)(CFG_CPLD_BASE + 0x08)) & 0x04) {
+
+		*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0xC1;
+	} else {
+	/* running from Backup flash */

^^^^^^^^^^^^^^^^^^^^^
Indentation wrong.

Quoted 8 lines

Makefile +7 -0

+		*((volatile u8 *)(CFG_CPLD_BASE + 0x08)) = 0x32;
+	}
+#endif
+	/*
+	 * Configure Flash Speed
+	 */
+	*((volatile u32 *)(CFG_IMMR + LPC_OFFSET + CS0_CONFIG)) =

CFG_CS0_CFG;

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Makefile void ft_cpu_setup(void *blob, bd_t *bd) · line 148

Quoted 6 lines

Makefile +1 -0

@@ -143,6 +144,9 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 	do_fixup_by_path(blob, eth_path, "local-mac-address",
 bd->bi_enetaddr, 6, 0);
 
 	/* this is so old kernels with old device trees will boot */
+

Do NOT add an empty line here.

Makefile void ft_cpu_setup(void *blob, bd_t *bd) · line 150

Quoted 2 lines

Makefile +0 -0

 	do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency",
 bd->bi_ipsfreq, 0);

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Quoted 2 lines

Makefile +1 -0
+	do_fixup_by_path(blob, eth_path_old, "local-mac-address",
bd->bi_enetaddr, 6, 0);

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Quoted 2 lines

Makefile +1 -0

+	do_fixup_by_path(blob, eth_path_old, "address", bd->bi_enetaddr, 6,

0);

^^^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Quoted 7 lines

}
#endif
include/configs/ads5121.h +0 -0
index 81e7c1e..5f82855 100644

include/configs/ads5121.h line 54

Quoted 7 lines

include/configs/ads5121.h +3 -0

@@ -48,9 +48,15 @@
 
 /* CONFIG_PCI is defined at config time */
 
+#ifdef CONFIG_ADS5121_256
 #define CFG_MPC512X_CLKIN	66000000	/* in Hz */
+#else
+#define CFG_MPC512X_CLKIN	33333333	/* in Hz */

Is this 33.333333 MHz or 33.0 MHz ?

include/configs/ads5121.h line 73

Quoted 9 lines

include/configs/ads5121.h +4 -0

@@ -60,7 +66,11 @@
 /*
  * DDR Setup - manually set all parameters as there's no SPD etc.
  */
+#ifdef CONFIG_ADS5121_256
 #define CFG_DDR_SIZE		256		/* MB */
+#else
+#define CFG_DDR_SIZE		512		/* MB */
+#endif

We should use auto-sizing for the RAM like all "correct" ports do.

include/configs/ads5121.h line 178

Quoted 5 lines

include/configs/ads5121.h +0 -1

@@ -175,8 +191,11 @@
 
 #define CFG_SRAM_BASE		0x30000000
 #define CFG_SRAM_SIZE		0x00020000	/* 128 KB */
-

Do not delete this empty line.

Quoted 3 lines

include/configs/ads5121.h +1 -0

+#ifdef ADS5121_256_CONFIG
 #define CFG_CS0_CFG		0x05059310	/* ALE active low, data size

4bytes */

^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Quoted 3 lines

include/configs/ads5121.h +2 -0
+#else
+#define CFG_CS0_CFG		0x05059310	/* ALE active low, data size
4bytes */

^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Quoted 3 lines

+#endif
#define CFG_CS2_CFG 0x05059010 /* ALE active low, data size
1byte */

^^^^^^^^^^^^^^^^^^^^
Line wrapped.

Best regards,

Wolfgang Denk

Signature · 4 lines

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Eureka!                                                 -- Archimedes