domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mvebu: update and fixup 4.4 patches

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 47832
This commit is contained in:
Imre Kaloz
2015-12-10 20:53:02 +00:00
parent 6df4426245
commit 73f774c960
12 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/mvebu/patches-4.4/001-fix_gpio_config_on_linksys_boards.patch
View File

@@ -11,7 +11,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -243,7 +243,7 @@ @@ -245,7 +245,7 @@
button@2 { button@2 {
label = "Factory Reset Button"; label = "Factory Reset Button";
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
@@ -20,7 +20,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
}; };
}; };
@@ -258,7 +258,7 @@ @@ -260,7 +260,7 @@
}; };
sata { sata {
@@ -29,7 +29,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
default-state = "off"; default-state = "off";
}; };
}; };
@@ -311,7 +311,7 @@ @@ -313,7 +313,7 @@
&pinctrl { &pinctrl {
keys_pin: keys-pin { keys_pin: keys-pin {
@@ -40,7 +40,7 @@ Cc: <stable@vger.kernel.org> # v4.1 +
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -302,13 +302,13 @@ @@ -304,13 +304,13 @@
button@1 { button@1 {
label = "WPS"; label = "WPS";
linux,code = <KEY_WPS_BUTTON>; linux,code = <KEY_WPS_BUTTON>;

2
target/linux/mvebu/patches-4.4/002-add_powertables.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -84,12 +84,100 @@ @@ -86,12 +86,100 @@
pcie@2,0 { pcie@2,0 {
/* Port 0, Lane 1 */ /* Port 0, Lane 1 */
status = "okay"; status = "okay";

4
target/linux/mvebu/patches-4.4/003-add_switch_nodes.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -465,6 +465,16 @@ @@ -467,6 +467,16 @@
}; };
}; };
}; };
@@ -19,7 +19,7 @@
&pinctrl { &pinctrl {
--- a/arch/arm/boot/dts/armada-385-linksys.dtsi --- a/arch/arm/boot/dts/armada-385-linksys.dtsi
+++ b/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi
@@ -307,6 +307,18 @@ @@ -309,6 +309,18 @@
}; };
}; };
}; };

2
target/linux/mvebu/patches-4.4/010-build_new_dtbs.patch
View File

@@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -635,6 +635,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \ @@ -748,6 +748,7 @@ dtb-$(CONFIG_MACH_ARMADA_38X) += \
armada-385-db-ap.dtb \ armada-385-db-ap.dtb \
armada-385-linksys-caiman.dtb \ armada-385-linksys-caiman.dtb \
armada-385-linksys-cobra.dtb \ armada-385-linksys-cobra.dtb \

15
target/linux/mvebu/patches-4.4/100-find_active_root.patch
View File

@@ -5,7 +5,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
--- a/drivers/mtd/ofpart.c --- a/drivers/mtd/ofpart.c
+++ b/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c
@@ -25,12 +25,15 @@ static bool node_has_compatible(struct d @@ -25,6 +25,8 @@ static bool node_has_compatible(struct d
return of_get_property(pp, "compatible", NULL); return of_get_property(pp, "compatible", NULL);
} }
@@ -14,14 +14,15 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
static int parse_ofpart_partitions(struct mtd_info *master, static int parse_ofpart_partitions(struct mtd_info *master,
struct mtd_partition **pparts, struct mtd_partition **pparts,
struct mtd_part_parser_data *data) struct mtd_part_parser_data *data)
{ @@ -32,6 +34,7 @@ static int parse_ofpart_partitions(struc
struct device_node *node; struct device_node *mtd_node;
struct device_node *ofpart_node;
const char *partname; const char *partname;
+ const char *owrtpart = "ubi"; + const char *owrtpart = "ubi";
struct device_node *pp; struct device_node *pp;
int nr_parts, i; int nr_parts, i, ret = 0;
bool dedicated = true;
@@ -78,9 +81,15 @@ static int parse_ofpart_partitions(struc @@ -102,9 +105,15 @@ static int parse_ofpart_partitions(struc
(*pparts)[i].offset = of_read_number(reg, a_cells); (*pparts)[i].offset = of_read_number(reg, a_cells);
(*pparts)[i].size = of_read_number(reg + a_cells, s_cells); (*pparts)[i].size = of_read_number(reg + a_cells, s_cells);
@@ -40,7 +41,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
(*pparts)[i].name = partname; (*pparts)[i].name = partname;
if (of_get_property(pp, "read-only", &len)) if (of_get_property(pp, "read-only", &len))
@@ -178,6 +187,18 @@ static int __init ofpart_parser_init(voi @@ -207,6 +216,18 @@ static int __init ofpart_parser_init(voi
return 0; return 0;
} }

4
target/linux/mvebu/patches-4.4/102-revert_i2c_delay.patch
View File

@@ -1,7 +1,7 @@
--- a/arch/arm/boot/dts/armada-xp.dtsi --- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi +++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -90,12 +90,10 @@ @@ -98,12 +98,10 @@
};
i2c0: i2c@11000 { i2c0: i2c@11000 {
- compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c"; - compatible = "marvell,mv78230-i2c", "marvell,mv64xxx-i2c";

20
target/linux/mvebu/patches-4.4/202-gpio_mvebu_add_limited_pwm_support.patch
View File

@@ -23,8 +23,8 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
--- a/drivers/gpio/Kconfig --- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig
@@ -287,6 +287,11 @@ config GPIO_MVEBU @@ -294,6 +294,11 @@ config GPIO_MVEBU
select GPIO_GENERIC depends on OF
select GENERIC_IRQ_CHIP select GENERIC_IRQ_CHIP
+config GPIO_MVEBU_PWM +config GPIO_MVEBU_PWM
@@ -37,9 +37,9 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
depends on ARCH_MXC depends on ARCH_MXC
--- a/drivers/gpio/Makefile --- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile +++ b/drivers/gpio/Makefile
@@ -62,6 +62,7 @@ obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8x @@ -67,6 +67,7 @@ obj-$(CONFIG_GPIO_MPC5200) += gpio-mpc52
obj-$(CONFIG_GPIO_MPC8XXX) += gpio-mpc8xxx.o
obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o obj-$(CONFIG_GPIO_MSIC) += gpio-msic.o
obj-$(CONFIG_GPIO_MSM_V2) += gpio-msm-v2.o
obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o obj-$(CONFIG_GPIO_MVEBU) += gpio-mvebu.o
+obj-$(CONFIG_GPIO_MVEBU_PWM) += gpio-mvebu-pwm.o +obj-$(CONFIG_GPIO_MVEBU_PWM) += gpio-mvebu-pwm.o
obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o obj-$(CONFIG_GPIO_MXC) += gpio-mxc.o
@@ -290,7 +290,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
/* /*
* Functions returning addresses of individual registers for a given * Functions returning addresses of individual registers for a given
* GPIO controller. * GPIO controller.
@@ -228,7 +211,7 @@ static int mvebu_gpio_get(struct gpio_ch @@ -218,7 +201,7 @@ static int mvebu_gpio_get(struct gpio_ch
return (u >> pin) & 1; return (u >> pin) & 1;
} }
@@ -299,7 +299,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
{ {
struct mvebu_gpio_chip *mvchip = struct mvebu_gpio_chip *mvchip =
container_of(chip, struct mvebu_gpio_chip, chip); container_of(chip, struct mvebu_gpio_chip, chip);
@@ -617,6 +600,8 @@ static int mvebu_gpio_suspend(struct pla @@ -607,6 +590,8 @@ static int mvebu_gpio_suspend(struct pla
BUG(); BUG();
} }
@@ -308,7 +308,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
return 0; return 0;
} }
@@ -660,6 +645,8 @@ static int mvebu_gpio_resume(struct plat @@ -650,6 +635,8 @@ static int mvebu_gpio_resume(struct plat
BUG(); BUG();
} }
@@ -317,7 +317,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
return 0; return 0;
} }
@@ -671,7 +658,6 @@ static int mvebu_gpio_probe(struct platf @@ -661,7 +648,6 @@ static int mvebu_gpio_probe(struct platf
struct resource *res; struct resource *res;
struct irq_chip_generic *gc; struct irq_chip_generic *gc;
struct irq_chip_type *ct; struct irq_chip_type *ct;
@@ -325,7 +325,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
unsigned int ngpios; unsigned int ngpios;
int soc_variant; int soc_variant;
int i, cpu, id; int i, cpu, id;
@@ -701,10 +687,10 @@ static int mvebu_gpio_probe(struct platf @@ -691,10 +677,10 @@ static int mvebu_gpio_probe(struct platf
return id; return id;
} }
@@ -339,7 +339,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
mvchip->soc_variant = soc_variant; mvchip->soc_variant = soc_variant;
mvchip->chip.label = dev_name(&pdev->dev); mvchip->chip.label = dev_name(&pdev->dev);
@@ -838,7 +824,8 @@ static int mvebu_gpio_probe(struct platf @@ -828,7 +814,8 @@ static int mvebu_gpio_probe(struct platf
goto err_generic_chip; goto err_generic_chip;
} }

2
target/linux/mvebu/patches-4.4/204-mvebu_xp_add_pwm_properties_to_dtsi_files.patch
View File

@@ -11,7 +11,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
--- a/arch/arm/boot/dts/armada-370.dtsi --- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -158,24 +158,30 @@ @@ -162,24 +162,30 @@
gpio0: gpio@18100 { gpio0: gpio@18100 {
compatible = "marvell,orion-gpio"; compatible = "marvell,orion-gpio";

2
target/linux/mvebu/patches-4.4/205-arm_mvebu_enable_pwm_in_defconfig.patch
View File

@@ -8,7 +8,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
--- a/arch/arm/configs/mvebu_v7_defconfig --- a/arch/arm/configs/mvebu_v7_defconfig
+++ b/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig
@@ -120,6 +120,7 @@ CONFIG_DMADEVICES=y @@ -131,6 +131,7 @@ CONFIG_DMADEVICES=y
CONFIG_MV_XOR=y CONFIG_MV_XOR=y
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_MEMORY=y CONFIG_MEMORY=y

2
target/linux/mvebu/patches-4.4/206-mvebu_wrt1900ac_use_pwm-fan_rather_than_gpio-fan.patch
View File

@@ -9,7 +9,7 @@ Signed-off-by: Andrew Lunn <andrew@lunn.ch>
--- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts --- a/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
+++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts +++ b/arch/arm/boot/dts/armada-xp-linksys-mamba.dts
@@ -412,13 +412,11 @@ @@ -414,13 +414,11 @@
}; };
}; };

4
target/linux/mvebu/patches-4.4/207-armada-385-rd-mtd-partitions.patch
View File

@@ -1,7 +1,7 @@
--- a/arch/arm/boot/dts/armada-388-rd.dts --- a/arch/arm/boot/dts/armada-388-rd.dts
+++ b/arch/arm/boot/dts/armada-388-rd.dts +++ b/arch/arm/boot/dts/armada-388-rd.dts
@@ -77,6 +77,16 @@ @@ -79,6 +79,16 @@
compatible = "st,m25p128"; compatible = "st,m25p128", "jedec,spi-nor";
reg = <0>; /* Chip select 0 */ reg = <0>; /* Chip select 0 */
spi-max-frequency = <108000000>; spi-max-frequency = <108000000>;
+ +

4
target/linux/mvebu/patches-4.4/208-ARM-mvebu-385-ap-Add-partitions.patch
View File

@@ -10,7 +10,7 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
--- a/arch/arm/boot/dts/armada-385-db-ap.dts --- a/arch/arm/boot/dts/armada-385-db-ap.dts
+++ b/arch/arm/boot/dts/armada-385-db-ap.dts +++ b/arch/arm/boot/dts/armada-385-db-ap.dts
@@ -186,6 +186,21 @@ @@ -170,6 +170,21 @@
marvell,nand-keep-config; marvell,nand-keep-config;
marvell,nand-enable-arbiter; marvell,nand-enable-arbiter;
nand-on-flash-bbt; nand-on-flash-bbt;
@@ -30,5 +30,5 @@ Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
+ reg = <0x01000000 0x3f000000>; + reg = <0x01000000 0x3f000000>;
+ }; + };
}; };
};
usb3@f0000 {