aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-07-28 12:44:17 +0200
committerRafał Miłecki <zajec5@gmail.com>2016-07-28 12:45:02 +0200
commita3be48593b04bfa3dd2b1c98dc360de742861b09 (patch)
treeeb26e804ef30a47bae61e04574f2a6f4f129e973
parent96fa9aa13bfa4efba70e6effab22438961c1127b (diff)
downloadupstream-a3be48593b04bfa3dd2b1c98dc360de742861b09.tar.gz
upstream-a3be48593b04bfa3dd2b1c98dc360de742861b09.tar.bz2
upstream-a3be48593b04bfa3dd2b1c98dc360de742861b09.zip
bcm53xx: refresh kernel patches
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-rw-r--r--target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch2
-rw-r--r--target/linux/bcm53xx/patches-4.4/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch b/target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
index ca930e75f0..abc9b0face 100644
--- a/target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
+++ b/target/linux/bcm53xx/patches-4.4/405-mtd-spi-nor-detect-JEDEC-incompatible-w25q128-using-.patch
@@ -13,7 +13,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -870,6 +870,18 @@ static const struct flash_info *spi_nor_
+@@ -871,6 +871,18 @@ static const struct flash_info *spi_nor_
}
dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %2x, %2x\n",
id[0], id[1], id[2]);
diff --git a/target/linux/bcm53xx/patches-4.4/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch b/target/linux/bcm53xx/patches-4.4/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
index 68fa647209..0f4f944ac6 100644
--- a/target/linux/bcm53xx/patches-4.4/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
+++ b/target/linux/bcm53xx/patches-4.4/710-b53-add-hacky-CPU-port-fixes-for-devices-not-using-p.patch
@@ -42,6 +42,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+ of_machine_is_compatible("netgear,r8000"))
+ sw_dev->cpu_port = 5;
+
- /* cpu port is always last */
- sw_dev->ports = sw_dev->cpu_port + 1;
dev->enabled_ports |= BIT(sw_dev->cpu_port);
+ sw_dev->ports = fls(dev->enabled_ports);
+