aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm63xx/patches-3.18/412-MTD-physmap-allow-passing-pp_data.patch
blob: 351112046801ab9b5847220344220f6e4904e56e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
From 266c506f4b262bd6aba0776a03d82c98e65d9906 Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jonas.gorski@gmail.com>
Date: Tue, 1 May 2012 17:32:36 +0200
Subject: [PATCH 63/79] MTD: physmap: allow passing pp_data

---
 drivers/mtd/maps/physmap.c  |    4 +++-
 include/linux/mtd/physmap.h |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -96,6 +96,7 @@ static int physmap_flash_probe(struct pl
 {
 	struct physmap_flash_data *physmap_data;
 	struct physmap_flash_info *info;
+	struct mtd_part_parser_data *pp_data;
 	const char * const *probe_type;
 	const char * const *part_types;
 	int err = 0;
@@ -187,8 +188,9 @@ static int physmap_flash_probe(struct pl
 	spin_lock_init(&info->vpp_lock);
 
 	part_types = physmap_data->part_probe_types ? : part_probe_types;
+	pp_data = physmap_data->pp_data ? physmap_data->pp_data : NULL;
 
-	mtd_device_parse_register(info->cmtd, part_types, NULL,
+	mtd_device_parse_register(info->cmtd, part_types, pp_data,
 				  physmap_data->parts, physmap_data->nr_parts);
 	return 0;
 
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -31,6 +31,7 @@ struct physmap_flash_data {
 	char                    *probe_type;
 	struct mtd_partition	*parts;
 	const char * const	*part_probe_types;
+	struct mtd_part_parser_data *pp_data;
 };
 
 #endif /* __LINUX_MTD_PHYSMAP__ */
/ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
@@ -4154,6 +4154,96 @@ static struct sprom_fixup __initdata vr3
 	{ .offset = 115, .value = 0xfad9 },
 };
 
+static struct board_info __initdata board_P870HW51A_V2 = {
+	.name				= "P870HW-51a_v2",
+	.expected_cpu_id		= 0x6368,
+
+	.has_uart0			= 1,
+	.has_pci			= 1,
+	.use_fallback_sprom		= 1,
+	.has_ohci0			= 1,
+	.has_ehci0			= 1,
+
+	.has_enetsw			= 1,
+	.enetsw = {
+		.used_ports = {
+			[0] = {
+				.used	= 1,
+				.phy_id	= 1,
+				.name	= "port1",
+			},
+			[1] = {
+				.used	= 1,
+				.phy_id	= 2,
+				.name	= "port2",
+			},
+			[2] = {
+				.used	= 1,
+				.phy_id	= 3,
+				.name	= "port3",
+			},
+			[3] = {
+				.used	= 1,
+				.phy_id	= 4,
+				.name	= "port4",
+			},
+		},
+	},
+
+	.leds = {
+		{
+			.name		= "P870HW-51a:green:power",
+			.gpio		= 0,
+			.default_trigger = "default-on",
+		},
+		{
+			.name		= "P870HW-51a:green:dsl",
+			.gpio		= 2,
+			.active_low	= 1,
+		},
+		{
+			.name		= "P870HW-51a:green:inet",
+			.gpio		= 22,
+			.active_low	= 1,
+		},
+		{
+			.name		= "P870HW-51a:orange:wps",
+			.gpio		= 24,
+			.active_low	= 1,
+		},
+		{
+			.name		= "P870HW-51a:red:inet",
+			.gpio		= 33,
+			.active_low	= 1,
+		},
+	},
+
+	.buttons = {
+		{
+			.desc		= "reset",
+			.gpio		= 34,
+			.type		= EV_KEY,
+			.code		= KEY_RESTART,
+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
+			.active_low	= 1,
+		},
+		{
+			.desc		= "wps",
+			.gpio		= 35,
+			.type		= EV_KEY,
+			.code		= KEY_WPS_BUTTON,
+			.debounce_interval = BCM963XX_KEYS_DEBOUNCE_INTERVAL,
+			.active_low	= 1,
+		},
+	},
+
+	.fallback_sprom = {
+		.type 				= SPROM_BCM4318,
+		.pci_bus			= 0,
+		.pci_dev			= 1,
+	},
+};
+
 static struct board_info __initdata board_VR3025u = {
 	.name					= "96368M-1541N",
 	.expected_cpu_id		= 0x6368,
@@ -4854,6 +4944,7 @@ static const struct board_info __initcon
 #ifdef CONFIG_BCM63XX_CPU_6368
 	&board_96368mvwg,
 	&board_96368mvngr,
+	&board_P870HW51A_V2,
 	&board_VR3025u,
 	&board_VR3025un,
 	&board_WAP5813n,
@@ -4933,6 +5024,7 @@ static struct of_device_id const bcm963x
 	{ .compatible = "comtrend,vr-3025u", .data = &board_VR3025u, },
 	{ .compatible = "comtrend,vr-3025un", .data = &board_VR3025un, },
 	{ .compatible = "comtrend,wap-5813n", .data = &board_WAP5813n, },
+	{ .compatible = "zyxel,p870hw-51a-v2", .data = &board_P870HW51A_V2, },
 #endif
 #ifdef CONFIG_BCM63XX_CPU_63268
 	{ .compatible = "brcm,bcm963268bu_p300", .data = &board_963268bu_p300, },