* [PATCH 1/8] ir-kbd-i2c: Don't use i2c_client.name for our own needs
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
@ 2009-05-13 19:48 ` Jean Delvare
2009-05-13 19:48 ` [PATCH 2/8] ir-kbd-i2c: Switch to the new-style device binding model Jean Delvare
` (7 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:48 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
In the standard device driver binding model, the name field of
struct i2c_client is used to match devices to their drivers, so we
must stop using it for internal purposes. Define a separate field
in struct IR_i2c as a replacement, and use it.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
linux/drivers/media/video/cx231xx/cx231xx-input.c | 2 +-
linux/drivers/media/video/em28xx/em28xx-cards.c | 6 +++---
linux/drivers/media/video/em28xx/em28xx-input.c | 2 +-
linux/drivers/media/video/ir-kbd-i2c.c | 5 +++--
linux/drivers/media/video/saa7134/saa7134-input.c | 12 ++++++------
linux/include/media/ir-kbd-i2c.h | 1 +
6 files changed, 15 insertions(+), 13 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-input.c 2009-04-24 11:45:21.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-input.c 2009-04-29 14:30:32.000000000 +0200
@@ -37,7 +37,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug
#define i2cdprintk(fmt, arg...) \
if (ir_debug) { \
- printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg); \
+ printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
}
#define dprintk(fmt, arg...) \
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-04-24 11:45:21.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-04-29 14:30:32.000000000 +0200
@@ -1948,19 +1948,19 @@ void em28xx_set_ir(struct em28xx *dev, s
case (EM2820_BOARD_TERRATEC_CINERGY_250):
ir->ir_codes = ir_codes_em_terratec;
ir->get_key = em28xx_get_key_terratec;
- snprintf(ir->c.name, sizeof(ir->c.name),
+ snprintf(ir->name, sizeof(ir->name),
"i2c IR (EM28XX Terratec)");
break;
case (EM2820_BOARD_PINNACLE_USB_2):
ir->ir_codes = ir_codes_pinnacle_grey;
ir->get_key = em28xx_get_key_pinnacle_usb_grey;
- snprintf(ir->c.name, sizeof(ir->c.name),
+ snprintf(ir->name, sizeof(ir->name),
"i2c IR (EM28XX Pinnacle PCTV)");
break;
case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
ir->ir_codes = ir_codes_hauppauge_new;
ir->get_key = em28xx_get_key_em_haup;
- snprintf(ir->c.name, sizeof(ir->c.name),
+ snprintf(ir->name, sizeof(ir->name),
"i2c IR (EM2840 Hauppauge)");
break;
case (EM2820_BOARD_MSI_VOX_USB_2):
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-input.c 2009-04-24 11:45:21.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-input.c 2009-04-29 14:30:32.000000000 +0200
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(ir_debug, "enable debug
#define i2cdprintk(fmt, arg...) \
if (ir_debug) { \
- printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg); \
+ printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg); \
}
#define dprintk(fmt, arg...) \
--- v4l-dvb.orig/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-24 11:45:21.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-29 14:30:32.000000000 +0200
@@ -346,6 +346,7 @@ static int ir_attach(struct i2c_adapter
ir->c.adapter = adap;
ir->c.addr = addr;
+ snprintf(ir->c.name, sizeof(ir->c.name), "ir-kbd");
i2c_set_clientdata(&ir->c, ir);
@@ -419,7 +420,7 @@ static int ir_attach(struct i2c_adapter
}
/* Sets name */
- snprintf(ir->c.name, sizeof(ir->c.name), "i2c IR (%s)", name);
+ snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
ir->ir_codes = ir_codes;
/* register i2c device
@@ -444,7 +445,7 @@ static int ir_attach(struct i2c_adapter
/* init + register input device */
ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
input_dev->id.bustype = BUS_I2C;
- input_dev->name = ir->c.name;
+ input_dev->name = ir->name;
input_dev->phys = ir->phys;
err = input_register_device(ir->input);
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-29 14:30:29.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-29 14:30:32.000000000 +0200
@@ -60,7 +60,7 @@ MODULE_PARM_DESC(disable_other_ir, "disa
#define dprintk(fmt, arg...) if (ir_debug) \
printk(KERN_DEBUG "%s/ir: " fmt, dev->name , ## arg)
#define i2cdprintk(fmt, arg...) if (ir_debug) \
- printk(KERN_DEBUG "%s/ir: " fmt, ir->c.name , ## arg)
+ printk(KERN_DEBUG "%s/ir: " fmt, ir->name , ## arg)
/* Helper functions for RC5 and NEC decoding at GPIO16 or GPIO18 */
static int saa7134_rc5_irq(struct saa7134_dev *dev);
@@ -697,7 +697,7 @@ void saa7134_set_i2c_ir(struct saa7134_d
switch (dev->board) {
case SAA7134_BOARD_PINNACLE_PCTV_110i:
case SAA7134_BOARD_PINNACLE_PCTV_310i:
- snprintf(ir->c.name, sizeof(ir->c.name), "Pinnacle PCTV");
+ snprintf(ir->name, sizeof(ir->name), "Pinnacle PCTV");
if (pinnacle_remote == 0) {
ir->get_key = get_key_pinnacle_color;
ir->ir_codes = ir_codes_pinnacle_color;
@@ -707,17 +707,17 @@ void saa7134_set_i2c_ir(struct saa7134_d
}
break;
case SAA7134_BOARD_UPMOST_PURPLE_TV:
- snprintf(ir->c.name, sizeof(ir->c.name), "Purple TV");
+ snprintf(ir->name, sizeof(ir->name), "Purple TV");
ir->get_key = get_key_purpletv;
ir->ir_codes = ir_codes_purpletv;
break;
case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
- snprintf(ir->c.name, sizeof(ir->c.name), "MSI TV@nywhere Plus");
+ snprintf(ir->name, sizeof(ir->name), "MSI TV@nywhere Plus");
ir->get_key = get_key_msi_tvanywhere_plus;
ir->ir_codes = ir_codes_msi_tvanywhere_plus;
break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110:
- snprintf(ir->c.name, sizeof(ir->c.name), "HVR 1110");
+ snprintf(ir->name, sizeof(ir->name), "HVR 1110");
ir->get_key = get_key_hvr1110;
ir->ir_codes = ir_codes_hauppauge_new;
break;
@@ -733,7 +733,7 @@ void saa7134_set_i2c_ir(struct saa7134_d
case SAA7134_BOARD_BEHOLD_M63:
case SAA7134_BOARD_BEHOLD_M6_EXTRA:
case SAA7134_BOARD_BEHOLD_H6:
- snprintf(ir->c.name, sizeof(ir->c.name), "BeholdTV");
+ snprintf(ir->name, sizeof(ir->name), "BeholdTV");
ir->get_key = get_key_beholdm6xx;
ir->ir_codes = ir_codes_behold;
break;
--- v4l-dvb.orig/linux/include/media/ir-kbd-i2c.h 2009-04-24 11:45:21.000000000 +0200
+++ v4l-dvb/linux/include/media/ir-kbd-i2c.h 2009-04-29 14:30:32.000000000 +0200
@@ -15,6 +15,7 @@ struct IR_i2c {
unsigned char old;
struct delayed_work work;
+ char name[32];
char phys[32];
int (*get_key)(struct IR_i2c*, u32*, u32*);
};
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 2/8] ir-kbd-i2c: Switch to the new-style device binding model
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
2009-05-13 19:48 ` [PATCH 1/8] ir-kbd-i2c: Don't use i2c_client.name for our own needs Jean Delvare
@ 2009-05-13 19:48 ` Jean Delvare
2009-05-13 19:49 ` [PATCH 3/8] ir-kbd-i2c: Use initialization data Jean Delvare
` (6 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:48 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
Let card drivers probe for IR receiver devices and instantiate them if
found. Ultimately it would be better if we could stop probing
completely, but I suspect this won't be possible for all card types.
There's certainly room for cleanups. For example, some drivers are
sharing I2C adapter IDs, so they also had to share the list of I2C
addresses being probed for an IR receiver. Now that each driver
explicitly says which addresses should be probed, maybe some addresses
can be dropped from some drivers.
Also, the special cases in saa7134-i2c should probably be handled on a
per-board basis. This would be more efficient and less risky than always
probing extra addresses on all boards. I'll give it a try later.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
Cc: Andy Walls <awalls@radix.net>
Cc: Mike Isely <isely@pobox.com>
---
linux/drivers/media/video/bt8xx/bttv-i2c.c | 21 ++
linux/drivers/media/video/cx231xx/cx231xx-cards.c | 11 -
linux/drivers/media/video/cx231xx/cx231xx-i2c.c | 3
linux/drivers/media/video/cx231xx/cx231xx.h | 1
linux/drivers/media/video/cx23885/cx23885-i2c.c | 12 +
linux/drivers/media/video/cx88/cx88-i2c.c | 13 +
linux/drivers/media/video/em28xx/em28xx-cards.c | 20 +-
linux/drivers/media/video/em28xx/em28xx-i2c.c | 3
linux/drivers/media/video/em28xx/em28xx-input.c | 6
linux/drivers/media/video/em28xx/em28xx.h | 1
linux/drivers/media/video/ir-kbd-i2c.c | 200 +++------------------
linux/drivers/media/video/ivtv/ivtv-i2c.c | 31 ++-
linux/drivers/media/video/saa7134/saa7134-i2c.c | 3
linux/drivers/media/video/saa7134/saa7134-input.c | 86 +++++++--
linux/drivers/media/video/saa7134/saa7134.h | 1
linux/include/media/ir-kbd-i2c.h | 2
16 files changed, 220 insertions(+), 194 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/bt8xx/bttv-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/bt8xx/bttv-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -405,6 +405,27 @@ int __devinit init_bttv_i2c(struct bttv
}
if (0 == btv->i2c_rc && i2c_scan)
do_i2c_scan(btv->c.v4l2_dev.name, &btv->i2c_client);
+
+ /* Instantiate the IR receiver device, if present */
+ if (0 == btv->i2c_rc) {
+ struct i2c_board_info info;
+ /* The external IR receiver is at i2c address 0x34 (0x35 for
+ reads). Future Hauppauge cards will have an internal
+ receiver at 0x30 (0x31 for reads). In theory, both can be
+ fitted, and Hauppauge suggest an external overrides an
+ internal.
+
+ That's why we probe 0x1a (~0x34) first. CB
+ */
+ const unsigned short addr_list[] = {
+ 0x1a, 0x18, 0x4b, 0x64, 0x30,
+ I2C_CLIENT_END
+ };
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ i2c_new_probed_device(&btv->c.i2c_adap, &info, addr_list);
+ }
return btv->i2c_rc;
}
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-cards.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-cards.c 2009-05-12 11:24:19.000000000 +0200
@@ -282,13 +282,16 @@ static void cx231xx_config_tuner(struct
}
/* ----------------------------------------------------------------------- */
-void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir)
+void cx231xx_register_i2c_ir(struct cx231xx *dev)
{
- if (disable_ir) {
- ir->get_key = NULL;
+ if (disable_ir)
return;
- }
+ /* REVISIT: instantiate IR device */
+}
+
+void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir)
+{
/* detect & configure */
switch (dev->model) {
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -540,6 +540,9 @@ int cx231xx_i2c_register(struct cx231xx_
if (0 == bus->i2c_rc) {
if (i2c_scan)
cx231xx_do_i2c_scan(dev, &bus->i2c_client);
+
+ /* Instantiate the IR receiver device, if present */
+ cx231xx_register_i2c_ir(dev);
} else
cx231xx_warn("%s: i2c bus %d register FAILED\n",
dev->name, bus->nr);
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx.h 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx.h 2009-05-12 11:24:19.000000000 +0200
@@ -747,6 +747,7 @@ extern void cx231xx_card_setup(struct cx
extern struct cx231xx_board cx231xx_boards[];
extern struct usb_device_id cx231xx_id_table[];
extern const unsigned int cx231xx_bcount;
+void cx231xx_register_i2c_ir(struct cx231xx *dev);
void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir);
int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
--- v4l-dvb.orig/linux/drivers/media/video/cx23885/cx23885-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx23885/cx23885-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -364,6 +364,18 @@ int cx23885_i2c_register(struct cx23885_
printk(KERN_WARNING "%s: i2c bus %d register FAILED\n",
dev->name, bus->nr);
+ /* Instantiate the IR receiver device, if present */
+ if (0 == bus->i2c_rc) {
+ struct i2c_board_info info;
+ const unsigned short addr_list[] = {
+ 0x6b, I2C_CLIENT_END
+ };
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ i2c_new_probed_device(&bus->i2c_adap, &info, addr_list);
+ }
+
return bus->i2c_rc;
}
--- v4l-dvb.orig/linux/drivers/media/video/cx88/cx88-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx88/cx88-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -186,6 +186,19 @@ int cx88_i2c_init(struct cx88_core *core
do_i2c_scan(core->name,&core->i2c_client);
} else
printk("%s: i2c register FAILED\n", core->name);
+
+ /* Instantiate the IR receiver device, if present */
+ if (0 == core->i2c_rc) {
+ struct i2c_board_info info;
+ const unsigned short addr_list[] = {
+ 0x18, 0x6b, 0x71,
+ I2C_CLIENT_END
+ };
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ i2c_new_probed_device(&core->i2c_adap, &info, addr_list);
+ }
return core->i2c_rc;
}
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-05-12 11:14:20.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-05-12 11:24:19.000000000 +0200
@@ -1931,13 +1931,23 @@ static int em28xx_hint_board(struct em28
}
/* ----------------------------------------------------------------------- */
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
+void em28xx_register_i2c_ir(struct em28xx *dev)
{
- if (disable_ir) {
- ir->get_key = NULL;
- return ;
- }
+ struct i2c_board_info info;
+ const unsigned short addr_list[] = {
+ 0x30, 0x47, I2C_CLIENT_END
+ };
+
+ if (disable_ir)
+ return;
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
+}
+void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
+{
/* detect & configure */
switch (dev->model) {
case (EM2800_BOARD_UNKNOWN):
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -581,6 +581,9 @@ int em28xx_i2c_register(struct em28xx *d
if (i2c_scan)
em28xx_do_i2c_scan(dev);
+ /* Instantiate the IR receiver device, if present */
+ em28xx_register_i2c_ir(dev);
+
return 0;
}
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-input.c 2009-05-12 11:14:20.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-input.c 2009-05-12 11:24:19.000000000 +0200
@@ -86,7 +86,7 @@ int em28xx_get_key_terratec(struct IR_i2
unsigned char b;
/* poll IR chip */
- if (1 != i2c_master_recv(&ir->c, &b, 1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
i2cdprintk("read error\n");
return -EIO;
}
@@ -115,7 +115,7 @@ int em28xx_get_key_em_haup(struct IR_i2c
unsigned char code;
/* poll IR chip */
- if (2 != i2c_master_recv(&ir->c, buf, 2))
+ if (2 != i2c_master_recv(ir->c, buf, 2))
return -EIO;
/* Does eliminate repeated parity code */
@@ -153,7 +153,7 @@ int em28xx_get_key_pinnacle_usb_grey(str
/* poll IR chip */
- if (3 != i2c_master_recv(&ir->c, buf, 3)) {
+ if (3 != i2c_master_recv(ir->c, buf, 3)) {
i2cdprintk("read error\n");
return -EIO;
}
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx.h 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx.h 2009-05-12 11:24:19.000000000 +0200
@@ -649,6 +649,7 @@ extern void em28xx_card_setup(struct em2
extern struct em28xx_board em28xx_boards[];
extern struct usb_device_id em28xx_id_table[];
extern const unsigned int em28xx_bcount;
+void em28xx_register_i2c_ir(struct em28xx *dev);
void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
void em28xx_release_resources(struct em28xx *dev);
--- v4l-dvb.orig/linux/drivers/media/video/ir-kbd-i2c.c 2009-05-12 11:14:20.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ir-kbd-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -75,7 +75,7 @@ static int get_key_haup_common(struct IR
int start, range, toggle, dev, code, ircode;
/* poll IR chip */
- if (size != i2c_master_recv(&ir->c,buf,size))
+ if (size != i2c_master_recv(ir->c, buf, size))
return -EIO;
/* split rc5 data block ... */
@@ -138,7 +138,7 @@ static int get_key_pixelview(struct IR_i
unsigned char b;
/* poll IR chip */
- if (1 != i2c_master_recv(&ir->c,&b,1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
dprintk(1,"read error\n");
return -EIO;
}
@@ -152,7 +152,7 @@ static int get_key_pv951(struct IR_i2c *
unsigned char b;
/* poll IR chip */
- if (1 != i2c_master_recv(&ir->c,&b,1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
dprintk(1,"read error\n");
return -EIO;
}
@@ -172,7 +172,7 @@ static int get_key_fusionhdtv(struct IR_
unsigned char buf[4];
/* poll IR chip */
- if (4 != i2c_master_recv(&ir->c,buf,4)) {
+ if (4 != i2c_master_recv(ir->c, buf, 4)) {
dprintk(1,"read error\n");
return -EIO;
}
@@ -196,7 +196,7 @@ static int get_key_knc1(struct IR_i2c *i
unsigned char b;
/* poll IR chip */
- if (1 != i2c_master_recv(&ir->c,&b,1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
dprintk(1,"read error\n");
return -EIO;
}
@@ -223,12 +223,12 @@ static int get_key_avermedia_cardbus(str
u32 *ir_key, u32 *ir_raw)
{
unsigned char subaddr, key, keygroup;
- struct i2c_msg msg[] = { { .addr = ir->c.addr, .flags = 0,
+ struct i2c_msg msg[] = { { .addr = ir->c->addr, .flags = 0,
.buf = &subaddr, .len = 1},
- { .addr = ir->c.addr, .flags = I2C_M_RD,
+ { .addr = ir->c->addr, .flags = I2C_M_RD,
.buf = &key, .len = 1} };
subaddr = 0x0d;
- if (2 != i2c_transfer(ir->c.adapter, msg, 2)) {
+ if (2 != i2c_transfer(ir->c->adapter, msg, 2)) {
dprintk(1, "read error\n");
return -EIO;
}
@@ -238,7 +238,7 @@ static int get_key_avermedia_cardbus(str
subaddr = 0x0b;
msg[1].buf = &keygroup;
- if (2 != i2c_transfer(ir->c.adapter, msg, 2)) {
+ if (2 != i2c_transfer(ir->c->adapter, msg, 2)) {
dprintk(1, "read error\n");
return -EIO;
}
@@ -295,7 +295,7 @@ static void ir_work(struct work_struct *
/* MSI TV@nywhere Plus requires more frequent polling
otherwise it will miss some keypresses */
- if (ir->c.adapter->id == I2C_HW_SAA7134 && ir->c.addr == 0x30)
+ if (ir->c->adapter->id == I2C_HW_SAA7134 && ir->c->addr == 0x30)
polling_interval = 50;
ir_key_poll(ir);
@@ -304,34 +304,15 @@ static void ir_work(struct work_struct *
/* ----------------------------------------------------------------------- */
-static int ir_attach(struct i2c_adapter *adap, int addr,
- unsigned short flags, int kind);
-static int ir_detach(struct i2c_client *client);
-static int ir_probe(struct i2c_adapter *adap);
-
-static struct i2c_driver driver = {
- .driver = {
- .name = "ir-kbd-i2c",
- },
- .id = I2C_DRIVERID_INFRARED,
- .attach_adapter = ir_probe,
- .detach_client = ir_detach,
-};
-
-static struct i2c_client client_template =
-{
- .name = "unset",
- .driver = &driver
-};
-
-static int ir_attach(struct i2c_adapter *adap, int addr,
- unsigned short flags, int kind)
+static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
IR_KEYTAB_TYPE *ir_codes = NULL;
char *name;
int ir_type;
struct IR_i2c *ir;
struct input_dev *input_dev;
+ struct i2c_adapter *adap = client->adapter;
+ unsigned short addr = client->addr;
int err;
ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL);
@@ -341,14 +322,9 @@ static int ir_attach(struct i2c_adapter
goto err_out_free;
}
- ir->c = client_template;
+ ir->c = client;
ir->input = input_dev;
-
- ir->c.adapter = adap;
- ir->c.addr = addr;
- snprintf(ir->c.name, sizeof(ir->c.name), "ir-kbd");
-
- i2c_set_clientdata(&ir->c, ir);
+ i2c_set_clientdata(client, ir);
switch(addr) {
case 0x64:
@@ -423,24 +399,9 @@ static int ir_attach(struct i2c_adapter
snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
ir->ir_codes = ir_codes;
- /* register i2c device
- * At device register, IR codes may be changed to be
- * board dependent.
- */
- err = i2c_attach_client(&ir->c);
- if (err)
- goto err_out_free;
-
- /* If IR not supported or disabled, unregisters driver */
- if (ir->get_key == NULL) {
- err = -ENODEV;
- goto err_out_detach;
- }
-
- /* Phys addr can only be set after attaching (for ir->c.dev) */
snprintf(ir->phys, sizeof(ir->phys), "%s/%s/ir0",
- dev_name(&ir->c.adapter->dev),
- dev_name(&ir->c.dev));
+ dev_name(&adap->dev),
+ dev_name(&client->dev));
/* init + register input device */
ir_input_init(input_dev, &ir->ir, ir_type, ir->ir_codes);
@@ -450,7 +411,7 @@ static int ir_attach(struct i2c_adapter
err = input_register_device(ir->input);
if (err)
- goto err_out_detach;
+ goto err_out_free;
printk(DEVNAME ": %s detected at %s [%s]\n",
ir->input->name, ir->input->phys, adap->name);
@@ -465,135 +426,42 @@ static int ir_attach(struct i2c_adapter
return 0;
- err_out_detach:
- i2c_detach_client(&ir->c);
err_out_free:
input_free_device(input_dev);
kfree(ir);
return err;
}
-static int ir_detach(struct i2c_client *client)
+static int ir_remove(struct i2c_client *client)
{
struct IR_i2c *ir = i2c_get_clientdata(client);
/* kill outstanding polls */
cancel_delayed_work_sync(&ir->work);
- /* unregister devices */
+ /* unregister device */
input_unregister_device(ir->input);
- i2c_detach_client(&ir->c);
/* free memory */
kfree(ir);
return 0;
}
-static int ir_probe(struct i2c_adapter *adap)
-{
-
- /* The external IR receiver is at i2c address 0x34 (0x35 for
- reads). Future Hauppauge cards will have an internal
- receiver at 0x30 (0x31 for reads). In theory, both can be
- fitted, and Hauppauge suggest an external overrides an
- internal.
-
- That's why we probe 0x1a (~0x34) first. CB
- */
-
- static const int probe_bttv[] = { 0x1a, 0x18, 0x4b, 0x64, 0x30, -1};
- static const int probe_saa7134[] = { 0x7a, 0x47, 0x71, 0x2d, -1 };
- static const int probe_em28XX[] = { 0x30, 0x47, -1 };
- static const int probe_cx88[] = { 0x18, 0x6b, 0x71, -1 };
- static const int probe_cx23885[] = { 0x6b, -1 };
- const int *probe;
- struct i2c_msg msg = {
- .flags = I2C_M_RD,
- .len = 0,
- .buf = NULL,
- };
- int i, rc;
-
- switch (adap->id) {
- case I2C_HW_B_BT848:
- probe = probe_bttv;
- break;
- case I2C_HW_B_CX2341X:
- probe = probe_bttv;
- break;
- case I2C_HW_SAA7134:
- probe = probe_saa7134;
- break;
- case I2C_HW_B_EM28XX:
- probe = probe_em28XX;
- break;
- case I2C_HW_B_CX2388x:
- probe = probe_cx88;
- break;
- case I2C_HW_B_CX23885:
- probe = probe_cx23885;
- break;
- default:
- return 0;
- }
-
- for (i = 0; -1 != probe[i]; i++) {
- msg.addr = probe[i];
- rc = i2c_transfer(adap, &msg, 1);
- dprintk(1,"probe 0x%02x @ %s: %s\n",
- probe[i], adap->name,
- (1 == rc) ? "yes" : "no");
- if (1 == rc) {
- ir_attach(adap, probe[i], 0, 0);
- return 0;
- }
- }
-
- /* Special case for MSI TV@nywhere Plus remote */
- if (adap->id == I2C_HW_SAA7134) {
- u8 temp;
-
- /* MSI TV@nywhere Plus controller doesn't seem to
- respond to probes unless we read something from
- an existing device. Weird... */
-
- msg.addr = 0x50;
- rc = i2c_transfer(adap, &msg, 1);
- dprintk(1, "probe 0x%02x @ %s: %s\n",
- msg.addr, adap->name,
- (1 == rc) ? "yes" : "no");
-
- /* Now do the probe. The controller does not respond
- to 0-byte reads, so we use a 1-byte read instead. */
- msg.addr = 0x30;
- msg.len = 1;
- msg.buf = &temp;
- rc = i2c_transfer(adap, &msg, 1);
- dprintk(1, "probe 0x%02x @ %s: %s\n",
- msg.addr, adap->name,
- (1 == rc) ? "yes" : "no");
- if (1 == rc)
- ir_attach(adap, msg.addr, 0, 0);
- }
-
- /* Special case for AVerMedia Cardbus remote */
- if (adap->id == I2C_HW_SAA7134) {
- unsigned char subaddr, data;
- struct i2c_msg msg[] = { { .addr = 0x40, .flags = 0,
- .buf = &subaddr, .len = 1},
- { .addr = 0x40, .flags = I2C_M_RD,
- .buf = &data, .len = 1} };
- subaddr = 0x0d;
- rc = i2c_transfer(adap, msg, 2);
- dprintk(1, "probe 0x%02x/0x%02x @ %s: %s\n",
- msg[0].addr, subaddr, adap->name,
- (2 == rc) ? "yes" : "no");
- if (2 == rc)
- ir_attach(adap, msg[0].addr, 0, 0);
- }
+static const struct i2c_device_id ir_kbd_id[] = {
+ /* Generic entry for any IR receiver */
+ { "ir_video", 0 },
+ /* IR device specific entries could be added here */
+ { }
+};
- return 0;
-}
+static struct i2c_driver driver = {
+ .driver = {
+ .name = "ir-kbd-i2c",
+ },
+ .probe = ir_probe,
+ .remove = ir_remove,
+ .id_table = ir_kbd_id,
+};
/* ----------------------------------------------------------------------- */
--- v4l-dvb.orig/linux/drivers/media/video/ivtv/ivtv-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ivtv/ivtv-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -592,9 +592,11 @@ static struct i2c_client ivtv_i2c_client
.name = "ivtv internal",
};
-/* init + register i2c algo-bit adapter */
+/* init + register i2c adapter + instantiate IR receiver */
int init_ivtv_i2c(struct ivtv *itv)
{
+ int retval;
+
IVTV_DEBUG_I2C("i2c init\n");
/* Sanity checks for the I2C hardware arrays. They must be the
@@ -634,9 +636,32 @@ int init_ivtv_i2c(struct ivtv *itv)
ivtv_setsda(itv, 1);
if (itv->options.newi2c > 0)
- return i2c_add_adapter(&itv->i2c_adap);
+ retval = i2c_add_adapter(&itv->i2c_adap);
else
- return i2c_bit_add_bus(&itv->i2c_adap);
+ retval = i2c_bit_add_bus(&itv->i2c_adap);
+
+ /* Instantiate the IR receiver device, if present */
+ if (retval == 0) {
+ struct i2c_board_info info;
+ /* The external IR receiver is at i2c address 0x34 (0x35 for
+ reads). Future Hauppauge cards will have an internal
+ receiver at 0x30 (0x31 for reads). In theory, both can be
+ fitted, and Hauppauge suggest an external overrides an
+ internal.
+
+ That's why we probe 0x1a (~0x34) first. CB
+ */
+ const unsigned short addr_list[] = {
+ 0x1a, 0x18, 0x64, 0x30,
+ I2C_CLIENT_END
+ };
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ i2c_new_probed_device(&itv->i2c_adap, &info, addr_list);
+ }
+
+ return retval;
}
void exit_ivtv_i2c(struct ivtv *itv)
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-i2c.c 2009-05-12 10:19:13.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-i2c.c 2009-05-12 11:24:19.000000000 +0200
@@ -444,6 +444,9 @@ int saa7134_i2c_register(struct saa7134_
saa7134_i2c_eeprom(dev,dev->eedata,sizeof(dev->eedata));
if (i2c_scan)
do_i2c_scan(dev->name,&dev->i2c_client);
+
+ /* Instantiate the IR receiver device, if present */
+ saa7134_probe_i2c_ir(dev);
return 0;
}
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-05-12 11:14:20.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-05-12 11:24:19.000000000 +0200
@@ -134,10 +134,10 @@ static int get_key_msi_tvanywhere_plus(s
int gpio;
/* <dev> is needed to access GPIO. Used by the saa_readl macro. */
- struct saa7134_dev *dev = ir->c.adapter->algo_data;
+ struct saa7134_dev *dev = ir->c->adapter->algo_data;
if (dev == NULL) {
dprintk("get_key_msi_tvanywhere_plus: "
- "gir->c.adapter->algo_data is NULL!\n");
+ "gir->c->adapter->algo_data is NULL!\n");
return -EIO;
}
@@ -156,7 +156,7 @@ static int get_key_msi_tvanywhere_plus(s
/* GPIO says there is a button press. Get it. */
- if (1 != i2c_master_recv(&ir->c, &b, 1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
i2cdprintk("read error\n");
return -EIO;
}
@@ -179,7 +179,7 @@ static int get_key_purpletv(struct IR_i2
unsigned char b;
/* poll IR chip */
- if (1 != i2c_master_recv(&ir->c,&b,1)) {
+ if (1 != i2c_master_recv(ir->c, &b, 1)) {
i2cdprintk("read error\n");
return -EIO;
}
@@ -202,7 +202,7 @@ static int get_key_hvr1110(struct IR_i2c
unsigned char buf[5], cod4, code3, code4;
/* poll IR chip */
- if (5 != i2c_master_recv(&ir->c,buf,5))
+ if (5 != i2c_master_recv(ir->c, buf, 5))
return -EIO;
cod4 = buf[4];
@@ -224,7 +224,7 @@ static int get_key_beholdm6xx(struct IR_
unsigned char data[12];
u32 gpio;
- struct saa7134_dev *dev = ir->c.adapter->algo_data;
+ struct saa7134_dev *dev = ir->c->adapter->algo_data;
/* rising SAA7134_GPIO_GPRESCAN reads the status */
saa_clearb(SAA7134_GPIO_GPMODE3, SAA7134_GPIO_GPRESCAN);
@@ -235,9 +235,9 @@ static int get_key_beholdm6xx(struct IR_
if (0x400000 & ~gpio)
return 0; /* No button press */
- ir->c.addr = 0x5a >> 1;
+ ir->c->addr = 0x5a >> 1;
- if (12 != i2c_master_recv(&ir->c, data, 12)) {
+ if (12 != i2c_master_recv(ir->c, data, 12)) {
i2cdprintk("read error\n");
return -EIO;
}
@@ -267,7 +267,7 @@ static int get_key_pinnacle(struct IR_i2
unsigned int start = 0,parity = 0,code = 0;
/* poll IR chip */
- if (4 != i2c_master_recv(&ir->c, b, 4)) {
+ if (4 != i2c_master_recv(ir->c, b, 4)) {
i2cdprintk("read error\n");
return -EIO;
}
@@ -686,14 +686,76 @@ void saa7134_input_fini(struct saa7134_d
dev->remote = NULL;
}
-void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
+void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
{
+ struct i2c_board_info info;
+ const unsigned short addr_list[] = {
+ 0x7a, 0x47, 0x71, 0x2d,
+ I2C_CLIENT_END
+ };
+
+ const unsigned short addr_list_msi[] = {
+ 0x30, I2C_CLIENT_END
+ };
+ struct i2c_msg msg_msi = {
+ .addr = 0x50,
+ .flags = I2C_M_RD,
+ .len = 0,
+ .buf = NULL,
+ };
+
+ unsigned char subaddr, data;
+ struct i2c_msg msg_avermedia[] = { {
+ .addr = 0x40,
+ .flags = 0,
+ .len = 1,
+ .buf = &subaddr,
+ }, {
+ .addr = 0x40,
+ .flags = I2C_M_RD,
+ .len = 1,
+ .buf = &data,
+ } };
+
+ struct i2c_client *client;
+ int rc;
+
if (disable_ir) {
- dprintk("Found supported i2c remote, but IR has been disabled\n");
- ir->get_key=NULL;
+ dprintk("IR has been disabled, not probing for i2c remote\n");
+ return;
+ }
+
+ memset(&info, 0, sizeof(struct i2c_board_info));
+ strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
+ client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
+ if (client)
return;
+
+ /* MSI TV@nywhere Plus controller doesn't seem to
+ respond to probes unless we read something from
+ an existing device. Weird... */
+ rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
+ dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
+ msg_msi.addr, dev->i2c_adap.name,
+ (1 == rc) ? "yes" : "no");
+ client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list_msi);
+ if (client)
+ return;
+
+ /* Special case for AVerMedia Cardbus remote */
+ subaddr = 0x0d;
+ rc = i2c_transfer(&dev->i2c_adap, msg_avermedia, 2);
+ dprintk(KERN_DEBUG "probe 0x%02x/0x%02x @ %s: %s\n",
+ msg_avermedia[0].addr, subaddr, dev->i2c_adap.name,
+ (2 == rc) ? "yes" : "no");
+ if (2 == rc) {
+ info.addr = msg_avermedia[0].addr;
+ i2c_new_device(&dev->i2c_adap, &info);
}
+}
+void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
+{
switch (dev->board) {
case SAA7134_BOARD_PINNACLE_PCTV_110i:
case SAA7134_BOARD_PINNACLE_PCTV_310i:
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134.h 2009-05-12 10:19:32.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h 2009-05-12 11:24:19.000000000 +0200
@@ -804,6 +804,7 @@ void saa7134_irq_oss_done(struct saa7134
int saa7134_input_init1(struct saa7134_dev *dev);
void saa7134_input_fini(struct saa7134_dev *dev);
void saa7134_input_irq(struct saa7134_dev *dev);
+void saa7134_probe_i2c_ir(struct saa7134_dev *dev);
void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir);
void saa7134_ir_stop(struct saa7134_dev *dev);
--- v4l-dvb.orig/linux/include/media/ir-kbd-i2c.h 2009-05-12 11:14:20.000000000 +0200
+++ v4l-dvb/linux/include/media/ir-kbd-i2c.h 2009-05-12 11:24:19.000000000 +0200
@@ -7,7 +7,7 @@ struct IR_i2c;
struct IR_i2c {
IR_KEYTAB_TYPE *ir_codes;
- struct i2c_client c;
+ struct i2c_client *c;
struct input_dev *input;
struct ir_input_state ir;
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 3/8] ir-kbd-i2c: Use initialization data
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
2009-05-13 19:48 ` [PATCH 1/8] ir-kbd-i2c: Don't use i2c_client.name for our own needs Jean Delvare
2009-05-13 19:48 ` [PATCH 2/8] ir-kbd-i2c: Switch to the new-style device binding model Jean Delvare
@ 2009-05-13 19:49 ` Jean Delvare
2009-05-13 19:50 ` [PATCH 4/8] ir-kbd-i2c: Don't assume all IR receivers are supported Jean Delvare
` (5 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:49 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
For specific boards, pass initialization data to ir-kbd-i2c instead
of modifying the settings after the device is initialized. This is
more efficient and easier to read.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
linux/drivers/media/video/cx231xx/cx231xx-cards.c | 3
linux/drivers/media/video/cx231xx/cx231xx-i2c.c | 29 ------
linux/drivers/media/video/cx231xx/cx231xx.h | 1
linux/drivers/media/video/em28xx/em28xx-cards.c | 31 +++---
linux/drivers/media/video/em28xx/em28xx-i2c.c | 22 ----
linux/drivers/media/video/em28xx/em28xx.h | 1
linux/drivers/media/video/ir-kbd-i2c.c | 12 ++
linux/drivers/media/video/saa7134/saa7134-i2c.c | 28 ------
linux/drivers/media/video/saa7134/saa7134-input.c | 94 ++++++++++-----------
linux/drivers/media/video/saa7134/saa7134.h | 1
linux/include/media/ir-kbd-i2c.h | 7 +
11 files changed, 79 insertions(+), 150 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-cards.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-cards.c 2009-05-12 11:32:50.000000000 +0200
@@ -288,10 +288,7 @@ void cx231xx_register_i2c_ir(struct cx23
return;
/* REVISIT: instantiate IR device */
-}
-void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir)
-{
/* detect & configure */
switch (dev->model) {
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx-i2c.c 2009-05-12 11:32:50.000000000 +0200
@@ -424,34 +424,6 @@ static u32 functionality(struct i2c_adap
return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;
}
-/*
- * attach_inform()
- * gets called when a device attaches to the i2c bus
- * does some basic configuration
- */
-static int attach_inform(struct i2c_client *client)
-{
- struct cx231xx_i2c *bus = i2c_get_adapdata(client->adapter);
- struct cx231xx *dev = bus->dev;
-
- switch (client->addr << 1) {
- case 0x8e:
- {
- struct IR_i2c *ir = i2c_get_clientdata(client);
- dprintk1(1, "attach_inform: IR detected (%s).\n",
- ir->phys);
- cx231xx_set_ir(dev, ir);
- break;
- }
- break;
-
- default:
- break;
- }
-
- return 0;
-}
-
static struct i2c_algorithm cx231xx_algo = {
.master_xfer = cx231xx_i2c_xfer,
.functionality = functionality,
@@ -465,7 +437,6 @@ static struct i2c_adapter cx231xx_adap_t
.name = "cx231xx",
.id = I2C_HW_B_CX231XX,
.algo = &cx231xx_algo,
- .client_register = attach_inform,
};
static struct i2c_client cx231xx_client_template = {
--- v4l-dvb.orig/linux/drivers/media/video/cx231xx/cx231xx.h 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/cx231xx/cx231xx.h 2009-05-12 11:32:50.000000000 +0200
@@ -748,7 +748,6 @@ extern struct cx231xx_board cx231xx_boar
extern struct usb_device_id cx231xx_id_table[];
extern const unsigned int cx231xx_bcount;
void cx231xx_register_i2c_ir(struct cx231xx *dev);
-void cx231xx_set_ir(struct cx231xx *dev, struct IR_i2c *ir);
int cx231xx_tuner_callback(void *ptr, int component, int command, int arg);
/* Provided by cx231xx-input.c */
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-cards.c 2009-05-12 11:32:50.000000000 +0200
@@ -1934,6 +1934,7 @@ static int em28xx_hint_board(struct em28
void em28xx_register_i2c_ir(struct em28xx *dev)
{
struct i2c_board_info info;
+ struct IR_i2c_init_data init_data;
const unsigned short addr_list[] = {
0x30, 0x47, I2C_CLIENT_END
};
@@ -1942,12 +1943,9 @@ void em28xx_register_i2c_ir(struct em28x
return;
memset(&info, 0, sizeof(struct i2c_board_info));
+ memset(&init_data, 0, sizeof(struct IR_i2c_init_data));
strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
- i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
-}
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir)
-{
/* detect & configure */
switch (dev->model) {
case (EM2800_BOARD_UNKNOWN):
@@ -1956,22 +1954,19 @@ void em28xx_set_ir(struct em28xx *dev, s
break;
case (EM2800_BOARD_TERRATEC_CINERGY_200):
case (EM2820_BOARD_TERRATEC_CINERGY_250):
- ir->ir_codes = ir_codes_em_terratec;
- ir->get_key = em28xx_get_key_terratec;
- snprintf(ir->name, sizeof(ir->name),
- "i2c IR (EM28XX Terratec)");
+ init_data.ir_codes = ir_codes_em_terratec;
+ init_data.get_key = em28xx_get_key_terratec;
+ init_data.name = "i2c IR (EM28XX Terratec)";
break;
case (EM2820_BOARD_PINNACLE_USB_2):
- ir->ir_codes = ir_codes_pinnacle_grey;
- ir->get_key = em28xx_get_key_pinnacle_usb_grey;
- snprintf(ir->name, sizeof(ir->name),
- "i2c IR (EM28XX Pinnacle PCTV)");
+ init_data.ir_codes = ir_codes_pinnacle_grey;
+ init_data.get_key = em28xx_get_key_pinnacle_usb_grey;
+ init_data.name = "i2c IR (EM28XX Pinnacle PCTV)";
break;
case (EM2820_BOARD_HAUPPAUGE_WINTV_USB_2):
- ir->ir_codes = ir_codes_hauppauge_new;
- ir->get_key = em28xx_get_key_em_haup;
- snprintf(ir->name, sizeof(ir->name),
- "i2c IR (EM2840 Hauppauge)");
+ init_data.ir_codes = ir_codes_hauppauge_new;
+ init_data.get_key = em28xx_get_key_em_haup;
+ init_data.name = "i2c IR (EM2840 Hauppauge)";
break;
case (EM2820_BOARD_MSI_VOX_USB_2):
break;
@@ -1982,6 +1977,10 @@ void em28xx_set_ir(struct em28xx *dev, s
case (EM2800_BOARD_GRABBEEX_USB2800):
break;
}
+
+ if (init_data.name)
+ info.platform_data = &init_data;
+ i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
}
void em28xx_card_setup(struct em28xx *dev)
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx-i2c.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx-i2c.c 2009-05-12 11:32:50.000000000 +0200
@@ -451,27 +451,6 @@ static u32 functionality(struct i2c_adap
return I2C_FUNC_SMBUS_EMUL;
}
-/*
- * attach_inform()
- * gets called when a device attaches to the i2c bus
- * does some basic configuration
- */
-static int attach_inform(struct i2c_client *client)
-{
- struct em28xx *dev = client->adapter->algo_data;
- struct IR_i2c *ir = i2c_get_clientdata(client);
-
- switch (client->addr << 1) {
- case 0x60:
- case 0x8e:
- dprintk1(1, "attach_inform: IR detected (%s).\n", ir->phys);
- em28xx_set_ir(dev, ir);
- break;
- }
-
- return 0;
-}
-
static struct i2c_algorithm em28xx_algo = {
.master_xfer = em28xx_i2c_xfer,
.functionality = functionality,
@@ -488,7 +467,6 @@ static struct i2c_adapter em28xx_adap_te
.name = "em28xx",
.id = I2C_HW_B_EM28XX,
.algo = &em28xx_algo,
- .client_register = attach_inform,
};
static struct i2c_client em28xx_client_template = {
--- v4l-dvb.orig/linux/drivers/media/video/em28xx/em28xx.h 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/em28xx/em28xx.h 2009-05-12 11:32:50.000000000 +0200
@@ -650,7 +650,6 @@ extern struct em28xx_board em28xx_boards
extern struct usb_device_id em28xx_id_table[];
extern const unsigned int em28xx_bcount;
void em28xx_register_i2c_ir(struct em28xx *dev);
-void em28xx_set_ir(struct em28xx *dev, struct IR_i2c *ir);
int em28xx_tuner_callback(void *ptr, int component, int command, int arg);
void em28xx_release_resources(struct em28xx *dev);
--- v4l-dvb.orig/linux/drivers/media/video/ir-kbd-i2c.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ir-kbd-i2c.c 2009-05-12 11:32:50.000000000 +0200
@@ -307,7 +307,7 @@ static void ir_work(struct work_struct *
static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
IR_KEYTAB_TYPE *ir_codes = NULL;
- char *name;
+ const char *name;
int ir_type;
struct IR_i2c *ir;
struct input_dev *input_dev;
@@ -395,6 +395,16 @@ static int ir_probe(struct i2c_client *c
goto err_out_free;
}
+ /* Let the caller override settings */
+ if (client->dev.platform_data) {
+ const struct IR_i2c_init_data *init_data =
+ client->dev.platform_data;
+
+ ir_codes = init_data->ir_codes;
+ name = init_data->name;
+ ir->get_key = init_data->get_key;
+ }
+
/* Sets name */
snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
ir->ir_codes = ir_codes;
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-i2c.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-i2c.c 2009-05-12 11:32:50.000000000 +0200
@@ -326,33 +326,6 @@ static u32 functionality(struct i2c_adap
return I2C_FUNC_SMBUS_EMUL;
}
-static int attach_inform(struct i2c_client *client)
-{
- struct saa7134_dev *dev = client->adapter->algo_data;
-
- d1printk( "%s i2c attach [addr=0x%x,client=%s]\n",
- client->driver->driver.name, client->addr, client->name);
-
- /* Am I an i2c remote control? */
-
- switch (client->addr) {
- case 0x7a:
- case 0x47:
- case 0x71:
- case 0x2d:
- case 0x30:
- {
- struct IR_i2c *ir = i2c_get_clientdata(client);
- d1printk("%s i2c IR detected (%s).\n",
- client->driver->driver.name, ir->phys);
- saa7134_set_i2c_ir(dev,ir);
- break;
- }
- }
-
- return 0;
-}
-
static struct i2c_algorithm saa7134_algo = {
.master_xfer = saa7134_i2c_xfer,
.functionality = functionality,
@@ -369,7 +342,6 @@ static struct i2c_adapter saa7134_adap_t
.name = "saa7134",
.id = I2C_HW_SAA7134,
.algo = &saa7134_algo,
- .client_register = attach_inform,
};
static struct i2c_client saa7134_client_template = {
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-05-12 11:32:50.000000000 +0200
@@ -689,6 +689,7 @@ void saa7134_input_fini(struct saa7134_d
void saa7134_probe_i2c_ir(struct saa7134_dev *dev)
{
struct i2c_board_info info;
+ struct IR_i2c_init_data init_data;
const unsigned short addr_list[] = {
0x7a, 0x47, 0x71, 0x2d,
I2C_CLIENT_END
@@ -726,62 +727,35 @@ void saa7134_probe_i2c_ir(struct saa7134
}
memset(&info, 0, sizeof(struct i2c_board_info));
+ memset(&init_data, 0, sizeof(struct IR_i2c_init_data));
strlcpy(info.type, "ir_video", I2C_NAME_SIZE);
- client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
- if (client)
- return;
-
- /* MSI TV@nywhere Plus controller doesn't seem to
- respond to probes unless we read something from
- an existing device. Weird... */
- rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
- dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
- msg_msi.addr, dev->i2c_adap.name,
- (1 == rc) ? "yes" : "no");
- client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list_msi);
- if (client)
- return;
- /* Special case for AVerMedia Cardbus remote */
- subaddr = 0x0d;
- rc = i2c_transfer(&dev->i2c_adap, msg_avermedia, 2);
- dprintk(KERN_DEBUG "probe 0x%02x/0x%02x @ %s: %s\n",
- msg_avermedia[0].addr, subaddr, dev->i2c_adap.name,
- (2 == rc) ? "yes" : "no");
- if (2 == rc) {
- info.addr = msg_avermedia[0].addr;
- i2c_new_device(&dev->i2c_adap, &info);
- }
-}
-
-void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir)
-{
switch (dev->board) {
case SAA7134_BOARD_PINNACLE_PCTV_110i:
case SAA7134_BOARD_PINNACLE_PCTV_310i:
- snprintf(ir->name, sizeof(ir->name), "Pinnacle PCTV");
+ init_data.name = "Pinnacle PCTV";
if (pinnacle_remote == 0) {
- ir->get_key = get_key_pinnacle_color;
- ir->ir_codes = ir_codes_pinnacle_color;
+ init_data.get_key = get_key_pinnacle_color;
+ init_data.ir_codes = ir_codes_pinnacle_color;
} else {
- ir->get_key = get_key_pinnacle_grey;
- ir->ir_codes = ir_codes_pinnacle_grey;
+ init_data.get_key = get_key_pinnacle_grey;
+ init_data.ir_codes = ir_codes_pinnacle_grey;
}
break;
case SAA7134_BOARD_UPMOST_PURPLE_TV:
- snprintf(ir->name, sizeof(ir->name), "Purple TV");
- ir->get_key = get_key_purpletv;
- ir->ir_codes = ir_codes_purpletv;
+ init_data.name = "Purple TV";
+ init_data.get_key = get_key_purpletv;
+ init_data.ir_codes = ir_codes_purpletv;
break;
case SAA7134_BOARD_MSI_TVATANYWHERE_PLUS:
- snprintf(ir->name, sizeof(ir->name), "MSI TV@nywhere Plus");
- ir->get_key = get_key_msi_tvanywhere_plus;
- ir->ir_codes = ir_codes_msi_tvanywhere_plus;
+ init_data.name = "MSI TV@nywhere Plus";
+ init_data.get_key = get_key_msi_tvanywhere_plus;
+ init_data.ir_codes = ir_codes_msi_tvanywhere_plus;
break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110:
- snprintf(ir->name, sizeof(ir->name), "HVR 1110");
- ir->get_key = get_key_hvr1110;
- ir->ir_codes = ir_codes_hauppauge_new;
+ init_data.name = "HVR 1110";
+ init_data.get_key = get_key_hvr1110;
+ init_data.ir_codes = ir_codes_hauppauge_new;
break;
case SAA7134_BOARD_BEHOLD_607FM_MK3:
case SAA7134_BOARD_BEHOLD_607FM_MK5:
@@ -795,15 +769,39 @@ void saa7134_set_i2c_ir(struct saa7134_d
case SAA7134_BOARD_BEHOLD_M63:
case SAA7134_BOARD_BEHOLD_M6_EXTRA:
case SAA7134_BOARD_BEHOLD_H6:
- snprintf(ir->name, sizeof(ir->name), "BeholdTV");
- ir->get_key = get_key_beholdm6xx;
- ir->ir_codes = ir_codes_behold;
- break;
- default:
- dprintk("Shouldn't get here: Unknown board %x for I2C IR?\n",dev->board);
+ init_data.name = "BeholdTV";
+ init_data.get_key = get_key_beholdm6xx;
+ init_data.ir_codes = ir_codes_behold;
break;
}
+ if (init_data.name)
+ info.platform_data = &init_data;
+ client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
+ if (client)
+ return;
+
+ /* MSI TV@nywhere Plus controller doesn't seem to
+ respond to probes unless we read something from
+ an existing device. Weird... */
+ rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
+ dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
+ msg_msi.addr, dev->i2c_adap.name,
+ (1 == rc) ? "yes" : "no");
+ client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list_msi);
+ if (client)
+ return;
+
+ /* Special case for AVerMedia Cardbus remote */
+ subaddr = 0x0d;
+ rc = i2c_transfer(&dev->i2c_adap, msg_avermedia, 2);
+ dprintk(KERN_DEBUG "probe 0x%02x/0x%02x @ %s: %s\n",
+ msg_avermedia[0].addr, subaddr, dev->i2c_adap.name,
+ (2 == rc) ? "yes" : "no");
+ if (2 == rc) {
+ info.addr = msg_avermedia[0].addr;
+ i2c_new_device(&dev->i2c_adap, &info);
+ }
}
static int saa7134_rc5_irq(struct saa7134_dev *dev)
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134.h 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134.h 2009-05-12 11:32:50.000000000 +0200
@@ -805,7 +805,6 @@ int saa7134_input_init1(struct saa7134_
void saa7134_input_fini(struct saa7134_dev *dev);
void saa7134_input_irq(struct saa7134_dev *dev);
void saa7134_probe_i2c_ir(struct saa7134_dev *dev);
-void saa7134_set_i2c_ir(struct saa7134_dev *dev, struct IR_i2c *ir);
void saa7134_ir_start(struct saa7134_dev *dev, struct card_ir *ir);
void saa7134_ir_stop(struct saa7134_dev *dev);
--- v4l-dvb.orig/linux/include/media/ir-kbd-i2c.h 2009-05-12 11:24:19.000000000 +0200
+++ v4l-dvb/linux/include/media/ir-kbd-i2c.h 2009-05-12 11:32:50.000000000 +0200
@@ -19,4 +19,11 @@ struct IR_i2c {
char phys[32];
int (*get_key)(struct IR_i2c*, u32*, u32*);
};
+
+/* Can be passed when instantiating an ir_video i2c device */
+struct IR_i2c_init_data {
+ IR_KEYTAB_TYPE *ir_codes;
+ const char *name;
+ int (*get_key)(struct IR_i2c*, u32*, u32*);
+};
#endif
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 4/8] ir-kbd-i2c: Don't assume all IR receivers are supported
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (2 preceding siblings ...)
2009-05-13 19:49 ` [PATCH 3/8] ir-kbd-i2c: Use initialization data Jean Delvare
@ 2009-05-13 19:50 ` Jean Delvare
2009-05-13 19:51 ` [PATCH 5/8] saa7134: Simplify handling of IR on MSI TV@nywhere Plus Jean Delvare
` (4 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:50 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
The code in ir_probe makes the dangerous assumption that all IR
receivers are supported by the driver. The new i2c model makes it
possible for bridge drivers to instantiate IR devices before they are
supported, therefore the ir-kbd-i2c drivers must be made more robust
to not spam the logs or even crash on unsupported IR devices. Simply,
the driver will not bind to the unsupported devices.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Andy Walls <awalls@radix.net>
---
linux/drivers/media/video/ir-kbd-i2c.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-07 21:35:53.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ir-kbd-i2c.c 2009-04-07 22:49:10.000000000 +0200
@@ -307,7 +307,7 @@ static void ir_work(struct work_struct *
static int ir_probe(struct i2c_client *client, const struct i2c_device_id *id)
{
IR_KEYTAB_TYPE *ir_codes = NULL;
- const char *name;
+ const char *name = NULL;
int ir_type;
struct IR_i2c *ir;
struct input_dev *input_dev;
@@ -389,8 +389,7 @@ static int ir_probe(struct i2c_client *c
ir_codes = ir_codes_avermedia_cardbus;
break;
default:
- /* shouldn't happen */
- printk(DEVNAME ": Huh? unknown i2c address (0x%02x)?\n", addr);
+ dprintk(1, DEVNAME ": Unsupported i2c address 0x%02x\n", addr);
err = -ENODEV;
goto err_out_free;
}
@@ -405,6 +404,14 @@ static int ir_probe(struct i2c_client *c
ir->get_key = init_data->get_key;
}
+ /* Make sure we are all setup before going on */
+ if (!name || !ir->get_key || !ir_codes) {
+ dprintk(1, DEVNAME ": Unsupported device at address 0x%02x\n",
+ addr);
+ err = -ENODEV;
+ goto err_out_free;
+ }
+
/* Sets name */
snprintf(ir->name, sizeof(ir->name), "i2c IR (%s)", name);
ir->ir_codes = ir_codes;
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 5/8] saa7134: Simplify handling of IR on MSI TV@nywhere Plus
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (3 preceding siblings ...)
2009-05-13 19:50 ` [PATCH 4/8] ir-kbd-i2c: Don't assume all IR receivers are supported Jean Delvare
@ 2009-05-13 19:51 ` Jean Delvare
2009-05-13 19:52 ` [PATCH 6/8] saa7134: Simplify handling of IR on AVerMedia Cardbus E506R Jean Delvare
` (3 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:51 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
Now that we instantiate I2C IR devices explicitly, we can skip probing
altogether on boards where the I2C IR device address is known. The MSI
TV@nywhere Plus is one of these boards.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
linux/drivers/media/video/saa7134/saa7134-input.c | 28 +++++++++++----------
1 file changed, 15 insertions(+), 13 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-29 15:42:53.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-29 15:53:23.000000000 +0200
@@ -695,9 +695,6 @@ void saa7134_probe_i2c_ir(struct saa7134
I2C_CLIENT_END
};
- const unsigned short addr_list_msi[] = {
- 0x30, I2C_CLIENT_END
- };
struct i2c_msg msg_msi = {
.addr = 0x50,
.flags = I2C_M_RD,
@@ -751,6 +748,15 @@ void saa7134_probe_i2c_ir(struct saa7134
init_data.name = "MSI TV@nywhere Plus";
init_data.get_key = get_key_msi_tvanywhere_plus;
init_data.ir_codes = ir_codes_msi_tvanywhere_plus;
+ info.addr = 0x30;
+ /* MSI TV@nywhere Plus controller doesn't seem to
+ respond to probes unless we read something from
+ an existing device. Weird...
+ REVISIT: might no longer be needed */
+ rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
+ dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
+ msg_msi.addr, dev->i2c_adap.name,
+ (1 == rc) ? "yes" : "no");
break;
case SAA7134_BOARD_HAUPPAUGE_HVR1110:
init_data.name = "HVR 1110";
@@ -777,18 +783,14 @@ void saa7134_probe_i2c_ir(struct saa7134
if (init_data.name)
info.platform_data = &init_data;
- client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
- if (client)
+ /* No need to probe if address is known */
+ if (info.addr) {
+ i2c_new_device(&dev->i2c_adap, &info);
return;
+ }
- /* MSI TV@nywhere Plus controller doesn't seem to
- respond to probes unless we read something from
- an existing device. Weird... */
- rc = i2c_transfer(&dev->i2c_adap, &msg_msi, 1);
- dprintk(KERN_DEBUG "probe 0x%02x @ %s: %s\n",
- msg_msi.addr, dev->i2c_adap.name,
- (1 == rc) ? "yes" : "no");
- client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list_msi);
+ /* Address not known, fallback to probing */
+ client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
if (client)
return;
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 6/8] saa7134: Simplify handling of IR on AVerMedia Cardbus E506R
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (4 preceding siblings ...)
2009-05-13 19:51 ` [PATCH 5/8] saa7134: Simplify handling of IR on MSI TV@nywhere Plus Jean Delvare
@ 2009-05-13 19:52 ` Jean Delvare
2009-05-13 19:55 ` [PATCH 7/8] ivtv: Probe more I2C addresses for IR devices Jean Delvare
` (2 subsequent siblings)
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:52 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
Now that we instantiate I2C IR devices explicitly, we can skip probing
altogether on boards where the I2C IR device address is known. The
AVerMedia Cardbus E506R is one of these boards.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Tested-by: Oldrich Jedlicka <oldium.pro@seznam.cz>
---
linux/drivers/media/video/saa7134/saa7134-input.c | 33 +++------------------
1 file changed, 5 insertions(+), 28 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-30 10:38:49.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/saa7134/saa7134-input.c 2009-04-30 10:39:10.000000000 +0200
@@ -702,20 +702,6 @@ void saa7134_probe_i2c_ir(struct saa7134
.buf = NULL,
};
- unsigned char subaddr, data;
- struct i2c_msg msg_avermedia[] = { {
- .addr = 0x40,
- .flags = 0,
- .len = 1,
- .buf = &subaddr,
- }, {
- .addr = 0x40,
- .flags = I2C_M_RD,
- .len = 1,
- .buf = &data,
- } };
-
- struct i2c_client *client;
int rc;
if (disable_ir) {
@@ -779,6 +765,10 @@ void saa7134_probe_i2c_ir(struct saa7134
init_data.get_key = get_key_beholdm6xx;
init_data.ir_codes = ir_codes_behold;
break;
+ case SAA7134_BOARD_AVERMEDIA_CARDBUS_501:
+ case SAA7134_BOARD_AVERMEDIA_CARDBUS_506:
+ info.addr = 0x40;
+ break;
}
if (init_data.name)
@@ -790,20 +780,7 @@ void saa7134_probe_i2c_ir(struct saa7134
}
/* Address not known, fallback to probing */
- client = i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
- if (client)
- return;
-
- /* Special case for AVerMedia Cardbus remote */
- subaddr = 0x0d;
- rc = i2c_transfer(&dev->i2c_adap, msg_avermedia, 2);
- dprintk(KERN_DEBUG "probe 0x%02x/0x%02x @ %s: %s\n",
- msg_avermedia[0].addr, subaddr, dev->i2c_adap.name,
- (2 == rc) ? "yes" : "no");
- if (2 == rc) {
- info.addr = msg_avermedia[0].addr;
- i2c_new_device(&dev->i2c_adap, &info);
- }
+ i2c_new_probed_device(&dev->i2c_adap, &info, addr_list);
}
static int saa7134_rc5_irq(struct saa7134_dev *dev)
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 7/8] ivtv: Probe more I2C addresses for IR devices
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (5 preceding siblings ...)
2009-05-13 19:52 ` [PATCH 6/8] saa7134: Simplify handling of IR on AVerMedia Cardbus E506R Jean Delvare
@ 2009-05-13 19:55 ` Jean Delvare
2009-05-13 19:56 ` [PATCH 8/8] pvrusb2: Instantiate ir_video I2C device by default Jean Delvare
2009-05-14 19:25 ` [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Oldřich Jedlička
8 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:55 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
Probe I2C addresses 0x71 and 0x6b for IR receiver devices (for the
PVR150 and Adaptec cards, respectively.)
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Hans Verkuil <hverkuil@xs4all.nl>
---
linux/drivers/media/video/ivtv/ivtv-i2c.c | 7 ++++++-
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
--- v4l-dvb.orig/linux/drivers/media/video/ivtv/ivtv-i2c.c 2009-05-13 16:36:49.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/ivtv/ivtv-i2c.c 2009-05-13 17:50:55.000000000 +0200
@@ -652,7 +652,12 @@ int init_ivtv_i2c(struct ivtv *itv)
That's why we probe 0x1a (~0x34) first. CB
*/
const unsigned short addr_list[] = {
- 0x1a, 0x18, 0x64, 0x30,
+ 0x1a, /* Hauppauge IR external */
+ 0x18, /* Hauppauge IR internal */
+ 0x71, /* Hauppauge IR (PVR150) */
+ 0x64, /* Pixelview IR */
+ 0x30, /* KNC ONE IR */
+ 0x6b, /* Adaptec IR */
I2C_CLIENT_END
};
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH 8/8] pvrusb2: Instantiate ir_video I2C device by default
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (6 preceding siblings ...)
2009-05-13 19:55 ` [PATCH 7/8] ivtv: Probe more I2C addresses for IR devices Jean Delvare
@ 2009-05-13 19:56 ` Jean Delvare
2009-05-17 21:56 ` Mike Isely
2009-05-14 19:25 ` [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Oldřich Jedlička
8 siblings, 1 reply; 14+ messages in thread
From: Jean Delvare @ 2009-05-13 19:56 UTC (permalink / raw)
To: LMML; +Cc: Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
Now that the ir-kbd-i2c driver has been converted to a new-style i2c
driver, we can instantiate the ir_video I2C device by default. The
pvr2_disable_ir_video is kept to disable the IR receiver, either
because the user doesn't use it, or for debugging purpose.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Mike Isely <isely@pobox.com>
---
linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- v4l-dvb.orig/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2009-05-13 18:05:54.000000000 +0200
+++ v4l-dvb/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2009-05-13 18:06:32.000000000 +0200
@@ -43,7 +43,7 @@ static int ir_mode[PVR_NUM] = { [0 ... P
module_param_array(ir_mode, int, NULL, 0444);
MODULE_PARM_DESC(ir_mode,"specify: 0=disable IR reception, 1=normal IR");
-static int pvr2_disable_ir_video = 1;
+static int pvr2_disable_ir_video;
module_param_named(disable_autoload_ir_video, pvr2_disable_ir_video,
int, S_IRUGO|S_IWUSR);
MODULE_PARM_DESC(disable_autoload_ir_video,
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 8/8] pvrusb2: Instantiate ir_video I2C device by default
2009-05-13 19:56 ` [PATCH 8/8] pvrusb2: Instantiate ir_video I2C device by default Jean Delvare
@ 2009-05-17 21:56 ` Mike Isely
0 siblings, 0 replies; 14+ messages in thread
From: Mike Isely @ 2009-05-17 21:56 UTC (permalink / raw)
To: Jean Delvare
Cc: LMML, Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
On Wed, 13 May 2009, Jean Delvare wrote:
> Now that the ir-kbd-i2c driver has been converted to a new-style i2c
> driver, we can instantiate the ir_video I2C device by default. The
> pvr2_disable_ir_video is kept to disable the IR receiver, either
> because the user doesn't use it, or for debugging purpose.
>
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> Cc: Mike Isely <isely@pobox.com>
Acked-by: Mike Isely <isely@pobox.com>
> ---
> linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- v4l-dvb.orig/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2009-05-13 18:05:54.000000000 +0200
> +++ v4l-dvb/linux/drivers/media/video/pvrusb2/pvrusb2-i2c-core.c 2009-05-13 18:06:32.000000000 +0200
> @@ -43,7 +43,7 @@ static int ir_mode[PVR_NUM] = { [0 ... P
> module_param_array(ir_mode, int, NULL, 0444);
> MODULE_PARM_DESC(ir_mode,"specify: 0=disable IR reception, 1=normal IR");
>
> -static int pvr2_disable_ir_video = 1;
> +static int pvr2_disable_ir_video;
> module_param_named(disable_autoload_ir_video, pvr2_disable_ir_video,
> int, S_IRUGO|S_IWUSR);
> MODULE_PARM_DESC(disable_autoload_ir_video,
>
>
--
Mike Isely
isely @ isely (dot) net
PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3)
2009-05-13 19:45 [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Jean Delvare
` (7 preceding siblings ...)
2009-05-13 19:56 ` [PATCH 8/8] pvrusb2: Instantiate ir_video I2C device by default Jean Delvare
@ 2009-05-14 19:25 ` Oldřich Jedlička
2009-05-14 19:26 ` Jean Delvare
8 siblings, 1 reply; 14+ messages in thread
From: Oldřich Jedlička @ 2009-05-14 19:25 UTC (permalink / raw)
To: Jean Delvare
Cc: LMML, Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
On Wednesday 13 of May 2009 at 21:45:59, Jean Delvare wrote:
> Hi all,
>
> Here comes an update of my conversion of ir-kbd-i2c to the new i2c
> binding model. I've split it into 8 pieces for easier review. Firstly
> there is 1 preliminary patch:
>
Hi Jean,
works for me, as usual :-) I've used the all-in-one patch and the up-to-date
v4l-dvb tree (compiled yesterday for completeness).
Cheers,
Oldrich.
> 01-ir-kbd-i2c-dont-abuse-client-name.patch
>
> Then 3 patches doing the actual conversion:
>
> 02-ir-kbd-i2c-convert-to-new-style.patch
> 03-configure-ir-receiver.patch
> 04-ir-kbd-i2c-dont-bind-to-unsupported-devices.patch
>
> Then 2 patches cleaning up saa7134-input thanks to the new
> possibilities offered by the conversion:
>
> 05-saa7134-input-cleanup-msi-ir.patch
> 06-saa7134-input-cleanup-avermedia-cardbus.patch
>
> And lastly driver-specific adjustments:
> 07-ir-add-lirc-addresses.patch
> 08-pvrusb2-enable-ir_video-by-default.patch
>
> This patch set is against the v4l-dvb repository, but I didn't pay
> attention to the compatibility issues. I simply build-tested it on
> 2.6.27, 2.6.29 and 2.6.30-rc5.
>
> This patch set touches many different drivers and I can't test any of
> them. My only TV card with an IR receiver doesn't make use of
> ir-kbd-i2c. So I would warmly welcome testers. The more testing my
> changes can get, the better.
>
> And of course I welcome reviews and comments as well. I had to touch
> many drivers I don't know anything about so it is possible that I
> missed something.
>
> The main difference with my previous patch set is that it is adjusted
> to apply after Mike Isely's recent prvusb2 patches.
>
> I'll post all 8 patches as replies to this post. They can also be
> temporarily downloaded from:
> http://jdelvare.pck.nerim.net/linux/ir-kbd-i2c/
> Additionally I've put a combined patch there, to make testing easier:
>
> http://jdelvare.pck.nerim.net/linux/ir-kbd-i2c/ir-kbd-i2c-conversion-ALL-IN
>-ONE.patch But for review the individual patches are much better.
>
> Thanks,
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3)
2009-05-14 19:25 ` [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3) Oldřich Jedlička
@ 2009-05-14 19:26 ` Jean Delvare
2009-05-17 21:55 ` Mike Isely
0 siblings, 1 reply; 14+ messages in thread
From: Jean Delvare @ 2009-05-14 19:26 UTC (permalink / raw)
To: Oldřich Jedlička
Cc: LMML, Mauro Carvalho Chehab, Andy Walls, Hans Verkuil, Mike Isely
On Thu, 14 May 2009 21:25:02 +0200, Oldřich Jedlička wrote:
> On Wednesday 13 of May 2009 at 21:45:59, Jean Delvare wrote:
> > Hi all,
> >
> > Here comes an update of my conversion of ir-kbd-i2c to the new i2c
> > binding model. I've split it into 8 pieces for easier review. Firstly
> > there is 1 preliminary patch:
> >
>
> Hi Jean,
>
> works for me, as usual :-) I've used the all-in-one patch and the up-to-date
> v4l-dvb tree (compiled yesterday for completeness).
Oldrich, thanks a lot for testing and reporting, this is very
appreciated.
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3)
2009-05-14 19:26 ` Jean Delvare
@ 2009-05-17 21:55 ` Mike Isely
2009-05-18 7:18 ` Jean Delvare
0 siblings, 1 reply; 14+ messages in thread
From: Mike Isely @ 2009-05-17 21:55 UTC (permalink / raw)
To: Jean Delvare
Cc: Old�~Yich Jedli�~Mka, LMML, Mauro Carvalho Chehab,
Andy Walls, Hans Verkuil, Mike Isely
[-- Attachment #1: Type: TEXT/PLAIN, Size: 968 bytes --]
On Thu, 14 May 2009, Jean Delvare wrote:
> On Thu, 14 May 2009 21:25:02 +0200, Oldřich Jedlička wrote:
> > On Wednesday 13 of May 2009 at 21:45:59, Jean Delvare wrote:
> > > Hi all,
> > >
> > > Here comes an update of my conversion of ir-kbd-i2c to the new i2c
> > > binding model. I've split it into 8 pieces for easier review. Firstly
> > > there is 1 preliminary patch:
> > >
> >
> > Hi Jean,
> >
> > works for me, as usual :-) I've used the all-in-one patch and the up-to-date
> > v4l-dvb tree (compiled yesterday for completeness).
>
> Oldrich, thanks a lot for testing and reporting, this is very
> appreciated.
>
Jean:
I tried the all-in-one patch here on a PVR-USB2 24xxx model (slightly
older v4l-dvb repo and 2.6.27.13 vanilla kernel) and it worked fine.
I'll add an acked-by to the corresponding (trivial) pvrusb2 patch that
you've posted.
-Mike
--
Mike Isely
isely @ isely (dot) net
PGP: 03 54 43 4D 75 E5 CC 92 71 16 01 E2 B5 F5 C1 E8
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 0/8] ir-kbd-i2c conversion to the new i2c binding model (v3)
2009-05-17 21:55 ` Mike Isely
@ 2009-05-18 7:18 ` Jean Delvare
0 siblings, 0 replies; 14+ messages in thread
From: Jean Delvare @ 2009-05-18 7:18 UTC (permalink / raw)
To: Mike Isely
Cc: Oldrich Jedlicka, LMML, Mauro Carvalho Chehab, Andy Walls,
Hans Verkuil
On Sun, 17 May 2009 16:55:54 -0500 (CDT), Mike Isely wrote:
> On Wednesday 13 of May 2009 at 21:45:59, Jean Delvare wrote:
> > Here comes an update of my conversion of ir-kbd-i2c to the new i2c
> > binding model. I've split it into 8 pieces for easier review. Firstly
> > there is 1 preliminary patch:
> > (...)
>
> I tried the all-in-one patch here on a PVR-USB2 24xxx model (slightly
> older v4l-dvb repo and 2.6.27.13 vanilla kernel) and it worked fine.
> I'll add an acked-by to the corresponding (trivial) pvrusb2 patch that
> you've posted.
Thanks for the testing Mike.
Mauro, I think it's time to add these patches to the v4l-dvb repository
so that they get broader testing.
--
Jean Delvare
^ permalink raw reply [flat|nested] 14+ messages in thread