X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Flinux%2Fetrax%2Fpatches-2.6.30%2F500-i2c_gvc.patch;h=115fd1c9b9528cb8477ce8f010da22d9fb36ff2d;hb=30d1329e802aab85af636daa4eaf6d81d3c66bc2;hp=dc63165c5e490051f47b0227dfd3e20c1eda4482;hpb=0a359982df3443a800795f19a2c1cb6cf86c2c17;p=openwrt-10.03%2F.git

diff --git a/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch b/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch
index dc63165c5..115fd1c9b 100644
--- a/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch
+++ b/target/linux/etrax/patches-2.6.30/500-i2c_gvc.patch
@@ -1,6 +1,8 @@
---- a/arch/cris/arch-v10/drivers/Kconfig
-+++ b/arch/cris/arch-v10/drivers/Kconfig
-@@ -450,11 +450,18 @@ config ETRAX_I2C
+Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig
+===================================================================
+--- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Kconfig	2009-10-02 11:31:49.000000000 +0200
++++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig	2009-10-06 10:36:23.000000000 +0200
+@@ -450,11 +450,31 @@
  	  i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
  	  val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
  
@@ -10,6 +12,19 @@
 +	select ETRAX_I2C_USES_PB_NOT_PB_I2C
 +	help
 +	  Enables an I2C driver with Geert Vancompernolle improvement.
++
++config ETRAX_I2C_SLAVE_DELAY
++	bool "I2C Slave delay support"
++	depends on ETRAX_I2C_GVC  && EXPERIMENTAL
++	help
++	  Enable this to enhanced master/slave dialog
++	  Improvement by Positive Going (www.positivegoing.it) and BK srl (www.b-k.it)
++
++config ETRAX_I2C_DYN_ALLOC
++	bool "I2C major device dynamic alloc"
++	depends on ETRAX_I2C_GVC && EXPERIMENTAL
++	help
++	  Enable this to dynamicaly alloc major i2c device number
 +
  # this is true for most products since PB-I2C seems to be somewhat
  # flawed..
@@ -20,7 +35,7 @@
  	help
  	  Select whether to use the special I2C mode in the PB I/O register or
  	  not.  This option needs to be selected in order to use some drivers
-@@ -478,7 +485,7 @@ config ETRAX_I2C_CLK_PORT
+@@ -478,7 +498,7 @@
  
  config ETRAX_I2C_EEPROM
  	bool "I2C EEPROM (non-volatile RAM) support"
@@ -29,8 +44,10 @@
  	help
  	  Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
  	  driver.  Select size option: Probed, 2k, 8k, 16k.
---- a/arch/cris/arch-v10/drivers/Makefile
-+++ b/arch/cris/arch-v10/drivers/Makefile
+Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile
+===================================================================
+--- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Makefile	2009-10-02 11:31:14.000000000 +0200
++++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile	2009-10-02 11:31:50.000000000 +0200
 @@ -4,6 +4,7 @@
  
  obj-$(CONFIG_ETRAX_AXISFLASHMAP)	+= axisflashmap.o