summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 17:16:52 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2017-06-12 17:16:52 -0400
commit019ea55e6daa5fac3cfec0ab4af49f5f9d4d4c40 (patch)
tree35e1f007b307a0b2f529b4aa830193984e630b27
parent595108bf2149a2641becbc5c76ba16ba4ceb6b28 (diff)
downloadlongterm-queue-4.8-019ea55e6daa5fac3cfec0ab4af49f5f9d4d4c40.tar.gz
hisi: drop dts patch n/a for 4.8.x baseline
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/arm64-dts-hisi-fix-hip06-sas-am-max-trans-quirk.patch30
-rw-r--r--queue/series1
2 files changed, 0 insertions, 31 deletions
diff --git a/queue/arm64-dts-hisi-fix-hip06-sas-am-max-trans-quirk.patch b/queue/arm64-dts-hisi-fix-hip06-sas-am-max-trans-quirk.patch
deleted file mode 100644
index 652deba..0000000
--- a/queue/arm64-dts-hisi-fix-hip06-sas-am-max-trans-quirk.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f65e786604b34d0b599b8c01ecca28be2d746290 Mon Sep 17 00:00:00 2001
-From: John Garry <john.garry@huawei.com>
-Date: Tue, 8 Nov 2016 00:44:23 +0800
-Subject: [PATCH] arm64: dts: hisi: fix hip06 sas am-max-trans quirk
-
-commit f65e786604b34d0b599b8c01ecca28be2d746290 upstream.
-
-The string for the am max transmissions quirk property
-is not correct -> fix it.
-
-Signed-off-by: John Garry <john.garry@huawei.com>
-Reviewed-by: Xiang Chen <chenxiang66@hisilicon.com>
-Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
-
-diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
-index da61e4384eeb..a05ad046cb9a 100644
---- a/arch/arm64/boot/dts/hisilicon/hip06.dtsi
-+++ b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
-@@ -590,7 +590,7 @@
- reg = <0 0xa2000000 0 0x10000>;
- sas-addr = [50 01 88 20 16 00 00 00];
- hisilicon,sas-syscon = <&pcie_subctl>;
-- am-max-trans;
-+ hip06-sas-v2-quirk-amt;
- ctrl-reset-reg = <0xa18>;
- ctrl-reset-sts-reg = <0x5a0c>;
- ctrl-clock-ena-reg = <0x318>;
---
-2.12.0
-
diff --git a/queue/series b/queue/series
index 0b5b42e..5994984 100644
--- a/queue/series
+++ b/queue/series
@@ -52,7 +52,6 @@ clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch
HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch
HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch
usb-dwc3-gadget-delay-unmap-of-bounced-requests.patch
-arm64-dts-hisi-fix-hip06-sas-am-max-trans-quirk.patch
net-mlx4_core-Use-device-ID-defines.patch
clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch
scsi-ufs-introduce-UFSHCD_QUIRK_PRDT_BYTE_GRAN-quirk.patch