Skip to content

Commit 9dffdb3

Browse files
torvaldstorvalds
committed
Merge tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here is the big staging driver pull request for 4.6-rc1. Lots of little things here, over 1600 patches or so. Notable is all of the good Lustre work happening, those developers have finally woken up and are cleaning up their code greatly. The Outreachy intern application process is also happening, which brought in another 400 or so patches. Full details are in the very long shortlog. All of these have been in linux-next with no reported issues" * tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1673 commits) staging: lustre: fix aligments in lnet selftest staging: lustre: report minimum of two buffers for LNet selftest load test staging: lustre: test for proper errno code in lstcon_rpc_trans_abort staging: lustre: filter remaining extra spacing for lnet selftest staging: lustre: remove extra spacing when setting variable for lnet selftest staging: lustre: remove extra spacing of variable declartions for lnet selftest staging: lustre: fix spacing issues checkpatch reported in lnet selftest staging: lustre: remove returns in void function for lnet selftest staging: lustre: fix bogus lst errors for lnet selftest staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc staging: mt29f_spinand: Replacing pr_info with dev_info after the call to devm_kzalloc staging: android: ion: fix up file mode staging: ion: debugfs invalid gfp mask staging: rts5208: Replace pci_enable_device with pcim_enable_device Staging: ieee80211: Place constant on right side of the test. staging: speakup: Replace del_timer with del_timer_sync staging: lowmemorykiller: fix 2 checks that checkpatch complained staging: mt29f_spinand: Drop void pointer cast staging: rdma: hfi1: file_ops: Replace ALIGN with PAGE_ALIGN staging: rdma: hfi1: driver: Replace IS_ALIGNED with PAGE_ALIGNED ...
2 parents 10fdfee + 2df122b commit 9dffdb3

File tree

895 files changed

+36024
-45222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

895 files changed

+36024
-45222
lines changed

‎CREDITS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3054,6 +3054,7 @@ D: PLX USB338x driver
30543054
D: PCA9634 driver
30553055
D: Option GTM671WFS
30563056
D: Fintek F81216A
3057+
D: AD5761 iio driver
30573058
D: Various kernel hacks
30583059
S: Qtechnology A/S
30593060
S: Valby Langgade 142

‎Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,8 +496,11 @@ Description:
496496
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
497497
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
498498
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
499+
90kohm_to_gnd: connected to ground via a 90kOhm resistor,
499500
100kohm_to_gnd: connected to ground via an 100kOhm resistor,
501+
125kohm_to_gnd: connected to ground via an 125kOhm resistor,
500502
500kohm_to_gnd: connected to ground via a 500kOhm resistor,
503+
640kohm_to_gnd: connected to ground via a 640kOhm resistor,
501504
three_state: left floating.
502505
For a list of available output power down options read
503506
outX_powerdown_mode_available. If Y is not present the
@@ -1491,3 +1494,10 @@ Description:
14911494
This ABI is especially applicable for humidity sensors
14921495
to heatup the device and get rid of any condensation
14931496
in some humidity environment
1497+
1498+
What: /sys/bus/iio/devices/iio:deviceX/in_ph_raw
1499+
KernelVersion: 4.5
1500+
Contact: [email protected]
1501+
Description:
1502+
Raw (unscaled no offset etc.) pH reading of a substance as a negative
1503+
base-10 logarithm of hydrodium ions in a litre of water.

‎Documentation/ABI/testing/sysfs-bus-iio-health-afe440x

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/tia_resistanceY
2+
/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY
3+
Date: December 2015
4+
KernelVersion:
5+
Contact: Andrew F. Davis <[email protected]>
6+
Description:
7+
Get and set the resistance and the capacitance settings for the
8+
Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for
9+
Rf2 and Cf2 values.
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/tia_separate_en
12+
Date: December 2015
13+
KernelVersion:
14+
Contact: Andrew F. Davis <[email protected]>
15+
Description:
16+
Enable or disable separate settings for the TransImpedance
17+
Amplifier above, when disabled both values are set by the
18+
first channel.
19+
20+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_raw
21+
/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw
22+
Date: December 2015
23+
KernelVersion:
24+
Contact: Andrew F. Davis <[email protected]>
25+
Description:
26+
Get measured values from the ADC for these stages. Y is the
27+
specific LED number. The values are expressed in 24-bit twos
28+
complement.
29+
30+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw
31+
Date: December 2015
32+
KernelVersion:
33+
Contact: Andrew F. Davis <[email protected]>
34+
Description:
35+
Get differential values from the ADC for these stages. Y is the
36+
specific LED number. The values are expressed in 24-bit twos
37+
complement for the specified LEDs.
38+
39+
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_offset
40+
/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset
41+
Date: December 2015
42+
KernelVersion:
43+
Contact: Andrew F. Davis <[email protected]>
44+
Description:
45+
Get and set the offset cancellation DAC setting for these
46+
stages. The values are expressed in 5-bit sign-magnitude.
47+
48+
What: /sys/bus/iio/devices/iio:deviceX/out_current_ledY_raw
49+
Date: December 2015
50+
KernelVersion:
51+
Contact: Andrew F. Davis <[email protected]>
52+
Description:
53+
Get and set the LED current for the specified LED. Y is the
54+
specific LED number.

‎Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/meas_conf
2+
What: /sys/bus/iio/devices/iio:deviceX/meas_conf_available
3+
KernelVersion: 4.5
4+
Contact: [email protected]
5+
Description:
6+
Current configuration and available configurations
7+
for the bias current.
8+
normal - Normal measurement configurations (default)
9+
positivebias - Positive bias configuration
10+
negativebias - Negative bias configuration
11+
disabled - Only available on HMC5983. Disables magnetic
12+
sensor and enables temperature sensor.
13+
Note: The effect of this configuration may vary
14+
according to the device. For exact documentation
15+
check the device's datasheet.

‎Documentation/ABI/testing/sysfs-bus-iio-vf610

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ Description:
55
Specifies the hardware conversion mode used. The three
66
available modes are "normal", "high-speed" and "low-power",
77
where the last is the default mode.
8+
9+
10+
What: /sys/bus/iio/devices/iio:deviceX/out_conversion_mode
11+
KernelVersion: 4.6
12+
Contact: [email protected]
13+
Description:
14+
Specifies the hardware conversion mode used within DAC.
15+
The two available modes are "high-power" and "low-power",
16+
where "low-power" mode is the default mode.

‎Documentation/devicetree/bindings/goldfish/audio.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Android Goldfish Audio
2+
3+
Android goldfish audio device generated by android emulator.
4+
5+
Required properties:
6+
7+
- compatible : should contain "google,goldfish-audio" to match emulator
8+
- reg : <registers mapping>
9+
- interrupts : <interrupt mapping>
10+
11+
Example:
12+
13+
goldfish_audio@9030000 {
14+
compatible = "google,goldfish-audio";
15+
reg = <0x9030000 0x100>;
16+
interrupts = <0x4>;
17+
};

‎Documentation/devicetree/bindings/iio/accel/mma8452.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
Freescale MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC triaxial accelerometer
1+
Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC
2+
triaxial accelerometer
23

34
Required properties:
45

56
- compatible: should contain one of
7+
* "fsl,mma8451"
68
* "fsl,mma8452"
79
* "fsl,mma8453"
810
* "fsl,mma8652"

‎Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
* AT91 SAMA5D2 Analog to Digital Converter (ADC)
2+
3+
Required properties:
4+
- compatible: Should be "atmel,sama5d2-adc".
5+
- reg: Should contain ADC registers location and length.
6+
- interrupts: Should contain the IRQ line for the ADC.
7+
- clocks: phandle to device clock.
8+
- clock-names: Must be "adc_clk".
9+
- vref-supply: Supply used as reference for conversions.
10+
- vddana-supply: Supply for the adc device.
11+
- atmel,min-sample-rate-hz: Minimum sampling rate, it depends on SoC.
12+
- atmel,max-sample-rate-hz: Maximum sampling rate, it depends on SoC.
13+
- atmel,startup-time-ms: Startup time expressed in ms, it depends on SoC.
14+
15+
Example:
16+
17+
adc: adc@fc030000 {
18+
compatible = "atmel,sama5d2-adc";
19+
reg = <0xfc030000 0x100>;
20+
interrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>;
21+
clocks = <&adc_clk>;
22+
clock-names = "adc_clk";
23+
atmel,min-sample-rate-hz = <200000>;
24+
atmel,max-sample-rate-hz = <20000000>;
25+
atmel,startup-time-ms = <4>;
26+
vddana-supply = <&vdd_3v3_lp_reg>;
27+
vref-supply = <&vdd_3v3_lp_reg>;
28+
}

