From 9883d5d0843027042294a30b54b69b6d84d5f19d Mon Sep 17 00:00:00 2001 From: Aleksander Jan Bajkowski Date: Mon, 9 Mar 2020 22:56:07 +0100 Subject: sunxi: make patches apply cleanly on 5.4 These patches are already in mainline 5.4 kernel: * 010-v5.3-drivers-ata-ahci_sunxi-Increased-SATA-AHCI-DMA-TX-RX.patch * 101-arm64-dts-allwinner-a64-Enable-A64-timer-workaround.patch Signed-off-by: Aleksander Jan Bajkowski --- .../310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch') diff --git a/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch b/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch index 1d58b7bcba..79c1671de1 100644 --- a/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch +++ b/target/linux/sunxi/patches-5.4/310-Revert-ARM-dts-sun7i-Add-BCM53125-switch-nodes-to-th.patch @@ -15,10 +15,10 @@ This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a. --- a/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts +++ b/arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts -@@ -124,67 +124,13 @@ +@@ -120,65 +120,13 @@ &gmac { pinctrl-names = "default"; - pinctrl-0 = <&gmac_pins_rgmii_a>; + pinctrl-0 = <&gmac_rgmii_pins>; + phy = <&phy1>; phy-mode = "rgmii"; phy-supply = <®_gmac_3v3>; @@ -37,8 +37,6 @@ This reverts commit d7b9eaff5f0ca00726336b4c0c3c29decf30412a. - switch: ethernet-switch@1e { - compatible = "brcm,bcm53125"; - reg = <30>; -- #address-cells = <1>; -- #size-cells = <0>; - - ports { - #address-cells = <1>; -- cgit v1.2.3