Skip to contentSkip to conversation

am3517_evm: activate Ethernet PHY

PATCH Superseded yegorslists at googlemail.com 3 participants 6 messages Dec 6, 2013

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +34 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET	0x48002598
+#define CPGMACSS_SW_RST		(1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+	__maybe_unused volatile unsigned int ctr;
+	__maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
 	am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+	/* activate PHY reset */
+	gpio_direction_output(30, 0);
+	gpio_set_value(30, 0);
+
+	ctr  = 0;
+	do {
+		udelay(1000);
+		ctr++;
+	} while (ctr < 300);
+
+	/* deactivate PHY reset */
+	gpio_set_value(30, 1);
+
+	/* allow the PHY to stabilize and settle down */
+	ctr = 0;
+	do {
+		udelay(1000);
+		ctr++;
+	} while (ctr < 300);
+
+	/* ensure that the module is out of reset */
+	reset = readl(AM3517_IP_SW_RESET);
+	reset &= (~CPGMACSS_SW_RST);
+	writel(reset,AM3517_IP_SW_RESET);
+#endif
+
 	return 0;
 }
 
board/logicpd/am3517evm/am3517evm.h +1 -1
index 704af84..d407d66 100644
@@ -315,7 +315,7 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(SYS_CLKREQ),		(IEN  | PTD | DIS | M0)) \
 	MUX_VAL(CP(SYS_NIRQ),		(IEN  | PTU | EN  | M0)) \
 	/*SYS_nRESWARM */\
-	MUX_VAL(CP(SYS_NRESWARM),     	(IDIS | PTU | DIS | M4)) \
+	MUX_VAL(CP(SYS_NRESWARM),     	(IDIS | PTU | EN | M4)) \
 							/* - GPIO30 */\
 	MUX_VAL(CP(SYS_BOOT0),		(IEN  | PTD | DIS | M4)) /*GPIO_2*/\
 							 /* - PEN_IRQ */\
Signature · 1 line
1.7.7
#1 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

Quoted 6 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

Looks good. One questions below though:

Quoted 61 lines

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +23 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET	0x48002598
+#define CPGMACSS_SW_RST		(1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+	__maybe_unused volatile unsigned int ctr;
+	__maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
 	i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
 	am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+	/* activate PHY reset */
+	gpio_direction_output(30, 0);
+	gpio_set_value(30, 0);
+
+	ctr  = 0;
+	do {
+		udelay(1000);
+		ctr++;
+	} while (ctr < 300);
+
+	/* deactivate PHY reset */
+	gpio_set_value(30, 1);
+
+	/* allow the PHY to stabilize and settle down */
+	ctr = 0;

board/logicpd/am3517evm/am3517evm.c int misc_init_r(void) · line 141

Quoted 10 lines
board/logicpd/am3517evm/am3517evm.c +10 -0
+	do {
+		udelay(1000);
+		ctr++;
+	} while (ctr < 300);
+
+	/* ensure that the module is out of reset */
+	reset = readl(AM3517_IP_SW_RESET);
+	reset &= (~CPGMACSS_SW_RST);
+	writel(reset,AM3517_IP_SW_RESET);
+#endif

Why do you need to put this "#if defined(CONFIG_DRIVER_TI_EMAC)" here at all? Isn't CONFIG_DRIVER_TI_EMAC enabled for this board always?

Thanks,
Stefan

#2 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

Quoted 76 lines · Stefan Roese
Quoted 6 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

Looks good. One questions below though:

Quoted 66 lines

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +28 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET   0x48002598
+#define CPGMACSS_SW_RST              (1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+     __maybe_unused volatile unsigned int ctr;
+     __maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
      i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
      am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+     /* activate PHY reset */
+     gpio_direction_output(30, 0);
+     gpio_set_value(30, 0);
+
+     ctr  = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
+     /* deactivate PHY reset */
+     gpio_set_value(30, 1);
+
+     /* allow the PHY to stabilize and settle down */
+     ctr = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
Quoted 8 lines

board/logicpd/am3517evm/am3517evm.c int misc_init_r(void) · line 141

Quoted 5 lines
board/logicpd/am3517evm/am3517evm.c +5 -0
+     /* ensure that the module is out of reset */
+     reset = readl(AM3517_IP_SW_RESET);
+     reset &= (~CPGMACSS_SW_RST);
+     writel(reset,AM3517_IP_SW_RESET);
+#endif

Why do you need to put this "#if defined(CONFIG_DRIVER_TI_EMAC)" here at all? Isn't CONFIG_DRIVER_TI_EMAC enabled for this board always?

