ramips: use definitions from rt305x_regs, and nuke the duplicated ones

SVN-Revision: 18175

diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h
index 9ddcbcd489bc2e1ee28ddea95a933e05a47feabf..891c47b438570adcb0929ef18644a74f5bc3d9c3 100644 (file)
--- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h
+++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h
@@ -33,9 +33,6 @@
 #define RAMIPS_DELAY_INIT                              ((RAMIPS_DELAY_CHAN << 16) | RAMIPS_DELAY_CHAN)
 #define RAMIPS_PSE_FQFC_CFG_INIT               0x80504000
 
-#define RAMIPS_FE_RESET                                        0x34
-#define RAMIPS_FE_RESET_BIT                            BIT(21)
-
 /* interrupt bitd */
 #define RAMIPS_CNT_PPE_AF                              BIT(31)
 #define RAMIPS_CNT_GDM_AF                              BIT(29)

diff --git a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
index 18850fda97622923bf9c2bc1a6096a9a2b7e339a..4ad93b580d7c910524a2e1e372ef56f985d08acf 100644 (file)
--- a/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
+++ b/target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c
@@ -99,8 +99,8 @@ void __init rt305x_register_flash(unsigned int id,
 
 static void rt305x_fe_reset(void)
 {
-       rt305x_sysc_wr(RAMIPS_FE_RESET_BIT, RAMIPS_FE_RESET);
-       rt305x_sysc_wr(0, RAMIPS_FE_RESET);
+       rt305x_sysc_wr(RT305X_RESET_FE, SYSC_REG_RESET_CTRL);
+       rt305x_sysc_wr(0, SYSC_REG_RESET_CTRL);
 }
 
 static struct resource rt305x_eth_resources[] = {