Pārlūkot izejas kodu

omap3evm: eth: split function setup_net_chip

In current implementation, the function sets up the ethernet
chip and resets it. The steps to reset depend upon the board
revision.

The patch moves the reset actions to new function reset_net_chip().

Signed-off-by: Sanjeev Premi <premi@ti.com>
Signed-off-by: Sandeep Paulraj <s-paulraj@ti.com>
Sanjeev Premi 13 gadi atpakaļ
vecāks
revīzija
6921b314a8
2 mainītis faili ar 12 papildinājumiem un 1 dzēšanām
  1. 11 1
      board/ti/evm/evm.c
  2. 1 0
      board/ti/evm/evm.h

+ 11 - 1
board/ti/evm/evm.c

@@ -130,6 +130,9 @@ int misc_init_r(void)
 #endif
 #endif
 	omap3_evm_get_revision();
 	omap3_evm_get_revision();
 
 
+#if defined(CONFIG_CMD_NET)
+	reset_net_chip();
+#endif
 	dieid_num_r();
 	dieid_num_r();
 
 
 	return 0;
 	return 0;
@@ -153,7 +156,6 @@ void set_muxconf_regs(void)
  */
  */
 static void setup_net_chip(void)
 static void setup_net_chip(void)
 {
 {
-	struct gpio *gpio3_base = (struct gpio *)OMAP34XX_GPIO3_BASE;
 	struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
 	struct ctrl *ctrl_base = (struct ctrl *)OMAP34XX_CTRL_BASE;
 
 
 	/* Configure GPMC registers */
 	/* Configure GPMC registers */
@@ -172,6 +174,14 @@ static void setup_net_chip(void)
 	/* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */
 	/* Enable off mode for ALE in PADCONF_GPMC_NADV_ALE register */
 	writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00,
 	writew(readw(&ctrl_base->gpmc_nadv_ale) | 0x0E00,
 		&ctrl_base->gpmc_nadv_ale);
 		&ctrl_base->gpmc_nadv_ale);
+}
+
+/**
+ * Reset the ethernet chip.
+ */
+static void reset_net_chip(void)
+{
+	struct gpio *gpio3_base = (struct gpio *)OMAP34XX_GPIO3_BASE;
 
 
 	/* Make GPIO 64 as output pin */
 	/* Make GPIO 64 as output pin */
 	writel(readl(&gpio3_base->oe) & ~(GPIO0), &gpio3_base->oe);
 	writel(readl(&gpio3_base->oe) & ~(GPIO0), &gpio3_base->oe);

+ 1 - 0
board/ti/evm/evm.h

@@ -49,6 +49,7 @@ u32 get_omap3_evm_rev(void);
 
 
 #if defined(CONFIG_CMD_NET)
 #if defined(CONFIG_CMD_NET)
 static void setup_net_chip(void);
 static void setup_net_chip(void);
+static void reset_net_chip(void);
 #endif
 #endif
 
 
 /*
 /*