arm, davinci: add am1808 based enbw_cmc board

repost from:
[U-Boot] [PATCH v3 0/3] arm, davinci: add am1808 based enbw_cmc board
http://lists.denx.de/pipermail/u-boot/2011-November/111427.html

changes for v4:
- change gp0[15] output state to high
- change gp6[10] output state to high
add comments from Igor Grinberg:
- removed clean, distclean targets from Makefile
- sorted includes
- aligned table
- use misc functions from board/davinci/common moved for this board/davinci/common/misc.c to arch/arm/cpu/arm926ejs/davinci/misc.c in a seperate patch
- use da8xx_configure_lpsc_items()
add comments from Wolfgang Denk:
- return instead continue, if gpio_request fails.

Following patches are needed for this patchset
- patchset from Christian Riesch:
[U-Boot] [PATCH v3 00/15] Add an SPL to boot the da850evm from SPI
http://lists.denx.de/pipermail/u-boot/2011-November/111182.html

- [U-Boot,1/2] arm, arm926ejs: always do cpu critical inits patchwork.ozlabs.org/patch/124787/

- [U-Boot] arm, fdt: update ethernet mac address before booting Linux
http://patchwork.ozlabs.org/patch/114736/

checkpatch:
total: 0 errors, 0 warnings, 75 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

20111129/0001-arm-davinci-move-davinci_rtc-struct-to-hardware.h.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 18 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

20111129/0002-arm-davinci-da850-add-uart1-tx-rx-pinmux-config.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 55 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

20111129/0003-arm-board-davinci-common-misc.c-Codingstyle-cleanup.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 48 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

20111129/0004-arm-davinci-move-misc-function-in-arch-tree.patch has no obvious style problems and is ready for submission.
total: 0 errors, 0 warnings, 1117 lines checked

NOTE: Ignored message types: COMPLEX_MACRO CONSIDER_KSTRTO MINMAX MULTISTATEMENT_MACRO_USE_DO_WHILE

20111129/0005-arm-davinci-add-support-for-am1808-based-enbw_cmc-bo.patch has no obvious style problems and is ready for submission.

Heiko Schocher (5):
arm, davinci: move davinci_rtc struct to hardware.h arm, davinci, da850: add uart1 tx rx pinmux config arm, board/davinci/common/misc.c: Codingstyle cleanup arm, davinci: move misc function in arch tree arm, davinci: add support for am1808 based enbw_cmc board

 MAINTAINERS                                        |    1 +
 arch/arm/cpu/arm926ejs/davinci/Makefile            |    2 +-
 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c      |    5 +
 .../arm/cpu/arm926ejs/davinci}/misc.c              |   19 +-
 arch/arm/include/asm/arch-davinci/hardware.h       |   39 ++
 arch/arm/include/asm/arch-davinci/pinmux_defs.h    |    1 +
 board/ait/cam_enc_4xx/cam_enc_4xx.c                |   15 -
 board/{davinci/common => enbw/enbw_cmc}/Makefile   |   12 +-
 board/enbw/enbw_cmc/enbw_cmc.c                     |  607 ++++++++++++++++++++
 boards.cfg                                         |    1 +
 drivers/rtc/davinci.c                              |   26 -
 include/configs/enbw_cmc.h                         |  451 +++++++++++++++
 nand_spl/board/davinci/da8xxevm/Makefile           |    9 +-
 13 files changed, 1125 insertions(+), 63 deletions(-)
 rename {board/davinci/common => arch/arm/cpu/arm926ejs/davinci}/misc.c (90%)
 rename board/{davinci/common => enbw/enbw_cmc}/Makefile (89%)
 create mode 100644 board/enbw/enbw_cmc/enbw_cmc.c
 create mode 100644 include/configs/enbw_cmc.h

1.7.6.4

move struct davinci_rtc to arch/arm/include/asm/arch-davinci/hardware.h and add RTC_KICK0R_WE, RTC_KICK1R_WE defines,
so they are global useable.

---
 arch/arm/include/asm/arch-davinci/hardware.h |   39 ++++++++++++++++++++++++++
 drivers/rtc/davinci.c                        |   26 -----------------
 2 files changed, 39 insertions(+), 26 deletions(-)

index 06819a6..dd89e84 100644
@@ -588,4 +588,43 @@ static inline int get_async3_src(void)
 #include <asm/arch/syscfg_defs.h>
 #include <asm/arch/timer_defs.h>
 #endif
