History

Merge tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging / IIO driver updates from Greg KH: "Here is the big staging and IIO driver pull request for 5.11-rc1 Lots of different things in here: - loads of driver updates - so many coding style cleanups - new IIO drivers - Android ION code is finally removed from the tree - wimax drivers are moved to staging on their way out of the kernel Nothing really exciting, just the constant grind of kernel development :) All have been in linux-next for a while with no reported issues" * tag 'staging-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits) staging: olpc_dcon: Do not call platform_device_unregister() in dcon_probe() staging: most: Fix spelling mistake "tranceiver" -> "transceiver" staging: qlge: remove duplicate word in comment staging: comedi: mf6x4: Fix AI end-of-conversion detection staging: greybus: Add TODO item about modernizing the pwm code pinctrl: ralink: add a pinctrl driver for the rt2880 family dt-bindings: pinctrl: rt2880: add binding document staging: rtl8723bs: remove ELEMENT_ID enum staging: rtl8723bs: remove unused macros staging: rtl8723bs: replace EID_EXTCapability staging: rtl8723bs: replace EID_BSSIntolerantChlReport staging: rtl8723bs: replace EID_BSSCoexistence staging: rtl8723bs: replace _MME_IE_ staging: rtl8723bs: replace _WAPI_IE_ staging: rtl8723bs: replace _EXT_SUPPORTEDRATES_IE_ staging: rtl8723bs: replace _ERPINFO_IE_ staging: rtl8723bs: replace _CHLGETXT_IE_ staging: rtl8723bs: replace _COUNTRY_IE_ staging: rtl8723bs: replace _IBSS_PARA_IE_ staging: rtl8723bs: replace _TIM_IE_ ...

Linus Torvalds committed 5 years ago

Commit 3db1a3f2 parents 2911ed9 4996b46434 files · +10177 −10875Browse files

Showing the changes to include/linux/platform_data (4 of 434 files). Show all

Unified · Split

4 files
  1. include/linux/platform_data/ad7298.h +0 −19
  2. include/linux/platform_data/ad7303.h +0 −20
  3. include/linux/platform_data/ad7887.h +0 −4
  4. include/linux/platform_data/at91_adc.h +0 −49
include/linux/platform_data/ad7298.h+0−19
@@ -1,19 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
2−/*
3− * AD7298 SPI ADC driver
4− *
5− * Copyright 2011 Analog Devices Inc.
6− */
7−
8−#ifndef __LINUX_PLATFORM_DATA_AD7298_H__
9−#define __LINUX_PLATFORM_DATA_AD7298_H__
10−
11−/**
12− * struct ad7298_platform_data - Platform data for the ad7298 ADC driver
13− * @ext_ref: Whether to use an external reference voltage.
14− **/
15−struct ad7298_platform_data {
16− bool ext_ref;
17−};
18−
19−#endif /* IIO_ADC_AD7298_H_ */
include/linux/platform_data/ad7303.h+0−20
@@ -1,20 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0-only */
2−/*
3− * Analog Devices AD7303 DAC driver
4− *
5− * Copyright 2013 Analog Devices Inc.
6− */
7−
8−#ifndef __IIO_ADC_AD7303_H__
9−#define __IIO_ADC_AD7303_H__
10−
11−/**
12− * struct ad7303_platform_data - AD7303 platform data
13− * @use_external_ref: If set to true use an external voltage reference connected
14− * to the REF pin, otherwise use the internal reference derived from Vdd.
15− */
16−struct ad7303_platform_data {
17− bool use_external_ref;
18−};
19−
20−#endif
include/linux/platform_data/ad7887.h+0−4
@@ -13,13 +13,9 @@ · 12 unmodified lines
1313 * second input channel, and Vref is internally connected to Vdd. If set to
1414 * false the device is used in single channel mode and AIN1/Vref is used as
1515 * VREF input.
16− * @use_onchip_ref: Whether to use the onchip reference. If set to true the
17− * internal 2.5V reference is used. If set to false a external reference is
18− * used.
1916 */
2017 struct ad7887_platform_data {
2118 bool en_dual;
22− bool use_onchip_ref;
2319 };
2420
2521 #endif /* IIO_ADC_AD7887_H_ */
include/linux/platform_data/at91_adc.h+0−49
@@ -1,49 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0-or-later */
2−/*
3− * Copyright (C) 2011 Free Electrons
4− */
5−
6−#ifndef _AT91_ADC_H_
7−#define _AT91_ADC_H_
8−
9−enum atmel_adc_ts_type {
10− ATMEL_ADC_TOUCHSCREEN_NONE = 0,
11− ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
12− ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
13−};
14−
15−/**
16− * struct at91_adc_trigger - description of triggers
17− * @name: name of the trigger advertised to the user
18− * @value: value to set in the ADC's trigger setup register
19− to enable the trigger
20− * @is_external: Does the trigger rely on an external pin?
21− */
22−struct at91_adc_trigger {
23− const char *name;
24− u8 value;
25− bool is_external;
26−};
27−
28−/**
29− * struct at91_adc_data - platform data for ADC driver
30− * @channels_used: channels in use on the board as a bitmask
31− * @startup_time: startup time of the ADC in microseconds
32− * @trigger_list: Triggers available in the ADC
33− * @trigger_number: Number of triggers available in the ADC
34− * @use_external_triggers: does the board has external triggers availables
35− * @vref: Reference voltage for the ADC in millivolts
36− * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires)
37− */
38−struct at91_adc_data {
39− unsigned long channels_used;
40− u8 startup_time;
41− struct at91_adc_trigger *trigger_list;
42− u8 trigger_number;
43− bool use_external_triggers;
44− u16 vref;
45− enum atmel_adc_ts_type touchscreen_type;
46−};
47−
48−extern void __init at91_add_device_adc(struct at91_adc_data *data);
49−#endif