diff options
author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2015-05-20 11:26:59 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-05-31 18:08:19 -0400 |
commit | 19a4fb21f804dbd5a327eba7a1569b6b8e941a54 (patch) | |
tree | c29861ee269636bd3cca2321152119c72c9719b1 | |
parent | 9be83c0a44de0c595734f96393aec847b68da3f1 (diff) |
i2c-parport: define ports to connect
As of now i2c-parport was connecting to all the available parallel
ports. Lets limit that to maximum of 4 instances and at the same time
define which instance connects to which parallel port.
Tested-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Acked-by: Wolfram Sang <wsa@the-dreams.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/i2c/busses/i2c-parport.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index a1fac5aa9bae..155da957a92b 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c | |||
@@ -46,6 +46,9 @@ struct i2c_par { | |||
46 | 46 | ||
47 | static LIST_HEAD(adapter_list); | 47 | static LIST_HEAD(adapter_list); |
48 | static DEFINE_MUTEX(adapter_list_lock); | 48 | static DEFINE_MUTEX(adapter_list_lock); |
49 | #define MAX_DEVICE 4 | ||
50 | static int parport[MAX_DEVICE] = {0, -1, -1, -1}; | ||
51 | |||
49 | 52 | ||
50 | /* ----- Low-level parallel port access ----------------------------------- */ | 53 | /* ----- Low-level parallel port access ----------------------------------- */ |
51 | 54 | ||
@@ -163,6 +166,19 @@ static void i2c_parport_irq(void *data) | |||
163 | static void i2c_parport_attach(struct parport *port) | 166 | static void i2c_parport_attach(struct parport *port) |
164 | { | 167 | { |
165 | struct i2c_par *adapter; | 168 | struct i2c_par *adapter; |
169 | int i; | ||
170 | struct pardev_cb i2c_parport_cb; | ||
171 | |||
172 | for (i = 0; i < MAX_DEVICE; i++) { | ||
173 | if (parport[i] == -1) | ||
174 | continue; | ||
175 | if (port->number == parport[i]) | ||
176 | break; | ||
177 | } | ||
178 | if (i == MAX_DEVICE) { | ||
179 | pr_debug("i2c-parport: Not using parport%d.\n", port->number); | ||
180 | return; | ||
181 | } | ||
166 | 182 | ||
167 | adapter = kzalloc(sizeof(struct i2c_par), GFP_KERNEL); | 183 | adapter = kzalloc(sizeof(struct i2c_par), GFP_KERNEL); |
168 | if (adapter == NULL) { | 184 | if (adapter == NULL) { |
@@ -298,5 +314,12 @@ MODULE_AUTHOR("Jean Delvare <jdelvare@suse.de>"); | |||
298 | MODULE_DESCRIPTION("I2C bus over parallel port"); | 314 | MODULE_DESCRIPTION("I2C bus over parallel port"); |
299 | MODULE_LICENSE("GPL"); | 315 | MODULE_LICENSE("GPL"); |
300 | 316 | ||
317 | module_param_array(parport, int, NULL, 0); | ||
318 | MODULE_PARM_DESC(parport, | ||
319 | "List of parallel ports to bind to, by index.\n" | ||
320 | " Atmost " __stringify(MAX_DEVICE) " devices are supported.\n" | ||
321 | " Default is one device connected to parport0.\n" | ||
322 | ); | ||
323 | |||
301 | module_init(i2c_parport_init); | 324 | module_init(i2c_parport_init); |
302 | module_exit(i2c_parport_exit); | 325 | module_exit(i2c_parport_exit); |