};
white-pulse {
-@@ -67,9 +72,18 @@
+@@ -66,6 +71,17 @@
+ gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
};
};
-
-- dsa {
-- status = "disabled";
-+ mvsw61xx {
++
++ mvsw61xx@10 {
+ compatible = "marvell,88e6171";
+ status = "okay";
+ reg = <0x10>;
+ cpu-port-1 = <6>;
+ is-indirect;
+ };
+ };
-+ dsa {
- compatible = "marvell,dsa";
- #address-cells = <2>;
- #size-cells = <0>;
-@@ -161,22 +175,22 @@
+ &pinctrl {
+@@ -114,22 +130,22 @@
};
partition@200000 {
reg = <0x1EA0000 0x1760000>;
};
-@@ -207,53 +221,6 @@
-
- &mdio {
+@@ -162,6 +178,7 @@
status = "okay";
--
-- switch@10 {
-- compatible = "marvell,mv88e6085";
-- #address-cells = <1>;
-- #size-cells = <0>;
-- reg = <16>;
--
-- ports {
-- #address-cells = <1>;
-- #size-cells = <0>;
--
-- port@0 {
-- reg = <0>;
-- label = "ethernet1";
-- };
--
-- port@1 {
-- reg = <1>;
-- label = "ethernet2";
-- };
--
-- port@2 {
-- reg = <2>;
-- label = "ethernet3";
-- };
--
-- port@3 {
-- reg = <3>;
-- label = "ethernet4";
-- };
--
-- port@4 {
-- reg = <4>;
-- label = "internet";
-- };
--
-- port@5 {
-- reg = <5>;
-- label = "cpu";
-- ethernet = <ð0port>;
-- fixed-link {
-- speed = <1000>;
-- full-duplex;
-- };
-- };
-- };
-- };
- };
- &uart0 {
-@@ -272,10 +239,14 @@
+ switch@10 {
++ status = "disabled";
+ compatible = "marvell,mv88e6085";
+ #address-cells = <1>;
+ #size-cells = <0>;
+@@ -225,10 +242,14 @@
};
/* eth1 is connected to the switch at port 6. However DSA only supports a
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
---
---- a/drivers/mtd/ofpart.c
-+++ b/drivers/mtd/ofpart.c
-@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
+--- a/drivers/mtd/parsers/ofpart.c
++++ b/drivers/mtd/parsers/ofpart.c
+@@ -21,6 +21,8 @@ static bool node_has_compatible(struct d
return of_get_property(pp, "compatible", NULL);
}
static int parse_fixed_partitions(struct mtd_info *master,
const struct mtd_partition **pparts,
struct mtd_part_parser_data *data)
-@@ -32,6 +34,7 @@ static int parse_fixed_partitions(struct
+@@ -28,6 +30,7 @@ static int parse_fixed_partitions(struct
struct mtd_partition *parts;
struct device_node *mtd_node;
struct device_node *ofpart_node;
const char *partname;
struct device_node *pp;
int nr_parts, i, ret = 0;
-@@ -110,9 +113,15 @@ static int parse_fixed_partitions(struct
+@@ -106,9 +109,15 @@ static int parse_fixed_partitions(struct
parts[i].size = of_read_number(reg + a_cells, s_cells);
parts[i].of_node = pp;
parts[i].name = partname;
if (of_get_property(pp, "read-only", &len))
-@@ -219,6 +228,18 @@ static int __init ofpart_parser_init(voi
+@@ -215,6 +224,18 @@ static int __init ofpart_parser_init(voi
return 0;
}