mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32: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>
70 lines
1.6 KiB
Diff
70 lines
1.6 KiB
Diff
From c8756cbad816954be912ba32277ccd55fe7acc01 Mon Sep 17 00:00:00 2001
|
|
From: Tim Harvey <tharvey@gateworks.com>
|
|
Date: Tue, 12 May 2020 13:59:56 -0700
|
|
Subject: [PATCH 06/20] ARM: dts: imx6qdl-gw5904: 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-gw5904.dtsi | 31 +++++++++++++++++++++++++++++++
|
|
1 file changed, 31 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw5904.dtsi
|
|
@@ -248,6 +248,15 @@
|
|
pinctrl-0 = <&pinctrl_i2c2>;
|
|
status = "okay";
|
|
|
|
+ magn@1c {
|
|
+ compatible = "st,lsm9ds1-magn";
|
|
+ reg = <0x1c>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_mag>;
|
|
+ interrupt-parent = <&gpio5>;
|
|
+ interrupts = <17 IRQ_TYPE_EDGE_RISING>;
|
|
+ };
|
|
+
|
|
ltc3676: pmic@3c {
|
|
compatible = "lltc,ltc3676";
|
|
reg = <0x3c>;
|
|
@@ -320,6 +329,16 @@
|
|
};
|
|
};
|
|
};
|
|
+
|
|
+ imu@6a {
|
|
+ compatible = "st,lsm9ds1-imu";
|
|
+ reg = <0x6a>;
|
|
+ st,drdy-int-pin = <1>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_imu>;
|
|
+ interrupt-parent = <&gpio4>;
|
|
+ interrupts = <18 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ };
|
|
};
|
|
|
|
&i2c3 {
|
|
@@ -501,6 +520,18 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_imu: imugrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_DI0_PIN2__GPIO4_IO18 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
+
|
|
+ pinctrl_mag: maggrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17 0x1b0b0
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_pcie: pciegrp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0 /* PCIE RST */
|