It is enabled in arago repository:
http://arago-project.org/git/projects/?p=u-boot-omap3.git;a=blob;f=include/configs/am3517_evm.h;h=b37b81e2aa5d635d14db87393e751ac25cb3611e;hb=HEAD,
but not in upstream u-boot. I was testing the stuff with my own board, so my am3517_evm.h is a little bit messy for now. That's why I wanted to have this change only in board/logicpd/am3517evm/am3517evm.c. It does no harm so far. I could patch am3517_evm.h later.

Yegor

#3 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

Quoted 86 lines · Yegor Yefremov
Quoted 76 lines · Stefan Roese
Quoted 6 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

Looks good. One questions below though:

Quoted 66 lines

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +28 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET   0x48002598
+#define CPGMACSS_SW_RST              (1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+     __maybe_unused volatile unsigned int ctr;
+     __maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
      i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
      am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+     /* activate PHY reset */
+     gpio_direction_output(30, 0);
+     gpio_set_value(30, 0);
+
+     ctr  = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
+     /* deactivate PHY reset */
+     gpio_set_value(30, 1);
+
+     /* allow the PHY to stabilize and settle down */
+     ctr = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
Quoted 8 lines

board/logicpd/am3517evm/am3517evm.c int misc_init_r(void) · line 141

Quoted 5 lines
board/logicpd/am3517evm/am3517evm.c +5 -0
+     /* ensure that the module is out of reset */
+     reset = readl(AM3517_IP_SW_RESET);
+     reset &= (~CPGMACSS_SW_RST);
+     writel(reset,AM3517_IP_SW_RESET);
+#endif

Why do you need to put this "#if defined(CONFIG_DRIVER_TI_EMAC)" here at all? Isn't CONFIG_DRIVER_TI_EMAC enabled for this board always?

Quoted 6 lines

It is enabled in arago repository:
http://arago-project.org/git/projects/?p=u-boot-omap3.git;a=blob;f=include/configs/am3517_evm.h;h=b37b81e2aa5d635d14db87393e751ac25cb3611e;hb=HEAD,
but not in upstream u-boot. I was testing the stuff with my own board, so my am3517_evm.h is a little bit messy for now. That's why I wanted to have this change only in board/logicpd/am3517evm/am3517evm.c. It does no harm so far. I could patch am3517_evm.h later.

Ah, I forgot that I marked http://patchwork.ozlabs.org/patch/129720/ as Deferred way back when rather than merge it. I don't know why I didn't need the bit you pulled in when I was testing eth.

The right answer here is to do both of these so that we are using and testing the feature we add. I'll see if I can dig up and boot up my am3517_evm.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131206/11ca15f5/attachment.pgp>
#4 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

Quoted 94 lines · Tom Rini
Quoted 86 lines · Yegor Yefremov
Quoted 76 lines · Stefan Roese
Quoted 6 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

Looks good. One questions below though:

Quoted 66 lines

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +28 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET   0x48002598
+#define CPGMACSS_SW_RST              (1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+     __maybe_unused volatile unsigned int ctr;
+     __maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
      i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
      am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+     /* activate PHY reset */
+     gpio_direction_output(30, 0);
+     gpio_set_value(30, 0);
+
+     ctr  = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
+     /* deactivate PHY reset */
+     gpio_set_value(30, 1);
+
+     /* allow the PHY to stabilize and settle down */
+     ctr = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
Quoted 8 lines

board/logicpd/am3517evm/am3517evm.c int misc_init_r(void) · line 141

Quoted 5 lines
board/logicpd/am3517evm/am3517evm.c +5 -0
+     /* ensure that the module is out of reset */
+     reset = readl(AM3517_IP_SW_RESET);
+     reset &= (~CPGMACSS_SW_RST);
+     writel(reset,AM3517_IP_SW_RESET);
+#endif

Why do you need to put this "#if defined(CONFIG_DRIVER_TI_EMAC)" here at all? Isn't CONFIG_DRIVER_TI_EMAC enabled for this board always?

Quoted 6 lines

It is enabled in arago repository:
http://arago-project.org/git/projects/?p=u-boot-omap3.git;a=blob;f=include/configs/am3517_evm.h;h=b37b81e2aa5d635d14db87393e751ac25cb3611e;hb=HEAD,
but not in upstream u-boot. I was testing the stuff with my own board, so my am3517_evm.h is a little bit messy for now. That's why I wanted to have this change only in board/logicpd/am3517evm/am3517evm.c. It does no harm so far. I could patch am3517_evm.h later.

