-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'media-fixes' (patches from Mauro)
Merge media fixes from Mauro Carvalho Chehab: "This contains two patches fixing problems with my patch series meant to make USB drivers to work again after the DMA on stack changes. The last patch on this series is actually not related to DMA on stack. It solves a longstanding bug affecting module unload, causing module_put() to be called twice. It was reported by the user who reported and tested the issues with the gp8psk driver with the DMA fixup patches. As we're late at -rc cycle, maybe you prefer to not apply it right now. If this is the case, I'll add to the pile of patches for 4.10. Exceptionally this time, I'm sending the patches via e-mail, because I'm on another trip, and won't be able to use the usual procedure until Monday. Also, it is only three patches, and you followed already the discussions about the first one" * emailed patches from Mauro Carvalho Chehab <mchehab@osg.samsung.com>: gp8psk: Fix DVB frontend attach gp8psk: fix gp8psk_usb_in_op() logic dvb-usb: move data_mutex to struct dvb_usb_device
- Loading branch information
Showing
14 changed files
with
310 additions
and
249 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * gp8psk_fe driver | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| */ | ||
|
|
||
| #ifndef GP8PSK_FE_H | ||
| #define GP8PSK_FE_H | ||
|
|
||
| #include <linux/types.h> | ||
|
|
||
| /* gp8psk commands */ | ||
|
|
||
| #define GET_8PSK_CONFIG 0x80 /* in */ | ||
| #define SET_8PSK_CONFIG 0x81 | ||
| #define I2C_WRITE 0x83 | ||
| #define I2C_READ 0x84 | ||
| #define ARM_TRANSFER 0x85 | ||
| #define TUNE_8PSK 0x86 | ||
| #define GET_SIGNAL_STRENGTH 0x87 /* in */ | ||
| #define LOAD_BCM4500 0x88 | ||
| #define BOOT_8PSK 0x89 /* in */ | ||
| #define START_INTERSIL 0x8A /* in */ | ||
| #define SET_LNB_VOLTAGE 0x8B | ||
| #define SET_22KHZ_TONE 0x8C | ||
| #define SEND_DISEQC_COMMAND 0x8D | ||
| #define SET_DVB_MODE 0x8E | ||
| #define SET_DN_SWITCH 0x8F | ||
| #define GET_SIGNAL_LOCK 0x90 /* in */ | ||
| #define GET_FW_VERS 0x92 | ||
| #define GET_SERIAL_NUMBER 0x93 /* in */ | ||
| #define USE_EXTRA_VOLT 0x94 | ||
| #define GET_FPGA_VERS 0x95 | ||
| #define CW3K_INIT 0x9d | ||
|
|
||
| /* PSK_configuration bits */ | ||
| #define bm8pskStarted 0x01 | ||
| #define bm8pskFW_Loaded 0x02 | ||
| #define bmIntersilOn 0x04 | ||
| #define bmDVBmode 0x08 | ||
| #define bm22kHz 0x10 | ||
| #define bmSEL18V 0x20 | ||
| #define bmDCtuned 0x40 | ||
| #define bmArmed 0x80 | ||
|
|
||
| /* Satellite modulation modes */ | ||
| #define ADV_MOD_DVB_QPSK 0 /* DVB-S QPSK */ | ||
| #define ADV_MOD_TURBO_QPSK 1 /* Turbo QPSK */ | ||
| #define ADV_MOD_TURBO_8PSK 2 /* Turbo 8PSK (also used for Trellis 8PSK) */ | ||
| #define ADV_MOD_TURBO_16QAM 3 /* Turbo 16QAM (also used for Trellis 8PSK) */ | ||
|
|
||
| #define ADV_MOD_DCII_C_QPSK 4 /* Digicipher II Combo */ | ||
| #define ADV_MOD_DCII_I_QPSK 5 /* Digicipher II I-stream */ | ||
| #define ADV_MOD_DCII_Q_QPSK 6 /* Digicipher II Q-stream */ | ||
| #define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */ | ||
| #define ADV_MOD_DSS_QPSK 8 /* DSS (DIRECTV) QPSK */ | ||
| #define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */ | ||
|
|
||
| /* firmware revision id's */ | ||
| #define GP8PSK_FW_REV1 0x020604 | ||
| #define GP8PSK_FW_REV2 0x020704 | ||
| #define GP8PSK_FW_VERS(_fw_vers) \ | ||
| ((_fw_vers)[2]<<0x10 | (_fw_vers)[1]<<0x08 | (_fw_vers)[0]) | ||
|
|
||
| struct gp8psk_fe_ops { | ||
| int (*in)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen); | ||
| int (*out)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen); | ||
| int (*reload)(void *priv); | ||
| }; | ||
|
|
||
| struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops, | ||
| void *priv, bool is_rev1); | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.