aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-11 12:07:06 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-05-12 12:36:28 +0200
commit7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c (patch)
treedfca30413303b6988cf4f69879b6ac0b1ff811e1 /target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch
parentef2d5a2ab46c44ad4145488913ac9d0bbb8c69df (diff)
downloadupstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.tar.gz
upstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.tar.bz2
upstream-7dd2d7289a06ac742cfce5dbc9c583146b2c4a9c.zip
kernel: bump 4.19 to 4.19.122
Refreshed all patches. Remove upstreamed: - 551-loop-Better-discard-support-for-block-devices.patch Fixed: - CVE-2020-11884 - CVE-2020-12114 - CVE-2019-3016 - CVE-2020-11669 Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch')
-rw-r--r--target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch b/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch
index e3ee39abba..900bc4911c 100644
--- a/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch
+++ b/target/linux/bcm27xx/patches-4.19/950-0556-ARM-dts-bcm283x-Move-BCM2835-6-7-specific-to-bcm2835.patch
@@ -159,8 +159,8 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
jtag_gpio22: jtag_gpio22 {
brcm,pins = <22 23 24 25 26 27>;
brcm,function = <BCM2835_FSEL_ALT4>;
-@@ -487,14 +460,6 @@
-
+@@ -488,14 +461,6 @@
+ status = "disabled";
};
- thermal: thermal@7e212000 {
@@ -174,7 +174,7 @@ Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
aux: aux@7e215000 {
compatible = "brcm,bcm2835-aux";
#clock-cells = <1>;
-@@ -660,12 +625,6 @@
+@@ -661,12 +626,6 @@
phy-names = "usb2-phy";
};