‎Documentation/devicetree/bindings/iio/adc/mcp3422.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Required properties:
66
"microchip,mcp3422" or
77
"microchip,mcp3423" or
88
"microchip,mcp3424" or
9+
"microchip,mcp3425" or
910
"microchip,mcp3426" or
1011
"microchip,mcp3427" or
1112
"microchip,mcp3428"

‎Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
* Texas Instruments' ADC0831/ADC0832/ADC0832/ADC0838
2+
3+
Required properties:
4+
- compatible: Should be one of
5+
* "ti,adc0831"
6+
* "ti,adc0832"
7+
* "ti,adc0834"
8+
* "ti,adc0838"
9+
- reg: spi chip select number for the device
10+
- vref-supply: The regulator supply for ADC reference voltage
11+
- spi-max-frequency: Max SPI frequency to use (< 400000)
12+
13+
Example:
14+
adc@0 {
15+
compatible = "ti,adc0832";
16+
reg = <0>;
17+
vref-supply = <&vdd_supply>;
18+
spi-max-frequency = <200000>;
19+
};

‎Documentation/devicetree/bindings/iio/chemical/atlas,ph-sm.txt

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
* Atlas Scientific pH-SM OEM sensor
2+
3+
http://www.atlas-scientific.com/_files/_datasheets/_oem/pH_oem_datasheet.pdf
4+
5+
Required properties:
6+
7+
- compatible: must be "atlas,ph-sm"
8+
- reg: the I2C address of the sensor
9+
- interrupt-parent: should be the phandle for the interrupt controller
10+
- interrupts: the sole interrupt generated by the device
11+
12+
Refer to interrupt-controller/interrupts.txt for generic interrupt client
13+
node bindings.
14+
15+
Example:
16+
17+
atlas@65 {
18+
compatible = "atlas,ph-sm";
19+
reg = <0x65>;
20+
interrupt-parent = <&gpio1>;
21+
interrupts = <16 2>;
22+
};

‎Documentation/devicetree/bindings/iio/dac/vf610-dac.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
Freescale vf610 Digital to Analog Converter bindings
2+
3+
The devicetree bindings are for the new DAC driver written for
4+
vf610 SoCs from Freescale.
5+
6+
Required properties:
7+
- compatible: Should contain "fsl,vf610-dac"
8+
- reg: Offset and length of the register set for the device
9+
- interrupts: Should contain the interrupt for the device
10+
- clocks: The clock is needed by the DAC controller
11+
- clock-names: Must contain "dac" matching entry in the clocks property.
12+
13+
Example:
14+
dac0: dac@400cc000 {
15+
compatible = "fsl,vf610-dac";
16+
reg = <0x400cc000 0x1000>;
17+
interrupts = <55 IRQ_TYPE_LEVEL_HIGH>;
18+
clock-names = "dac";
19+
clocks = <&clks VF610_CLK_DAC0>;
20+
};

‎Documentation/devicetree/bindings/iio/health/afe4403.txt

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
Texas Instruments AFE4403 Heart rate and Pulse Oximeter
2+
3+
Required properties:
4+
- compatible : Should be "ti,afe4403".
5+
- reg : SPI chip select address of device.
6+
- tx-supply : Regulator supply to transmitting LEDs.
7+
- interrupt-parent : Phandle to he parent interrupt controller.
8+
- interrupts : The interrupt line the device ADC_RDY pin is
9+
connected to. For details refer to,
10+
../../interrupt-controller/interrupts.txt.
11+
12+
Optional properties:
13+
- reset-gpios : GPIO used to reset the device.
14+
For details refer to, ../../gpio/gpio.txt.
15+
16+
For other required and optional properties of SPI slave nodes
17+
please refer to ../../spi/spi-bus.txt.
18+
19+
Example:
20+
21+
&spi0 {
22+
heart_mon@0 {
23+
compatible = "ti,afe4403";
24+
reg = <0>;
25+
spi-max-frequency = <10000000>;
26+
27+
tx-supply = <&vbat>;
28+
29+
interrupt-parent = <&gpio1>;
30+
interrupts = <28 IRQ_TYPE_EDGE_RISING>;
31+
32+
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
33+
};
34+
};

