mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 09:39:00 +00:00
39bf2aee0e
Added the new configuration options: CONFIG_HARDEN_BRANCH_HISTORY=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=y Manually adapted: target/linux/generic/hack-5.4/220-gc_sections.patch Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From df749cdb015011e9ed8b60ebb84b4e76a9f35735 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Marek=20Beh=C3=BAn?= <marek.behun@nic.cz>
|
|
Date: Thu, 30 Apr 2020 10:06:24 +0200
|
|
Subject: [PATCH] arm64: dts: marvell: armada-37xx: Move PCIe comphy handle
|
|
property
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Move the comphy handle property of the PCIe node from board specific
|
|
device tree files (EspressoBin and Turris Mox) to the generic
|
|
armada-37xx.dtsi.
|
|
|
|
This is correct since this is the only possible PCIe PHY configuration
|
|
on Armada 37xx, so when PCIe is enabled on any board, this handle is
|
|
correct.
|
|
|
|
Signed-off-by: Marek Behún <marek.behun@nic.cz>
|
|
Tested-by: Tomasz Maciej Nowak <tmn505@gmail.com>
|
|
Acked-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
|
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
|
|
---
|
|
arch/arm64/boot/dts/marvell/armada-3720-espressobin.dtsi | 1 -
|
|
arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts | 1 -
|
|
arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 1 +
|
|
3 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts
|
|
@@ -56,7 +56,6 @@
|
|
/* J9 */
|
|
&pcie0 {
|
|
status = "okay";
|
|
- phys = <&comphy1 0>;
|
|
pinctrl-names = "default";
|
|
pinctrl-0 = <&pcie_reset_pins &pcie_clkreq_pins>;
|
|
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
|
|
--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
|
|
@@ -134,7 +134,6 @@
|
|
status = "okay";
|
|
max-link-speed = <2>;
|
|
reset-gpios = <&gpiosb 3 GPIO_ACTIVE_LOW>;
|
|
- phys = <&comphy1 0>;
|
|
/*
|
|
* U-Boot port for Turris Mox has a bug which always expects that "ranges" DT property
|
|
* contains exactly 2 ranges with 3 (child) address cells, 2 (parent) address cells and
|
|
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
|
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
|
|
@@ -501,6 +501,7 @@
|
|
<0 0 0 2 &pcie_intc 1>,
|
|
<0 0 0 3 &pcie_intc 2>,
|
|
<0 0 0 4 &pcie_intc 3>;
|
|
+ phys = <&comphy1 0>;
|
|
pcie_intc: interrupt-controller {
|
|
interrupt-controller;
|
|
#interrupt-cells = <1>;
|