mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +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>
77 lines
1.7 KiB
Diff
77 lines
1.7 KiB
Diff
From 9e72702a3d9a967edac02d8e937bce2b68b77814 Mon Sep 17 00:00:00 2001
|
|
From: Tim Harvey <tharvey@gateworks.com>
|
|
Date: Tue, 12 May 2020 13:59:37 -0700
|
|
Subject: [PATCH 05/20] ARM: dts: imx6qdl-gw560x: add lsm9ds1 iio imu/magn
|
|
support
|
|
|
|
Add one node for the accel/gyro i2c device and another for the separate
|
|
magnetometer device in the lsm9ds1.
|
|
|
|
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
|
---
|
|
arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 31 +++++++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
|
|
@@ -295,6 +295,15 @@
|
|
VDDIO-supply = <®_3p3v>;
|
|
};
|
|
|
|
+ magn@1c {
|
|
+ compatible = "st,lsm9ds1-magn";
|
|
+ reg = <0x1c>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_mag>;
|
|
+ interrupt-parent = <&gpio5>;
|
|
+ interrupts = <9 IRQ_TYPE_EDGE_RISING>;
|
|
+ };
|
|
+
|
|
tca8418: keypad@34 {
|
|
compatible = "ti,tca8418";
|
|
pinctrl-names = "default";
|
|
@@ -389,6 +398,16 @@
|
|
};
|
|
};
|
|
};
|
|
+
|
|
+ imu@6a {
|
|
+ compatible = "st,lsm9ds1-imu";
|
|
+ reg = <0x6a>;
|
|
+ st,drdy-int-pin = <1>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_imu>;
|
|
+ interrupt-parent = <&gpio5>;
|
|
+ interrupts = <6 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ };
|
|
};
|
|
|
|
&i2c3 {
|
|
@@ -609,6 +628,12 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_imu: imugrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_DISP0_DAT12__GPIO5_IO06 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_keypad: keypadgrp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_DISP0_DAT17__GPIO5_IO11 0x0001b0b0 /* KEYPAD_IRQ# */
|
|
@@ -616,6 +641,12 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_mag: maggrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_DISP0_DAT15__GPIO5_IO09 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_pcie: pciegrp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_DISP0_DAT10__GPIO4_IO31 0x1b0b0 /* PCI_RST# */
|