Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2ecc3d0 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'staging-4.15-rc1' into v4l_for_linus 



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: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parents b1cb7372 c14dd9d5

Documentation/ABI/testing/sysfs-bus-iio

+4 −3
Original line number Diff line number Diff line
@@ -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,
@@ -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

Documentation/ABI/testing/sysfs-bus-iio-cros-ec

+10 −0
Original line number Diff line number Diff line
@@ -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.

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+8 −0
Original line number Diff line number Diff line
@@ -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

Documentation/core-api/kernel-api.rst

+0 −14
Original line number Diff line number Diff line
@@ -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:

Documentation/devicetree/bindings/iio/adc/mcp320x.txt

+14 −0
Original line number Diff line number Diff line
@@ -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>;

	};

};