kirkwood: initial refresh of 5.4 patches
Refreshed all patches. Changed: 105-ea4500.patch-> Upstream DSA driver was updated. Patch was fixed 202-linksys-find-active-root.patch -> Upstream driver was moved. Patch was fixed Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
This commit is contained in:
parent
43a1767afb
commit
45e47a9cd7
3 changed files with 21 additions and 70 deletions
|
@ -23,13 +23,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
white-pulse {
|
white-pulse {
|
||||||
@@ -67,9 +72,18 @@
|
@@ -66,6 +71,17 @@
|
||||||
|
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
+
|
||||||
- dsa {
|
+ mvsw61xx@10 {
|
||||||
- status = "disabled";
|
|
||||||
+ mvsw61xx {
|
|
||||||
+ compatible = "marvell,88e6171";
|
+ compatible = "marvell,88e6171";
|
||||||
+ status = "okay";
|
+ status = "okay";
|
||||||
+ reg = <0x10>;
|
+ reg = <0x10>;
|
||||||
|
@ -39,12 +38,10 @@
|
||||||
+ cpu-port-1 = <6>;
|
+ cpu-port-1 = <6>;
|
||||||
+ is-indirect;
|
+ is-indirect;
|
||||||
+ };
|
+ };
|
||||||
|
};
|
||||||
|
|
||||||
+ dsa {
|
&pinctrl {
|
||||||
compatible = "marvell,dsa";
|
@@ -114,22 +130,22 @@
|
||||||
#address-cells = <2>;
|
|
||||||
#size-cells = <0>;
|
|
||||||
@@ -161,22 +175,22 @@
|
|
||||||
};
|
};
|
||||||
|
|
||||||
partition@200000 {
|
partition@200000 {
|
||||||
|
@ -71,61 +68,15 @@
|
||||||
reg = <0x1EA0000 0x1760000>;
|
reg = <0x1EA0000 0x1760000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -207,53 +221,6 @@
|
@@ -162,6 +178,7 @@
|
||||||
|
|
||||||
&mdio {
|
|
||||||
status = "okay";
|
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 {
|
switch@10 {
|
||||||
@@ -272,10 +239,14 @@
|
+ 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
|
/* eth1 is connected to the switch at port 6. However DSA only supports a
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/arm/mach-mvebu/Kconfig
|
--- a/arch/arm/mach-mvebu/Kconfig
|
||||||
+++ b/arch/arm/mach-mvebu/Kconfig
|
+++ b/arch/arm/mach-mvebu/Kconfig
|
||||||
@@ -118,6 +118,7 @@ config MACH_DOVE
|
@@ -119,6 +119,7 @@ config MACH_DOVE
|
||||||
config MACH_KIRKWOOD
|
config MACH_KIRKWOOD
|
||||||
bool "Marvell Kirkwood boards"
|
bool "Marvell Kirkwood boards"
|
||||||
depends on ARCH_MULTI_V5
|
depends on ARCH_MULTI_V5
|
||||||
|
|
|
@ -3,9 +3,9 @@ Dynamically rename the active partition to "ubi".
|
||||||
|
|
||||||
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||||
---
|
---
|
||||||
--- a/drivers/mtd/ofpart.c
|
--- a/drivers/mtd/parsers/ofpart.c
|
||||||
+++ b/drivers/mtd/ofpart.c
|
+++ b/drivers/mtd/parsers/ofpart.c
|
||||||
@@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
|
@@ -21,6 +21,8 @@ static bool node_has_compatible(struct d
|
||||||
return of_get_property(pp, "compatible", NULL);
|
return of_get_property(pp, "compatible", NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||||
static int parse_fixed_partitions(struct mtd_info *master,
|
static int parse_fixed_partitions(struct mtd_info *master,
|
||||||
const struct mtd_partition **pparts,
|
const struct mtd_partition **pparts,
|
||||||
struct mtd_part_parser_data *data)
|
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 mtd_partition *parts;
|
||||||
struct device_node *mtd_node;
|
struct device_node *mtd_node;
|
||||||
struct device_node *ofpart_node;
|
struct device_node *ofpart_node;
|
||||||
|
@ -22,7 +22,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||||
const char *partname;
|
const char *partname;
|
||||||
struct device_node *pp;
|
struct device_node *pp;
|
||||||
int nr_parts, i, ret = 0;
|
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].size = of_read_number(reg + a_cells, s_cells);
|
||||||
parts[i].of_node = pp;
|
parts[i].of_node = pp;
|
||||||
|
|
||||||
|
@ -41,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
||||||
parts[i].name = partname;
|
parts[i].name = partname;
|
||||||
|
|
||||||
if (of_get_property(pp, "read-only", &len))
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue