aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-10-26 17:17:48 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-10-26 17:17:48 +0000
commit5dd653a6bd50300b968da894a764bcef4e96f609 (patch)
treed3aab899491decfe71a83764830b638f3baf043d
parentc170980c4f57693dca78347e453a5dbeae6fe703 (diff)
downloadupstream-5dd653a6bd50300b968da894a764bcef4e96f609.tar.gz
upstream-5dd653a6bd50300b968da894a764bcef4e96f609.tar.bz2
upstream-5dd653a6bd50300b968da894a764bcef4e96f609.zip
ramips: use definitions from rt305x_regs, and nuke the duplicated ones
SVN-Revision: 18175
-rw-r--r--target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h3
-rw-r--r--target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c4
2 files changed, 2 insertions, 5 deletions
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 9ddcbcd489..891c47b438 100644
--- 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 18850fda97..4ad93b580d 100644
--- 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[] = {