aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-3.8
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2013-04-14 09:25:53 +0000
committerGabor Juhos <juhosg@openwrt.org>2013-04-14 09:25:53 +0000
commit604395650ae3ca2c4eda4dbe6f9e4743e041f53f (patch)
treebe5edf58993c0eac92478a78899054fcd409dcc6 /target/linux/lantiq/patches-3.8
parent68c54dc34fdc58b65f346fdded8ca40f7f656f5e (diff)
downloadupstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.tar.gz
upstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.tar.bz2
upstream-604395650ae3ca2c4eda4dbe6f9e4743e041f53f.zip
kernel: update linux 3.8 to 3.8.7
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36332
Diffstat (limited to 'target/linux/lantiq/patches-3.8')
-rw-r--r--target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch4
-rw-r--r--target/linux/lantiq/patches-3.8/0028-NET-lantiq-adds-PHY11G-firmware-blobs.patch20
-rw-r--r--target/linux/lantiq/patches-3.8/0030-MIPS-lantiq-add-pcie-driver.patch2
-rw-r--r--target/linux/lantiq/patches-3.8/0042-PINCTRL-lantiq-fix-pinmux.patch4
4 files changed, 12 insertions, 18 deletions
diff --git a/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
index 3daec9f8ac..6df2beb1ca 100644
--- a/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
+++ b/target/linux/lantiq/patches-3.8/0001-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
@@ -14,7 +14,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
-@@ -827,10 +827,13 @@ static int m25p_probe(struct spi_device
+@@ -828,10 +828,13 @@ static int m25p_probe(struct spi_device
unsigned i;
struct mtd_part_parser_data ppdata;
struct device_node __maybe_unused *np = spi->dev.of_node;
@@ -28,7 +28,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#endif
/* Platform data helps sort out which chip type we have, as
-@@ -906,6 +909,8 @@ static int m25p_probe(struct spi_device
+@@ -907,6 +910,8 @@ static int m25p_probe(struct spi_device
if (data && data->name)
flash->mtd.name = data->name;
diff --git a/target/linux/lantiq/patches-3.8/0028-NET-lantiq-adds-PHY11G-firmware-blobs.patch b/target/linux/lantiq/patches-3.8/0028-NET-lantiq-adds-PHY11G-firmware-blobs.patch
index dc095679d1..59430dc7d0 100644
--- a/target/linux/lantiq/patches-3.8/0028-NET-lantiq-adds-PHY11G-firmware-blobs.patch
+++ b/target/linux/lantiq/patches-3.8/0028-NET-lantiq-adds-PHY11G-firmware-blobs.patch
@@ -12,11 +12,9 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
create mode 100644 firmware/lantiq/COPYING
create mode 100644 firmware/lantiq/README
-Index: linux-3.8.6/firmware/Makefile
-===================================================================
---- linux-3.8.6.orig/firmware/Makefile 2013-04-05 18:49:06.000000000 +0200
-+++ linux-3.8.6/firmware/Makefile 2013-04-11 11:25:42.252465469 +0200
-@@ -134,6 +134,9 @@
+--- a/firmware/Makefile
++++ b/firmware/Makefile
+@@ -134,6 +134,9 @@ fw-shipped-$(CONFIG_USB_SERIAL_KEYSPAN_P
fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
@@ -26,10 +24,8 @@ Index: linux-3.8.6/firmware/Makefile
fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
-Index: linux-3.8.6/firmware/lantiq/COPYING
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.6/firmware/lantiq/COPYING 2013-04-11 10:23:19.408305468 +0200
+--- /dev/null
++++ b/firmware/lantiq/COPYING
@@ -0,0 +1,286 @@
+All firmware files are copyrighted by Lantiq Deutschland GmbH.
+The files have been extracted from header files found in Lantiq BSPs.
@@ -317,10 +313,8 @@ Index: linux-3.8.6/firmware/lantiq/COPYING
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
-Index: linux-3.8.6/firmware/lantiq/README
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.8.6/firmware/lantiq/README 2013-04-11 10:23:19.408305468 +0200
+--- /dev/null
++++ b/firmware/lantiq/README
@@ -0,0 +1,45 @@
+#
+# This program is free software; you can redistribute it and/or
diff --git a/target/linux/lantiq/patches-3.8/0030-MIPS-lantiq-add-pcie-driver.patch b/target/linux/lantiq/patches-3.8/0030-MIPS-lantiq-add-pcie-driver.patch
index 152ee93b4d..55b598c1ff 100644
--- a/target/linux/lantiq/patches-3.8/0030-MIPS-lantiq-add-pcie-driver.patch
+++ b/target/linux/lantiq/patches-3.8/0030-MIPS-lantiq-add-pcie-driver.patch
@@ -4663,7 +4663,7 @@ Subject: [PATCH 30/40] MIPS: lantiq: add pcie driver
+
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
-@@ -249,6 +249,31 @@ static int __init pcibios_init(void)
+@@ -255,6 +255,31 @@ static int __init pcibios_init(void)
subsys_initcall(pcibios_init);
diff --git a/target/linux/lantiq/patches-3.8/0042-PINCTRL-lantiq-fix-pinmux.patch b/target/linux/lantiq/patches-3.8/0042-PINCTRL-lantiq-fix-pinmux.patch
index d84df7e7de..0995e203fc 100644
--- a/target/linux/lantiq/patches-3.8/0042-PINCTRL-lantiq-fix-pinmux.patch
+++ b/target/linux/lantiq/patches-3.8/0042-PINCTRL-lantiq-fix-pinmux.patch
@@ -1,5 +1,5 @@
---- a/drivers/pinctrl/pinctrl-xway.c 2013-04-10 21:51:51.739780800 +0200
-+++ b/drivers/pinctrl/pinctrl-xway.c 2013-04-10 21:56:47.990049456 +0200
+--- a/drivers/pinctrl/pinctrl-xway.c
++++ b/drivers/pinctrl/pinctrl-xway.c
@@ -563,10 +563,9 @@ static struct pinctrl_desc xway_pctrl_de
.confops = &xway_pinconf_ops,
};