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

Commit 7da59d2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge v3.6-rc3 into 'char-misc-next' 



This resolves a conflict in:
	drivers/misc/mei/interrupt.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents fea7a08a 877cdf39

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>;

	};

drivers/char/tlclk.c

+3 −1
Original line number Diff line number Diff line
@@ -784,8 +784,10 @@ static int __init tlclk_init(void) 
	}

	tlclk_major = ret;

	alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL);

	if (!alarm_events)

	if (!alarm_events) {

		ret = -ENOMEM;

		goto out1;

	}



	/* Read telecom clock IRQ number (Set by BIOS) */

	if (!request_region(TLCLK_BASE, 8, "telco_clock")) {

drivers/misc/bmp085-i2c.c

+0 −7
Original line number Diff line number Diff line
@@ -57,12 +57,6 @@ static int bmp085_i2c_remove(struct i2c_client *client) 
	return bmp085_remove(&client->dev);

}



static const struct of_device_id bmp085_of_match[] = {

	{ .compatible = "bosch,bmp085", },

	{ },

};

MODULE_DEVICE_TABLE(of, bmp085_of_match);



static const struct i2c_device_id bmp085_id[] = {

	{ BMP085_NAME, 0 },

	{ "bmp180", 0 },
@@ -74,7 +68,6 @@ static struct i2c_driver bmp085_i2c_driver = { 
	.driver = {

		.owner	= THIS_MODULE,

		.name	= BMP085_NAME,

		.of_match_table = bmp085_of_match

	},

	.id_table	= bmp085_id,

	.probe		= bmp085_i2c_probe,

drivers/misc/carma/carma-fpga-program.c

+0 −1
Original line number Diff line number Diff line
@@ -978,7 +978,6 @@ static int fpga_of_probe(struct platform_device *op) 
	dev_set_drvdata(priv->dev, priv);

	dma_cap_zero(mask);

	dma_cap_set(DMA_MEMCPY, mask);

	dma_cap_set(DMA_INTERRUPT, mask);

	dma_cap_set(DMA_SLAVE, mask);

	dma_cap_set(DMA_SG, mask);

drivers/misc/carma/carma-fpga.c

+1 −1
Original line number Diff line number Diff line
@@ -666,7 +666,7 @@ static int data_submit_dma(struct fpga_device *priv, struct data_buf *buf) 
	src = SYS_FPGA_BLOCK;

	tx = chan->device->device_prep_dma_memcpy(chan, dst, src,

						  REG_BLOCK_SIZE,

						  DMA_PREP_INTERRUPT);

						  0);

	if (!tx) {

		dev_err(priv->dev, "unable to prep SYS-FPGA DMA\n");

		return -ENOMEM;