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

Commit 3aebd34b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull char/misc driver merge from Greg Kroah-Hartman:
 "Here is the "big" char/misc driver tree update for the 3.7-rc1 merge
  window.

  Nothing major, just a number of driver updates and fixes, all of which
  have been in the linux-next releases for a while now either in my
  tree, or in Andrew's (the lis3l driver changes came from his tree last
  week).

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

* tag 'char-misc-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (52 commits)
  drivers/misc/lis3lv02d/lis3lv02d_i2c.c: add lis3lv02d device tree init
  drivers/misc/lis3lv02d/lis3lv02d_spi.c: add lis3lv02d device tree init
  drivers/misc/lis3lv02d: remove lis3lv02d driver DT init
  drivers/misc/lis3lv02d/lis3lv02d_spi.c: add DT matching table passthru code
  drivers/misc/lis3lv02d: add generic DT matching code
  lis3lv02d: fix some comments specific to lis331dlh driver
  MISC: hpilo, remove pci_disable_device
  pcmcia: synclink_cs: fix potential tty NULL dereference
  drivers/char/mmtimer.c: Remove useless kfree
  drivers/char: removes unnecessary semicolon
  char/misc: remove CONFIG_EXPERIMENTAL dependencies
  mei: don't print buffer as a string
  mei: struct mei_message_data doesn't have to be packed
  mei: add error messages for open count errors
  misc: use module_spi_driver
  tifm: use module_pci_driver
  misc/at25, dt: Improve at25 SPI eeprom device tree bindings.
  mei: add lynx point pci device ids
  mei: fix max number of open handles
  mei: rename struct pci_dev *mei_device to mei_pdev
  ...
parents 2c0c86d5 5dc2db05

Documentation/devicetree/bindings/misc/at25.txt

+24 −10
Original line number Diff line number Diff line 
Atmel AT25 eeprom

EEPROMs (SPI) compatible with Atmel at25.



Required properties:

- compatible : "atmel,at25".

- reg : chip select number

- spi-max-frequency : max spi frequency to use

- pagesize : size of the eeprom page

- size : total eeprom size in bytes

- address-width : number of address bits (one of 8, 16, or 24)



Optional properties:

- spi-cpha : SPI shifted clock phase, as per spi-bus bindings.

- spi-cpol : SPI inverse clock polarity, as per spi-bus bindings.

- read-only : this parameter-less property disables writes to the eeprom



Obsolete legacy properties are can be used in place of "size", "pagesize",

"address-width", and "read-only":

- at25,byte-len : total eeprom size in bytes

- at25,addr-mode : addr-mode flags, as defined in include/linux/spi/eeprom.h

- at25,page-size : size of the eeprom page



Examples:

Additional compatible properties are also allowed.



Example:

	at25@0 {

	compatible = "atmel,at25";

		compatible = "atmel,at25", "st,m95256";

		reg = <0>

		spi-max-frequency = <5000000>;

		spi-cpha;

		spi-cpol;



	at25,byte-len = <0x8000>;

	at25,addr-mode = <2>;

	at25,page-size = <64>;

		pagesize = <64>;

		size = <32768>;

		address-width = <16>;

	};

Documentation/devicetree/bindings/misc/lis302.txt

0 → 100644
+112 −0
Original line number Diff line number Diff line 
LIS302 accelerometer devicetree bindings



This device is matched via its bus drivers, and has a number of properties

that apply in on the generic device (independent from the bus).





Required properties for the SPI bindings:

 - compatible: 		should be set to "st,lis3lv02d_spi"

 - reg:			the chipselect index

 - spi-max-frequency:	maximal bus speed, should be set to 1000000 unless

			constrained by external circuitry

 - interrupts:		the interrupt generated by the device



Required properties for the I2C bindings:

 - compatible:		should be set to "st,lis3lv02d"

 - reg:			i2c slave address

 - Vdd-supply:		The input supply for Vdd

 - Vdd_IO-supply:	The input supply for Vdd_IO





