diff options
| author | Michael Krufky <mkrufky@kernellabs.com> | 2009-07-12 17:25:45 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-08-13 19:39:04 -0400 |
| commit | d1ae4e1d05cc982b6b480c1a3d69b8bb231e3493 (patch) | |
| tree | 255e2581cbc16a38a61890d88f56ffef52792fa9 /drivers/media/dvb/siano/sms-cards.c | |
| parent | 261982f17051d10a1054a77ec8ae13517e0acee2 (diff) | |
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: Michael Krufky <mkrufky@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/siano/sms-cards.c')
| -rw-r--r-- | drivers/media/dvb/siano/sms-cards.c | 100 |
1 files changed, 0 insertions, 100 deletions
diff --git a/drivers/media/dvb/siano/sms-cards.c b/drivers/media/dvb/siano/sms-cards.c index d8b15d583bde..76bd3cb82d9f 100644 --- a/drivers/media/dvb/siano/sms-cards.c +++ b/drivers/media/dvb/siano/sms-cards.c | |||
| @@ -124,91 +124,15 @@ int sms_board_event(struct smscore_device_t *coredev, | |||
| 124 | 124 | ||
| 125 | switch (gevent) { | 125 | switch (gevent) { |
| 126 | case BOARD_EVENT_POWER_INIT: /* including hotplug */ | 126 | case BOARD_EVENT_POWER_INIT: /* including hotplug */ |
| 127 | switch (board_id) { | ||
| 128 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 129 | /* set I/O and turn off all LEDs */ | ||
| 130 | smscore_gpio_configure(coredev, | ||
| 131 | board->board_cfg.leds_power, | ||
| 132 | &MyGpioConfig); | ||
| 133 | smscore_gpio_set_level(coredev, | ||
| 134 | board->board_cfg.leds_power, 0); | ||
| 135 | smscore_gpio_configure(coredev, board->board_cfg.led0, | ||
| 136 | &MyGpioConfig); | ||
| 137 | smscore_gpio_set_level(coredev, | ||
| 138 | board->board_cfg.led0, 0); | ||
| 139 | smscore_gpio_configure(coredev, board->board_cfg.led1, | ||
| 140 | &MyGpioConfig); | ||
| 141 | smscore_gpio_set_level(coredev, | ||
| 142 | board->board_cfg.led1, 0); | ||
| 143 | break; | ||
| 144 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2: | ||
| 145 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD: | ||
| 146 | /* set I/O and turn off LNA */ | ||
| 147 | smscore_gpio_configure(coredev, | ||
| 148 | board->board_cfg.foreign_lna0_ctrl, | ||
| 149 | &MyGpioConfig); | ||
| 150 | smscore_gpio_set_level(coredev, | ||
| 151 | board->board_cfg.foreign_lna0_ctrl, | ||
| 152 | 0); | ||
| 153 | break; | ||
| 154 | } | ||
| 155 | break; /* BOARD_EVENT_BIND */ | 127 | break; /* BOARD_EVENT_BIND */ |
| 156 | 128 | ||
| 157 | case BOARD_EVENT_POWER_SUSPEND: | 129 | case BOARD_EVENT_POWER_SUSPEND: |
| 158 | switch (board_id) { | ||
| 159 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 160 | smscore_gpio_set_level(coredev, | ||
| 161 | board->board_cfg.leds_power, 0); | ||
| 162 | smscore_gpio_set_level(coredev, | ||
| 163 | board->board_cfg.led0, 0); | ||
| 164 | smscore_gpio_set_level(coredev, | ||
| 165 | board->board_cfg.led1, 0); | ||
| 166 | break; | ||
| 167 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2: | ||
| 168 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD: | ||
| 169 | smscore_gpio_set_level(coredev, | ||
| 170 | board->board_cfg.foreign_lna0_ctrl, | ||
| 171 | 0); | ||
| 172 | break; | ||
| 173 | } | ||
| 174 | break; /* BOARD_EVENT_POWER_SUSPEND */ | 130 | break; /* BOARD_EVENT_POWER_SUSPEND */ |
| 175 | 131 | ||
| 176 | case BOARD_EVENT_POWER_RESUME: | 132 | case BOARD_EVENT_POWER_RESUME: |
| 177 | switch (board_id) { | ||
| 178 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 179 | smscore_gpio_set_level(coredev, | ||
| 180 | board->board_cfg.leds_power, 1); | ||
| 181 | smscore_gpio_set_level(coredev, | ||
| 182 | board->board_cfg.led0, 1); | ||
| 183 | smscore_gpio_set_level(coredev, | ||
| 184 | board->board_cfg.led1, 0); | ||
| 185 | break; | ||
| 186 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2: | ||
| 187 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD: | ||
| 188 | smscore_gpio_set_level(coredev, | ||
| 189 | board->board_cfg.foreign_lna0_ctrl, | ||
| 190 | 1); | ||
| 191 | break; | ||
| 192 | } | ||
| 193 | break; /* BOARD_EVENT_POWER_RESUME */ | 133 | break; /* BOARD_EVENT_POWER_RESUME */ |
| 194 | 134 | ||
| 195 | case BOARD_EVENT_BIND: | 135 | case BOARD_EVENT_BIND: |
| 196 | switch (board_id) { | ||
| 197 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 198 | smscore_gpio_set_level(coredev, | ||
| 199 | board->board_cfg.leds_power, 1); | ||
| 200 | smscore_gpio_set_level(coredev, | ||
| 201 | board->board_cfg.led0, 1); | ||
| 202 | smscore_gpio_set_level(coredev, | ||
| 203 | board->board_cfg.led1, 0); | ||
| 204 | break; | ||
| 205 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD_R2: | ||
| 206 | case SMS1XXX_BOARD_HAUPPAUGE_TIGER_MINICARD: | ||
| 207 | smscore_gpio_set_level(coredev, | ||
| 208 | board->board_cfg.foreign_lna0_ctrl, | ||
| 209 | 1); | ||
| 210 | break; | ||
| 211 | } | ||
| 212 | break; /* BOARD_EVENT_BIND */ | 136 | break; /* BOARD_EVENT_BIND */ |
| 213 | 137 | ||
| 214 | case BOARD_EVENT_SCAN_PROG: | 138 | case BOARD_EVENT_SCAN_PROG: |
| @@ -218,20 +142,8 @@ int sms_board_event(struct smscore_device_t *coredev, | |||
| 218 | case BOARD_EVENT_EMERGENCY_WARNING_SIGNAL: | 142 | case BOARD_EVENT_EMERGENCY_WARNING_SIGNAL: |
| 219 | break; /* BOARD_EVENT_EMERGENCY_WARNING_SIGNAL */ | 143 | break; /* BOARD_EVENT_EMERGENCY_WARNING_SIGNAL */ |
| 220 | case BOARD_EVENT_FE_LOCK: | 144 | case BOARD_EVENT_FE_LOCK: |
| 221 | switch (board_id) { | ||
| 222 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 223 | smscore_gpio_set_level(coredev, | ||
| 224 | board->board_cfg.led1, 1); | ||
| 225 | break; | ||
| 226 | } | ||
| 227 | break; /* BOARD_EVENT_FE_LOCK */ | 145 | break; /* BOARD_EVENT_FE_LOCK */ |
| 228 | case BOARD_EVENT_FE_UNLOCK: | 146 | case BOARD_EVENT_FE_UNLOCK: |
| 229 | switch (board_id) { | ||
| 230 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 231 | smscore_gpio_set_level(coredev, | ||
| 232 | board->board_cfg.led1, 0); | ||
| 233 | break; | ||
| 234 | } | ||
| 235 | break; /* BOARD_EVENT_FE_UNLOCK */ | 147 | break; /* BOARD_EVENT_FE_UNLOCK */ |
| 236 | case BOARD_EVENT_DEMOD_LOCK: | 148 | case BOARD_EVENT_DEMOD_LOCK: |
| 237 | break; /* BOARD_EVENT_DEMOD_LOCK */ | 149 | break; /* BOARD_EVENT_DEMOD_LOCK */ |
| @@ -248,20 +160,8 @@ int sms_board_event(struct smscore_device_t *coredev, | |||
| 248 | case BOARD_EVENT_RECEPTION_LOST_0: | 160 | case BOARD_EVENT_RECEPTION_LOST_0: |
| 249 | break; /* BOARD_EVENT_RECEPTION_LOST_0 */ | 161 | break; /* BOARD_EVENT_RECEPTION_LOST_0 */ |
| 250 | case BOARD_EVENT_MULTIPLEX_OK: | 162 | case BOARD_EVENT_MULTIPLEX_OK: |
| 251 | switch (board_id) { | ||
| 252 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 253 | smscore_gpio_set_level(coredev, | ||
| 254 | board->board_cfg.led1, 1); | ||
| 255 | break; | ||
| 256 | } | ||
| 257 | break; /* BOARD_EVENT_MULTIPLEX_OK */ | 163 | break; /* BOARD_EVENT_MULTIPLEX_OK */ |
| 258 | case BOARD_EVENT_MULTIPLEX_ERRORS: | 164 | case BOARD_EVENT_MULTIPLEX_ERRORS: |
| 259 | switch (board_id) { | ||
| 260 | case SMS1XXX_BOARD_HAUPPAUGE_WINDHAM: | ||
| 261 | smscore_gpio_set_level(coredev, | ||
| 262 | board->board_cfg.led1, 0); | ||
| 263 | break; | ||
| 264 | } | ||
| 265 | break; /* BOARD_EVENT_MULTIPLEX_ERRORS */ | 165 | break; /* BOARD_EVENT_MULTIPLEX_ERRORS */ |
| 266 | 166 | ||
| 267 | default: | 167 | default: |
