* [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try
@ 2008-04-29 17:18 Andre Schwarz
2008-04-29 19:40 ` Andy Fleming
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Andre Schwarz @ 2008-04-29 17:18 UTC (permalink / raw)
To: u-boot
The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
and Tx clock lines. They are configured using 2 bits in extended
register 0x17.
Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.
Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
--
drivers/net/tsec.c | 6 ++++++
drivers/net/tsec.h | 3 +++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
index 9d22aa3..06250ae 100644
--- a/drivers/net/tsec.c
+++ b/drivers/net/tsec.c
@@ -1277,6 +1277,12 @@ struct phy_info phy_info_VSC8601 = {
{MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
#ifdef CFG_VSC8601_SKEWFIX
{MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
+#if defined(CFG_VSC8601_SKEW_TX) && defined(CFG_VSC8601_SKEW_RX)
+ {MIIM_EXT_PAGE_ACCESS,1,NULL},
+#define VSC8101_SKEW (CFG_VSC8601_SKEW_TX<<14)|(CFG_VSC8601_SKEW_RX<<12)
+ {MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
+ {MIIM_EXT_PAGE_ACCESS,0,NULL},
+#endif
#endif
{miim_end,}
},
diff --git a/drivers/net/tsec.h b/drivers/net/tsec.h
index cfa7d1a..213a809 100644
--- a/drivers/net/tsec.h
+++ b/drivers/net/tsec.h
@@ -112,6 +112,8 @@
#define MIIM_GBIT_CONTROL 0x9
#define MIIM_GBIT_CONTROL_INIT 0xe00
+#define MIIM_EXT_PAGE_ACCESS 0x1f
+
/* Broadcom BCM54xx -- taken from linux sungem_phy */
#define MIIM_BCM54xx_AUXSTATUS 0x19
#define MIIM_BCM54xx_AUXSTATUS_LINKMODE_MASK 0x0700
@@ -163,6 +165,7 @@
/* Vitesse VSC8601 Extended PHY Control Register 1 */
#define MIIM_VSC8601_EPHY_CON 0x17
#define MIIM_VSC8601_EPHY_CON_INIT_SKEW 0x1120
+#define MIIM_VSC8601_SKEW_CTRL 0x1c
/* 88E1011 PHY Status Register */
#define MIIM_88E1011_PHY_STATUS 0x11
MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090
Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try
2008-04-29 17:18 [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try Andre Schwarz
@ 2008-04-29 19:40 ` Andy Fleming
2008-05-01 6:55 ` Ben Warren
2008-05-03 21:26 ` Wolfgang Denk
2 siblings, 0 replies; 6+ messages in thread
From: Andy Fleming @ 2008-04-29 19:40 UTC (permalink / raw)
To: u-boot
On Tue, Apr 29, 2008 at 12:18 PM, Andre Schwarz
<andre.schwarz@matrix-vision.de> wrote:
> The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
> and Tx clock lines. They are configured using 2 bits in extended
> register 0x17.
> Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
> been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.
>
> Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Acked-by: Andy Fleming <afleming@freescale.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try
2008-04-29 17:18 [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try Andre Schwarz
2008-04-29 19:40 ` Andy Fleming
@ 2008-05-01 6:55 ` Ben Warren
2008-05-03 21:26 ` Wolfgang Denk
2 siblings, 0 replies; 6+ messages in thread
From: Ben Warren @ 2008-05-01 6:55 UTC (permalink / raw)
To: u-boot
Andre Schwarz wrote:
> The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
> and Tx clock lines. They are configured using 2 bits in extended
> register 0x17.
> Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
> been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.
>
> Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
>
Acked-by: Ben Warren <biggerbadderben@gmail.com>
> --
>
>
>
Wolfgang - please apply directly. I believe this one was on your list
of outstanding patches.
> drivers/net/tsec.c | 6 ++++++
> drivers/net/tsec.h | 3 +++
> 2 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/net/tsec.c b/drivers/net/tsec.c
> index 9d22aa3..06250ae 100644
> --- a/drivers/net/tsec.c
> +++ b/drivers/net/tsec.c
> @@ -1277,6 +1277,12 @@ struct phy_info phy_info_VSC8601 = {
> {MIIM_CONTROL, MIIM_CONTROL_INIT, &mii_cr_init},
> #ifdef CFG_VSC8601_SKEWFIX
>
> {MIIM_VSC8601_EPHY_CON,MIIM_VSC8601_EPHY_CON_INIT_SKEW,NULL},
> +#if defined(CFG_VSC8601_SKEW_TX) && defined(CFG_VSC8601_SKEW_RX)
> + {MIIM_EXT_PAGE_ACCESS,1,NULL},
> +#define VSC8101_SKEW (CFG_VSC8601_SKEW_TX<<14)|(CFG_VSC8601_SKEW_RX<<12)
> + {MIIM_VSC8601_SKEW_CTRL,VSC8101_SKEW,NULL},
> + {MIIM_EXT_PAGE_ACCESS,0,NULL},
> +#endif
> #endif
> {miim_end,}
> },
> diff --git a/drivers/net/tsec.h b/drivers/net/tsec.h
> index cfa7d1a..213a809 100644
> --- a/drivers/net/tsec.h
> +++ b/drivers/net/tsec.h
> @@ -112,6 +112,8 @@
> #define MIIM_GBIT_CONTROL 0x9
> #define MIIM_GBIT_CONTROL_INIT 0xe00
>
> +#define MIIM_EXT_PAGE_ACCESS 0x1f
> +
> /* Broadcom BCM54xx -- taken from linux sungem_phy */
> #define MIIM_BCM54xx_AUXSTATUS 0x19
> #define MIIM_BCM54xx_AUXSTATUS_LINKMODE_MASK 0x0700
> @@ -163,6 +165,7 @@
> /* Vitesse VSC8601 Extended PHY Control Register 1 */
> #define MIIM_VSC8601_EPHY_CON 0x17
> #define MIIM_VSC8601_EPHY_CON_INIT_SKEW 0x1120
> +#define MIIM_VSC8601_SKEW_CTRL 0x1c
>
> /* 88E1011 PHY Status Register */
> #define MIIM_88E1011_PHY_STATUS 0x11
>
>
> MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090
> Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try
2008-04-29 17:18 [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try Andre Schwarz
2008-04-29 19:40 ` Andy Fleming
2008-05-01 6:55 ` Ben Warren
@ 2008-05-03 21:26 ` Wolfgang Denk
2008-05-04 10:19 ` André Schwarz
2 siblings, 1 reply; 6+ messages in thread
From: Wolfgang Denk @ 2008-05-03 21:26 UTC (permalink / raw)
To: u-boot
In message <48175868.5090501@matrix-vision.de> you wrote:
> The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
> and Tx clock lines. They are configured using 2 bits in extended
> register 0x17.
> Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
> been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.
>
> Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
Applied, but manually - please fix your Thunderbird configuration, or
even better, use git-send-mail to send patches. This is what I get:
Applying add config options for VSC8601 RGMII PHY - 2nd try
error: patch failed: drivers/net/tsec.c:1277
error: drivers/net/tsec.c: patch does not apply
error: patch failed: drivers/net/tsec.h:112
error: drivers/net/tsec.h: patch does not apply
Using index info to reconstruct a base tree...
error: patch failed: drivers/net/tsec.c:1277
error: drivers/net/tsec.c: patch does not apply
error: patch failed: drivers/net/tsec.h:112
error: drivers/net/tsec.h: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001.
The patch was sent white-space corrupted...
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Prediction is very difficult, especially of the future. - Niels Bohr
^ permalink raw reply [flat|nested] 6+ messages in thread
* [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try
2008-05-03 21:26 ` Wolfgang Denk
@ 2008-05-04 10:19 ` André Schwarz
2008-05-05 17:04 ` Kim Phillips
0 siblings, 1 reply; 6+ messages in thread
From: André Schwarz @ 2008-05-04 10:19 UTC (permalink / raw)
To: u-boot
Wolfgang,
I'm sorry for that.
Unfortunately I'm stuck to Thunderbird due to company rules.
Thunderbird is configured according to to the kernel-doc page.
Obviously there's something going wrong during copy+paste ...
I'll try to find a solution to send correct patches in the future.
Thanks again,
Andr?
Wolfgang Denk wrote:
> In message <48175868.5090501@matrix-vision.de> you wrote:
>
>> The Vitesse VSC8601 RGMII PHY has internal delay for both Rx
>> and Tx clock lines. They are configured using 2 bits in extended
>> register 0x17.
>> Therefore CFG_VSC8601_SKEW_TX and CFG_VSC8601_SKEW_RX have
>> been introduced with valid values 0-3 giving 0.0, 1.4,1.7 and 2.0ns delay.
>>
>> Signed-off-by: Andre Schwarz <andre.schwarz@matrix-vision.de>
>>
>
> Applied, but manually - please fix your Thunderbird configuration, or
> even better, use git-send-mail to send patches. This is what I get:
>
> Applying add config options for VSC8601 RGMII PHY - 2nd try
> error: patch failed: drivers/net/tsec.c:1277
> error: drivers/net/tsec.c: patch does not apply
> error: patch failed: drivers/net/tsec.h:112
> error: drivers/net/tsec.h: patch does not apply
> Using index info to reconstruct a base tree...
> error: patch failed: drivers/net/tsec.c:1277
> error: drivers/net/tsec.c: patch does not apply
> error: patch failed: drivers/net/tsec.h:112
> error: drivers/net/tsec.h: patch does not apply
> Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Cannot fall back to three-way merge.
> Patch failed at 0001.
>
>
> The patch was sent white-space corrupted...
>
> Best regards,
>
> Wolfgang Denk
>
>
MATRIX VISION GmbH, Talstra?e 16, DE-71570 Oppenweiler - Registergericht: Amtsgericht Stuttgart, HRB 271090
Gesch?ftsf?hrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.denx.de/pipermail/u-boot/attachments/20080504/6b71a005/attachment.htm
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-05-05 17:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-04-29 17:18 [U-Boot-Users] [PATCH] add config options for VSC8601 RGMII PHY - 2nd try Andre Schwarz
2008-04-29 19:40 ` Andy Fleming
2008-05-01 6:55 ` Ben Warren
2008-05-03 21:26 ` Wolfgang Denk
2008-05-04 10:19 ` André Schwarz
2008-05-05 17:04 ` Kim Phillips
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox