mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-18 02:40:19 +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>
50 lines
1.4 KiB
Diff
50 lines
1.4 KiB
Diff
From 43ebc7c1b3ed8198b9acf3019eca16e722f7331c Mon Sep 17 00:00:00 2001
|
|
From: Ding Tao <miyatsu@qq.com>
|
|
Date: Fri, 26 Oct 2018 11:50:28 +0000
|
|
Subject: [PATCH] arm64: dts: marvell: armada-37xx: Enable emmc on espressobin
|
|
|
|
The ESPRESSObin board has a emmc interface available on U11: declare it
|
|
and let the bootloader enable it if the emmc is present.
|
|
|
|
[gregory.clement@bootlin.com: disable the emmc by default]
|
|
Signed-off-by: Ding Tao <miyatsu@qq.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
.../dts/marvell/armada-3720-espressobin.dts | 22 +++++++++++++++++++
|
|
1 file changed, 22 insertions(+)
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
@@ -100,9 +100,31 @@
|
|
cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>;
|
|
marvell,pad-type = "sd";
|
|
vqmmc-supply = <&vcc_sd_reg1>;
|
|
+
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&sdio_pins>;
|
|
status = "okay";
|
|
};
|
|
|
|
+/* U11 */
|
|
+&sdhci0 {
|
|
+ non-removable;
|
|
+ bus-width = <8>;
|
|
+ mmc-ddr-1_8v;
|
|
+ mmc-hs400-1_8v;
|
|
+ marvell,xenon-emmc;
|
|
+ marvell,xenon-tun-count = <9>;
|
|
+ marvell,pad-type = "fixed-1-8v";
|
|
+
|
|
+ pinctrl-names = "default";
|
|
+ pinctrl-0 = <&mmc_pins>;
|
|
+/*
|
|
+ * This eMMC is not populated on all boards, so disable it by
|
|
+ * default and let the bootloader enable it, if it is present
|
|
+ */
|
|
+ status = "disabled";
|
|
+};
|
|
+
|
|
&spi0 {
|
|
status = "okay";
|
|
|