ar71xx: cleanup SoC detection code

SVN-Revision: 26559
owl
Gabor Juhos 2011-04-09 18:47:49 +00:00
parent 694d9059c9
commit ab4c3b3a1c
1 changed files with 6 additions and 9 deletions

View File

@ -114,19 +114,19 @@ static void __init ar71xx_detect_sys_type(void)
case REV_ID_MAJOR_AR7240: case REV_ID_MAJOR_AR7240:
ar71xx_soc = AR71XX_SOC_AR7240; ar71xx_soc = AR71XX_SOC_AR7240;
chip = "7240"; chip = "7240";
rev = (id & AR724X_REV_ID_REVISION_MASK); rev = id & AR724X_REV_ID_REVISION_MASK;
break; break;
case REV_ID_MAJOR_AR7241: case REV_ID_MAJOR_AR7241:
ar71xx_soc = AR71XX_SOC_AR7241; ar71xx_soc = AR71XX_SOC_AR7241;
chip = "7241"; chip = "7241";
rev = (id & AR724X_REV_ID_REVISION_MASK); rev = id & AR724X_REV_ID_REVISION_MASK;
break; break;
case REV_ID_MAJOR_AR7242: case REV_ID_MAJOR_AR7242:
ar71xx_soc = AR71XX_SOC_AR7242; ar71xx_soc = AR71XX_SOC_AR7242;
chip = "7242"; chip = "7242";
rev = (id & AR724X_REV_ID_REVISION_MASK); rev = id & AR724X_REV_ID_REVISION_MASK;
break; break;
case REV_ID_MAJOR_AR913X: case REV_ID_MAJOR_AR913X:
@ -149,22 +149,19 @@ static void __init ar71xx_detect_sys_type(void)
case REV_ID_MAJOR_AR9341: case REV_ID_MAJOR_AR9341:
ar71xx_soc = AR71XX_SOC_AR9341; ar71xx_soc = AR71XX_SOC_AR9341;
chip = "9341"; chip = "9341";
rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) & rev = id & AR934X_REV_ID_REVISION_MASK;
AR934X_REV_ID_REVISION_MASK;
break; break;
case REV_ID_MAJOR_AR9342: case REV_ID_MAJOR_AR9342:
ar71xx_soc = AR71XX_SOC_AR9342; ar71xx_soc = AR71XX_SOC_AR9342;
chip = "9342"; chip = "9342";
rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) & rev = id & AR934X_REV_ID_REVISION_MASK;
AR934X_REV_ID_REVISION_MASK;
break; break;
case REV_ID_MAJOR_AR9344: case REV_ID_MAJOR_AR9344:
ar71xx_soc = AR71XX_SOC_AR9344; ar71xx_soc = AR71XX_SOC_AR9344;
chip = "9344"; chip = "9344";
rev = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) & rev = id & AR934X_REV_ID_REVISION_MASK;
AR934X_REV_ID_REVISION_MASK;
break; break;
default: default: