Skip to content

Commit

Permalink
Merge tag 'staging-4.15-rc1' into v4l_for_linus
Browse files Browse the repository at this point in the history 
There are some conflicts between staging and media trees,
as reported by Stephen Rothwell <sfr@canb.auug.org.au>.

So, merge from staging.

* tag 'staging-4.15-rc1': (775 commits)
  staging: lustre: add SPDX identifiers to all lustre files
  staging: greybus: Remove redundant license text
  staging: greybus: add SPDX identifiers to all greybus driver files
  staging: ccree: simplify ioread/iowrite
  staging: ccree: simplify registers access
  staging: ccree: simplify error handling logic
  staging: ccree: remove dead code
  staging: ccree: handle limiting of DMA masks
  staging: ccree: copy IV to DMAable memory
  staging: fbtft: remove redundant initialization of buf
  staging: sm750fb: Fix parameter mistake in poke32
  staging: wilc1000: Fix bssid buffer offset in Txq
  staging: fbtft: fb_ssd1331: fix mirrored display
  staging: android: Fix checkpatch.pl error
  staging: greybus: loopback: convert loopback to use generic async operations
  staging: greybus: operation: add private data with get/set accessors
  staging: greybus: loopback: Fix iteration count on async path
  staging: greybus: loopback: Hold per-connection mutex across operations
  staging: greybus/loopback: use ktime_get() for time intervals
  staging: fsl-dpaa2/eth: Extra headroom in RX buffers
  ...

Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
  • Loading branch information
@mchehab
mchehab committed Nov 14, 2017
2 parents b1cb737 + c14dd9d commit f2ecc3d
Show file tree
Hide file tree
Showing 1,302 changed files with 12,056 additions and 9,850 deletions.
7 changes: 4 additions & 3 deletions Documentation/ABI/testing/sysfs-bus-iio
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,7 @@ Description:
Specifies the output powerdown mode.
DAC output stage is disconnected from the amplifier and
1kohm_to_gnd: connected to ground via an 1kOhm resistor,
2.5kohm_to_gnd: connected to ground via a 2.5kOhm resistor,
6kohm_to_gnd: connected to ground via a 6kOhm resistor,
20kohm_to_gnd: connected to ground via a 20kOhm resistor,
90kohm_to_gnd: connected to ground via a 90kOhm resistor,
Expand Down Expand Up @@ -1242,9 +1243,9 @@ What: /sys/.../iio:deviceX/in_distance_raw
KernelVersion: 4.0
Contact: linux-iio@vger.kernel.org
Description:
This attribute is used to read the distance covered by the user
since the last reboot while activated. Units after application
of scale are meters.
This attribute is used to read the measured distance to an object
or the distance covered by the user since the last reboot while
activated. Units after application of scale are meters.

What: /sys/bus/iio/devices/iio:deviceX/store_eeprom
KernelVersion: 3.4.0
Expand Down
10 changes: 10 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio-cros-ec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,13 @@ Description:
the motion sensor is placed. For example, in a laptop a motion
sensor can be located on the base or on the lid. Current valid
values are 'base' and 'lid'.

What: /sys/bus/iio/devices/iio:deviceX/id
Date: Septembre 2017
KernelVersion: 4.14
Contact: linux-iio@vger.kernel.org
Description:
This attribute is exposed by the CrOS EC legacy accelerometer
driver and represents the sensor ID as exposed by the EC. This
ID is used by the Android sensor service hardware abstraction
layer (sensor HAL) through the Android container on ChromeOS.
8 changes: 8 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@ Description:
Show or set the gain boost of the amp, from 0-31 range.
18 = indoors (default)
14 = outdoors

What /sys/bus/iio/devices/iio:deviceX/noise_level_tripped
Date: May 2017
KernelVersion: 4.13
Contact: Matt Ranostay <matt.ranostay@konsulko.com>
Description:
When 1 the noise level is over the trip level and not reporting
valid data
14 changes: 0 additions & 14 deletions Documentation/core-api/kernel-api.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,44 +352,30 @@ Read-Copy Update (RCU)
----------------------

.. kernel-doc:: include/linux/rcupdate.h
:external:

.. kernel-doc:: include/linux/rcupdate_wait.h
:external:

.. kernel-doc:: include/linux/rcutree.h
:external:

.. kernel-doc:: kernel/rcu/tree.c
:external:

.. kernel-doc:: kernel/rcu/tree_plugin.h
:external:

.. kernel-doc:: kernel/rcu/tree_exp.h
:external:

.. kernel-doc:: kernel/rcu/update.c
:external:

.. kernel-doc:: include/linux/srcu.h
:external:

.. kernel-doc:: kernel/rcu/srcutree.c
:external:

.. kernel-doc:: include/linux/rculist_bl.h
:external:

.. kernel-doc:: include/linux/rculist.h
:external:

.. kernel-doc:: include/linux/rculist_nulls.h
:external:

.. kernel-doc:: include/linux/rcu_sync.h
:external:

.. kernel-doc:: kernel/rcu/sync.c
:external:

14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/iio/adc/mcp320x.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,29 @@ Required properties:
"microchip,mcp3204"
"microchip,mcp3208"
"microchip,mcp3301"
"microchip,mcp3550-50"
"microchip,mcp3550-60"
"microchip,mcp3551"
"microchip,mcp3553"

NOTE: The use of the compatibles with no vendor prefix
is deprecated and only listed because old DT use them.

