From 58d2bd88aefef1f3a37b401223fccae374af6c63 Mon Sep 17 00:00:00 2001 From: Ansuel Smith Date: Sat, 8 Aug 2020 16:50:04 +0200 Subject: ipq806x: replace pci patchset with upstream version Changes: - Update patches - Update dts with new binding Tx term offset dropped and replaced with a new compatible Removed: - 0071-5-PCI-qcom-Programming-the-PCIE-iATU-for-IPQ806x Pci init does the same exact thing (was needed in older kernel version) - 0071-7-pcie-Set-PCIE-MRRS-and-MPS-to-256B Rejected upstream, can't find any reason to have this. No regression with testing it on R7800. Tested on R7800 (ipq8065), R7500 v2 ("ipq8064-v2") Signed-off-by: Ansuel Smith Tested-by: Paul Blazejowski [R7800] [rebase and refresh] Signed-off-by: Adrian Schmutzler --- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi | 6 +++--- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts | 2 +- .../files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts | 2 +- .../ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts | 2 +- target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi | 6 +++--- 14 files changed, 18 insertions(+), 18 deletions(-) (limited to 'target/linux/ipq806x/files-5.4/arch/arm') diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts index a28927cde7..b2fdc427e2 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap148.dts @@ -48,7 +48,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &nand_controller { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts index f86f61f5ca..6ba3d70808 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-ap161.dts @@ -56,7 +56,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &pcie2 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts index 1f2cd247b6..2d5685558e 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-c2600.dts @@ -355,7 +355,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &mdio0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts index dc25a42403..3183ac3f9c 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-d7800.dts @@ -176,7 +176,7 @@ reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; - force_gen1 = <1>; + max-link-speed = <1>; }; &nand_controller { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi index c0c8372eec..3e6732e9df 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-eax500.dtsi @@ -23,7 +23,7 @@ &pcie0 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &pcie1 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts index 868d1e9a9a..082ae50949 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500.dts @@ -157,7 +157,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &nand_controller { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts index 8cb6376ee7..dc912a990c 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-r7500v2.dts @@ -187,7 +187,7 @@ reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; - force_gen1 = <1>; + max-link-speed = <1>; }; &nand_controller { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi index 350965200b..b9ee86a891 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-v2.0.dtsi @@ -41,15 +41,15 @@ }; &pcie0 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &pcie1 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &pcie2 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &sata { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts index 8cc69bca88..2f46b220a8 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-vr2600v.dts @@ -278,7 +278,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &mdio0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts index 322968dfdb..8120eee142 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wg2600hp.dts @@ -310,7 +310,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &qcom_pinmux { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts index 812757131a..476c6bab40 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8064-wxr-2533dhp.dts @@ -381,7 +381,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; }; &qcom_pinmux { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts index dab5c4ccd5..781394f75a 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-nbg6817.dts @@ -214,7 +214,7 @@ reset-gpio = <&qcom_pinmux 48 GPIO_ACTIVE_LOW>; pinctrl-0 = <&pcie1_pins>; pinctrl-names = "default"; - force_gen1 = <1>; + max-link-speed = <1>; }; &mdio0 { diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts index 7b272b74ca..89c1a5653c 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065-r7800.dts @@ -430,7 +430,7 @@ &pcie1 { status = "okay"; - force_gen1 = <1>; + max-link-speed = <1>; bridge@0,0 { reg = <0x00000000 0 0 0 0>; diff --git a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi index b706bfa3a7..ab67d504e6 100644 --- a/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi +++ b/target/linux/ipq806x/files-5.4/arch/arm/boot/dts/qcom-ipq8065.dtsi @@ -46,15 +46,15 @@ }; &pcie0 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &pcie1 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &pcie2 { - phy-tx0-term-offset = <0>; + compatible = "qcom,pcie-ipq8064-v2"; }; &sata { -- cgit v1.2.3