115fd1c9b9528cb8477ce8f010da22d9fb36ff2d
[openwrt/openwrt.git] / target / linux / etrax / patches-2.6.30 / 500-i2c_gvc.patch
1 Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig
2 ===================================================================
3 --- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Kconfig 2009-10-02 11:31:49.000000000 +0200
4 +++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Kconfig 2009-10-06 10:36:23.000000000 +0200
5 @@ -450,11 +450,31 @@
6 i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
7 val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
8
9 +config ETRAX_I2C_GVC
10 + bool "I2C GVC support"
11 + depends on ETRAX_ARCH_V10 && !ETRAX_I2C
12 + select ETRAX_I2C_USES_PB_NOT_PB_I2C
13 + help
14 + Enables an I2C driver with Geert Vancompernolle improvement.
15 +
16 +config ETRAX_I2C_SLAVE_DELAY
17 + bool "I2C Slave delay support"
18 + depends on ETRAX_I2C_GVC && EXPERIMENTAL
19 + help
20 + Enable this to enhanced master/slave dialog
21 + Improvement by Positive Going (www.positivegoing.it) and BK srl (www.b-k.it)
22 +
23 +config ETRAX_I2C_DYN_ALLOC
24 + bool "I2C major device dynamic alloc"
25 + depends on ETRAX_I2C_GVC && EXPERIMENTAL
26 + help
27 + Enable this to dynamicaly alloc major i2c device number
28 +
29 # this is true for most products since PB-I2C seems to be somewhat
30 # flawed..
31 config ETRAX_I2C_USES_PB_NOT_PB_I2C
32 bool "I2C uses PB not PB-I2C"
33 - depends on ETRAX_I2C
34 + depends on ETRAX_I2C || ETRAX_I2C_GVC
35 help
36 Select whether to use the special I2C mode in the PB I/O register or
37 not. This option needs to be selected in order to use some drivers
38 @@ -478,7 +498,7 @@
39
40 config ETRAX_I2C_EEPROM
41 bool "I2C EEPROM (non-volatile RAM) support"
42 - depends on ETRAX_I2C
43 + depends on ETRAX_I2C || ETRAX_I2C_GVC
44 help
45 Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
46 driver. Select size option: Probed, 2k, 8k, 16k.
47 Index: linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile
48 ===================================================================
49 --- linux-2.6.30.8.orig/arch/cris/arch-v10/drivers/Makefile 2009-10-02 11:31:14.000000000 +0200
50 +++ linux-2.6.30.8/arch/cris/arch-v10/drivers/Makefile 2009-10-02 11:31:50.000000000 +0200
51 @@ -4,6 +4,7 @@
52
53 obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o
54 obj-$(CONFIG_ETRAX_I2C) += i2c.o
55 +obj-$(CONFIG_ETRAX_I2C_GVC) += i2c_gvc.o
56 obj-$(CONFIG_ETRAX_I2C_EEPROM) += eeprom.o
57 obj-$(CONFIG_ETRAX_GPIO) += gpio.o
58 obj-$(CONFIG_ETRAX_DS1302) += ds1302.o