From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 8 Dec 2010 10:14:58 +0000 (+0000)
Subject: ramips: ramips_esw: move hardware initialization into a separate function
X-Git-Tag: reboot~18171
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=889729df016ab162aeb1092628f70e742a6aede5;p=openwrt%2Fstaging%2Fblogic.git

ramips: ramips_esw: move hardware initialization into a separate function

SVN-Revision: 24330
---

diff --git a/target/linux/ramips/files/drivers/net/ramips_esw.c b/target/linux/ramips/files/drivers/net/ramips_esw.c
index e4c8ea3dbf2b..e8041b48dfde 100644
--- a/target/linux/ramips/files/drivers/net/ramips_esw.c
+++ b/target/linux/ramips/files/drivers/net/ramips_esw.c
@@ -75,17 +75,11 @@ out:
 	return ret;
 }
 
-static int
-rt305x_esw_init(void)
+static void
+rt305x_esw_hw_init(struct rt305x_esw *esw)
 {
-	struct rt305x_esw *esw;
 	int i;
 
-	esw = &rt305x_esw;
-	esw->base = ioremap_nocache(RT305X_SWITCH_BASE, PAGE_SIZE);
-	if(!esw->base)
-		return -ENOMEM;
-
 	/* vodoo from original driver */
 	ramips_esw_wr(esw, 0xC8A07850, 0x08);
 	ramips_esw_wr(esw, 0x00000000, 0xe4);
@@ -124,6 +118,18 @@ rt305x_esw_init(void)
 	/* set default vlan */
 	ramips_esw_wr(esw, 0x2001, 0x50);
 	ramips_esw_wr(esw, 0x504f, 0x70);
+}
+
+static int
+rt305x_esw_init(void)
+{
+	struct rt305x_esw *esw;
+
+	esw = &rt305x_esw;
+	esw->base = ioremap_nocache(RT305X_SWITCH_BASE, PAGE_SIZE);
+	if(!esw->base)
+		return -ENOMEM;
 
+	rt305x_esw_hw_init(esw);
 	return 0;
 }