ar71xx: merge files-3.2 to files
[openwrt.git] / target / linux / ar71xx / patches-3.2 / 122-MIPS-ath79-sort-case-statements-in-ath79_detect_sys_.patch
1 From 655a57ed2df5e34c32645e08c3244facba70ae5f Mon Sep 17 00:00:00 2001
2 From: Gabor Juhos <juhosg@openwrt.org>
3 Date: Fri, 9 Dec 2011 14:39:04 +0100
4 Subject: [PATCH 22/35] MIPS: ath79: sort case statements in ath79_detect_sys_type
5
6 Sort the case statements alphabetically in order to improve
7 readability.
8
9 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
10 Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
11 ---
12  arch/mips/ath79/setup.c |   24 ++++++++++++------------
13  1 files changed, 12 insertions(+), 12 deletions(-)
14
15 --- a/arch/mips/ath79/setup.c
16 +++ b/arch/mips/ath79/setup.c
17 @@ -116,18 +116,6 @@ static void __init ath79_detect_sys_type
18                 rev = id & AR724X_REV_ID_REVISION_MASK;
19                 break;
20  
21 -       case REV_ID_MAJOR_AR9330:
22 -               ath79_soc = ATH79_SOC_AR9330;
23 -               chip = "9330";
24 -               rev = id & AR933X_REV_ID_REVISION_MASK;
25 -               break;
26 -
27 -       case REV_ID_MAJOR_AR9331:
28 -               ath79_soc = ATH79_SOC_AR9331;
29 -               chip = "9331";
30 -               rev = id & AR933X_REV_ID_REVISION_MASK;
31 -               break;
32 -
33         case REV_ID_MAJOR_AR913X:
34                 minor = id & AR913X_REV_ID_MINOR_MASK;
35                 rev = id >> AR913X_REV_ID_REVISION_SHIFT;
36 @@ -145,6 +133,18 @@ static void __init ath79_detect_sys_type
37                 }
38                 break;
39  
40 +       case REV_ID_MAJOR_AR9330:
41 +               ath79_soc = ATH79_SOC_AR9330;
42 +               chip = "9330";
43 +               rev = id & AR933X_REV_ID_REVISION_MASK;
44 +               break;
45 +
46 +       case REV_ID_MAJOR_AR9331:
47 +               ath79_soc = ATH79_SOC_AR9331;
48 +               chip = "9331";
49 +               rev = id & AR933X_REV_ID_REVISION_MASK;
50 +               break;
51 +
52         default:
53                 panic("ath79: unknown SoC, id:0x%08x\n", id);
54         }