From d9c2b6a237f6481353e98dcdace3b14a3c9ca3de Mon Sep 17 00:00:00 2001 From: juhosg Date: Mon, 26 Oct 2009 17:17:48 +0000 Subject: ramips: use definitions from rt305x_regs, and nuke the duplicated ones git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18175 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/files/arch/mips/include/asm/mach-ralink/eth.h | 3 --- target/linux/ramips/files/arch/mips/ralink/rt305x/devices.c | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'target/linux/ramips/files/arch/mips') 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 9ddcbcd48..891c47b43 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 18850fda9..4ad93b580 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[] = { -- cgit v1.2.3