linux-3.11/linux-3.11-dns320l.patch
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
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/common.c linux-3.11/arch/arm/mach-kirkwood/common.c
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     2
--- linux-3.11.orig/arch/arm/mach-kirkwood/common.c	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     3
+++ linux-3.11/arch/arm/mach-kirkwood/common.c	2013-09-09 19:39:04.839177000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     4
@@ -665,6 +665,11 @@ char * __init kirkwood_id(void)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     5
 			return "MV88F6282-Rev-A1";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     6
 		else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     7
 			return "MV88F6282-Rev-Unsupported";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     8
+    } else if (dev == MV88F6702_DEV_ID) {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
     9
+        if (rev == MV88F6702_REV_A1)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    10
+            return "MV88F67-2-Rev-A1";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    11
+        else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    12
+            return "MV88F6702-Rev-Unsupported";			
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    13
 	} else {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    14
 		return "Device-Unknown";
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    15
 	}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    16
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/dns320l-setup.c linux-3.11/arch/arm/mach-kirkwood/dns320l-setup.c
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    17
--- linux-3.11.orig/arch/arm/mach-kirkwood/dns320l-setup.c	1970-01-01 01:00:00.000000000 +0100
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    18
+++ linux-3.11/arch/arm/mach-kirkwood/dns320l-setup.c	2013-09-09 20:31:07.965673261 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    19
@@ -0,0 +1,242 @@
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    20
+/*
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    21
+ * arch/arm/mach-kirkwood/dns320l-setup.c
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    22
+ *
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    23
+ * D-Link DNS-320L Setup File
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    24
+ *
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    25
+ * This file is licensed under the terms of the GNU General Public
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    26
+ * License version 2.  This program is licensed "as is" without any
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    27
+ * warranty of any kind, whether express or implied.
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    28
+ */
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    29
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    30
+#include <linux/kernel.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    31
+#include <linux/init.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    32
+#include <linux/platform_device.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    33
+#include <linux/ata_platform.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    34
+#include <linux/mtd/partitions.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    35
+#include <linux/mv643xx_eth.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    36
+#include <linux/gpio.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    37
+#include <linux/leds.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    38
+#include <asm/mach-types.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    39
+#include <asm/mach/arch.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    40
+#include <mach/kirkwood.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    41
+#include "common.h"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    42
+#include "mpp.h"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    43
+#include <linux/sysfs.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    44
+#include <linux/kobject.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    45
+#include <linux/mtd/nand.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    46
+#include <linux/i2c.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    47
+#include <linux/gpio_keys.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    48
+#include <linux/gpio-fan.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    49
+#include <linux/input.h>
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    50
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    51
+#define DNS320L_GPIO_LED_SATA1_BLUE     20
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    52
+#define DNS320L_GPIO_LED_SATA0_BLUE     21
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    53
+#define DNS320L_GPIO_LED_SATA1_RED      22
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    54
+#define DNS320L_GPIO_LED_SATA0_RED      23
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    55
+#define DNS320L_GPIO_POWER_SATA         24
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    56
+#define DNS320L_GPIO_LED_USB_BLUE       25
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    57
+#define DNS320L_GPIO_LED_USB_ORANGE     26
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    58
+#define DNS320L_GPIO_BUTTON_USB         27
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    59
+#define DNS320L_GPIO_BUTTON_RESET       28
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    60
+#define DNS320L_GPIO_BUTTON_POWER       29
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    61
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    62
+static struct mtd_partition dns320l_nand_parts[] = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    63
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    64
+		.name = "u-boot",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    65
+		.offset = 0,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    66
+		.size = SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    67
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    68
+		.name = "uImage",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    69
+		.offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    70
+		.size = 5 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    71
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    72
+		.name = "ramdisk",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    73
+		.offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    74
+		.size = 5 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    75
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    76
+		.name = "image",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    77
+		.offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    78
+		.size = 100 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    79
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    80
+	    .name = "rescue firmware",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    81
+	    .offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    82
+	    .size = 10 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    83
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    84
+	    .name = "config",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    85
+	    .offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    86
+	    .size = 5 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    87
+	}, {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    88
+	    .name = "my-dlink",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    89
+	    .offset = MTDPART_OFS_NXTBLK,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    90
+	    .size = 2 * SZ_1M
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    91
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    92
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    93
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    94
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    95
+static struct mv643xx_eth_platform_data dns320l_ge00_data = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    96
+	.phy_addr	= MV643XX_ETH_PHY_ADDR(0),
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    97
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    98
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
    99
+static struct mv_sata_platform_data dns320l_sata_data = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   100
+	.n_ports	= 2,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   101
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   102
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   103
+static void __init dns320l_gpio_register_output(unsigned gpio, char *name, int def)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   104
+{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   105
+	if (gpio_request(gpio, name) == 0 &&
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   106
+	    gpio_direction_output(gpio, 0) == 0) {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   107
+		gpio_set_value(gpio, def);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   108
+		if (gpio_export(gpio, 0) != 0)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   109
+			pr_err("dns320l: Failed to export GPIO %s\n", name);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   110
+	} else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   111
+		pr_err("dns320l: Failed to register %s\n", name);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   112
+}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   113
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   114
+static void __init dns320l_gpio_register_input(unsigned gpio, char *name)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   115
+{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   116
+    if (gpio_request(gpio, name) == 0 && 
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   117
+        gpio_direction_input(gpio) == 0) {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   118
+        if(gpio_export(gpio, 0) != 0)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   119
+            pr_err("dns320L: Failed to export GPIO %s\n", name);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   120
+    } else
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   121
+        pr_err("dns32l: Failed to register %s\n", name);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   122
+}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   123
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   124
+/*****************************************************************************
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   125
+ * Buttons
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   126
+ ****************************************************************************/
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   127
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   128
+static struct gpio_keys_button dns320l_button_pins[] = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   129
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   130
+		.code		= KEY_COPY,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   131
+		.type       = EV_KEY,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   132
+		.gpio		= DNS320L_GPIO_BUTTON_USB,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   133
+		.desc		= "USB Copy button",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   134
+		.active_low	= 1,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   135
+		.debounce_interval = 1000,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   136
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   137
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   138
+	    .code       = KEY_OPTION,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   139
+	    .type       = EV_KEY,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   140
+	    .gpio       = DNS320L_GPIO_BUTTON_RESET,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   141
+	    .desc       = "Reset Button",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   142
+	    .active_low = 1,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   143
+	    .debounce_interval = 1000,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   144
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   145
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   146
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   147
+static struct gpio_keys_platform_data dns320l_button_data = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   148
+	.buttons	= dns320l_button_pins,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   149
+	.nbuttons	= ARRAY_SIZE(dns320l_button_pins),
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   150
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   151
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   152
+static struct platform_device dns320l_button_device = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   153
+	.name		= "gpio-keys",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   154
+	.id		= -1,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   155
+	.dev		= {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   156
+		.platform_data	= &dns320l_button_data,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   157
+	}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   158
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   159
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   160
+/*****************************************************************************
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   161
+ * LEDs
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   162
+ ****************************************************************************/
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   163
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   164
+static struct gpio_led dns320l_led_pins[] = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   165
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   166
+		.name	= "dns320l:blue:usb",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   167
+		.gpio	= DNS320L_GPIO_LED_USB_BLUE,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   168
+		.default_trigger = "default-on",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   169
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   170
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   171
+		.name	= "dns320l:orange:usb",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   172
+		.gpio	= DNS320L_GPIO_LED_USB_ORANGE,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   173
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   174
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   175
+	    .name   = "dns320l:blue:sata0",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   176
+	    .gpio   = DNS320L_GPIO_LED_SATA0_BLUE,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   177
+	    .default_trigger = "ide-disk"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   178
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   179
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   180
+	    .name   = "dns320l:blue:sata1",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   181
+	    .gpio   = DNS320L_GPIO_LED_SATA1_BLUE,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   182
+	    .default_trigger = "ide-disk"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   183
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   184
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   185
+	    .name   = "dns320l:red:sata0",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   186
+	    .gpio   = DNS320L_GPIO_LED_SATA0_RED,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   187
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   188
+	{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   189
+	    .name   = "dns320l:red:sata1",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   190
+	    .gpio   = DNS320L_GPIO_LED_SATA1_RED,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   191
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   192
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   193
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   194
+static struct gpio_led_platform_data dns320l_led_data = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   195
+	.num_leds	= ARRAY_SIZE(dns320l_led_pins),
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   196
+	.leds		= dns320l_led_pins,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   197
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   198
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   199
+static struct platform_device dns320l_led_device = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   200
+	.name		= "leds-gpio",
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   201
+	.id		= -1,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   202
+	.dev		= {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   203
+		.platform_data	= &dns320l_led_data,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   204
+	},
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   205
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   206
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   207
+/*****************************************************************************
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   208
+ * Fan
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   209
+ ****************************************************************************/
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   210
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   211
+static unsigned int dns320l_mpp_config[] __initdata = {
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   212
+    MPP13_UART1_TXD,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   213
+	MPP14_UART1_RXD,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   214
+	MPP20_GPIO,    // SATA LED BLUE
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   215
+	MPP21_GPIO,    // SATA LED BLUE
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   216
+	MPP22_GPIO,    // SATA LED RED
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   217
+	MPP23_GPIO,    // SATA LED RED
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   218
+	MPP24_GPIO,    // SATA Power
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   219
+	MPP25_GPIO,    // USB LED Blue
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   220
+	MPP26_GPIO,	   // USB LED Orange
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   221
+	MPP27_GPIO,	   // Button USB Copy
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   222
+	MPP28_GPIO,	   // Button Reset
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   223
+	MPP29_GPIO,	   // Button Power
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   224
+	0
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   225
+};
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   226
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   227
+static void __init dns320l_init(void)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   228
+{
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   229
+    /*
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   230
+     * Basic setup. Needs to be called early.
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   231
+     */
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   232
+    
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   233
+    kirkwood_init();
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   234
+    /* setup gpio pin select */
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   235
+    kirkwood_mpp_conf(dns320l_mpp_config);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   236
+    kirkwood_uart0_init();
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   237
+    kirkwood_uart1_init();
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   238
+    kirkwood_nand_init(ARRAY_AND_SIZE(dns320l_nand_parts), 40);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   239
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   240
+    kirkwood_ehci_init();
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   241
+    kirkwood_i2c_init();
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   242
+    kirkwood_ge00_init(&dns320l_ge00_data);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   243
+    platform_device_register(&dns320l_led_device);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   244
+	dns320l_gpio_register_output(DNS320L_GPIO_POWER_SATA, "dns320l:power:sata", 1);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   245
+	dns320l_gpio_register_input(DNS320L_GPIO_BUTTON_POWER, "dns320l:button:power");
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   246
+    kirkwood_sata_init(&dns320l_sata_data);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   247
+    
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   248
+    platform_device_register(&dns320l_button_device);
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   249
+}
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   250
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   251
+MACHINE_START(DNS320L, "DNS-320L")
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   252
+	/* Maintainer: Andreas Boehler <andreas@aboehler.at> */
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   253
+	.atag_offset	= 0x00000100,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   254
+	.init_machine	= dns320l_init,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   255
+	.map_io		= kirkwood_map_io,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   256
+	.init_early	= kirkwood_init_early,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   257
+	.init_irq	= kirkwood_init_irq,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   258
+	.init_time		= kirkwood_timer_init,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   259
+	.restart      = kirkwood_restart,
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   260
+MACHINE_END
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   261
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   262
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h linux-3.11/arch/arm/mach-kirkwood/include/mach/kirkwood.h
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   263
--- linux-3.11.orig/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   264
+++ linux-3.11/arch/arm/mach-kirkwood/include/mach/kirkwood.h	2013-09-09 20:35:39.848991746 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   265
@@ -139,4 +139,7 @@
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   266
 #define MV88F6282_DEV_ID	0x6282
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   267
 #define MV88F6282_REV_A0	0
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   268
 #define MV88F6282_REV_A1	1
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   269
+
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   270
+#define MV88F6702_DEV_ID    0x6702
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   271
+#define MV88F6702_REV_A1    3
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   272
 #endif
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   273
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/Kconfig linux-3.11/arch/arm/mach-kirkwood/Kconfig
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   274
--- linux-3.11.orig/arch/arm/mach-kirkwood/Kconfig	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   275
+++ linux-3.11/arch/arm/mach-kirkwood/Kconfig	2013-09-09 19:40:16.162506000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   276
@@ -123,6 +123,12 @@ config MACH_TS41X
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   277
 	  Say 'Y' here if you want your kernel to support the
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   278
 	  QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   279
 	  NAS devices.
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   280
+	  
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   281
+config MACH_DNS320L
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   282
+	bool "D-Link DNS-320L NAS"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   283
+	help
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   284
+	  Say 'Y' here if you want your kernel to support the
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   285
+	  D-Link DNS-320L.	  
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   286
 
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   287
 comment "Device tree entries"
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   288
 
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   289
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/Makefile linux-3.11/arch/arm/mach-kirkwood/Makefile
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   290
--- linux-3.11.orig/arch/arm/mach-kirkwood/Makefile	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   291
+++ linux-3.11/arch/arm/mach-kirkwood/Makefile	2013-09-09 19:40:34.945838000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   292
@@ -17,6 +17,7 @@ obj-$(CONFIG_MACH_SHEEVAPLUG)		+= sheeva
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   293
 obj-$(CONFIG_MACH_T5325)		+= t5325-setup.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   294
 obj-$(CONFIG_MACH_TS219)		+= ts219-setup.o tsx1x-common.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   295
 obj-$(CONFIG_MACH_TS41X)		+= ts41x-setup.o tsx1x-common.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   296
+obj-$(CONFIG_MACH_DNS320L)       += dns320l-setup.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   297
 
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   298
 obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   299
 obj-$(CONFIG_MACH_CLOUDBOX_DT)		+= board-ns2.o
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   300
diff -purN linux-3.11.orig/arch/arm/mach-kirkwood/mpp.c linux-3.11/arch/arm/mach-kirkwood/mpp.c
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   301
--- linux-3.11.orig/arch/arm/mach-kirkwood/mpp.c	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   302
+++ linux-3.11/arch/arm/mach-kirkwood/mpp.c	2013-09-09 19:39:36.232508000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   303
@@ -26,7 +26,8 @@ static unsigned int __init kirkwood_vari
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   304
 		return MPP_F6281_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   305
 	if (dev == MV88F6282_DEV_ID)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   306
 		return MPP_F6282_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   307
-	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
   308
+	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
   309
+	    (dev == MV88F6702_DEV_ID))
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   310
 		return MPP_F6192_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   311
 	if (dev == MV88F6180_DEV_ID)
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   312
 		return MPP_F6180_MASK;
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   313
diff -purN linux-3.11.orig/arch/arm/tools/mach-types linux-3.11/arch/arm/tools/mach-types
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   314
--- linux-3.11.orig/arch/arm/tools/mach-types	2013-09-02 22:46:10.000000000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   315
+++ linux-3.11/arch/arm/tools/mach-types	2013-09-09 19:43:44.112495000 +0200
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   316
@@ -1007,3 +1007,4 @@ eco5_bx2		MACH_ECO5_BX2		ECO5_BX2		4572
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   317
 eukrea_cpuimx28sd	MACH_EUKREA_CPUIMX28SD	EUKREA_CPUIMX28SD	4573
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   318
 domotab			MACH_DOMOTAB		DOMOTAB			4574
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   319
 pfla03			MACH_PFLA03		PFLA03			4575
1b9d05c730cb Move Linux 3.1 specific patches to Linux 3.1 subdir
andy
parents:
diff changeset
   320
+dns320l         MACH_DNS320L        DNS320L     4746