From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 11 Mar 2019 18:22:15 +0000 (-0700)
Subject: Merge tag 'linux-watchdog-5.1-rc1' of git://www.linux-watchdog.org/linux-watchdog
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a089e4fed5c5e8717f233d71bb750fbf9e1f38e0;p=linux.git

Merge tag 'linux-watchdog-5.1-rc1' of git://linux-watchdog.org/linux-watchdog

Pull watchdog updates from Wim Van Sebroeck:

 - a new watchdog driver for the Mellanox systems

 - renesas-wdt: Document r8a77470 support

 - numerous 'Mark expected switch fall-throughs'

 - qcom: Add suspend/resume support

 - some small fixes and documentation updates

* tag 'linux-watchdog-5.1-rc1' of git://www.linux-watchdog.org/linux-watchdog:
  watchdog: w83877f_wdt: Mark expected switch fall-through
  watchdog: sc520_wdt: Mark expected switch fall-through
  watchdog: sbc60xxwdt: Mark expected switch fall-through
  watchdog: smsc37b787_wdt: Mark expected switch fall-through
  watchdog: sc1200: Mark expected switch fall-through
  watchdog: pc87413: Mark expected switch fall-through
  Documentation/watchdog: Add documentation mlx-wdt driver
  watchdog: mlx-wdt: introduce a watchdog driver for Mellanox systems.
  platform_data/mlxreg: additions for Mellanox watchdog driver.
  watchdog: Update sysfs documentation.
  watchdog: dw: remove useless pr_fmt
  watchdog: pika_wdt: drop pointless static qualifier in pikawdt_init
  watchdog/hpwdt: Update Kconfig documentation
  dt-bindings: watchdog: renesas-wdt: Document r8a77470 support
  watchdog: qcom: Add suspend/resume support
---

a089e4fed5c5e8717f233d71bb750fbf9e1f38e0
diff --cc include/linux/platform_data/mlxreg.h
index 1b2f86f967438,31f7c25a44da9..6d54fe3bcac9c
--- a/include/linux/platform_data/mlxreg.h
+++ b/include/linux/platform_data/mlxreg.h
@@@ -109,9 -120,12 +122,12 @@@ struct mlxreg_core_item 
  /**
   * struct mlxreg_core_platform_data - platform data:
   *
 - * @led_data: led private data;
 + * @data: instance private data;
   * @regmap: register map of parent device;
 - * @counter: number of led instances;
 + * @counter: number of instances;
+  * @features: supported features of device;
+  * @version: implementation version;
+  * @identity: device identity name;
   */
  struct mlxreg_core_platform_data {
  	struct mlxreg_core_data *data;