Commit d1ae4e1d authored by Michael Krufky's avatar Michael Krufky Committed by Mauro Carvalho Chehab

V4L/DVB (12374): sms1xxx: fix broken Hauppauge devices

The current GPIO configuration breaks all Hauppauge devices.

The code being removed affects Hauppauge devices only,
and is the cause of the breakage.
Signed-off-by: default avatarMichael Krufky <mkrufky@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 261982f1
...@@ -124,91 +124,15 @@ int sms_board_event(struct smscore_device_t *coredev, ...@@ -124,91 +124,15 @@ int sms_board_event(struct smscore_device_t *coredev,
switch (gevent) { switch (gevent) {
case BOARD_EVENT_POWER_INIT: /* including hotplug */ case BOARD_EVENT_POWER_INIT: /* including hotplug */
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
/* set I/O and turn off all LEDs */
smscore_gpio_configure(coredev,
board->board_cfg.leds_power,
&MyGpioConfig);
smscore_gpio_set_level(coredev,
board->board_cfg.leds_power, 0);
smscore_gpio_configure(coredev, board->board_cfg.led0,
&MyGpioConfig);
smscore_gpio_set_level(coredev,
board->board_cfg.led0, 0);
smscore_gpio_configure(coredev, board->board_cfg.led1,
&MyGpioConfig);
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
/* set I/O and turn off LNA */
smscore_gpio_configure(coredev,
board->board_cfg.foreign_lna0_ctrl,
&MyGpioConfig);
smscore_gpio_set_level(coredev,
board->board_cfg.foreign_lna0_ctrl,
0);
break;
}
break; /* BOARD_EVENT_BIND */ break; /* BOARD_EVENT_BIND */
case BOARD_EVENT_POWER_SUSPEND: case BOARD_EVENT_POWER_SUSPEND:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.leds_power, 0);
smscore_gpio_set_level(coredev,
board->board_cfg.led0, 0);
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
smscore_gpio_set_level(coredev,
board->board_cfg.foreign_lna0_ctrl,
0);
break;
}
break; /* BOARD_EVENT_POWER_SUSPEND */ break; /* BOARD_EVENT_POWER_SUSPEND */
case BOARD_EVENT_POWER_RESUME: case BOARD_EVENT_POWER_RESUME:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.leds_power, 1);
smscore_gpio_set_level(coredev,
board->board_cfg.led0, 1);
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
smscore_gpio_set_level(coredev,
board->board_cfg.foreign_lna0_ctrl,
1);
break;
}
break; /* BOARD_EVENT_POWER_RESUME */ break; /* BOARD_EVENT_POWER_RESUME */
case BOARD_EVENT_BIND: case BOARD_EVENT_BIND:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.leds_power, 1);
smscore_gpio_set_level(coredev,
board->board_cfg.led0, 1);
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2:
case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD:
smscore_gpio_set_level(coredev,
board->board_cfg.foreign_lna0_ctrl,
1);
break;
}
break; /* BOARD_EVENT_BIND */ break; /* BOARD_EVENT_BIND */
case BOARD_EVENT_SCAN_PROG: case BOARD_EVENT_SCAN_PROG:
...@@ -218,20 +142,8 @@ int sms_board_event(struct smscore_device_t *coredev, ...@@ -218,20 +142,8 @@ int sms_board_event(struct smscore_device_t *coredev,
case BOARD_EVENT_EMERGENCY_WARNING_SIGNAL: case BOARD_EVENT_EMERGENCY_WARNING_SIGNAL:
break; /* BOARD_EVENT_EMERGENCY_WARNING_SIGNAL */ break; /* BOARD_EVENT_EMERGENCY_WARNING_SIGNAL */
case BOARD_EVENT_FE_LOCK: case BOARD_EVENT_FE_LOCK:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 1);
break;
}
break; /* BOARD_EVENT_FE_LOCK */ break; /* BOARD_EVENT_FE_LOCK */
case BOARD_EVENT_FE_UNLOCK: case BOARD_EVENT_FE_UNLOCK:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
}
break; /* BOARD_EVENT_FE_UNLOCK */ break; /* BOARD_EVENT_FE_UNLOCK */
case BOARD_EVENT_DEMOD_LOCK: case BOARD_EVENT_DEMOD_LOCK:
break; /* BOARD_EVENT_DEMOD_LOCK */ break; /* BOARD_EVENT_DEMOD_LOCK */
...@@ -248,20 +160,8 @@ int sms_board_event(struct smscore_device_t *coredev, ...@@ -248,20 +160,8 @@ int sms_board_event(struct smscore_device_t *coredev,
case BOARD_EVENT_RECEPTION_LOST_0: case BOARD_EVENT_RECEPTION_LOST_0:
break; /* BOARD_EVENT_RECEPTION_LOST_0 */ break; /* BOARD_EVENT_RECEPTION_LOST_0 */
case BOARD_EVENT_MULTIPLEX_OK: case BOARD_EVENT_MULTIPLEX_OK:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 1);
break;
}
break; /* BOARD_EVENT_MULTIPLEX_OK */ break; /* BOARD_EVENT_MULTIPLEX_OK */
case BOARD_EVENT_MULTIPLEX_ERRORS: case BOARD_EVENT_MULTIPLEX_ERRORS:
switch (board_id) {
case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM:
smscore_gpio_set_level(coredev,
board->board_cfg.led1, 0);
break;
}
break; /* BOARD_EVENT_MULTIPLEX_ERRORS */ break; /* BOARD_EVENT_MULTIPLEX_ERRORS */
default: default:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment