net: sh_eth: clean up for the SH7757's code
Shimoda
PATCH 1/4 net: sh_eth: clean up for the SH7757's code
The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it.
--- drivers/net/sh_eth.c | 9 +-------- drivers/net/sh_eth.h | 14 ++------------ 2 files changed, 3 insertions(+), 20 deletions(-)
drivers/net/sh_eth.c +1 -8
@@ -376,12 +376,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)outl ((FIFO_F_D_RFF |FIFO_F_D_RFD ),FCFTR (port));/* Configure e-mac registers */ -#if defined(CONFIG_CPU_SH7757 ) -outl (ECSIPR_BRCRXIP |ECSIPR_PSRTOIP |ECSIPR_LCHNGIP | -ECSIPR_MPDIP |ECSIPR_ICDIP ,ECSIPR (port)); -#else outl (0 ,ECSIPR (port)); -#endif /* Set Mac address */ val = dev->enetaddr[0] << 24 | dev->enetaddr[1] << 16 |
@@ -395,14 +390,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)#if !defined(CONFIG_CPU_SH7757 ) && !defined(CONFIG_CPU_SH7724 )outl (0 ,PIPR (port));#endif -#if !defined(CONFIG_CPU_SH7724 ) +#if !defined(CONFIG_CPU_SH7724 ) && !defined(CONFIG_CPU_SH7757 )outl (APR_AP ,APR (port));outl (MPR_MP ,MPR (port));#endif #if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )outl (TPAUSER_TPAUSE ,TPAUSER (port)); -#elif defined(CONFIG_CPU_SH7757 ) -outl (TPAUSER_UNLIMITED ,TPAUSER (port));#endif #if defined(CONFIG_CPU_SH7734 )
drivers/net/sh_eth.h +2 -12
@@ -319,7 +319,7 @@ enum EESR_BIT { EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, -#if defined(CONFIG_CPU_SH7724) && !defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) EESR_CND = 0x00000800,#endif EESR_DLC = 0x00000400,
@@ -426,9 +426,7 @@ enum FELIC_MODE_BIT {#if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \ ECMR_TXF | ECMR_MCT) -#elif CONFIG_CPU_SH7757 -#define ECMR_CHG_DM (ECMR_ZPF) -#elif CONFIG_CPU_SH7724 +#elif CONFIG_CPU_SH7724 ||CONFIG_CPU_SH7757 #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)#else #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)
@@ -473,20 +471,12 @@ enum ECSIPR_STATUS_MASK_BIT {/* APR */ enum APR_BIT { -#ifdef CONFIG_CPU_SH7757 -APR_AP =0x00000001 , -#else APR_AP =0x00000004 , -#endif };/* MPR */ enum MPR_BIT { -#ifdef CONFIG_CPU_SH7757 -MPR_MP =0x00000001 , -#else MPR_MP =0x00000006 , -#endif };/* TRSCER */
Signature · 1 line
1.7.1
PATCH 1/4 net: sh_eth: clean up for the SH7757's code
2012/6/27 Shimoda, Yoshihiro <[email protected]>:
Quoted 89 lines
The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it.
Signed-off-by Yoshihiro Shimoda <[email protected]>---
?drivers/net/sh_eth.c | ? ?9 +-------- ?drivers/net/sh_eth.h | ? 14 ++------------ ?2 files changed, 3 insertions(+), 20 deletions(-)drivers/net/sh_eth.c +0
-0@@ -376,12 +376,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) ? ? ? ?outl((FIFO_F_D_RFF | FIFO_F_D_RFD), FCFTR(port));? ? ? ?/* Configure e-mac registers */
drivers/net/sh_eth.c +0
-4-#if defined(CONFIG_CPU_SH7757 ) - ? ? ? outl(ECSIPR_BRCRXIP | ECSIPR_PSRTOIP | ECSIPR_LCHNGIP | - ? ? ? ? ? ? ? ECSIPR_MPDIP | ECSIPR_ICDIP, ECSIPR(port)); -#else ? ? ? ?outl(0, ECSIPR(port));
-#endif? ? ? ?/* Set Mac address */
? ? ? ?val = dev->enetaddr[0] << 24 | dev->enetaddr[1] << 16 |drivers/net/sh_eth.c +0
-0@@ -395,14 +390,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd) ?#if !defined(CONFIG_CPU_SH7757) && !defined(CONFIG_CPU_SH7724) ? ? ? ?outl(0, PIPR(port));?#endif
drivers/net/sh_eth.c +1
-1-#if !defined(CONFIG_CPU_SH7724 ) +#if !defined(CONFIG_CPU_SH7724 ) && !defined(CONFIG_CPU_SH7757 )? ? ? ?outl(APR_AP, APR(port));
? ? ? ?outl(MPR_MP, MPR(port));
?#endif
?#ifdefined(CONFIG_CPU_SH7763)||defined(CONFIG_CPU_SH7734)? ? ? ?outl(TPAUSER_TPAUSE, TPAUSER(port));
-#elifdefined(CONFIG_CPU_SH7757)
- ? ? ?outl(TPAUSER_UNLIMITED, TPAUSER(port)); ?#endif?#if
defined(CONFIG_CPU_SH7734)drivers/net/sh_eth.h +1
-1@@ -319,7 +319,7 @@ enum EESR_BIT { ? ? ? ?EESR_FTC ?= 0x00200000, EESR_TDE ?= 0x00100000, ? ? ? ?EESR_TFE ?= 0x00080000, EESR_FRC ?= 0x00040000, ? ? ? ?EESR_RDE ?= 0x00020000, EESR_RFE ?= 0x00010000, -#if defined(CONFIG_CPU_SH7724) && !defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) ? ? ? ?EESR_CND ?= 0x00000800,?#endif
? ? ? ?EESR_DLC ?=0x00000400,drivers/net/sh_eth.h +1
-3@@ -426,9 +426,7 @@ enum FELIC_MODE_BIT { ?#if defined(CONFIG_CPU_SH7763) || defined(CONFIG_CPU_SH7734) ?#define ECMR_CHG_DM ? ?(ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \ ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ? ?ECMR_TXF | ECMR_MCT) -#elif CONFIG_CPU_SH7757 -#define ECMR_CHG_DM ? ?(ECMR_ZPF) -#elif CONFIG_CPU_SH7724 +#elif CONFIG_CPU_SH7724 ||CONFIG_CPU_SH7757 ?#define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)?#else
?#defineECMR_CHG_DM? ?(ECMR_ZPF |ECMR_PFR|ECMR_RXF|ECMR_TXF|ECMR_MCT)drivers/net/sh_eth.h +0
-0@@ -473,20 +471,12 @@ enum ECSIPR_STATUS_MASK_BIT {?/* APR */
?enumAPR_BIT{drivers/net/sh_eth.h +0
-3-#ifdef CONFIG_CPU_SH7757 - ? ? ? APR_AP = 0x00000001, -#else ? ? ? ?APR_AP =
0x00000004,
-#endif
?};?/* MPR */
?enumMPR_BIT{drivers/net/sh_eth.h +0
-3-#ifdef CONFIG_CPU_SH7757 - ? ? ? MPR_MP = 0x00000001, -#else ? ? ? ?MPR_MP =
0x00000006,
-#endif
?};?/* TRSCER */
--
1.7.1
Signature · 1 line
Nobuhiro Iwamatsu
Shimoda
PATCH 1/4 net: sh_eth: clean up for the SH7757's code
Hi Iwamatsu-san,
Thank for the test and Acked-by:
Today I checked remotes/origin/{master,next} in u-boot-net.git, but, the patches have not applied yet.
Should I resend the patches?
Best regards,
Yoshihiro Shimoda
Quoted 94 lines · Nobuhiro Iwamatsu
Tested-off-by Nobuhiro Iwamatsu <[email protected]>2012/6/27 Shimoda, Yoshihiro <[email protected]>:
Quoted 89 lines
The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it.
Signed-off-by Yoshihiro Shimoda <[email protected]>--- drivers/net/sh_eth.c | 9 +-------- drivers/net/sh_eth.h | 14 ++------------ 2 files changed, 3 insertions(+), 20 deletions(-)drivers/net/sh_eth.c +1
-8@@ -376,12 +376,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)outl ((FIFO_F_D_RFF |FIFO_F_D_RFD ),FCFTR (port));/* Configure e-mac registers */ -#if defined(CONFIG_CPU_SH7757 ) -outl (ECSIPR_BRCRXIP |ECSIPR_PSRTOIP |ECSIPR_LCHNGIP | -ECSIPR_MPDIP |ECSIPR_ICDIP ,ECSIPR (port)); -#else outl (0 ,ECSIPR (port)); -#endif /* Set Mac address */ val = dev->enetaddr[0] << 24 | dev->enetaddr[1] << 16 |@@ -395,14 +390,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)#if !defined(CONFIG_CPU_SH7757 ) && !defined(CONFIG_CPU_SH7724 )outl (0 ,PIPR (port));#endif -#if !defined(CONFIG_CPU_SH7724 ) +#if !defined(CONFIG_CPU_SH7724 ) && !defined(CONFIG_CPU_SH7757 )outl (APR_AP ,APR (port));outl (MPR_MP ,MPR (port));#endif #if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )outl (TPAUSER_TPAUSE ,TPAUSER (port)); -#elif defined(CONFIG_CPU_SH7757 ) -outl (TPAUSER_UNLIMITED ,TPAUSER (port));#endif #if defined(CONFIG_CPU_SH7734 )drivers/net/sh_eth.h +2
-13@@ -319,7 +319,7 @@ enum EESR_BIT { EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, -#if defined(CONFIG_CPU_SH7724) && !defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) EESR_CND = 0x00000800,#endif EESR_DLC = 0x00000400,@@ -426,9 +426,7 @@ enum FELIC_MODE_BIT {#if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \ ECMR_TXF | ECMR_MCT) -#elif CONFIG_CPU_SH7757 -#define ECMR_CHG_DM (ECMR_ZPF) -#elif CONFIG_CPU_SH7724 +#elif CONFIG_CPU_SH7724 ||CONFIG_CPU_SH7757 #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)#else #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)@@ -473,20 +471,12 @@ enum ECSIPR_STATUS_MASK_BIT {/* APR */ enum APR_BIT { -#ifdef CONFIG_CPU_SH7757 -APR_AP =0x00000001 , -#else APR_AP =0x00000004 , -#endif };/* MPR */ enum MPR_BIT { -#ifdef CONFIG_CPU_SH7757 -MPR_MP =0x00000001 , -#else MPR_MP =0x00000006 , -#endif };/* TRSCER */ --1.7.1
Signature · 2 lines
Yoshihiro Shimoda <[email protected]> EC No.
PATCH 1/4 net: sh_eth: clean up for the SH7757's code
Hi,
Perhaps, your patch already are in Joe' patch queue, I think.
http://patchwork.ozlabs.org/patch/167486/
Nobuhiro
2012/7/23 Shimoda, Yoshihiro <[email protected]>:
Quoted 115 lines
Hi Iwamatsu-san,
Thank for the test and Acked-by:
Today I checked remotes/origin/{master,next} in u-boot-net.git, but, the patches have not applied yet.
Should I resend the patches?Best regards,
Yoshihiro ShimodaQuoted 90 lines · Nobuhiro Iwamatsu
Tested-off-by Nobuhiro Iwamatsu <[email protected]>2012/6/27 Shimoda, Yoshihiro <[email protected]>:
Quoted 86 lines
The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it.
Signed-off-by Yoshihiro Shimoda <[email protected]>--- drivers/net/sh_eth.c | 9 +-------- drivers/net/sh_eth.h | 14 ++------------ 2 files changed, 3 insertions(+), 20 deletions(-)drivers/net/sh_eth.c +1
-8@@ -376,12 +376,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)outl ((FIFO_F_D_RFF |FIFO_F_D_RFD ),FCFTR (port));/* Configure e-mac registers */ -#if defined(CONFIG_CPU_SH7757 ) -outl (ECSIPR_BRCRXIP |ECSIPR_PSRTOIP |ECSIPR_LCHNGIP | -ECSIPR_MPDIP |ECSIPR_ICDIP ,ECSIPR (port)); -#else outl (0 ,ECSIPR (port)); -#endif /* Set Mac address */ val = dev->enetaddr[0] << 24 | dev->enetaddr[1] << 16 |@@ -395,14 +390,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)#if !defined(CONFIG_CPU_SH7757 ) && !defined(CONFIG_CPU_SH7724 )outl (0 ,PIPR (port));#endif -#if !defined(CONFIG_CPU_SH7724 ) +#if !defined(CONFIG_CPU_SH7724 ) && !defined(CONFIG_CPU_SH7757 )outl (APR_AP ,APR (port));outl (MPR_MP ,MPR (port));#endif #if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )outl (TPAUSER_TPAUSE ,TPAUSER (port)); -#elif defined(CONFIG_CPU_SH7757 ) -outl (TPAUSER_UNLIMITED ,TPAUSER (port));#endif #if defined(CONFIG_CPU_SH7734 )drivers/net/sh_eth.h +2
-12@@ -319,7 +319,7 @@ enum EESR_BIT { EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, -#if defined(CONFIG_CPU_SH7724) && !defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) EESR_CND = 0x00000800,#endif EESR_DLC = 0x00000400,@@ -426,9 +426,7 @@ enum FELIC_MODE_BIT {#if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \ ECMR_TXF | ECMR_MCT) -#elif CONFIG_CPU_SH7757 -#define ECMR_CHG_DM (ECMR_ZPF) -#elif CONFIG_CPU_SH7724 +#elif CONFIG_CPU_SH7724 ||CONFIG_CPU_SH7757 #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)#else #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)@@ -473,20 +471,12 @@ enum ECSIPR_STATUS_MASK_BIT {/* APR */ enum APR_BIT { -#ifdef CONFIG_CPU_SH7757 -APR_AP =0x00000001 , -#else APR_AP =0x00000004 , -#endif };/* MPR */ enum MPR_BIT { -#ifdef CONFIG_CPU_SH7757 -MPR_MP =0x00000001 , -#else MPR_MP =0x00000006 , -#endif };Quoted 4 lines
Quoted 3 lines
drivers/net/sh_eth.h +0
-1/* TRSCER */ --1.7.1
--
Yoshihiro Shimoda <[email protected]> EC No.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 1 line
Nobuhiro Iwamatsu
Shimoda
PATCH 1/4 net: sh_eth: clean up for the SH7757's code
Hi,
Thank you for the reply. I will wait until it is merged.
Best regards,
Yoshihiro Shimoda
Quoted 126 lines · Nobuhiro Iwamatsu
Hi,
Perhaps, your patch already are in Joe' patch queue, I think.
http://patchwork.ozlabs.org/patch/167486/Nobuhiro
2012/7/23 Shimoda, Yoshihiro <[email protected]>:
Quoted 115 lines
Hi Iwamatsu-san,
Thank for the test and Acked-by:
Today I checked remotes/origin/{master,next} in u-boot-net.git, but, the patches have not applied yet.
Should I resend the patches?Best regards,
Yoshihiro ShimodaQuoted 90 lines · Nobuhiro Iwamatsu
Tested-off-by Nobuhiro Iwamatsu <[email protected]>2012/6/27 Shimoda, Yoshihiro <[email protected]>:
Quoted 86 lines
The SH7757's ETHER can work using the SH7724's setting. So, the patch modifies it.
Signed-off-by Yoshihiro Shimoda <[email protected]>--- drivers/net/sh_eth.c | 9 +-------- drivers/net/sh_eth.h | 14 ++------------ 2 files changed, 3 insertions(+), 20 deletions(-)drivers/net/sh_eth.c +1
-8@@ -376,12 +376,7 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)outl ((FIFO_F_D_RFF |FIFO_F_D_RFD ),FCFTR (port));/* Configure e-mac registers */ -#if defined(CONFIG_CPU_SH7757 ) -outl (ECSIPR_BRCRXIP |ECSIPR_PSRTOIP |ECSIPR_LCHNGIP | -ECSIPR_MPDIP |ECSIPR_ICDIP ,ECSIPR (port)); -#else outl (0 ,ECSIPR (port)); -#endif /* Set Mac address */ val = dev->enetaddr[0] << 24 | dev->enetaddr[1] << 16 |@@ -395,14 +390,12 @@ static int sh_eth_config(struct sh_eth_dev *eth, bd_t *bd)#if !defined(CONFIG_CPU_SH7757 ) && !defined(CONFIG_CPU_SH7724 )outl (0 ,PIPR (port));#endif -#if !defined(CONFIG_CPU_SH7724 ) +#if !defined(CONFIG_CPU_SH7724 ) && !defined(CONFIG_CPU_SH7757 )outl (APR_AP ,APR (port));outl (MPR_MP ,MPR (port));#endif #if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )outl (TPAUSER_TPAUSE ,TPAUSER (port)); -#elif defined(CONFIG_CPU_SH7757 ) -outl (TPAUSER_UNLIMITED ,TPAUSER (port));#endif #if defined(CONFIG_CPU_SH7734 )drivers/net/sh_eth.h +2
-12@@ -319,7 +319,7 @@ enum EESR_BIT { EESR_FTC = 0x00200000, EESR_TDE = 0x00100000, EESR_TFE = 0x00080000, EESR_FRC = 0x00040000, EESR_RDE = 0x00020000, EESR_RFE = 0x00010000, -#if defined(CONFIG_CPU_SH7724) && !defined(CONFIG_CPU_SH7757) +#if defined(CONFIG_CPU_SH7724) || defined(CONFIG_CPU_SH7757) EESR_CND = 0x00000800,#endif EESR_DLC = 0x00000400,@@ -426,9 +426,7 @@ enum FELIC_MODE_BIT {#if defined(CONFIG_CPU_SH7763 ) || defined(CONFIG_CPU_SH7734 )#define ECMR_CHG_DM (ECMR_TRCCM | ECMR_RZPF | ECMR_ZPF | ECMR_PFR | ECMR_RXF | \ ECMR_TXF | ECMR_MCT) -#elif CONFIG_CPU_SH7757 -#define ECMR_CHG_DM (ECMR_ZPF) -#elif CONFIG_CPU_SH7724 +#elif CONFIG_CPU_SH7724 ||CONFIG_CPU_SH7757 #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF)#else #define ECMR_CHG_DM (ECMR_ZPF | ECMR_PFR | ECMR_RXF | ECMR_TXF | ECMR_MCT)@@ -473,20 +471,12 @@ enum ECSIPR_STATUS_MASK_BIT {/* APR */ enum APR_BIT { -#ifdef CONFIG_CPU_SH7757 -APR_AP =0x00000001 , -#else APR_AP =0x00000004 , -#endif };/* MPR */ enum MPR_BIT { -#ifdef CONFIG_CPU_SH7757 -MPR_MP =0x00000001 , -#else MPR_MP =0x00000006 , -#endif };Quoted 4 lines
Quoted 3 lines
drivers/net/sh_eth.h +0
-1/* TRSCER */ --1.7.1
--
Yoshihiro Shimoda <[email protected]> EC No.
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Signature · 2 lines
Yoshihiro Shimoda <[email protected]> EC No.
Joe Hershberger
AppliedPATCH 1/4 net: sh_eth: clean up for the SH7757's code
Hi Yoshihiro,
Quoted 3 lines · Yoshihiro
Hi,
Thank you for the reply. I will wait until it is merged.
Applied to next, thanks.
-Joe