+
+struct davinci_rtc {
+	dv_reg	second;
+	dv_reg	minutes;
+	dv_reg	hours;
+	dv_reg	day;
+	dv_reg	month; /* 0x10 */
+	dv_reg	year;
+	dv_reg	dotw;
+	dv_reg	resv1;
+	dv_reg	alarmsecond; /* 0x20 */
+	dv_reg	alarmminute;
+	dv_reg	alarmhour;
+	dv_reg	alarmday;
+	dv_reg	alarmmonth; /* 0x30 */
+	dv_reg	alarmyear;
+	dv_reg	resv2[2];
+	dv_reg	ctrl; /* 0x40 */
+	dv_reg	status;
+	dv_reg	irq;
+	dv_reg	complsb;
+	dv_reg	compmsb; /* 0x50 */
+	dv_reg	osc;
+	dv_reg	resv3[2];
+	dv_reg	scratch0; /* 0x60 */
+	dv_reg	scratch1;
+	dv_reg	scratch2;
+	dv_reg	kick0r;
+	dv_reg	kick1r; /* 0x70 */
+};
+
+#define RTC_STATE_BUSY	0x01
+#define RTC_STATE_RUN	0x02
+
+#define RTC_KICK0R_WE	0x130be783
+#define RTC_KICK1R_WE	0xe0f1a495
+
+#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
+
 #endif /* __ASM_ARCH_HARDWARE_H */

index 8436cbf..5cafff4 100644
@@ -27,32 +27,6 @@
 #include <asm/arch/hardware.h>
 
 #if defined(CONFIG_CMD_DATE)
-struct davinci_rtc {
-	u_int32_t	second;
-	u_int32_t	minutes;
-	u_int32_t	hours;
-	u_int32_t	day;
-	u_int32_t	month; /* 0x10 */
-	u_int32_t	year;
-	u_int32_t	dotw;
-	u_int32_t	resv1;
-	u_int32_t	alarmsecond; /* 0x20 */
-	u_int32_t	alarmminute;
-	u_int32_t	alarmhour;
-	u_int32_t	alarmday;
-	u_int32_t	alarmmonth; /* 0x30 */
-	u_int32_t	alarmyear;
-	u_int32_t	resv2[2];
-	u_int32_t	ctrl; /* 0x40 */
-	u_int32_t	status;
-	u_int32_t	irq;
-};
-
-#define RTC_STATE_BUSY	0x01
-#define RTC_STATE_RUN	0x02
-
-#define davinci_rtc_base ((struct davinci_rtc *)DAVINCI_RTC_BASE)
-
 int rtc_get(struct rtc_time *tmp)
 {
 	struct davinci_rtc *rtc = davinci_rtc_base;

1.7.6.4

Hello Heiko,

[...]

[..]

---
changes for v4:
add Acked-by from Tom Rini

 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   |    5 +++++
 arch/arm/include/asm/arch-davinci/pinmux_defs.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

 arch/arm/cpu/arm926ejs/davinci/da850_pinmux.c   |    5 +++++
 arch/arm/include/asm/arch-davinci/pinmux_defs.h |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

index a3472ea..fa07fb5 100644
@@ -35,6 +35,11 @@ const struct pinmux_config spi1_pins_scs0[] = {
 };
 
 /* UART pin muxer settings */
+const struct pinmux_config uart1_pins_txrx[] = {
+	{ pinmux(4), 2, 6 }, /* UART1_RXD */
+	{ pinmux(4), 2, 7 }, /* UART1_TXD */
+};
+
 const struct pinmux_config uart2_pins_txrx[] = {
 	{ pinmux(4), 2, 4 }, /* UART2_RXD */
 	{ pinmux(4), 2, 5 }, /* UART2_TXD */

index 191494b..07aceaa 100644
@@ -28,6 +28,7 @@ extern const struct pinmux_config spi1_pins_base[3];
 extern const struct pinmux_config spi1_pins_scs0[1];
 
 /* UART pin muxer settings */
+extern const struct pinmux_config uart1_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_txrx[2];
 extern const struct pinmux_config uart2_pins_rtscts[2];
 

1.7.6.4

---
 board/davinci/common/misc.c |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

index 5aa7605..5f510b6 100644
@@ -51,16 +51,16 @@ void dram_init_banksize(void)
 #endif
 
 #ifdef CONFIG_DRIVER_TI_EMAC
-
-/* Read ethernet MAC address from EEPROM for DVEVM compatible boards.
+/*
+ * Read ethernet MAC address from EEPROM for DVEVM compatible boards.
  * Returns 1 if found, 0 otherwise.
  */
 int dvevm_read_mac_address(uint8_t *buf)
 {
 #ifdef CONFIG_SYS_I2C_EEPROM_ADDR
 	/* Read MAC address. */
-	if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00, CONFIG_SYS_I2C_EEPROM_ADDR_LEN,
-		     (uint8_t *) &buf[0], 6))
+	if (i2c_read(CONFIG_SYS_I2C_EEPROM_ADDR, 0x7F00,
+		CONFIG_SYS_I2C_EEPROM_ADDR_LEN, (uint8_t *) &buf[0], 6))
 		goto i2cerr;
 
 	/* Check that MAC address is valid. */

@@ -70,7 +70,8 @@ int dvevm_read_mac_address(uint8_t *buf)
 	return 1; /* Found */
 
 i2cerr:
-	printf("Read from EEPROM @ 0x%02x failed\n", CONFIG_SYS_I2C_EEPROM_ADDR);
+	printf("Read from EEPROM @ 0x%02x failed\n",
+		CONFIG_SYS_I2C_EEPROM_ADDR);
 err:
 #endif /* CONFIG_SYS_I2C_EEPROM_ADDR */
 

@@ -103,15 +104,16 @@ void davinci_sync_env_enetaddr(uint8_t *rom_enetaddr)
 
 	eth_getenv_enetaddr_by_index("eth", 0, env_enetaddr);
 	if (!memcmp(env_enetaddr, "\0\0\0\0\0\0", 6)) {
-		/* There is no MAC address in the environment, so we initialize
-		 * it from the value in the EEPROM. */
+		/*
+		 * There is no MAC address in the environment, so we
+		 * initialize it from the value in the EEPROM.
+		 */
 		debug("### Setting environment from EEPROM MAC address = "
 			"\"%pM\"\n",
 			env_enetaddr);
 		eth_setenv_enetaddr("ethaddr", rom_enetaddr);
 	}
 }