Quoted 7 lines

Ah, I forgot that I marked http://patchwork.ozlabs.org/patch/129720/ as Deferred way back when rather than merge it. I don't know why I didn't need the bit you pulled in when I was testing eth.

The right answer here is to do both of these so that we are using and testing the feature we add. I'll see if I can dig up and boot up my am3517_evm.

Bah, it's not quite trivial to apply the old patch, some other stuff needs to be enabled too, so I'll set this aside for now.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20131206/b8f3e6e1/attachment.pgp>
#5 lore raw

PATCH v3 1/1 am3517_evm: activate Ethernet PHY

Quoted 99 lines · Tom Rini
Quoted 98 lines · Tom Rini
Quoted 86 lines · Yegor Yefremov
Quoted 76 lines · Stefan Roese
Quoted 6 lines · yegorslists at googlemail.com

From: Yegor Yefremov <[email protected]>

Pin 30 is connected to PHY's RESET# signal, so it must be put to high. Otherwise PHY won't be found via MDIO interface.

Looks good. One questions below though:

Quoted 66 lines

---
Changes:
v3: use "__maybe_unused", instead of #if defined statement (Stefan Roese)
v2: put ctr and reset under #if defined statement, to avoid compiler warnings, when EMAC is not selected

 board/logicpd/am3517evm/am3517evm.c |   34 ++++++++++++++++++++++++++++++++++
 board/logicpd/am3517evm/am3517evm.h |    2 +-
 2 files changed, 35 insertions(+), 1 deletions(-)
board/logicpd/am3517evm/am3517evm.c +28 -0
index 1569905..3b1dfd1 100644
@@ -22,6 +22,7 @@
 #include <asm/arch/musb.h>
 #include <asm/mach-types.h>
 #include <asm/errno.h>
+#include <asm/gpio.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -31,6 +32,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define AM3517_IP_SW_RESET   0x48002598
+#define CPGMACSS_SW_RST              (1 << 1)
+
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -98,6 +102,9 @@ static void am3517_evm_musb_init(void)
  */
 int misc_init_r(void)
 {
+     __maybe_unused volatile unsigned int ctr;
+     __maybe_unused u32 reset;
+
 #ifdef CONFIG_SYS_I2C_OMAP34XX
      i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
 #endif
@@ -106,6 +113,33 @@ int misc_init_r(void)
 
      am3517_evm_musb_init();
 
+#if defined(CONFIG_DRIVER_TI_EMAC)
+     /* activate PHY reset */
+     gpio_direction_output(30, 0);
+     gpio_set_value(30, 0);
+
+     ctr  = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
+     /* deactivate PHY reset */
+     gpio_set_value(30, 1);
+
+     /* allow the PHY to stabilize and settle down */
+     ctr = 0;
+     do {
+             udelay(1000);
+             ctr++;
+     } while (ctr < 300);
+
Quoted 8 lines

board/logicpd/am3517evm/am3517evm.c int misc_init_r(void) · line 141

Quoted 5 lines
board/logicpd/am3517evm/am3517evm.c +5 -0
+     /* ensure that the module is out of reset */
+     reset = readl(AM3517_IP_SW_RESET);
+     reset &= (~CPGMACSS_SW_RST);
+     writel(reset,AM3517_IP_SW_RESET);
+#endif

Why do you need to put this "#if defined(CONFIG_DRIVER_TI_EMAC)" here at all? Isn't CONFIG_DRIVER_TI_EMAC enabled for this board always?

Quoted 6 lines

It is enabled in arago repository:
http://arago-project.org/git/projects/?p=u-boot-omap3.git;a=blob;f=include/configs/am3517_evm.h;h=b37b81e2aa5d635d14db87393e751ac25cb3611e;hb=HEAD,
but not in upstream u-boot. I was testing the stuff with my own board, so my am3517_evm.h is a little bit messy for now. That's why I wanted to have this change only in board/logicpd/am3517evm/am3517evm.c. It does no harm so far. I could patch am3517_evm.h later.

Ah, I forgot that I marked http://patchwork.ozlabs.org/patch/129720/ as Deferred way back when rather than merge it. I don't know why I didn't need the bit you pulled in when I was testing eth.

Quoted 6 lines
Quoted 3 lines

The right answer here is to do both of these so that we are using and testing the feature we add. I'll see if I can dig up and boot up my am3517_evm.

Bah, it's not quite trivial to apply the old patch, some other stuff needs to be enabled too, so I'll set this aside for now.

I've added #define CONFIG_PHYLIB and #define CONFIG_OMAP_GPIO

Yegor