mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
ee3067c588
Bump kernel to 4.4.44. Compile-tested on ar71xx, ramips/mt7621 and x86/64.
.44 has been run-tested on the 17.01 branch here on ar71xx and mt7621.
Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
(cherry picked from commit 20996edd68)
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Conflicts:
target/linux/ar71xx/patches-4.4/920-usb-chipidea-AR933x-platform-support.patch
target/linux/ar71xx/patches-4.4/930-chipidea-pullup.patch
28 lines
968 B
Diff
28 lines
968 B
Diff
From cca118fa2a0a94e0f0b3c8dd1dda922cdee45089 Mon Sep 17 00:00:00 2001
|
|
From: Huang Rui <ray.huang@amd.com>
|
|
Date: Mon, 23 Nov 2015 18:07:36 +0800
|
|
Subject: [PATCH] sp5100_tco: Add AMD Carrizo platform support
|
|
|
|
sp5100_tco watchdog is also supported on AMD KernCZ chipset of Carrizo
|
|
platform.
|
|
|
|
Signed-off-by: Huang Rui <ray.huang@amd.com>
|
|
Cc: Denis Turischev <denis.turischev@compulab.co.il>
|
|
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
|
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
|
|
---
|
|
drivers/watchdog/sp5100_tco.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
--- a/drivers/watchdog/sp5100_tco.c
|
|
+++ b/drivers/watchdog/sp5100_tco.c
|
|
@@ -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, },
|
|
+ { PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_KERNCZ_SMBUS, PCI_ANY_ID,
|
|
+ PCI_ANY_ID, },
|
|
{ 0, }, /* End of list */
|
|
};
|
|
MODULE_DEVICE_TABLE(pci, sp5100_tco_pci_tbl);
|