-
 #endif	/* CONFIG_DRIVER_TI_EMAC */
 
 #if defined(CONFIG_SOC_DA8XX)

@@ -122,7 +124,6 @@ void irq_init(void)
 	 * Mask all IRQs by clearing the global enable and setting
 	 * the enable clear for all the 90 interrupts.
 	 */
-
 	writel(0, &davinci_aintc_regs->ger);
 
 	writel(0, &davinci_aintc_regs->hier);

1.7.6.4

move the board/davinci/common/misc.c file to
arch/arm/cpu/arm926ejs/davinci/misc.c, so all
davinci boards can use this functions.

---
 arch/arm/cpu/arm926ejs/davinci/Makefile            |    2 +-
 .../arm/cpu/arm926ejs/davinci}/misc.c              |    0
 board/ait/cam_enc_4xx/cam_enc_4xx.c                |   15 ------
 board/davinci/common/Makefile                      |   47 --------------------
 nand_spl/board/davinci/da8xxevm/Makefile           |    9 ++--
 5 files changed, 5 insertions(+), 68 deletions(-)
 rename {board/davinci/common => arch/arm/cpu/arm926ejs/davinci}/misc.c (100%)
 delete mode 100644 board/davinci/common/Makefile

index 4ac187a..5ae89df 100644
@@ -27,7 +27,7 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(SOC).o
 
-COBJS-y				+= cpu.o timer.o psc.o pinmux.o
+COBJS-y				+= cpu.o misc.o timer.o psc.o pinmux.o
 COBJS-$(CONFIG_DA850_LOWLEVEL)	+= da850_lowlevel.o
 COBJS-$(CONFIG_SOC_DM355)	+= dm355.o
 COBJS-$(CONFIG_SOC_DM365)	+= dm365.o

similarity index 100%
rename from board/davinci/common/misc.c
rename to arch/arm/cpu/arm926ejs/davinci/misc.c

index 1351358..f438c15 100644
@@ -36,21 +36,6 @@
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifndef CONFIG_SPL_BUILD
-int dram_init(void)
-{
-	/* dram_init must store complete ramsize in gd->ram_size */
-	gd->ram_size = get_ram_size(
-			(void *)CONFIG_SYS_SDRAM_BASE,
-			CONFIG_MAX_RAM_BANK_SIZE);
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
-	gd->bd->bi_dram[0].size = gd->ram_size;
-}
-
 static struct davinci_timer *timer =
 	(struct davinci_timer *)DAVINCI_TIMER3_BASE;
 

index 4a857ef..7746e41 100644
@@ -126,15 +126,14 @@ $(obj)cpu.c:
 	@rm -f $@
 	@ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/cpu.c $@
 
