ramips: use definitions from rt305x_regs, and nuke the duplicated ones
authorGabor Juhos <juhosg@openwrt.org>
Mon, 26 Oct 2009 17:17:48 +0000 (17:17 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Mon, 26 Oct 2009 17:17:48 +0000 (17:17 +0000)
SVN-Revision: 18175

target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h
target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c

index 9ddcbcd..891c47b 100644 (file)
@@ -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)
index 18850fd..4ad93b5 100644 (file)
@@ -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[] = {