Kernel: bump to 4.4.44

[openwrt/openwrt.git] / target / linux / x86 / patches-4.4 / 097-0003-sp5100_tco-fix-the-device-check-for-SB800-and-later-chipsets.patch

diff --git a/target/linux/x86/patches-4.4/097-0003-sp5100_tco-fix-the-device-check-for-SB800-and-later-chipsets.patch b/target/linux/x86/patches-4.4/097-0003-sp5100_tco-fix-the-device-check-for-SB800-and-later-chipsets.patch
index e9f451394f539275194ac37a23f23724f81147ba..8f16fa99062bfab7ff0f2a5264a4fcbfe560aa01 100644 (file)
--- a/target/linux/x86/patches-4.4/097-0003-sp5100_tco-fix-the-device-check-for-SB800-and-later-chipsets.patch
+++ b/target/linux/x86/patches-4.4/097-0003-sp5100_tco-fix-the-device-check-for-SB800-and-later-chipsets.patch
@@ -15,19 +15,17 @@ Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
  drivers/watchdog/sp5100_tco.c | 28 ++++++++++++++++------------
  1 file changed, 16 insertions(+), 12 deletions(-)
 
-diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c
-index 0ccadb4..6467b91 100644
 --- a/drivers/watchdog/sp5100_tco.c
 +++ b/drivers/watchdog/sp5100_tco.c
-@@ -335,21 +335,24 @@ static unsigned char sp5100_tco_setupdevice(void)
+@@ -335,21 +335,24 @@ static unsigned char sp5100_tco_setupdev
        if (!sp5100_tco_pci)
                return 0;
-
+ 
 -      pr_info("PCI Revision ID: 0x%x\n", sp5100_tco_pci->revision);
 +      pr_info("PCI Vendor ID: 0x%x, Device ID: 0x%x, Revision ID: 0x%x\n",
 +              sp5100_tco_pci->vendor, sp5100_tco_pci->device,
 +              sp5100_tco_pci->revision);
-
+ 
        /*
         * Determine type of southbridge chipset.
         */
@@ -49,9 +47,9 @@ index 0ccadb4..6467b91 100644
 +              data_reg = SB800_IO_PM_DATA_REG;
 +              base_addr = SB800_PM_WATCHDOG_BASE;
        }
-
+ 
        /* Request the IO ports used by this driver */
-@@ -385,7 +388,12 @@ static unsigned char sp5100_tco_setupdevice(void)
+@@ -385,7 +388,12 @@ static unsigned char sp5100_tco_setupdev
         * Secondly, Find the watchdog timer MMIO address
         * from SBResource_MMIO register.
         */
@@ -65,7 +63,7 @@ index 0ccadb4..6467b91 100644
                /* Read SBResource_MMIO from AcpiMmioEn(PM_Reg: 24h) */
                outb(SB800_PM_ACPI_MMIO_EN+3, SB800_IO_PM_INDEX_REG);
                val = inb(SB800_IO_PM_DATA_REG);
-@@ -395,10 +403,6 @@ static unsigned char sp5100_tco_setupdevice(void)
+@@ -395,10 +403,6 @@ static unsigned char sp5100_tco_setupdev
                val = val << 8 | inb(SB800_IO_PM_DATA_REG);
                outb(SB800_PM_ACPI_MMIO_EN+0, SB800_IO_PM_INDEX_REG);
                val = val << 8 | inb(SB800_IO_PM_DATA_REG);
@@ -74,7 +72,5 @@ index 0ccadb4..6467b91 100644
 -              pci_read_config_dword(sp5100_tco_pci,
 -                                    SP5100_SB_RESOURCE_MMIO_BASE, &val);
        }
-
+ 
        /* The SBResource_MMIO is enabled and mapped memory space? */
---
-2.7.4