mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-10 06:52:53 +00:00
1d94f72439
Rebased patches:
* generic: 273-batman-adv-Convert-packet.h-to-uapi-header.patch
* ipq806x: 0065-arm-override-compiler-flags.patch
* mvebu: 513-arm64-dts-marvell-armada37xx-Add-emmc-sdio-pinctrl-d.patch
Removed patches:
Fixed upstream:
* ar71xx: 821-serial-core-add-support-for-boot-console-with-arbitr.patch
* ath79: 921-serial-core-add-support-for-boot-console-with-arbitr.patch
- in 4.14.256 via 9112e7ef87149b3d8093e7446d784117f6e18d69
* mvebu: 527-PCI-aardvark-allow-to-specify-link-capability.patch
- in 4.14.257 via 62a3dc9b65a2b24800fc4267b8cf590fad135034
* mvebu: 524-PCI-aardvark-set-host-and-device-to-the-same-MAX-payload-size.patch
- should be hopefully fixed by the bunch of changes in .256 and .257
Run tested on ipq40xx/glinet-b1300 and mvebu/turris-omnia.
Fixes: CVE-2021-3640
Signed-off-by: Petr Štetiar <ynezz@true.cz>
41 lines
1.0 KiB
Diff
41 lines
1.0 KiB
Diff
From d2314a5265eb43e754a26050caa2b31527cc1770 Mon Sep 17 00:00:00 2001
|
|
From: Ding Tao <miyatsu@qq.com>
|
|
Date: Fri, 26 Oct 2018 11:50:27 +0000
|
|
Subject: [PATCH] arm64: dts: marvell: armada37xx: Add emmc/sdio pinctrl
|
|
definition
|
|
|
|
Add emmc/sdio pinctrl definition for marvell armada37xx SoCs.
|
|
|
|
Signed-off-by: Ding Tao <miyatsu@qq.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 ++++++++++
|
|
1 file changed, 10 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
|
@@ -218,6 +218,11 @@
|
|
groups = "uart2";
|
|
function = "uart";
|
|
};
|
|
+
|
|
+ mmc_pins: mmc-pins {
|
|
+ groups = "emmc_nb";
|
|
+ function = "emmc";
|
|
+ };
|
|
};
|
|
|
|
nb_pm: syscon@14000 {
|
|
@@ -247,6 +252,11 @@
|
|
function = "mii";
|
|
};
|
|
|
|
+ sdio_pins: sdio-pins {
|
|
+ groups = "sdio_sb";
|
|
+ function = "sdio";
|
|
+ };
|
|
+
|
|
pcie_reset_pins: pcie-reset-pins {
|
|
groups = "pcie1";
|
|
function = "gpio";
|