aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/cns3xxx/patches-4.19
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-21 14:09:35 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-22 16:56:46 +0100
commite29500eb849a18fa988a6ce53e10ad8c188e35df (patch)
tree275b3ebaeb24df6006ac85eec9738c5312ed341f /target/linux/cns3xxx/patches-4.19
parentdb9e9e8382169ef85ea5994c958cfba7c87abfd8 (diff)
downloadupstream-e29500eb849a18fa988a6ce53e10ad8c188e35df.tar.gz
upstream-e29500eb849a18fa988a6ce53e10ad8c188e35df.tar.bz2
upstream-e29500eb849a18fa988a6ce53e10ad8c188e35df.zip
kernel: bump 4.19 to 4.19.85
Refreshed all patches. Altered patches: - 080-sata_support.patch Remove upstreamed: - 034-v4.20-MIPS-BCM47XX-Enable-USB-power-on-Netgear-WNDR3400v3.patch - 001-4.21-01-BCM63XX-fix-switch-core-reset-on-BCM6368.patch - 073-qcom-ipq4019-fix-cpu0-s-qcom-saw2-reg-value.patch Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.19')
-rw-r--r--target/linux/cns3xxx/patches-4.19/080-sata_support.patch28
1 files changed, 21 insertions, 7 deletions
diff --git a/target/linux/cns3xxx/patches-4.19/080-sata_support.patch b/target/linux/cns3xxx/patches-4.19/080-sata_support.patch
index 20871916fb..65a5275bec 100644
--- a/target/linux/cns3xxx/patches-4.19/080-sata_support.patch
+++ b/target/linux/cns3xxx/patches-4.19/080-sata_support.patch
@@ -1,6 +1,6 @@
--- a/drivers/ata/ahci_platform.c
+++ b/drivers/ata/ahci_platform.c
-@@ -37,12 +37,23 @@ static struct scsi_host_template ahci_pl
+@@ -44,11 +44,18 @@ static struct scsi_host_template ahci_pl
AHCI_SHT(DRV_NAME),
};
@@ -15,12 +15,26 @@
{
struct device *dev = &pdev->dev;
struct ahci_host_priv *hpriv;
-+ const struct ata_port_info *info = &ahci_port_info;
+- const struct ata_port_info *port;
++ const struct ata_port_info *port = &ahci_port_info;
int rc;
-+ if (IS_ENABLED(CONFIG_ARCH_CNS3XXX))
-+ info = &cns3xxx_port_info;
-+
hpriv = ahci_platform_get_resources(pdev,
- AHCI_PLATFORM_GET_RESETS);
- if (IS_ERR(hpriv))
+@@ -66,9 +73,14 @@ static int ahci_probe(struct platform_de
+ if (of_device_is_compatible(dev->of_node, "hisilicon,hisi-ahci"))
+ hpriv->flags |= AHCI_HFLAG_NO_FBS | AHCI_HFLAG_NO_NCQ;
+
+- port = acpi_device_get_match_data(dev);
+- if (!port)
+- port = &ahci_port_info;
++ if (IS_ENABLED(CONFIG_ARCH_CNS3XXX)) {
++ port = &cns3xxx_port_info;
++ }
++ else {
++ port = acpi_device_get_match_data(dev);
++ if (!port)
++ port = &ahci_port_info;
++ }
+
+ rc = ahci_platform_init_host(pdev, hpriv, port,
+ &ahci_platform_sht);