mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
e5aa498acb
Fixes CVE-2020-10757 via upstream commit df4988aa1c96 ("mm: Fix mremap
not considering huge pmd devmap").
Resolved merge conflict in the following patches:
bcm27xx: 950-0128-gpiolib-Don-t-prevent-IRQ-usage-of-output-GPIOs.patch
Refreshed patches, removed upstreamed patch:
generic: 751-v5.8-net-dsa-mt7530-set-CPU-port-to-fallback-mode.patch
generic: 754-v5.7-net-dsa-mt7530-fix-roaming-from-DSA-user-ports.patch
Run tested: qemu-x86-64
Build tested: x86/64, imx6, sunxi/a53
Signed-off-by: Petr Štetiar <ynezz@true.cz>
58 lines
1.3 KiB
Diff
58 lines
1.3 KiB
Diff
From 66d19a4f8d0fa7539f90cad64d793b4dac6f6e5d Mon Sep 17 00:00:00 2001
|
|
From: Robert Jones <rjones@gateworks.com>
|
|
Date: Fri, 14 Feb 2020 13:01:55 -0800
|
|
Subject: [PATCH] ARM: dts: imx: ventana: add fxos8700 on gateworks boards
|
|
|
|
Add fxos8700 iio imu entries for Gateworks ventana SBCs.
|
|
|
|
Signed-off-by: Robert Jones <rjones@gateworks.com>
|
|
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
|
---
|
|
arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 5 +++++
|
|
arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 5 +++++
|
|
arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 5 +++++
|
|
3 files changed, 15 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw52xx.dtsi
|
|
@@ -313,6 +313,11 @@
|
|
interrupts = <12 2>;
|
|
wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
|
|
};
|
|
+
|
|
+ accel@1e {
|
|
+ compatible = "nxp,fxos8700";
|
|
+ reg = <0x1e>;
|
|
+ };
|
|
};
|
|
|
|
&ldb {
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw53xx.dtsi
|
|
@@ -304,6 +304,11 @@
|
|
interrupts = <11 2>;
|
|
wakeup-gpios = <&gpio1 11 GPIO_ACTIVE_LOW>;
|
|
};
|
|
+
|
|
+ accel@1e {
|
|
+ compatible = "nxp,fxos8700";
|
|
+ reg = <0x1e>;
|
|
+ };
|
|
};
|
|
|
|
&ldb {
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw54xx.dtsi
|
|
@@ -361,6 +361,11 @@
|
|
interrupts = <12 2>;
|
|
wakeup-gpios = <&gpio7 12 GPIO_ACTIVE_LOW>;
|
|
};
|
|
+
|
|
+ accel@1e {
|
|
+ compatible = "nxp,fxos8700";
|
|
+ reg = <0x1e>;
|
|
+ };
|
|
};
|
|
|
|
&ldb {
|