aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2011-04-09 18:47:49 +0000
committerGabor Juhos <juhosg@openwrt.org>2011-04-09 18:47:49 +0000
commitab4c3b3a1c1e7ddb3270be6ecf942ca5a5fe0101 (patch)
tree5fc99802ece1a0608a970ef30e9fc1961e09062f /target
parent694d9059c93c592852dec75851cbd7d4f5916149 (diff)
downloadupstream-ab4c3b3a1c1e7ddb3270be6ecf942ca5a5fe0101.tar.gz
upstream-ab4c3b3a1c1e7ddb3270be6ecf942ca5a5fe0101.tar.bz2
upstream-ab4c3b3a1c1e7ddb3270be6ecf942ca5a5fe0101.zip
ar71xx: cleanup SoC detection code
SVN-Revision: 26559
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/setup.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
index 37ce27dece..3a73229d9b 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c
@@ -114,19 +114,19 @@ static void __init ar71xx_detect_sys_type(void)
case REV_ID_MAJOR_AR7240:
ar71xx_soc = AR71XX_SOC_AR7240;
chip = "7240";
- rev = (id & AR724X_REV_ID_REVISION_MASK);
+ rev = id & AR724X_REV_ID_REVISION_MASK;
break;
case REV_ID_MAJOR_AR7241:
ar71xx_soc = AR71XX_SOC_AR7241;
chip = "7241";
- rev = (id & AR724X_REV_ID_REVISION_MASK);
+ rev = id & AR724X_REV_ID_REVISION_MASK;
break;
case REV_ID_MAJOR_AR7242:
ar71xx_soc = AR71XX_SOC_AR7242;
chip = "7242";
- rev = (id & AR724X_REV_ID_REVISION_MASK);
+ rev = id & AR724X_REV_ID_REVISION_MASK;
break;
case REV_ID_MAJOR_AR913X:
@@ -149,22 +149,19 @@ static void __init ar71xx_detect_sys_type(void)
case REV_ID_MAJOR_AR9341:
ar71xx_soc = AR71XX_SOC_AR9341;
chip = "9341";
- rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) &
- AR934X_REV_ID_REVISION_MASK;
+ rev = id & AR934X_REV_ID_REVISION_MASK;
break;
case REV_ID_MAJOR_AR9342:
ar71xx_soc = AR71XX_SOC_AR9342;
chip = "9342";
- rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) &
- AR934X_REV_ID_REVISION_MASK;
+ rev = id & AR934X_REV_ID_REVISION_MASK;
break;
case REV_ID_MAJOR_AR9344:
ar71xx_soc = AR71XX_SOC_AR9344;
chip = "9344";
- rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) &
- AR934X_REV_ID_REVISION_MASK;
+ rev = id & AR934X_REV_ID_REVISION_MASK;
break;
default: