mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-20 14:13:16 +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>
46 lines
1.1 KiB
Diff
46 lines
1.1 KiB
Diff
From 957743b79b1ebb710f5498b61a212cebc302e685 Mon Sep 17 00:00:00 2001
|
|
From: Tim Harvey <tharvey@gateworks.com>
|
|
Date: Wed, 29 Apr 2020 08:22:35 -0700
|
|
Subject: [PATCH 01/20] ARM: dts: imx6qdl-gw552x: add USB OTG support
|
|
|
|
The GW552x-B board revision adds USB OTG support.
|
|
|
|
Enable the device-tree node and configure the OTG_ID pin.
|
|
|
|
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
|
|
---
|
|
arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 14 ++++++++++++++
|
|
1 file changed, 14 insertions(+)
|
|
|
|
--- a/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
|
|
+++ b/arch/arm/boot/dts/imx6qdl-gw552x.dtsi
|
|
@@ -258,6 +258,14 @@
|
|
status = "okay";
|
|
};
|
|
|
|
+&usbotg {
|
|
+ vbus-supply = <®_5p0v>;
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&pinctrl_usbotg>;
|
|
+ disable-over-current;
|
|
+ status = "okay";
|
|
+};
|
|
+
|
|
&wdog1 {
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pinctrl_wdog>;
|
|
@@ -359,6 +367,12 @@
|
|
>;
|
|
};
|
|
|
|
+ pinctrl_usbotg: usbotggrp {
|
|
+ fsl,pins = <
|
|
+ MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x13059
|
|
+ >;
|
|
+ };
|
|
+
|
|
pinctrl_wdog: wdoggrp {
|
|
fsl,pins = <
|
|
MX6QDL_PAD_DISP0_DAT8__WDOG1_B 0x1b0b0
|