diff options
Diffstat (limited to 'target/linux/x86')
4 files changed, 13 insertions, 29 deletions
diff --git a/target/linux/x86/patches-4.4/097-0001-sp5100_tco-Add-AMD-Mullins-platform-support.patch b/target/linux/x86/patches-4.4/097-0001-sp5100_tco-Add-AMD-Mullins-platform-support.patch index ee88859..70169ab 100644 --- a/target/linux/x86/patches-4.4/097-0001-sp5100_tco-Add-AMD-Mullins-platform-support.patch +++ b/target/linux/x86/patches-4.4/097-0001-sp5100_tco-Add-AMD-Mullins-platform-support.patch @@ -13,11 +13,9 @@ Signed-off-by: Wim Van Sebroeck <wim@iguana.be> drivers/watchdog/sp5100_tco.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c -index eb8044e..ef039f8 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c -@@ -306,6 +306,8 @@ static struct miscdevice sp5100_tco_miscdev = { +@@ -306,6 +306,8 @@ static struct miscdevice sp5100_tco_misc static const struct pci_device_id sp5100_tco_pci_tbl[] = { { PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_SBX00_SMBUS, PCI_ANY_ID, PCI_ANY_ID, }, @@ -26,5 +24,3 @@ index eb8044e..ef039f8 100644 { 0, }, /* End of list */ }; MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl); --- -2.7.4 diff --git a/target/linux/x86/patches-4.4/097-0002-sp5100_tco-Add-AMD-Carrizo-platform-support.patch b/target/linux/x86/patches-4.4/097-0002-sp5100_tco-Add-AMD-Carrizo-platform-support.patch index 664d4bb..33862a2 100644 --- a/target/linux/x86/patches-4.4/097-0002-sp5100_tco-Add-AMD-Carrizo-platform-support.patch +++ b/target/linux/x86/patches-4.4/097-0002-sp5100_tco-Add-AMD-Carrizo-platform-support.patch @@ -14,11 +14,9 @@ Signed-off-by: Wim Van Sebroeck <wim@iguana.be> drivers/watchdog/sp5100_tco.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c -index ef039f8..0ccadb4 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c -@@ -308,6 +308,8 @@ static const struct pci_device_id sp5100_tco_pci_tbl[] = { +@@ -308,6 +308,8 @@ static const struct pci_device_id sp5100 PCI_ANY_ID, }, { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID, PCI_ANY_ID, }, @@ -27,5 +25,3 @@ index ef039f8..0ccadb4 100644 { 0, }, /* End of list */ }; MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl); --- -2.7.4 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 e9f4513..8f16fa9 100644 --- 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 diff --git a/target/linux/x86/patches-4.4/097-0004-watchdog-sp5100_tco-properly-check-for-new-register-.patch b/target/linux/x86/patches-4.4/097-0004-watchdog-sp5100_tco-properly-check-for-new-register-.patch index cb7fe98..103aa48 100644 --- a/target/linux/x86/patches-4.4/097-0004-watchdog-sp5100_tco-properly-check-for-new-register-.patch +++ b/target/linux/x86/patches-4.4/097-0004-watchdog-sp5100_tco-properly-check-for-new-register-.patch @@ -25,11 +25,9 @@ Signed-off-by: Wim Van Sebroeck <wim@iguana.be> drivers/watchdog/sp5100_tco.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) -diff --git a/drivers/watchdog/sp5100_tco.c b/drivers/watchdog/sp5100_tco.c -index 6467b91..028618c 100644 --- a/drivers/watchdog/sp5100_tco.c +++ b/drivers/watchdog/sp5100_tco.c -@@ -73,6 +73,13 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started." +@@ -73,6 +73,13 @@ MODULE_PARM_DESC(nowayout, "Watchdog can /* * Some TCO specific functions */ @@ -46,13 +44,13 @@ index 6467b91..028618c 100644 @@ -129,7 +136,7 @@ static void tco_timer_enable(void) { int val; - + - if (sp5100_tco_pci->revision >= 0x40) { + if (!tco_has_sp5100_reg_layout(sp5100_tco_pci)) { /* For SB800 or later */ /* Set the Watchdog timer resolution to 1 sec */ outb(SB800_PM_WATCHDOG_CONFIG, SB800_IO_PM_INDEX_REG); -@@ -342,8 +349,7 @@ static unsigned char sp5100_tco_setupdevice(void) +@@ -342,8 +349,7 @@ static unsigned char sp5100_tco_setupdev /* * Determine type of southbridge chipset. */ @@ -62,7 +60,7 @@ index 6467b91..028618c 100644 dev_name = SP5100_DEVNAME; index_reg = SP5100_IO_PM_INDEX_REG; data_reg = SP5100_IO_PM_DATA_REG; -@@ -388,8 +394,7 @@ static unsigned char sp5100_tco_setupdevice(void) +@@ -388,8 +394,7 @@ static unsigned char sp5100_tco_setupdev * Secondly, Find the watchdog timer MMIO address * from SBResource_MMIO register. */ @@ -72,5 +70,3 @@ index 6467b91..028618c 100644 /* Read SBResource_MMIO from PCI config(PCI_Reg: 9Ch) */ pci_read_config_dword(sp5100_tco_pci, SP5100_SB_RESOURCE_MMIO_BASE, &val); --- -2.7.4 |