diff options
Diffstat (limited to 'target/linux')
4 files changed, 8 insertions, 21 deletions
diff --git a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch index 9889a33cb1..54858657cb 100644 --- a/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch +++ b/target/linux/generic/pending-4.14/190-2-5-e1000e-Fix-wrong-comment-related-to-link-detection.patch @@ -23,7 +23,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c -@@ -5093,7 +5093,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5082,7 +5082,7 @@ static bool e1000e_has_link(struct e1000 /* get_link_status is set on LSC (link status) interrupt or * Rx sequence error interrupt. get_link_status will stay @@ -32,7 +32,7 @@ Tested-by: Aaron Brown <aaron.f.brown@intel.com> * for copper adapters ONLY */ switch (hw->phy.media_type) { -@@ -5111,7 +5111,7 @@ static bool e1000e_has_link(struct e1000 +@@ -5100,7 +5100,7 @@ static bool e1000e_has_link(struct e1000 break; case e1000_media_type_internal_serdes: ret_val = hw->mac.ops.check_for_link(hw); diff --git a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch index daff25b633..6bc626dd6a 100644 --- a/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch +++ b/target/linux/generic/pending-4.14/736-net-phy-at803x-allow-to-configure-via-dt.patch @@ -1,7 +1,5 @@ -Index: linux-4.14.60/drivers/net/phy/at803x.c -=================================================================== ---- linux-4.14.60.orig/drivers/net/phy/at803x.c -+++ linux-4.14.60/drivers/net/phy/at803x.c +--- a/drivers/net/phy/at803x.c ++++ b/drivers/net/phy/at803x.c @@ -354,6 +354,14 @@ static int at803x_config_init(struct phy AT803X_DEBUG_TX_CLK_DLY_EN, 0); } diff --git a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch index 5908108e6b..996b309e8f 100644 --- a/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch +++ b/target/linux/mediatek/patches-4.14/0227-arm-dts-Add-Unielec-U7623-DTS.patch @@ -11,8 +11,6 @@ Subject: [PATCH] arm: dts: Add Unielec U7623 DTS create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts create mode 100644 arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi -diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 3fec84fa0..e685ce9a4 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -1062,6 +1062,7 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ @@ -23,9 +21,6 @@ index 3fec84fa0..e685ce9a4 100644 mt7623n-rfb-nand.dtb \ mt7623n-bananapi-bpi-r2.dtb \ mt8127-moose.dtb \ -diff --git a/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts -new file mode 100644 -index 000000000..857d440d0 --- /dev/null +++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc-512M.dts @@ -0,0 +1,18 @@ @@ -47,9 +42,6 @@ index 000000000..857d440d0 + reg = <0 0x80000000 0 0x20000000>; + }; +}; -diff --git a/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi -new file mode 100644 -index 000000000..adc91266e --- /dev/null +++ b/arch/arm/boot/dts/mt7623a-unielec-u7623-02-emmc.dtsi @@ -0,0 +1,366 @@ @@ -419,6 +411,3 @@ index 000000000..adc91266e + status = "okay"; +}; + --- -2.14.1 - diff --git a/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch b/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch index 799e900a8d..d8693374d2 100644 --- a/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch +++ b/target/linux/sunxi/patches-4.14/301-orangepi_pc2_usb_otg_to_host_key_power.patch @@ -1,7 +1,6 @@ -diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts ---- linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:40:04.794444000 +0100 -+++ linux-4.14.20/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts 2018-03-02 09:41:04.880472000 +0100 -@@ -88,7 +88,7 @@ +--- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +@@ -87,7 +87,7 @@ sw4 { label = "sw4"; @@ -18,3 +17,4 @@ diff -Naur linux-4.14.20.ori/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc + dr_mode = "host"; status = "okay"; }; + |