Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git

9 files changed, 0 insertions, 220 deletions

diff --git a/include/linux/f75375s.h b/include/linux/f75375s.h
deleted file mode 100644
index e99e22500668..000000000000
--- a/include/linux/f75375s.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * f75375s.h - platform data structure for f75375s sensor
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2007, Riku Voipio <riku.voipio@iki.fi>
- */
-
-#ifndef __LINUX_F75375S_H
-#define __LINUX_F75375S_H
-
-/* We want to set fans spinning on systems where there is no
- * BIOS to do that for us */
-struct f75375s_platform_data {
-	u8 pwm[2];
-	u8 pwm_enable[2];
-};
-
-#endif /* __LINUX_F75375S_H */
diff --git a/include/linux/platform_data/ads7828.h b/include/linux/platform_data/ads7828.h
deleted file mode 100644
index 0fa4186c6171..000000000000
--- a/include/linux/platform_data/ads7828.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * TI ADS7828 A/D Converter platform data definition
- *
- * Copyright (c) 2012 Savoir-faire Linux Inc.
- *          Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * For further information, see the Documentation/hwmon/ads7828.rst file.
- */
-
-#ifndef _PDATA_ADS7828_H
-#define _PDATA_ADS7828_H
-
-/**
- * struct ads7828_platform_data - optional ADS7828 connectivity info
- * @diff_input:		Differential input mode.
- * @ext_vref:		Use an external voltage reference.
- * @vref_mv:		Voltage reference value, if external.
- */
-struct ads7828_platform_data {
-	bool diff_input;
-	bool ext_vref;
-	unsigned int vref_mv;
-};
-
-#endif /* _PDATA_ADS7828_H */
diff --git a/include/linux/platform_data/ds620.h b/include/linux/platform_data/ds620.h
deleted file mode 100644
index f0ce22a78bb8..000000000000
--- a/include/linux/platform_data/ds620.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _LINUX_DS620_H
-#define _LINUX_DS620_H
-
-#include <linux/types.h>
-#include <linux/i2c.h>
-
-/* platform data for the DS620 temperature sensor and thermostat */
-
-struct ds620_platform_data {
-	/*
-	 *  Thermostat output pin PO mode:
-	 *  0 = always low (default)
-	 *  1 = PO_LOW
-	 *  2 = PO_HIGH
-	 *
-	 * (see Documentation/hwmon/ds620.rst)
-	 */
-	int pomode;
-};
-
-#endif /* _LINUX_DS620_H */
diff --git a/include/linux/platform_data/emc2305.h b/include/linux/platform_data/emc2305.h
deleted file mode 100644
index 76043a97f975..000000000000
--- a/include/linux/platform_data/emc2305.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#ifndef __LINUX_PLATFORM_DATA_EMC2305__
-#define __LINUX_PLATFORM_DATA_EMC2305__
-
-#define EMC2305_PWM_MAX	5
-
-/**
- * struct emc2305_platform_data - EMC2305 driver platform data
- * @max_state: maximum cooling state of the cooling device;
- * @pwm_num: number of active channels;
- * @pwm_output_mask: PWM output mask
- * @pwm_polarity_mask: PWM polarity mask
- * @pwm_separate: separate PWM settings for every channel;
- * @pwm_min: array of minimum PWM per channel;
- * @pwm_freq: array of PWM frequency per channel
- */
-struct emc2305_platform_data {
-	u8 max_state;
-	u8 pwm_num;
-	u8 pwm_output_mask;
-	u8 pwm_polarity_mask;
-	bool pwm_separate;
-	u8 pwm_min[EMC2305_PWM_MAX];
-	u16 pwm_freq[EMC2305_PWM_MAX];
-};
-
-#endif
diff --git a/include/linux/platform_data/g762.h b/include/linux/platform_data/g762.h
deleted file mode 100644
index 249257ee2132..000000000000
--- a/include/linux/platform_data/g762.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Platform data structure for g762 fan controller driver
- *
- * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- */
-#ifndef __LINUX_PLATFORM_DATA_G762_H__
-#define __LINUX_PLATFORM_DATA_G762_H__
-
-/*
- * Following structure can be used to set g762 driver platform specific data
- * during board init. Note that passing a sparse structure is possible but
- * will result in non-specified attributes to be set to default value, hence
- * overloading those installed during boot (e.g. by u-boot).
- */
-
-struct g762_platform_data {
-	u32 fan_startv;
-	u32 fan_gear_mode;
-	u32 pwm_polarity;
-	u32 clk_freq;
-};
-
-#endif /* __LINUX_PLATFORM_DATA_G762_H__ */
diff --git a/include/linux/platform_data/gsc_hwmon.h b/include/linux/platform_data/gsc_hwmon.h
deleted file mode 100644
index 70e8a6bec0f6..000000000000
--- a/include/linux/platform_data/gsc_hwmon.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef _GSC_HWMON_H
-#define _GSC_HWMON_H
-
-enum gsc_hwmon_mode {
-	mode_temperature,
-	mode_voltage_24bit,
-	mode_voltage_raw,
-	mode_voltage_16bit,
-	mode_fan,
-	mode_max,
-};
-
-/**
- * struct gsc_hwmon_channel - configuration parameters
- * @reg:  I2C register offset
- * @mode: channel mode
- * @name: channel name
- * @mvoffset: voltage offset
- * @vdiv: voltage divider array (2 resistor values in milli-ohms)
- */
-struct gsc_hwmon_channel {
-	unsigned int reg;
-	unsigned int mode;
-	const char *name;
-	unsigned int mvoffset;
-	unsigned int vdiv[2];
-};
-
-/**
- * struct gsc_hwmon_platform_data - platform data for gsc_hwmon driver
- * @nchannels:	number of elements in @channels array
- * @vreference: voltage reference (mV)
- * @resolution: ADC bit resolution
- * @fan_base: register base for FAN controller
- * @channels:	array of gsc_hwmon_channel structures describing channels
- */
-struct gsc_hwmon_platform_data {
-	int nchannels;
-	unsigned int resolution;
-	unsigned int vreference;
-	unsigned int fan_base;
-	struct gsc_hwmon_channel channels[] __counted_by(nchannels);
-};
-#endif
diff --git a/include/linux/platform_data/ltc4245.h b/include/linux/platform_data/ltc4245.h
deleted file mode 100644
index f07fa05ea6c4..000000000000
--- a/include/linux/platform_data/ltc4245.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Platform Data for LTC4245 hardware monitor chip
- *
- * Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
- */
-
-#ifndef LINUX_LTC4245_H
-#define LINUX_LTC4245_H
-
-#include <linux/types.h>
-
-struct ltc4245_platform_data {
-	bool use_extra_gpios;
-};
-
-#endif /* LINUX_LTC4245_H */
diff --git a/include/linux/platform_data/max197.h b/include/linux/platform_data/max197.h
deleted file mode 100644
index 03ef46f9cd65..000000000000
--- a/include/linux/platform_data/max197.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Maxim MAX197 A/D Converter Driver
- *
- * Copyright (c) 2012 Savoir-faire Linux Inc.
- *          Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * For further information, see the Documentation/hwmon/max197.rst file.
- */
-
-#ifndef _PDATA_MAX197_H
-#define _PDATA_MAX197_H
-
-/**
- * struct max197_platform_data - MAX197 connectivity info
- * @convert:	Function used to start a conversion with control byte ctrl.
- *		It must return the raw data, or a negative error code.
- */
-struct max197_platform_data {
-	int (*convert)(u8 ctrl);
-};
-
-#endif /* _PDATA_MAX197_H */
diff --git a/include/linux/platform_data/shtc1.h b/include/linux/platform_data/shtc1.h
deleted file mode 100644
index 5ba6f8f9a9a1..000000000000
--- a/include/linux/platform_data/shtc1.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- * Copyright (C) 2014 Sensirion AG, Switzerland
- * Author: Johannes Winkelmann <johannes.winkelmann@sensirion.com>
- */
-
-#ifndef __SHTC1_H_
-#define __SHTC1_H_
-
-struct shtc1_platform_data {
-	bool blocking_io;
-	bool high_precision;
-};
-#endif /* __SHTC1_H_ */