‎Documentation/devicetree/bindings/iio/health/afe4404.txt

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
Texas Instruments AFE4404 Heart rate and Pulse Oximeter
2+
3+
Required properties:
4+
- compatible : Should be "ti,afe4404".
5+
- reg : I2C address of the device.
6+
- tx-supply : Regulator supply to transmitting LEDs.
7+
- interrupt-parent : Phandle to he parent interrupt controller.
8+
- interrupts : The interrupt line the device ADC_RDY pin is
9+
connected to. For details refer to,
10+
../interrupt-controller/interrupts.txt.
11+
12+
Optional properties:
13+
- reset-gpios : GPIO used to reset the device.
14+
For details refer to, ../gpio/gpio.txt.
15+
16+
Example:
17+
18+
&i2c2 {
19+
heart_mon@58 {
20+
compatible = "ti,afe4404";
21+
reg = <0x58>;
22+
23+
tx-supply = <&vbat>;
24+
25+
interrupt-parent = <&gpio1>;
26+
interrupts = <28 IRQ_TYPE_EDGE_RISING>;
27+
28+
reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;
29+
};
30+
};

‎Documentation/devicetree/bindings/iio/health/max30100.txt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ Required properties:
1111
Refer to interrupt-controller/interrupts.txt for generic
1212
interrupt client node bindings.
1313

14+
Optional properties:
15+
- maxim,led-current-microamp: configuration for LED current in microamperes
16+
while the engine is running. First indexed value is the configuration for
17+
the RED LED, and second value is for the IR LED.
18+
19+
Refer to the datasheet for the allowed current values.
20+
1421
Example:
1522

1623
max30100@057 {
1724
compatible = "maxim,max30100";
1825
reg = <57>;
26+
maxim,led-current-microamp = <24000 50000>;
1927
interrupt-parent = <&gpio1>;
2028
interrupts = <16 2>;
2129
};

‎Documentation/devicetree/bindings/iio/light/opt3001.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
* Texas Instruments OPT3001 Ambient Light Sensor
2+
3+
The driver supports interrupt-driven and interrupt-less operation, depending
4+
on whether an interrupt property has been populated into the DT. Note that
5+
the optional generation of IIO events on rising/falling light threshold changes
6+
requires the use of interrupts. Without interrupts, only the simple reading
7+
of the current light value is supported through the IIO API.
8+
9+
http://www.ti.com/product/opt3001
10+
11+
Required properties:
12+
- compatible: should be "ti,opt3001"
13+
- reg: the I2C address of the sensor
14+
15+
Optional properties:
16+
- interrupt-parent: should be the phandle for the interrupt controller
17+
- interrupts: interrupt mapping for GPIO IRQ (configure for falling edge)
18+
19+
Example:
20+
21+
opt3001@44 {
22+
compatible = "ti,opt3001";
23+
reg = <0x44>;
24+
interrupt-parent = <&gpio1>;
25+
interrupts = <28 IRQ_TYPE_EDGE_FALLING>;
26+
};

‎Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ arm ARM Ltd.
2828
armadeus ARMadeus Systems SARL
2929
artesyn Artesyn Embedded Technologies Inc.
3030
asahi-kasei Asahi Kasei Corp.
31+
atlas Atlas Scientific LLC
3132
atmel Atmel Corporation
3233
auo AU Optronics Corporation
3334
avago Avago Technologies

‎Documentation/isdn/00-INDEX

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@ README.FAQ
1616
- general info for FAQ.
1717
README.HiSax
1818
- info on the HiSax driver which replaces the old teles.
19-
README.act2000
20-
- info on driver for IBM ACT-2000 card.
2119
README.audio
2220
- info for running audio over ISDN.
2321
README.avmb1
@@ -34,14 +32,8 @@ README.hfc-pci
3432
- info on hfc-pci based cards.
3533
README.hysdn
3634
- info on driver for Hypercope active HYSDN cards
37-
README.icn
38-
- info on the ICN-ISDN-card and its driver.
3935
README.mISDN
4036
- info on the Modular ISDN subsystem (mISDN)
41-
README.pcbit
42-
- info on the PCBIT-D ISDN adapter and driver.
43-
README.sc
44-
- info on driver for Spellcaster cards.
4537
README.syncppp
4638
- info on running Sync PPP over ISDN.
4739
README.x25

‎drivers/staging/panel/lcd-panel-cgram.txt renamed to ‎Documentation/misc-devices/lcd-panel-cgram.txt

File renamed without changes.

0 commit comments

Comments
 (0)