-# from board directory
-$(obj)hawkboard_nand_spl.c:
+$(obj)misc.c:
 	@rm -f $@
-	ln -s $(TOPDIR)/board/davinci/da8xxevm/hawkboard_nand_spl.c $@
+	ln -s $(TOPDIR)/arch/arm/cpu/arm926ejs/davinci/misc.c $@
 
 # from board directory
-$(obj)misc.c:
+$(obj)hawkboard_nand_spl.c:
 	@rm -f $@
-	ln -s $(TOPDIR)/board/davinci/common/misc.c $@
+	ln -s $(TOPDIR)/board/davinci/da8xxevm/hawkboard_nand_spl.c $@
 
 $(obj)psc.c:
 	@rm -f $@

1.7.6.4

- booting from NOR Flash with direct boot method
- POST support
- LOGBUF support

---
- changes for v2
- use CONFIG_MACH_TYPE instead setting the MACH_TYPE in board specific code, as Igor Grinberg suggested.
- add logversion=2 to default Environment
- Fix typo CONFIG_AM1808_LOWLEVEL as Christian Riesch suggested.
- Fix comment for PLL0 and PLL1 frequency and use PLLM = 18 for PLL0 to get the 456 MHz as Christian Riesch commented. Also fix the DDR RAM timing according to the new settings from the PLL
- add MMC support
- enable USB PSC
- correct default environment "key_cmd*" vars
- added MAINTAINERS entry

- changes for v3:
- rebased to TOT commit

    56b13b1e06473d189bc202eb8a541d673fd20247

- Power on required peripherals as early as possible, and do that only once.
- rename defaultenvironment variable "uboot" to "u-boot"
- change key_cmd_* values in the default environment
- add CONFIG_FLASH_CFI_MTD
- remove CONFIG_EMAC_MDIO_PHY_NUM
- add GP6[1] as GPIO pin (Out[13]), value 1
- change pinmux 7_11_8 to EMA_CS4
- change pinmux 7_7_4 to EMA_CS3
- change pinmux 7_3_0 to EMA_CS2
- change UART1_CTS/RTS pin function to gpio mode
- add CONFIG_SYS_DA850_LPSC_UART, CONFIG_SYS_DA850_DDR2_PBBPR and CONFIG_SYS_DA850_SYSCFG_SUSPSRC defines to
board config
- count all restarts in an environment variable called restartcount.
- changed LED5 behaviour:
- switch LED5 on as early as possible in board_gpio_init()
- switch LED5 off in board_late_init()
- switch LED5 on in show_boot_progress() state 1
- switch LED5 off in show_boot_progress() state 4
- switch LED5 on in show_boot_progress() state 15
- add CONFIG_SYS_DAVINCI_EMAC_PHY_COUNT
- cleanup board file:
- use davinci_configure_pin_mux_items() for
pinmux setup
-> don't need CONFIG_SYS_DA850_PINMUX* anymore
- based on patches from christian riesch
- use gpio api for accessing LEDs, where possible
- rename environment var flash_self to nand_selfnand
- pass per cmdline use_dma=0 for davinci_mmc
- needed patches:
- changes for v4:
- change gp0[15] output state to high
- change gp6[10] output state to high
add comments from Igor Grinberg:
- removed clean, distclean targets from Makefile
- sorted includes
- aligned table
- use misc functions from board/davinci/common. Moved for this board/davinci/common/misc.c to arch/arm/cpu/arm926ejs/davinci/misc.c in 2 seperate patches (one Codingstyle cleanup and one move patch).
- use da8xx_configure_lpsc_items()
- return instead continue, if gpio_request fails.

[U-Boot,v3,01/15] arm, davinci: Move pinmux functions from board to arch tree
http://patchwork.ozlabs.org/patch/127683/

[U-Boot,v3,02/15] arm, hawkboard: Remove obsolete struct pinmux_config i2c_pins
http://patchwork.ozlabs.org/patch/127678/

[U-Boot,v3,03/15] arm, da850evm: Do pinmux configuration for EMAC together with other pinmuxes
http://patchwork.ozlabs.org/patch/127677/

[U-Boot,v3,04/15] arm, da850: Add pinmux configurations to the arch tree
http://patchwork.ozlabs.org/patch/127689/

[U-Boot,v3,05/15] arm, da850evm: Use the pinmux configurations defined in the arch tree
http://patchwork.ozlabs.org/patch/127679/

