Commit b9af5643 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging updates from Greg KH:
 "Here is the big staging patch set for 3.18-rc1.

  Once again, we are deleting more code than we added, with something
  like 150000 lines deleted overall.  Some of this is due to drivers
  being added to the networking tree, so the old versions are removed
  here, but even then, the overall difference is quite good.

  Other than driver deletions, lots and lots and lots of minor cleanups
  all over the place.  Full details are in the changelog"

* tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1481 commits)
  staging: et131x: Remove et131x driver from drivers/staging
  staging: emxx_udc: Use min_t instead of min
  staging: emxx_udc: Fix replace printk(KERN_DEBUG ..) with dev_dbg
  staging: media: Fixed else after return or break warning
  staging: media: omap4iss: Fixed else after return or break warning
  staging: rtl8712: Fixed else not required after return
  staging: rtl8712: Fix missing blank line warning
  staging: rtl8192e: rtl8192e: Remove spaces before the semicolons
  staging: rtl8192e: rtl8192e: Remove unnecessary return statements
  staging: rtl8192e: Remove unneeded void return
  staging: rtl8192e: Fix void function return statements style
  staging: rtl8712: Fix unnecessary parentheses style warning
  staging: rtl8192e: Fix unnecessary space before function pointer arguments
  staging: rtl8192e: Array was made static const char * const
  staging: ft1000: ft1000-usb: Removed unnecessary else statement.
  staging: ft1000: ft1000-usb: Removed unnecessary else statement.
  staging: ft1000: ft1000-usb: Removed unnecessary parentheses.
  staging: ft1000: ft1000-usb: Added new line after declarations.
  staging: vt6655: Fixed C99 // comment errors in wpactl.c
  staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>
  ...
parents 46331196 e6039848

Documentation/ABI/testing/sysfs-bus-iio-accel-bmc150

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/name = "bmc150_accel-any-motion-devX"

KernelVersion:	3.17

Contact:	linux-iio@vger.kernel.org

Description:

		The BMC150 accelerometer kernel module provides an additional trigger,

		which sets driver in a mode, where data is pushed to the buffer

		only when there is any motion.

Documentation/ABI/testing/sysfs-bus-iio-gyro-bmg160

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/name = "bmg160-any-motion-devX"

KernelVersion:	3.17

Contact:	linux-iio@vger.kernel.org

Description:

		The BMG160 gyro kernel module provides an additional trigger,

		which sets driver in a mode, where data is pushed to the buffer

		only when there is any motion.

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+15 −3
Original line number Diff line number Diff line
@@ -11,13 +11,25 @@ New driver handles the following 


Required properties:

- compatible:		Must be "samsung,exynos-adc-v1"

				for exynos4412/5250 controllers.

				for exynos4412/5250 and s5pv210 controllers.

			Must be "samsung,exynos-adc-v2" for

				future controllers.

			Must be "samsung,exynos3250-adc" for

				controllers compatible with ADC of Exynos3250.

- reg:			Contains ADC register address range (base address and

			length) and the address of the phy enable register.

			Must be "samsung,s3c2410-adc" for

				the ADC in s3c2410 and compatibles

			Must be "samsung,s3c2416-adc" for

				the ADC in s3c2416 and compatibles

			Must be "samsung,s3c2440-adc" for

				the ADC in s3c2440 and compatibles

			Must be "samsung,s3c2443-adc" for

				the ADC in s3c2443 and compatibles

			Must be "samsung,s3c6410-adc" for

				the ADC in s3c6410 and compatibles

- reg:			List of ADC register address range

			- The base address and range of ADC register

			- The base address and range of ADC_PHY register (every

			  SoC except for s3c24xx/s3c64xx ADC)

- interrupts: 		Contains the interrupt information for the timer. The

			format is being dependent on which interrupt controller

			the Samsung device uses.

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Rockchip Successive Approximation Register (SAR) A/D Converter bindings



Required properties:

- compatible: Should be "rockchip,saradc"

- reg: physical base address of the controller and length of memory mapped

       region.

- interrupts: The interrupt number to the cpu. The interrupt specifier format

              depends on the interrupt controller.

- clocks: Must contain an entry for each entry in clock-names.

- clock-names: Shall be "saradc" for the converter-clock, and "apb_pclk" for

               the peripheral clock.

- vref-supply: The regulator supply ADC reference voltage.

- #io-channel-cells: Should be 1, see ../iio-bindings.txt



Example:

	saradc: saradc@2006c000 {

		compatible = "rockchip,saradc";

		reg = <0x2006c000 0x100>;

		interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>;

		clock-names = "saradc", "apb_pclk";

		#io-channel-cells = <1>;

		vref-supply = <&vcc18>;

	};

Documentation/devicetree/bindings/iio/dac/max5821.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
Maxim max5821 DAC device driver



Required properties:

	- compatible: Must be "maxim,max5821"

	- reg: Should contain the DAC I2C address

	- vref-supply: Phandle to the vref power supply



Example:



	max5821@38 {

		compatible = "maxim,max5821";

		reg = <0x38>;

		vref-supply = <&reg_max5821>;

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE