diff mbox

[U-Boot,v2] Devkit8000: Switch over to enable_gpmc_cs_config

Message ID 1323791657-17667-1-git-send-email-weber@corscience.de
State Accepted, archived
Commit 13b178edc242cb7b61b6f4264456f7061fa3cf5b
Delegated to: Tom Rini
Headers show

Commit Message

Thomas Weber Dec. 13, 2011, 3:54 p.m. UTC 
Use enable_gpmc_cs_config instead of local writing
timing configuration for GPMC.

Signed-off-by: Thomas Weber <weber@corscience.de>
---
Changelog
	v2: Change gpmc_net_config[6] to 0, because it is calculated 
		in enable_gpmc_cs_config
 board/timll/devkit8000/devkit8000.c |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

Comments

Tom Rini Dec. 13, 2011, 6:46 p.m. UTC | #1 
On Tue, Dec 13, 2011 at 8:54 AM, Thomas Weber <weber@corscience.de> wrote:
> Use enable_gpmc_cs_config instead of local writing
> timing configuration for GPMC.
>
> Signed-off-by: Thomas Weber <weber@corscience.de>

Merged to u-boot-ti/next, thanks!
diff mbox

Patch

diff --git a/board/timll/devkit8000/devkit8000.c b/board/timll/devkit8000/devkit8000.c
index b06aab6..10f189e 100644
--- a/board/timll/devkit8000/devkit8000.c
+++ b/board/timll/devkit8000/devkit8000.c
@@ -48,6 +48,16 @@ 
 
 DECLARE_GLOBAL_DATA_PTR;
 
+static u32 gpmc_net_config[GPMC_MAX_REG] = {
+	NET_GPMC_CONFIG1,
+	NET_GPMC_CONFIG2,
+	NET_GPMC_CONFIG3,
+	NET_GPMC_CONFIG4,
+	NET_GPMC_CONFIG5,
+	NET_GPMC_CONFIG6,
+	0
+};
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -82,13 +92,8 @@  int misc_init_r(void)
 
 #ifdef CONFIG_DRIVER_DM9000
 	/* Configure GPMC registers for DM9000 */
-	writel(NET_GPMC_CONFIG1, &gpmc_cfg->cs[6].config1);
-	writel(NET_GPMC_CONFIG2, &gpmc_cfg->cs[6].config2);
-	writel(NET_GPMC_CONFIG3, &gpmc_cfg->cs[6].config3);
-	writel(NET_GPMC_CONFIG4, &gpmc_cfg->cs[6].config4);
-	writel(NET_GPMC_CONFIG5, &gpmc_cfg->cs[6].config5);
-	writel(NET_GPMC_CONFIG6, &gpmc_cfg->cs[6].config6);
-	writel(NET_GPMC_CONFIG7, &gpmc_cfg->cs[6].config7);
+	enable_gpmc_cs_config(gpmc_net_config, &gpmc_cfg->cs[6],
+			CONFIG_DM9000_BASE, GPMC_SIZE_16M);
 
 	/* Use OMAP DIE_ID as MAC address */
 	if (!eth_getenv_enetaddr("ethaddr", enetaddr)) {