Optional properties for all bus drivers:



 - st,click-single-{x,y,z}:	if present, tells the device to issue an

				interrupt on single click events on the

				x/y/z axis.

 - st,click-double-{x,y,z}:	if present, tells the device to issue an

				interrupt on double click events on the

				x/y/z axis.

 - st,click-thresh-{x,y,z}:	set the x/y/z axis threshold

 - st,click-click-time-limit:	click time limit, from 0 to 127.5msec

				with step of 0.5 msec

 - st,click-latency:		click latency, from 0 to 255 msec with

				step of 1 msec.

 - st,click-window:		click window, from 0 to 255 msec with

				step of 1 msec.

 - st,irq{1,2}-disable:		disable IRQ 1/2

 - st,irq{1,2}-ff-wu-1:		raise IRQ 1/2 on FF_WU_1 condition

 - st,irq{1,2}-ff-wu-2:		raise IRQ 1/2 on FF_WU_2 condition

 - st,irq{1,2}-data-ready:	raise IRQ 1/2 on data ready contition

 - st,irq{1,2}-click:		raise IRQ 1/2 on click condition

 - st,irq-open-drain:		consider IRQ lines open-drain

 - st,irq-active-low:		make IRQ lines active low

 - st,wu-duration-1:		duration register for Free-Fall/Wake-Up

				interrupt 1

 - st,wu-duration-2:		duration register for Free-Fall/Wake-Up

				interrupt 2

 - st,wakeup-{x,y,z}-{lo,hi}:	set wakeup condition on x/y/z axis for

				upper/lower limit

 - st,highpass-cutoff-hz=:	1, 2, 4 or 8 for 1Hz, 2Hz, 4Hz or 8Hz of

				highpass cut-off frequency

 - st,hipass{1,2}-disable:	disable highpass 1/2.

 - st,default-rate=:		set the default rate

 - st,axis-{x,y,z}=:		set the axis to map to the three coordinates

 - st,{min,max}-limit-{x,y,z}	set the min/max limits for x/y/z axis

				(used by self-test)





Example for a SPI device node:



	lis302@0 {

		compatible = "st,lis302dl-spi";

		reg = <0>;

		spi-max-frequency = <1000000>;

		interrupt-parent = <&gpio>;

		interrupts = <104 0>;



		st,click-single-x;

		st,click-single-y;

		st,click-single-z;

		st,click-thresh-x = <10>;

		st,click-thresh-y = <10>;

		st,click-thresh-z = <10>;

		st,irq1-click;

		st,irq2-click;

		st,wakeup-x-lo;

		st,wakeup-x-hi;

		st,wakeup-y-lo;

		st,wakeup-y-hi;

		st,wakeup-z-lo;

		st,wakeup-z-hi;

	};



Example for a I2C device node:



	lis331dlh: lis331dlh@18 {

		compatible = "st,lis331dlh", "st,lis3lv02d";

		reg = <0x18>;

		Vdd-supply = <&lis3_reg>;

		Vdd_IO-supply = <&lis3_reg>;



		st,click-single-x;

		st,click-single-y;

		st,click-single-z;

		st,click-thresh-x = <10>;

		st,click-thresh-y = <10>;

		st,click-thresh-z = <10>;

		st,irq1-click;

		st,irq2-click;

		st,wakeup-x-lo;

		st,wakeup-x-hi;

		st,wakeup-y-lo;

		st,wakeup-y-hi;

		st,wakeup-z-lo;

		st,wakeup-z-hi;

		st,min-limit-x = <120>;

		st,min-limit-y = <120>;

		st,min-limit-z = <140>;

		st,max-limit-x = <550>;

		st,max-limit-y = <550>;

		st,max-limit-z = <750>;

	};

Documentation/devicetree/bindings/w1/w1-gpio.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
w1-gpio devicetree bindings



Required properties:



 - compatible: "w1-gpio"

 - gpios: one or two GPIO specs:

		- the first one is used as data I/O pin

		- the second one is optional. If specified, it is used as

		  enable pin for an external pin pullup.



Optional properties:



 - linux,open-drain: if specified, the data pin is considered in

		     open-drain mode.



Examples:



	onewire@0 {

		compatible = "w1-gpio";

		gpios = <&gpio 126 0>, <&gpio 105 0>;

	};

Documentation/misc-devices/lis3lv02d

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Kernel driver lis3lv02d 
Supported chips:



  * STMicroelectronics LIS3LV02DL, LIS3LV02DQ (12 bits precision)

  * STMicroelectronics LIS302DL, LIS3L02DQ, LIS331DL (8 bits)

  * STMicroelectronics LIS302DL, LIS3L02DQ, LIS331DL (8 bits) and

    LIS331DLH (16 bits)



Authors:

        Yan Burman <burman.yan@gmail.com>

drivers/char/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -418,8 +418,8 @@ config APPLICOM 
	  If unsure, say N.



config SONYPI

	tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT

	tristate "Sony Vaio Programmable I/O Control Device support"

	depends on X86 && PCI && INPUT && !64BIT

	---help---

	  This driver enables access to the Sony Programmable I/O Control

	  Device which can be found in many (all ?) Sony Vaio laptops.
@@ -566,7 +566,7 @@ source "drivers/char/tpm/Kconfig" 


config TELCLOCK

	tristate "Telecom clock driver for ATCA SBC"

	depends on EXPERIMENTAL && X86

	depends on X86

	default n

	help

	  The telecom clock device is specific to the MPCBL0010 and MPCBL0050