linux-3.1/add_88f6702a_cpu.diff
author andy
Mon, 09 Sep 2013 20:39:42 +0200
changeset 4 1b9d05c730cb
permissions -rw-r--r--
Move Linux 3.1 specific patches to Linux 3.1 subdir
Add Linux 3.11 specific patches
4
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     1
--- linux-3.1.arch-orig/arch/arm/mach-kirkwood/common.c	2011-10-24 09:10:05.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     2
+++ linux-3.1/arch/arm/mach-kirkwood/common.c	2013-09-02 19:15:48.772407684 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     3
@@ -432,6 +432,11 @@ static char * __init kirkwood_id(void)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     4
 			return "MV88F6282-Rev-A0";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     5
 		else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     6
 			return "MV88F6282-Rev-Unsupported";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     7
+    } else if (dev == MV88F6702_DEV_ID) {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     8
+        if (rev == MV88F6702_REV_A1)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     9
+            return "MV88F6702-Rev-A1";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    10
+        else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    11
+            return "MV88F6702-Rev-Unsupported";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    12
 	} else {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    13
 		return "Device-Unknown";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    14
 	}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    15
--- linux-3.1.arch-orig/arch/arm/mach-kirkwood/mpp.c	2011-10-24 09:10:05.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    16
+++ linux-3.1/arch/arm/mach-kirkwood/mpp.c	2013-09-02 21:58:56.841873166 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    17
@@ -27,7 +27,8 @@ static unsigned int __init kirkwood_vari
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    18
 	if ((dev == MV88F6281_DEV_ID && rev >= MV88F6281_REV_A0) ||
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    19
 	    (dev == MV88F6282_DEV_ID))
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    20
 		return MPP_F6281_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    21
-	if (dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    22
+	if ((dev == MV88F6192_DEV_ID && rev >= MV88F6192_REV_A0) ||
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    23
+	    (dev == MV88F6702_DEV_ID))
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    24
 		return MPP_F6192_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    25
 	if (dev == MV88F6180_DEV_ID)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    26
 		return MPP_F6180_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    27
--- linux-3.1.arch-orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2011-10-24 09:10:05.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    28
+++ linux-3.1/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2013-09-02 19:15:58.945740460 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    29
@@ -135,4 +135,7 @@
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    30
 
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    31
 #define MV88F6282_DEV_ID	0x6282
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    32
 #define MV88F6282_REV_A0	0
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    33
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    34
+#define MV88F6702_DEV_ID    0x6702
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    35
+#define MV88F6702_REV_A1    3
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    36
 #endif