History

Merge tag 'char-misc-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char / misc / IIO / and others driver updates from Greg KH: "Here is the char/misc/iio and other smaller driver subsystem updates for 7.1-rc1. Lots of stuff in here, all tiny, but relevant for the different drivers they touch. Major points in here is: - the usual large set of new IIO drivers and updates for that subsystem (the large majority of this diffstat) - lots of comedi driver updates and bugfixes - coresight driver updates - interconnect driver updates and additions - mei driver updates - binder (both rust and C versions) updates and fixes - lots of other smaller driver subsystem updates and additions All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (405 commits) coresight: tpdm: fix invalid MMIO access issue mei: me: add nova lake point H DID mei: lb: add late binding version 2 mei: bus: add mei_cldev_uuid w1: ds2490: drop redundant device reference bus: mhi: host: pci_generic: Add Telit FE912C04 modem support mei: csc: wake device while reading firmware status mei: csc: support controller with separate PCI device mei: convert PCI error to common errno mei: trace: print return value of pci_cfg_read mei: me: move trace into firmware status read mei: fix idle print specifiers mei: me: use PCI_DEVICE_DATA macro sonypi: Convert ACPI driver to a platform one misc: apds990x: fix all kernel-doc warnings most: usb: Use kzalloc_objs for endpoint address array hpet: Convert ACPI driver to a platform one misc: vmw_vmci: Fix spelling mistakes in comments parport: Remove completed item from to-do list char: remove unnecessary module_init/exit functions ...

Linus Torvalds committed 6 months ago

Commit cb4eb672 parents b2680ba 1c0220a356 files · +12801 −4299Browse files

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

Unified · Split

2 files
  1. include/linux/platform_data/apds990x.h +2 −2
  2. include/linux/platform_data/tsl2772.h +2 −2
include/linux/platform_data/apds990x.h+2−2
@@ -31,7 +31,6 @@ · 30 unmodified lines
3131 * itself. If the GA is zero, driver will use uncovered sensor default values
3232 * format: decimal value * APDS_PARAM_SCALE except df which is plain integer.
3333 */
34−#define APDS_PARAM_SCALE 4096
3534 struct apds990x_chip_factors {
3635 int ga;
3736 int cf1;
@@ -40,11 +39,12 @@ struct apds990x_chip_factors { · 2 unmodified lines
4039 int irf2;
4140 int df;
4241 };
42+#define APDS_PARAM_SCALE 4096
4343
4444 /**
4545 * struct apds990x_platform_data - platform data for apsd990x.c driver
4646 * @cf: chip factor data
47− * @pddrive: IR-led driving current
47+ * @pdrive: IR-led driving current
4848 * @ppcount: number of IR pulses used for proximity estimation
4949 * @setup_resources: interrupt line setup call back function
5050 * @release_resources: interrupt line release call back function
include/linux/platform_data/tsl2772.h+2−2
@@ -61,9 +61,9 @@ struct tsl2772_lux { · 60 unmodified lines
6161 * @prox_pulse_count: Number if proximity emitter pulses.
6262 * @prox_max_samples_cal: The number of samples that are taken when performing
6363 * a proximity calibration.
64− * @prox_diode Which diode(s) to use for driving the external
64+ * @prox_diode: Which diode(s) to use for driving the external
6565 * LED(s) for proximity sensing.
66− * @prox_power The amount of power to use for the external LED(s).
66+ * @prox_power: The amount of power to use for the external LED(s).
6767 */
6868 struct tsl2772_settings {
6969 int als_time;