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

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



Pull Char/Misc patches from Greg Kroah-Hartman:
 "Here are a few various char/misc tree patches for the 3.5-rc1 merge
  window.

  Nothing major here at all, just different driver updates and some
  parport dead code removal.

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

* tag 'char-misc-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
  parport: remove unused dead code from lowlevel drivers
  xilinx_hwicap: reset XHI_MAX_RETRIES
  xilinx_hwicap: add support for virtex6 FPGAs
  Support M95040 SPI EEPROM
  misc: add support for bmp18x chips to the bmp085 driver
  misc: bmp085: add device tree properties
  misc: clean up bmp085 driver
  misc: do not mark exported functions __devexit
  misc: add missing __devexit_p() annotations
  pch_phub: delete duplicate definitions
  misc: Fix irq leak in max8997_muic_probe error path
parents a4819914 99121438

Documentation/devicetree/bindings/misc/bmp085.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
BMP085/BMP18x digital pressure sensors



Required properties:

- compatible: bosch,bmp085



Optional properties:

- chip-id: configurable chip id for non-default chip revisions

- temp-measurement-period: temperature measurement period (milliseconds)

- default-oversampling: default oversampling value to be used at startup,

  value range is 0-3 with rising sensitivity.



Example:



pressure@77 {

	compatible = "bosch,bmp085";

	reg = <0x77>;

	chip-id = <10>;

	temp-measurement-period = <100>;

	default-oversampling = <2>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ amcc Applied Micro Circuits Corporation (APM, formally AMCC) 
apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

atmel	Atmel Corporation

bosch	Bosch Sensortec GmbH

cavium	Cavium, Inc.

chrp	Common Hardware Reference Platform

cortina	Cortina Systems, Inc.

drivers/char/xilinx_hwicap/xilinx_hwicap.c

+30 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static const struct config_registers v4_config_registers = { 
	.BOOTSTS = UNIMPLEMENTED,

	.CTL_1 = UNIMPLEMENTED,

};



static const struct config_registers v5_config_registers = {

	.CRC = 0,

	.FAR = 1,
@@ -192,6 +193,31 @@ static const struct config_registers v5_config_registers = { 
	.CTL_1 = 19,

};



static const struct config_registers v6_config_registers = {

	.CRC = 0,

	.FAR = 1,

	.FDRI = 2,

	.FDRO = 3,

	.CMD = 4,

	.CTL = 5,

	.MASK = 6,

	.STAT = 7,

	.LOUT = 8,

	.COR = 9,

	.MFWR = 10,

	.FLR = UNIMPLEMENTED,

	.KEY = UNIMPLEMENTED,

	.CBC = 11,

	.IDCODE = 12,

	.AXSS = 13,

	.C0R_1 = 14,

	.CSOB = 15,

	.WBSTAR = 16,

	.TIMER = 17,

	.BOOTSTS = 22,

	.CTL_1 = 24,

};



/**

 * hwicap_command_desync - Send a DESYNC command to the ICAP port.

 * @drvdata: a pointer to the drvdata.
@@ -744,6 +770,8 @@ static int __devinit hwicap_of_probe(struct platform_device *op, 
			regs = &v4_config_registers;

		} else if (!strcmp(family, "virtex5")) {

			regs = &v5_config_registers;

		} else if (!strcmp(family, "virtex6")) {

			regs = &v6_config_registers;

		}

	}

	return hwicap_setup(&op->dev, id ? *id : -1, &res, config,
@@ -785,6 +813,8 @@ static int __devinit hwicap_drv_probe(struct platform_device *pdev) 
			regs = &v4_config_registers;

		} else if (!strcmp(family, "virtex5")) {

			regs = &v5_config_registers;

		} else if (!strcmp(family, "virtex6")) {

			regs = &v6_config_registers;

		}

	}

drivers/char/xilinx_hwicap/xilinx_hwicap.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct hwicap_driver_config { 
};



/* Number of times to poll the done regsiter */

#define XHI_MAX_RETRIES     10

#define XHI_MAX_RETRIES     5000



/************ Constant Definitions *************/

drivers/misc/Kconfig

+22 −4
Original line number Diff line number Diff line
@@ -452,14 +452,32 @@ config ARM_CHARLCD 
	  still useful.



config BMP085

	tristate "BMP085 digital pressure sensor"

	bool

	depends on SYSFS



config BMP085_I2C

	tristate "BMP085 digital pressure sensor on I2C"

	select BMP085

	select REGMAP_I2C

	depends on I2C && SYSFS

	help

	  If you say yes here you get support for the Bosch Sensortec

	  BMP085 digital pressure sensor.

	  Say Y here if you want to support Bosch Sensortec's digital pressure

	  sensor hooked to an I2C bus.



	  To compile this driver as a module, choose M here: the

	  module will be called bmp085-i2c.



config BMP085_SPI

	tristate "BMP085 digital pressure sensor on SPI"

	select BMP085

	select REGMAP_SPI

	depends on SPI_MASTER && SYSFS

	help

	  Say Y here if you want to support Bosch Sensortec's digital pressure

	  sensor hooked to an SPI bus.



	  To compile this driver as a module, choose M here: the

	  module will be called bmp085.

	  module will be called bmp085-spi.



config PCH_PHUB

	tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB"

CRA Git | Maintained and supported by SUSTech CRA and CCSE