- spi-cpha, spi-cpol (boolean):
Either SPI mode (0,0) or (1,1) must be used, so specify
none or both of spi-cpha, spi-cpol. The MCP3550/1/3
is more efficient in mode (1,1) as only 3 instead of
4 bytes need to be read from the ADC, but not all SPI
masters support it.

- vref-supply: Phandle to the external reference voltage supply.

Examples:
spi_controller {
mcp3x0x@0 {
compatible = "mcp3002";
reg = <0>;
spi-max-frequency = <1000000>;
vref-supply = <&vref_reg>;
};
};
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/iio/adc/mt6577_auxadc.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ for the Thermal Controller which holds a phandle to the AUXADC.
Required properties:
- compatible: Should be one of:
- "mediatek,mt2701-auxadc": For MT2701 family of SoCs
- "mediatek,mt2712-auxadc": For MT2712 family of SoCs
- "mediatek,mt7622-auxadc": For MT7622 family of SoCs
- "mediatek,mt8173-auxadc": For MT8173 family of SoCs
- reg: Address range of the AUXADC unit.
Expand Down
20 changes: 20 additions & 0 deletions Documentation/devicetree/bindings/iio/dac/ds4424.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Maxim Integrated DS4422/DS4424 7-bit Sink/Source Current DAC Device Driver

Datasheet publicly available at:
https://datasheets.maximintegrated.com/en/ds/DS4422-DS4424.pdf

Required properties:
- compatible: Should be one of
maxim,ds4422
maxim,ds4424
- reg: Should contain the DAC I2C address

Optional properties:
- vcc-supply: Power supply is optional. If not defined, driver will ignore it.

Example:
ds4224@10 {
compatible = "maxim,ds4424";
reg = <0x10>; /* When A0, A1 pins are ground */
vcc-supply = <&vcc_3v3>;
};
34 changes: 34 additions & 0 deletions Documentation/devicetree/bindings/iio/dac/ti-dac082s085.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
Texas Instruments 8/10/12-bit 2/4-channel DAC driver

Required properties:
- compatible: Must be one of:
"ti,dac082s085"
"ti,dac102s085"
"ti,dac122s085"
"ti,dac084s085"
"ti,dac104s085"
"ti,dac124s085"
- reg: Chip select number.
- spi-cpha, spi-cpol: SPI mode (0,1) or (1,0) must be used, so specify
either spi-cpha or spi-cpol (but not both).
- vref-supply: Phandle to the external reference voltage supply.

For other required and optional properties of SPI slave nodes please refer to
../../spi/spi-bus.txt.

Example:
vref_2v5_reg: regulator-vref {
compatible = "regulator-fixed";
regulator-name = "2v5";
regulator-min-microvolt = <2500000>;
regulator-max-microvolt = <2500000>;
regulator-always-on;
};

dac@0 {
compatible = "ti,dac082s085";
reg = <0>;
spi-max-frequency = <40000000>;
spi-cpol;
vref-supply = <&vref_2v5_reg>;
};
4 changes: 2 additions & 2 deletions Documentation/devicetree/bindings/iio/health/max30100.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Optional properties:

Example:

max30100@057 {
max30100@57 {
compatible = "maxim,max30100";
reg = <57>;
reg = <0x57>;
maxim,led-current-microamp = <24000 50000>;
interrupt-parent = <&gpio1>;
interrupts = <16 2>;
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/iio/health/max30102.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Optional properties:

Example:

max30100@57 {
max30102@57 {
compatible = "maxim,max30102";
reg = <0x57>;
maxim,red-led-current-microamp = <7000>;
Expand Down
5 changes: 5 additions & 0 deletions Documentation/devicetree/bindings/iio/proximity/as3935.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ Optional properties:
- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping
value 0 - 120pF. This will require using the calibration data from
the manufacturer.
- ams,nflwdth: Set the noise and watchdog threshold register on
startup. This will need to set according to the noise from the
MCU board, and possibly the local environment. Refer to the
datasheet for the threshold settings.

Example:

Expand All @@ -27,4 +31,5 @@ as3935@0 {
interrupt-parent = <&gpio1>;
interrupts = <16 1>;
ams,tuning-capacitor-pf = <80>;
ams,nflwdth = <0x44>;
};
4 changes: 4 additions & 0 deletions Documentation/devicetree/bindings/iio/st-sensors.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ Accelerometers:
- st,h3lis331dl-accel
- st,lng2dm-accel
- st,lis3l02dq
- st,lis2dw12
- st,lis3dhh

Gyroscopes:
- st,l3g4200d-gyro
Expand All @@ -71,3 +73,5 @@ Pressure sensors:
- st,lps25h-press
- st,lps331ap-press
- st,lps22hb-press
- st,lps33hw
- st,lps35hw
6 changes: 3 additions & 3 deletions Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Examples:
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c200000 0 0x200000>;
reg = <0x0 0x2c200000 0 0x20000>;
};
};

Expand All @@ -124,14 +124,14 @@ Examples:
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c200000 0 0x200000>;
reg = <0x0 0x2c200000 0 0x20000>;
};

gic-its@2c400000 {
compatible = "arm,gic-v3-its";
msi-controller;
#msi-cells = <1>;
reg = <0x0 0x2c400000 0 0x200000>;
reg = <0x0 0x2c400000 0 0x20000>;
};

ppi-partitions {
Expand Down
1 change: 1 addition & 0 deletions Documentation/process/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Below are the essential guides that every developer should read.
submitting-patches
coding-style
email-clients
kernel-enforcement-statement

Other guides to the community that are of interest to most developers are:

Expand Down
Loading

0 comments on commit f2ecc3d

Please sign in to comment.