From: Matt Fleming <matt.fleming@xxxxxxxxx> Starting with Intel Sunrisepoint (Skylake PCH) the TCO watchdog device is now on the SMBUS, whereas for previous ICH/PCH it was on the LPC bus. Because iTCO_wdt devices may now appear on either the LPC bus or the SMBUS we need to abstract the bus information into an agnostic structure instead of the existing 'lpc_ich_info' which tightly integrates both the lpc_ich and iTCO_wdt drivers. The first patch introduces a platform data structure to handle this and shuffles the existing code around. The other patches add the device-specific information to the i2c-i801 and iTCO_wdt drivers. Patches based against v4.2-rc4, if there's some other tree I should base this on, please let me know. Comments welcome! Changes in v4: - Added Darren's ACK for PATCH 1 - Explicitly list versions in iTCO_wdt_probe() - Delete superfluous 'ret' variable in iTCO_wdt_unset_NO_REBOOT_bit() Changes in v3: - Added Ack/Review tags to patches Changes in v2: - Use lowercase for all new files and data structures - Allocate platform data with devm_kzalloc() - Move Kconfig changes to final patch and use 'select', not 'depends' - Swap strcpy() for strlcpy() - Fixup use of lpc_ich_info in intel_pmc_ipc which was missed in v1 - Don't use bitops in i2c-i801 - Remove superfluous NULL checks in i2c-i801 - Explicitly list reboot bit versions in no_reboot_bit() - Use switch/case construst instead of crazy if else - Fold original fixups from PATCH 4 and 5 into PATCH 1 and 2 Matt Fleming (2): iTCO_wdt: Expose watchdog properties using platform data iTCO_wdt: Add support for TCO on Intel Sunrisepoint Mika Westerberg (1): i2c: i801: Create iTCO device on newer Intel PCHs drivers/i2c/busses/i2c-i801.c | 120 ++++++++++++++++++++++++++++++++- drivers/mfd/lpc_ich.c | 32 ++++++++- drivers/platform/x86/intel_pmc_ipc.c | 9 ++- drivers/watchdog/Kconfig | 3 +- drivers/watchdog/iTCO_wdt.c | 82 +++++++++++++--------- include/linux/mfd/lpc_ich.h | 6 -- include/linux/platform_data/itco_wdt.h | 19 ++++++ 7 files changed, 222 insertions(+), 49 deletions(-) create mode 100644 include/linux/platform_data/itco_wdt.h -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
