History

Merge tag 'v7.0-rc4' into togreg

Linux 7.0-rc4 Required for the ds4422 series which is build upon; 5187e03b817c ("iio: dac: ds4424: reject -128 RAW value")

Jonathan Cameron committed 7 months ago

Commit 9e4e86a2 parents e8b8349 f338e771405 files · +17925 −9135Browse files

Showing the changes to include/linux/platform_data (2 of 1405 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/mlxreg.h +7 −7
  2. include/linux/platform_data/x86/int3472.h +3 −2
include/linux/platform_data/mlxreg.h+7−7
@@ -13,10 +13,10 @@ · 12 unmodified lines
13/**13/**
14 * enum mlxreg_wdt_type - type of HW watchdog14 * enum mlxreg_wdt_type - type of HW watchdog
15 *15 *
16 * TYPE1 HW watchdog implementation exist in old systems.16 * @MLX_WDT_TYPE1: HW watchdog implementation in old systems.
17 * All new systems have TYPE2 HW watchdog.17 * @MLX_WDT_TYPE2: All new systems have TYPE2 HW watchdog.
18 * TYPE3 HW watchdog can exist on all systems with new CPLD.18 * @MLX_WDT_TYPE3: HW watchdog that can exist on all systems with new CPLD.
19 * TYPE3 is selected by WD capability bit.19 * TYPE3 is selected by WD capability bit.
20 */20 */
21enum mlxreg_wdt_type {21enum mlxreg_wdt_type {
22 MLX_WDT_TYPE1,22 MLX_WDT_TYPE1,
@@ -35,7 +35,7 @@ enum mlxreg_wdt_type { · 12 unmodified lines
35 * @MLXREG_HOTPLUG_LC_SYNCED: entry for line card synchronization events, coming35 * @MLXREG_HOTPLUG_LC_SYNCED: entry for line card synchronization events, coming
36 * after hardware-firmware synchronization handshake;36 * after hardware-firmware synchronization handshake;
37 * @MLXREG_HOTPLUG_LC_READY: entry for line card ready events, indicating line card37 * @MLXREG_HOTPLUG_LC_READY: entry for line card ready events, indicating line card
38 PHYs ready / unready state;38 * PHYs ready / unready state;
39 * @MLXREG_HOTPLUG_LC_ACTIVE: entry for line card active events, indicating firmware39 * @MLXREG_HOTPLUG_LC_ACTIVE: entry for line card active events, indicating firmware
40 * availability / unavailability for the ports on line card;40 * availability / unavailability for the ports on line card;
41 * @MLXREG_HOTPLUG_LC_THERMAL: entry for line card thermal shutdown events, positive41 * @MLXREG_HOTPLUG_LC_THERMAL: entry for line card thermal shutdown events, positive
@@ -123,8 +123,8 @@ struct mlxreg_hotplug_device { · 81 unmodified lines
123 * @reg_pwr: attribute power register;123 * @reg_pwr: attribute power register;
124 * @reg_ena: attribute enable register;124 * @reg_ena: attribute enable register;
125 * @mode: access mode;125 * @mode: access mode;
126 * @np - pointer to node platform associated with attribute;126 * @np: pointer to node platform associated with attribute;
127 * @hpdev - hotplug device data;127 * @hpdev: hotplug device data;
128 * @notifier: pointer to event notifier block;128 * @notifier: pointer to event notifier block;
129 * @health_cntr: dynamic device health indication counter;129 * @health_cntr: dynamic device health indication counter;
130 * @attached: true if device has been attached after good health indication;130 * @attached: true if device has been attached after good health indication;
include/linux/platform_data/x86/int3472.h+3−2
@@ -26,6 +26,7 @@ · 25 unmodified lines
26#define INT3472_GPIO_TYPE_POWER_ENABLE 0x0b26#define INT3472_GPIO_TYPE_POWER_ENABLE 0x0b
27#define INT3472_GPIO_TYPE_CLK_ENABLE 0x0c27#define INT3472_GPIO_TYPE_CLK_ENABLE 0x0c
28#define INT3472_GPIO_TYPE_PRIVACY_LED 0x0d28#define INT3472_GPIO_TYPE_PRIVACY_LED 0x0d
29#define INT3472_GPIO_TYPE_DOVDD 0x10
29#define INT3472_GPIO_TYPE_HANDSHAKE 0x1230#define INT3472_GPIO_TYPE_HANDSHAKE 0x12
30#define INT3472_GPIO_TYPE_HOTPLUG_DETECT 0x1331#define INT3472_GPIO_TYPE_HOTPLUG_DETECT 0x13
31 32
@@ -33,8 +34,8 @@ · 1 unmodified line
33#define INT3472_MAX_SENSOR_GPIOS 334#define INT3472_MAX_SENSOR_GPIOS 3
34#define INT3472_MAX_REGULATORS 335#define INT3472_MAX_REGULATORS 3
35 36
36/* E.g. "avdd\0" */37/* E.g. "dovdd\0" */
37#define GPIO_SUPPLY_NAME_LENGTH 538#define GPIO_SUPPLY_NAME_LENGTH 6
38/* 12 chars for acpi_dev_name() + "-", e.g. "ABCD1234:00-" */39/* 12 chars for acpi_dev_name() + "-", e.g. "ABCD1234:00-" */
39#define GPIO_REGULATOR_NAME_LENGTH (12 + GPIO_SUPPLY_NAME_LENGTH)40#define GPIO_REGULATOR_NAME_LENGTH (12 + GPIO_SUPPLY_NAME_LENGTH)
40/* lower- and upper-case mapping */41/* lower- and upper-case mapping */