[U-Boot,v3,06/15] arm, hawkboard: Use the pinmux configurations defined in the arch tree
http://patchwork.ozlabs.org/patch/127686/

[U-Boot,v3,07/15] arm, davinci: Remove duplication of pinmux configuration code
http://patchwork.ozlabs.org/patch/127680/

[U-Boot,1/2] arm, arm926ejs: always do cpu critical inits patchwork.ozlabs.org/patch/124787/

[U-Boot] arm, fdt: update ethernet mac address before booting Linux
http://patchwork.ozlabs.org/patch/114736/

 MAINTAINERS                    |    1 +
 board/enbw/enbw_cmc/Makefile   |   45 +++
 board/enbw/enbw_cmc/enbw_cmc.c |  607 ++++++++++++++++++++++++++++++++++++++++
 boards.cfg                     |    1 +
 include/configs/enbw_cmc.h     |  451 +++++++++++++++++++++++++++++
 5 files changed, 1105 insertions(+), 0 deletions(-)
 create mode 100644 board/enbw/enbw_cmc/Makefile
 create mode 100644 board/enbw/enbw_cmc/enbw_cmc.c
 create mode 100644 include/configs/enbw_cmc.h

index c68842e..ab02eef 100644
@@ -810,6 +810,7 @@ Jens Scharsig <[email protected]>
 
 Heiko Schocher <[email protected]>
 
+	enbw_cmc	ARM926EJS (AM1808 SoC)
 	magnesium	i.MX27
 	mgcoge3un	ARM926EJS (Kirkwood SoC)
 

index c83d861..7e8ab12 100644
@@ -136,6 +136,7 @@ davinci_dvevm                arm         arm926ejs   dvevm               davinci
 davinci_schmoogie            arm         arm926ejs   schmoogie           davinci        davinci
 davinci_sffsdr               arm         arm926ejs   sffsdr              davinci        davinci
 davinci_sonata               arm         arm926ejs   sonata              davinci        davinci
+enbw_cmc                     arm         arm926ejs   enbw_cmc            enbw           davinci
 km_kirkwood                  arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_DISABLE_PCI
 km_kirkwood_pci              arm         arm926ejs   km_arm              keymile        kirkwood	km_kirkwood:KM_RECONFIG_XLX
 mgcoge3un                    arm         arm926ejs   km_arm              keymile        kirkwood

1.7.6.4

Hello Heiko,

[...]

Actually, your patches don't need the full patchset but only patches 1 to 7. I split my patchset into smaller pieces, so you only need this patchset:

[U-Boot] [PATCH v4 0/7] Remove duplication of pinmux configuration code
http://lists.denx.de/pipermail/u-boot/2011-November/111607.html

and the two patches below.

Regards, Christian

I've taken this one.

I've delegated this to Albert.

The rest of the series (will be) queued to u-boot-ti, thanks for your patience.

Tom

Hello Tom,

Thanks!

Ok, thanks!

Yep, checked this. The enbw_cmc board build and works fine with u-boot-ti.git

A "./MAKEALL -a arm --soc davinci" show me this errors:

Configuring for davinci_schmoogie board...
schmoogie.c: In function 'board_init':
schmoogie.c:37:27: error: 'MACH_TYPE_SCHMOOGIE' undeclared (first use in this function) schmoogie.c:37:27: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [schmoogie.o] Fehler 1
make: *** [board/davinci/schmoogie/libschmoogie.o] Fehler 2
arm-linux-gnueabi-size: './u-boot': No such file
Configuring for davinci_sffsdr board...
text data bss dec hex filename
187778 6216 54620 248614 3cb26 ./u-boot
Configuring for davinci_sonata board...
sonata.c: In function 'board_init':
sonata.c:38:27: error: 'MACH_TYPE_SONATA' undeclared (first use in this function) sonata.c:38:27: note: each undeclared identifier is reported only once for each function it appears in make[1]: *** [sonata.o] Fehler 1
make: *** [board/davinci/sonata/libsonata.o] Fehler 2
arm-linux-gnueabi-size: './u-boot': No such file

Fixes for this from Christian Riesch
for MACH_TYPE_SCHMOOGIE
http://www.mail-archive.com/u-boot at lists.denx.de/msg69998.html

for MACH_TYPE_SONATA
http://www.mail-archive.com/u-boot at lists.denx.de/msg69997.html

I could not find this patches in patchwork, nor are they applied in u-boot-arm.git ... Ah, they are in mainline u-boot.git ... Ok, they are not lost!

bye,
Heiko

DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany