updated arm patches

diff --git a/atheros-disallow-retrain-nongen1-pcie.patch b/atheros-disallow-retrain-nongen1-pcie.patch
index 54746c83ec8a5742f75fbbb43b0cd76580bb1ef1..c3bec28b0c2072c7f037bcdbfc8cc1b6fff3350e 100644 (file)
--- a/atheros-disallow-retrain-nongen1-pcie.patch
+++ b/atheros-disallow-retrain-nongen1-pcie.patch
@@ -208,7 +208,7 @@ diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
 index 653660e3ba9e..4999ad9d08b8 100644
 --- a/drivers/pci/quirks.c
 +++ b/drivers/pci/quirks.c
-@@ -3553,30 +3553,53 @@ static void mellanox_check_broken_intx_masking(struct pci_dev *pdev)
+@@ -3553,31 +3553,55 @@ static void mellanox_check_broken_intx_masking(struct pci_dev *pdev)
        dev->dev_flags |= PCI_DEV_FLAGS_NO_BUS_RESET;
  }
  
@@ -251,6 +251,7 @@ index 653660e3ba9e..4999ad9d08b8 100644
 -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);
 -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0033, quirk_no_bus_reset);
 -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0034, quirk_no_bus_reset);
+-DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003e, quirk_no_bus_reset);
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x002e,
 +                       quirk_no_bus_reset_and_no_retrain_link);
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030,
@@ -263,6 +264,8 @@ index 653660e3ba9e..4999ad9d08b8 100644
 +                       quirk_no_bus_reset_and_no_retrain_link);
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c,
 +                       quirk_no_bus_reset_and_no_retrain_link);
++DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003e,
++                       quirk_no_bus_reset_and_no_retrain_link);
 +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0042,
 +                       quirk_no_bus_reset_and_no_retrain_link);
  
@@ -273,9 +276,9 @@ index 86c799c97b77..fdbf7254e4ab 100644
 --- a/include/linux/pci.h
 +++ b/include/linux/pci.h
 @@ -227,6 +227,8 @@ enum pci_dev_flags {
-       PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
-       /* Don't use Relaxed Ordering for TLPs directed at this device */
        PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11),
+       /* Device does honor MSI masking despite saying otherwise */
+       PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 << 12),
 +      /* Don't Retrain Link for device when bridge is not in GEN1 mode */
 +      PCI_DEV_FLAGS_NO_RETRAIN_LINK_WHEN_NOT_GEN1 = (__force pci_dev_flags_t) (1 << 12),
  };

diff --git a/kernel-pinebook-pro.patch b/kernel-pinebook-pro.patch
index 91a539aff6ddd9687ef6dcdf7a8b844bcd1cfe9d..23ad042e51070ccaf399bca8e52d5d18b4d635fd 100644 (file)
--- a/kernel-pinebook-pro.patch
+++ b/kernel-pinebook-pro.patch
@@ -980,14 +980,18 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/b
 index decb212e2dca..37f967a89401 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -401,6 +401,7 @@ opp08 {
- 
- &cdn_dp {
-       status = "okay";
-+      extcon = <&fusb0>;
+@@ -385,6 +385,11 @@ opp08 {
+       };
  };
  
++&cdn_dp {
++      status = "okay";
++      extcon = <&fusb0>;
++};
++
  &cpu_b0 {
+       cpu-supply = <&vdd_cpu_b>;
+ };
 @@ -735,6 +736,9 @@ connector {
                                <PDO_FIXED(5000, 1400, PDO_FIXED_USB_COMM)>;
                        try-power-role = "sink";