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

Commit 91f7b5c4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 

* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
  i2c/m41t00: Do not forget to write year
  i2c-mv64xxx: Fix random oops at boot
  i2c: Migration aids for i2c_adapter.dev removal
  i2c-pnx: Add entry to MAINTAINERS
  i2c-pnx: Fix interrupt handler, get rid of EARLY config option
parents af3e095a 81ffbc04

Documentation/feature-removal-schedule.txt

+17 −0
Original line number Diff line number Diff line
@@ -226,6 +226,23 @@ Who: Jean Delvare <khali@linux-fr.org> 


---------------------------



What:	i2c_adapter.dev

	i2c_adapter.list

When:	July 2007

Why:	Superfluous, given i2c_adapter.class_dev:

	  * The "dev" was a stand-in for the physical device node that legacy

	    drivers would not have; but now it's almost always present.  Any

	    remaining legacy drivers must upgrade (they now trigger warnings).

	  * The "list" duplicates class device children.

	The delay in removing this is so upgraded lm_sensors and libsensors

	can get deployed.  (Removal causes minor changes in the sysfs layout,

	notably the location of the adapter type name and parenting the i2c

	client hardware directly from their controller.)

Who:	Jean Delvare <khali@linux-fr.org>,

	David Brownell <dbrownell@users.sourceforge.net>



---------------------------



What:	IPv4 only connection tracking/NAT/helpers

When:	2.6.22

Why:	The new layer 3 independant connection tracking replaces the old

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,12 @@ P: Adam Belay 
M:	ambx1@neo.rr.com

S:	Maintained



PNXxxxx I2C DRIVER

P:	Vitaly Wool

M:	vitalywool@gmail.com

L:	i2c@lm-sensors.org

S:	Maintained



PPP PROTOCOL DRIVERS AND COMPRESSORS

P:	Paul Mackerras

M:	paulus@samba.org

drivers/i2c/busses/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -564,13 +564,4 @@ config I2C_PNX 
	  This driver can also be built as a module.  If so, the module

	  will be called i2c-pnx.



config I2C_PNX_EARLY

	bool "Early initialization for I2C on PNXxxxx"

	depends on I2C_PNX=y

	help

	  Under certain circumstances one may need to make sure I2C on PNXxxxx

	  is initialized earlier than some other driver that depends on it

	  (for instance, that might be USB in case of PNX4008). With this

	  option turned on you can guarantee that.



endmenu

drivers/i2c/busses/i2c-mv64xxx.c

+2 −2
Original line number Diff line number Diff line
@@ -529,6 +529,8 @@ mv64xxx_i2c_probe(struct platform_device *pd) 
	platform_set_drvdata(pd, drv_data);

	i2c_set_adapdata(&drv_data->adapter, drv_data);



	mv64xxx_i2c_hw_init(drv_data);



	if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0,

			MV64XXX_I2C_CTLR_NAME, drv_data)) {

		dev_err(&drv_data->adapter.dev,
@@ -542,8 +544,6 @@ mv64xxx_i2c_probe(struct platform_device *pd) 
		goto exit_free_irq;

	}



	mv64xxx_i2c_hw_init(drv_data);



	return 0;



	exit_free_irq:

drivers/i2c/busses/i2c-pnx.c

+1 −6
Original line number Diff line number Diff line
@@ -305,8 +305,7 @@ static int i2c_pnx_master_rcv(struct i2c_adapter *adap) 
	return 0;

}



static irqreturn_t

i2c_pnx_interrupt(int irq, void *dev_id, struct pt_regs *regs)

static irqreturn_t i2c_pnx_interrupt(int irq, void *dev_id)

{

	u32 stat, ctl;

	struct i2c_adapter *adap = dev_id;
@@ -699,10 +698,6 @@ MODULE_AUTHOR("Vitaly Wool, Dennis Kovalev <source@mvista.com>"); 
MODULE_DESCRIPTION("I2C driver for Philips IP3204-based I2C busses");

MODULE_LICENSE("GPL");



#ifdef CONFIG_I2C_PNX_EARLY

/* We need to make sure I2C is initialized before USB */

subsys_initcall(i2c_adap_pnx_init);

#else

mudule_init(i2c_adap_pnx_init);

#endif

module_exit(i2c_adap_pnx_exit);