media Kconfig reorg - part 3
Subsystems (6)
cover media Kconfig reorg - part 3
That's a third part of the patch series with improve the media Kconfig settings.
The entire series is
at:
https://git.linuxtv.org/mchehab/experimental.git/log/?h=media-kconfig
patch 1 addresses a report from Helen that an user might not notice that drivers are filtered. So, it adds an explicit message warning about that;
patch 2 marks PCI skeleton and dvb-dummy-fe as test drivers too;
patch 3-5 duplicates the dvb_dummy_fe driver into the ddbridge driver. The ddbridge driver is unique: it has a PCI bridge with some slots for frontends. When the slot is empty, it uses the dummy frontend. As we'll be soon changing the dummy frontend to make it a virtual driver, and no other real driver requires a dummy FE, place a simplified copy of it at the ddbridge directory;
patch 6 fix several problems related to media test devices. Before such patch, one would need to build a real driver in order to select the needed cores for the test ones.
patch 7 adds some missing SPDX headers at the media build system.
Mauro Carvalho Chehab (7):
media: Kconfig: warn if drivers are filtered
media: Kconfig: mark other drivers as test drivers
media: ddbridge: copy the dvb_dummy_fe driver to ddbridge
media: ddbridge-dummy_fe: do some vars and function renames
media: ddbridge: use the ddbridge's own dummy fe driver
media: Kconfig: fix selection for test drivers
media: add SPDX headers on Kconfig and Makefile files
drivers/media/Kconfig | 7 +- drivers/media/dvb-frontends/Kconfig | 15 +- drivers/media/mc/Kconfig | 2 + drivers/media/pci/Kconfig | 9 +- drivers/media/pci/ddbridge/Kconfig | 1 - drivers/media/pci/ddbridge/Makefile | 2 +- drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- .../media/pci/ddbridge/ddbridge-dummy-fe.c | 153 ++++++++++++++++++ .../media/pci/ddbridge/ddbridge-dummy-fe.h | 16 ++ drivers/media/platform/sunxi/Kconfig | 2 + drivers/media/platform/sunxi/Makefile | 2 + .../media/platform/sunxi/sun4i-csi/Kconfig | 2 + .../media/platform/sunxi/sun4i-csi/Makefile | 2 + drivers/media/test_drivers/Kconfig | 2 +- drivers/staging/media/hantro/Makefile | 2 + drivers/staging/media/rkisp1/Makefile | 2 + 16 files changed, 210 insertions(+), 13 deletions(-) create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.c create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.h
Signature · 1 line
2.25.1
PATCH 1/7 media: Kconfig: warn if drivers are filtered
As per a tester feedback, add an option to report when the drivers are filtered at the Kconfig menu.
--- drivers/media/Kconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/media/Kconfig +4 -1
@@ -19,7 +19,7 @@ menuconfig MEDIA_SUPPORT if MEDIA_SUPPORT config MEDIA_SUPPORT_FILTER - bool "Filter devices by their types" + bool "Filter media drivers" depends on MEDIA_SUPPORT default y if !EMBEDDED && !EXPERT help
@@ -213,6 +213,9 @@ menu "HDMI CEC options" source "drivers/media/cec/Kconfig" endmenu +comment "Drivers filtered as selected at 'Filter media drivers'" + depends on MEDIA_SUPPORT_FILTER + menu "Media drivers" source "drivers/media/usb/Kconfig"
Signature · 1 line
2.25.1
PATCH 2/7 media: Kconfig: mark other drivers as test drivers
In reply to Mauro Carvalho ChehabNeither the PCI skeleton nor the DVB dummy driver are real drivers. They're there just as an example for a driver writter.
Distros should not enable those drivers. So, hide them if MEDIA_TEST_SUPPORT is not selected.
--- drivers/media/dvb-frontends/Kconfig | 4 ++++ drivers/media/pci/Kconfig | 1 + 2 files changed, 5 insertions(+)
drivers/media/dvb-frontends/Kconfig +4 -0
@@ -944,8 +944,12 @@ config DVB_SP2 CIMaX SP2/SP2HF Common Interface module. comment "Tools to develop new frontends" + depends on MEDIA_TEST_SUPPORT config DVB_DUMMY_FE tristate "Dummy frontend driver" depends on DVB_CORE + depends on MEDIA_TEST_SUPPORT + help + Dummy skeleton frontend driver. endmenu
drivers/media/pci/Kconfig +1 -0
@@ -65,6 +65,7 @@ source "drivers/media/pci/intel/ipu3/Kconfig" config VIDEO_PCI_SKELETON tristate "Skeleton PCI V4L2 driver" + depends on MEDIA_TEST_SUPPORT depends on PCI depends on SAMPLES depends on VIDEO_V4L2 && VIDEOBUF2_CORE
Signature · 1 line
2.25.1
PATCH 3/7 media: ddbridge: copy the dvb_dummy_fe driver to ddbridge
In reply to Mauro Carvalho ChehabAs we'll be transforming the dvb-dummy-fe driver soon into a virtual driver, let's first copy the existing one to ddbridge as-is, as it is needed there.
--- .../media/pci/ddbridge/ddbridge-dummy-fe.c | 286 ++++++++++++++++++ .../media/pci/ddbridge/ddbridge-dummy-fe.h | 36 +++ 2 files changed, 322 insertions(+) create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.c create mode 100644 drivers/media/pci/ddbridge/ddbridge-dummy-fe.h
drivers/media/pci/ddbridge/ddbridge-dummy-fe.c new file +286 -0
@@ -0,0 +1,286 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Driver for Dummy Frontend +* +* Written by Emard <[email protected]> +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/string.h> +#include <linux/slab.h> + +#include <media/dvb_frontend.h> +#include "dvb_dummy_fe.h" + + +struct dvb_dummy_fe_state { +struct dvb_frontend frontend; +}; + + +static int dvb_dummy_fe_read_status (struct dvb_frontend *fe, +enum fe_status *status) +{ + *status =FE_HAS_SIGNAL + |FE_HAS_CARRIER + |FE_HAS_VITERBI + |FE_HAS_SYNC + |FE_HAS_LOCK ; + +return 0 ; +} + +static int dvb_dummy_fe_read_ber (struct dvb_frontend *fe,u32 *ber) +{ + *ber =0 ; +return 0 ; +} + +static int dvb_dummy_fe_read_signal_strength (struct dvb_frontend *fe, +u16 *strength) +{ + *strength =0 ; +return 0 ; +} + +static int dvb_dummy_fe_read_snr (struct dvb_frontend *fe,u16 *snr) +{ + *snr =0 ; +return 0 ; +} + +static int dvb_dummy_fe_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) +{ + *ucblocks =0 ; +return 0 ; +} + +/* +* Should only be implemented if it actually reads something from the hardware. +* Also, it should check for the locks, in order to avoid report wrong data +* to userspace. +*/ +static int dvb_dummy_fe_get_frontend (struct dvb_frontend *fe, +struct dtv_frontend_properties *p) +{ +return 0 ; +} + +static int dvb_dummy_fe_set_frontend (struct dvb_frontend *fe) +{ +if (fe->ops.tuner_ops.set_params) { + fe->ops.tuner_ops.set_params (fe); +if (fe->ops.i2c_gate_ctrl) + fe->ops.i2c_gate_ctrl (fe,0 ); + } + +return 0 ; +} + +static int dvb_dummy_fe_sleep (struct dvb_frontend *fe) +{ +return 0 ; +} + +static int dvb_dummy_fe_init (struct dvb_frontend *fe) +{ +return 0 ; +} + +static int dvb_dummy_fe_set_tone (struct dvb_frontend *fe, +enum fe_sec_tone_mode tone) +{ +return 0 ; +} + +static int dvb_dummy_fe_set_voltage (struct dvb_frontend *fe, +enum fe_sec_voltage voltage) +{ +return 0 ; +} + +static void dvb_dummy_fe_release (struct dvb_frontend *fe) +{ +struct dvb_dummy_fe_state *state = fe->demodulator_priv; + +kfree (state); +} + +static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops; + +struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ) +{ +struct dvb_dummy_fe_state *state =NULL ; + +/* allocate memory for the internal state */ + state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); +if (!state) +return NULL ; + +/* create dvb_frontend */ +memcpy (&state->frontend.ops, + &dvb_dummy_fe_ofdm_ops, +sizeof (struct dvb_frontend_ops )); + + state->frontend.demodulator_priv = state; +return &state->frontend; +} +EXPORT_SYMBOL (dvb_dummy_fe_ofdm_attach); + +static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops; + +struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ) +{ +struct dvb_dummy_fe_state *state =NULL ; + +/* allocate memory for the internal state */ + state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); +if (!state) +return NULL ; + +/* create dvb_frontend */ +memcpy (&state->frontend.ops, + &dvb_dummy_fe_qpsk_ops, +sizeof (struct dvb_frontend_ops )); + + state->frontend.demodulator_priv = state; +return &state->frontend; +} +EXPORT_SYMBOL (dvb_dummy_fe_qpsk_attach); + +static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops; + +struct dvb_frontend *dvb_dummy_fe_qam_attach (void ) +{ +struct dvb_dummy_fe_state *state =NULL ; + +/* allocate memory for the internal state */ + state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); +if (!state) +return NULL ; + +/* create dvb_frontend */ +memcpy (&state->frontend.ops, + &dvb_dummy_fe_qam_ops, +sizeof (struct dvb_frontend_ops )); + + state->frontend.demodulator_priv = state; +return &state->frontend; +} +EXPORT_SYMBOL (dvb_dummy_fe_qam_attach); + +static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = { + .delsys = {SYS_DVBT }, + .info = { + .name ="Dummy DVB-T" , + .frequency_min_hz =0 , + .frequency_max_hz =863250 * kHz, + .frequency_stepsize_hz =62500 , + .caps =FE_CAN_FEC_1_2 | +FE_CAN_FEC_2_3 | +FE_CAN_FEC_3_4 | +FE_CAN_FEC_4_5 | +FE_CAN_FEC_5_6 | +FE_CAN_FEC_6_7 | +FE_CAN_FEC_7_8 | +FE_CAN_FEC_8_9 | +FE_CAN_FEC_AUTO | +FE_CAN_QAM_16 | +FE_CAN_QAM_64 | +FE_CAN_QAM_AUTO | +FE_CAN_TRANSMISSION_MODE_AUTO | +FE_CAN_GUARD_INTERVAL_AUTO | +FE_CAN_HIERARCHY_AUTO , + }, + + .release = dvb_dummy_fe_release, + + .init = dvb_dummy_fe_init, + .sleep = dvb_dummy_fe_sleep, + + .set_frontend = dvb_dummy_fe_set_frontend, + .get_frontend = dvb_dummy_fe_get_frontend, + + .read_status = dvb_dummy_fe_read_status, + .read_ber = dvb_dummy_fe_read_ber, + .read_signal_strength = dvb_dummy_fe_read_signal_strength, + .read_snr = dvb_dummy_fe_read_snr, + .read_ucblocks = dvb_dummy_fe_read_ucblocks, +}; + +static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops = { + .delsys = {SYS_DVBC_ANNEX_A }, + .info = { + .name ="Dummy DVB-C" , + .frequency_min_hz =51 * MHz, + .frequency_max_hz =858 * MHz, + .frequency_stepsize_hz =62500 , +/* symbol_rate_min: SACLK/64 == (XIN/2)/64 */ + .symbol_rate_min = (57840000 /2 ) /64 , + .symbol_rate_max = (57840000 /2 ) /4 ,/* SACLK/4 */ + .caps =FE_CAN_QAM_16 | +FE_CAN_QAM_32 | +FE_CAN_QAM_64 | +FE_CAN_QAM_128 | +FE_CAN_QAM_256 | +FE_CAN_FEC_AUTO | +FE_CAN_INVERSION_AUTO + }, + + .release = dvb_dummy_fe_release, + + .init = dvb_dummy_fe_init, + .sleep = dvb_dummy_fe_sleep, + + .set_frontend = dvb_dummy_fe_set_frontend, + .get_frontend = dvb_dummy_fe_get_frontend, + + .read_status = dvb_dummy_fe_read_status, + .read_ber = dvb_dummy_fe_read_ber, + .read_signal_strength = dvb_dummy_fe_read_signal_strength, + .read_snr = dvb_dummy_fe_read_snr, + .read_ucblocks = dvb_dummy_fe_read_ucblocks, +}; + +static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = { + .delsys = {SYS_DVBS }, + .info = { + .name ="Dummy DVB-S" , + .frequency_min_hz =950 * MHz, + .frequency_max_hz =2150 * MHz, + .frequency_stepsize_hz =250 * kHz, + .frequency_tolerance_hz =29500 * kHz, + .symbol_rate_min =1000000 , + .symbol_rate_max =45000000 , + .caps =FE_CAN_INVERSION_AUTO | +FE_CAN_FEC_1_2 | +FE_CAN_FEC_2_3 | +FE_CAN_FEC_3_4 | +FE_CAN_FEC_5_6 | +FE_CAN_FEC_7_8 | +FE_CAN_FEC_AUTO | +FE_CAN_QPSK + }, + + .release = dvb_dummy_fe_release, + + .init = dvb_dummy_fe_init, + .sleep = dvb_dummy_fe_sleep, + + .set_frontend = dvb_dummy_fe_set_frontend, + .get_frontend = dvb_dummy_fe_get_frontend, + + .read_status = dvb_dummy_fe_read_status, + .read_ber = dvb_dummy_fe_read_ber, + .read_signal_strength = dvb_dummy_fe_read_signal_strength, + .read_snr = dvb_dummy_fe_read_snr, + .read_ucblocks = dvb_dummy_fe_read_ucblocks, + + .set_voltage = dvb_dummy_fe_set_voltage, + .set_tone = dvb_dummy_fe_set_tone, +}; + +MODULE_DESCRIPTION ("DVB DUMMY Frontend" ); +MODULE_AUTHOR ("Emard" ); +MODULE_LICENSE ("GPL" );
drivers/media/pci/ddbridge/ddbridge-dummy-fe.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Driver for Dummy Frontend +* +* Written by Emard <[email protected]> +*/ + +#ifndef DVB_DUMMY_FE_H +#define DVB_DUMMY_FE_H + +#include <linux/dvb/frontend.h> +#include <media/dvb_frontend.h> + +#if IS_REACHABLE (CONFIG_DVB_DUMMY_FE ) +struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ); +struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ); +struct dvb_frontend *dvb_dummy_fe_qam_attach (void ); +#else +static inline struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ) +{ +pr_warn ("%s: driver disabled by Kconfig\n" , __func__); +return NULL ; +} +static inline struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ) +{ +pr_warn ("%s: driver disabled by Kconfig\n" , __func__); +return NULL ; +} +static inline struct dvb_frontend *dvb_dummy_fe_qam_attach (void ) +{ +pr_warn ("%s: driver disabled by Kconfig\n" , __func__); +return NULL ; +} +#endif /* CONFIG_DVB_DUMMY_FE */ + +#endif // DVB_DUMMY_FE_H
Signature · 1 line
2.25.1
PATCH 4/7 media: ddbridge-dummy_fe: do some vars and function renames
In reply to Mauro Carvalho ChehabAs the name of this driver is now ddbridge-dummy, do some renames internally.
No functional changes.
--- .../media/pci/ddbridge/ddbridge-dummy-fe.c | 144 +++++++++--------- .../media/pci/ddbridge/ddbridge-dummy-fe.h | 22 +-- 2 files changed, 83 insertions(+), 83 deletions(-)
drivers/media/pci/ddbridge/ddbridge-dummy-fe.c +72 -72
@@ -11,15 +11,15 @@#include <linux/slab.h> #include <media/dvb_frontend.h> -#include "dvb_dummy_fe.h" +#include "ddbridge-dummy-fe.h" -struct dvb_dummy_fe_state { +struct ddbridge_dummy_fe_state {struct dvb_frontend frontend; }; -static int dvb_dummy_fe_read_status (struct dvb_frontend *fe, +static int ddbridge_dummy_fe_read_status (struct dvb_frontend *fe,enum fe_status *status) { *status =FE_HAS_SIGNAL
@@ -31,26 +31,26 @@ static int dvb_dummy_fe_read_status(struct dvb_frontend *fe,return 0 ; } -static int dvb_dummy_fe_read_ber (struct dvb_frontend *fe,u32 *ber) +static int ddbridge_dummy_fe_read_ber (struct dvb_frontend *fe,u32 *ber) { *ber =0 ;return 0 ; } -static int dvb_dummy_fe_read_signal_strength (struct dvb_frontend *fe, +static int ddbridge_dummy_fe_read_signal_strength (struct dvb_frontend *fe,u16 *strength) { *strength =0 ;return 0 ; } -static int dvb_dummy_fe_read_snr (struct dvb_frontend *fe,u16 *snr) +static int ddbridge_dummy_fe_read_snr (struct dvb_frontend *fe,u16 *snr) { *snr =0 ;return 0 ; } -static int dvb_dummy_fe_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) +static int ddbridge_dummy_fe_read_ucblocks (struct dvb_frontend *fe,u32 *ucblocks) { *ucblocks =0 ;return 0 ;
@@ -61,13 +61,13 @@ static int dvb_dummy_fe_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)* Also, it should check for the locks, in order to avoid report wrong data * to userspace. */ -static int dvb_dummy_fe_get_frontend (struct dvb_frontend *fe, +static int ddbridge_dummy_fe_get_frontend (struct dvb_frontend *fe,struct dtv_frontend_properties *p) {return 0 ; } -static int dvb_dummy_fe_set_frontend (struct dvb_frontend *fe) +static int ddbridge_dummy_fe_set_frontend (struct dvb_frontend *fe) {if (fe->ops.tuner_ops.set_params) { fe->ops.tuner_ops.set_params (fe);
@@ -78,102 +78,102 @@ static int dvb_dummy_fe_set_frontend(struct dvb_frontend *fe)return 0 ; } -static int dvb_dummy_fe_sleep (struct dvb_frontend *fe) +static int ddbridge_dummy_fe_sleep (struct dvb_frontend *fe) {return 0 ; } -static int dvb_dummy_fe_init (struct dvb_frontend *fe) +static int ddbridge_dummy_fe_init (struct dvb_frontend *fe) {return 0 ; } -static int dvb_dummy_fe_set_tone (struct dvb_frontend *fe, +static int ddbridge_dummy_fe_set_tone (struct dvb_frontend *fe,enum fe_sec_tone_mode tone) {return 0 ; } -static int dvb_dummy_fe_set_voltage (struct dvb_frontend *fe, +static int ddbridge_dummy_fe_set_voltage (struct dvb_frontend *fe,enum fe_sec_voltage voltage) {return 0 ; } -static void dvb_dummy_fe_release (struct dvb_frontend *fe) +static void ddbridge_dummy_fe_release (struct dvb_frontend *fe) { -struct dvb_dummy_fe_state *state = fe->demodulator_priv; +struct ddbridge_dummy_fe_state *state = fe->demodulator_priv;kfree (state); } -static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops; +static const struct dvb_frontend_ops ddbridge_dummy_fe_ofdm_ops; -struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ) +struct dvb_frontend *ddbridge_dummy_fe_ofdm_attach (void ) { -struct dvb_dummy_fe_state *state =NULL ; +struct ddbridge_dummy_fe_state *state =NULL ;/* allocate memory for the internal state */ - state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); + state =kzalloc (sizeof (struct ddbridge_dummy_fe_state ),GFP_KERNEL );if (!state)return NULL ;/* create dvb_frontend */ memcpy (&state->frontend.ops, - &dvb_dummy_fe_ofdm_ops, + &ddbridge_dummy_fe_ofdm_ops,sizeof (struct dvb_frontend_ops )); state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (dvb_dummy_fe_ofdm_attach); +EXPORT_SYMBOL (ddbridge_dummy_fe_ofdm_attach); -static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops; +static const struct dvb_frontend_ops ddbridge_dummy_fe_qpsk_ops; -struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ) +struct dvb_frontend *ddbridge_dummy_fe_qpsk_attach (void ) { -struct dvb_dummy_fe_state *state =NULL ; +struct ddbridge_dummy_fe_state *state =NULL ;/* allocate memory for the internal state */ - state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); + state =kzalloc (sizeof (struct ddbridge_dummy_fe_state ),GFP_KERNEL );if (!state)return NULL ;/* create dvb_frontend */ memcpy (&state->frontend.ops, - &dvb_dummy_fe_qpsk_ops, + &ddbridge_dummy_fe_qpsk_ops,sizeof (struct dvb_frontend_ops )); state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (dvb_dummy_fe_qpsk_attach); +EXPORT_SYMBOL (ddbridge_dummy_fe_qpsk_attach); -static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops; +static const struct dvb_frontend_ops ddbridge_dummy_fe_qam_ops; -struct dvb_frontend *dvb_dummy_fe_qam_attach (void ) +struct dvb_frontend *ddbridge_dummy_fe_qam_attach (void ) { -struct dvb_dummy_fe_state *state =NULL ; +struct ddbridge_dummy_fe_state *state =NULL ;/* allocate memory for the internal state */ - state =kzalloc (sizeof (struct dvb_dummy_fe_state ),GFP_KERNEL ); + state =kzalloc (sizeof (struct ddbridge_dummy_fe_state ),GFP_KERNEL );if (!state)return NULL ;/* create dvb_frontend */ memcpy (&state->frontend.ops, - &dvb_dummy_fe_qam_ops, + &ddbridge_dummy_fe_qam_ops,sizeof (struct dvb_frontend_ops )); state->frontend.demodulator_priv = state;return &state->frontend; } -EXPORT_SYMBOL (dvb_dummy_fe_qam_attach); +EXPORT_SYMBOL (ddbridge_dummy_fe_qam_attach); -static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = { +static const struct dvb_frontend_ops ddbridge_dummy_fe_ofdm_ops = { .delsys = {SYS_DVBT }, .info = { - .name ="Dummy DVB-T" , + .name ="ddbridge dummy DVB-T" , .frequency_min_hz =0 , .frequency_max_hz =863250 * kHz, .frequency_stepsize_hz =62500 ,
@@ -194,25 +194,25 @@ static const struct dvb_frontend_ops dvb_dummy_fe_ofdm_ops = { FE_CAN_HIERARCHY_AUTO, }, - .release = dvb_dummy_fe_release, + .release = ddbridge_dummy_fe_release, - .init = dvb_dummy_fe_init, - .sleep = dvb_dummy_fe_sleep, + .init = ddbridge_dummy_fe_init, + .sleep = ddbridge_dummy_fe_sleep, - .set_frontend = dvb_dummy_fe_set_frontend, - .get_frontend = dvb_dummy_fe_get_frontend, + .set_frontend = ddbridge_dummy_fe_set_frontend, + .get_frontend = ddbridge_dummy_fe_get_frontend, - .read_status = dvb_dummy_fe_read_status, - .read_ber = dvb_dummy_fe_read_ber, - .read_signal_strength = dvb_dummy_fe_read_signal_strength, - .read_snr = dvb_dummy_fe_read_snr, - .read_ucblocks = dvb_dummy_fe_read_ucblocks, + .read_status = ddbridge_dummy_fe_read_status, + .read_ber = ddbridge_dummy_fe_read_ber, + .read_signal_strength = ddbridge_dummy_fe_read_signal_strength, + .read_snr = ddbridge_dummy_fe_read_snr, + .read_ucblocks = ddbridge_dummy_fe_read_ucblocks, }; -static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops = { +static const struct dvb_frontend_ops ddbridge_dummy_fe_qam_ops = { .delsys = {SYS_DVBC_ANNEX_A }, .info = { - .name ="Dummy DVB-C" , + .name ="ddbridge dummy DVB-C" , .frequency_min_hz =51 * MHz, .frequency_max_hz =858 * MHz, .frequency_stepsize_hz =62500 ,
@@ -228,25 +228,25 @@ static const struct dvb_frontend_ops dvb_dummy_fe_qam_ops = {FE_CAN_INVERSION_AUTO }, - .release = dvb_dummy_fe_release, + .release = ddbridge_dummy_fe_release, - .init = dvb_dummy_fe_init, - .sleep = dvb_dummy_fe_sleep, + .init = ddbridge_dummy_fe_init, + .sleep = ddbridge_dummy_fe_sleep, - .set_frontend = dvb_dummy_fe_set_frontend, - .get_frontend = dvb_dummy_fe_get_frontend, + .set_frontend = ddbridge_dummy_fe_set_frontend, + .get_frontend = ddbridge_dummy_fe_get_frontend, - .read_status = dvb_dummy_fe_read_status, - .read_ber = dvb_dummy_fe_read_ber, - .read_signal_strength = dvb_dummy_fe_read_signal_strength, - .read_snr = dvb_dummy_fe_read_snr, - .read_ucblocks = dvb_dummy_fe_read_ucblocks, + .read_status = ddbridge_dummy_fe_read_status, + .read_ber = ddbridge_dummy_fe_read_ber, + .read_signal_strength = ddbridge_dummy_fe_read_signal_strength, + .read_snr = ddbridge_dummy_fe_read_snr, + .read_ucblocks = ddbridge_dummy_fe_read_ucblocks, }; -static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = { +static const struct dvb_frontend_ops ddbridge_dummy_fe_qpsk_ops = { .delsys = {SYS_DVBS }, .info = { - .name ="Dummy DVB-S" , + .name ="ddbridge dummy DVB-S" , .frequency_min_hz =950 * MHz, .frequency_max_hz =2150 * MHz, .frequency_stepsize_hz =250 * kHz,
@@ -263,24 +263,24 @@ static const struct dvb_frontend_ops dvb_dummy_fe_qpsk_ops = {FE_CAN_QPSK }, - .release = dvb_dummy_fe_release, + .release = ddbridge_dummy_fe_release, - .init = dvb_dummy_fe_init, - .sleep = dvb_dummy_fe_sleep, + .init = ddbridge_dummy_fe_init, + .sleep = ddbridge_dummy_fe_sleep, - .set_frontend = dvb_dummy_fe_set_frontend, - .get_frontend = dvb_dummy_fe_get_frontend, + .set_frontend = ddbridge_dummy_fe_set_frontend, + .get_frontend = ddbridge_dummy_fe_get_frontend, - .read_status = dvb_dummy_fe_read_status, - .read_ber = dvb_dummy_fe_read_ber, - .read_signal_strength = dvb_dummy_fe_read_signal_strength, - .read_snr = dvb_dummy_fe_read_snr, - .read_ucblocks = dvb_dummy_fe_read_ucblocks, + .read_status = ddbridge_dummy_fe_read_status, + .read_ber = ddbridge_dummy_fe_read_ber, + .read_signal_strength = ddbridge_dummy_fe_read_signal_strength, + .read_snr = ddbridge_dummy_fe_read_snr, + .read_ucblocks = ddbridge_dummy_fe_read_ucblocks, - .set_voltage = dvb_dummy_fe_set_voltage, - .set_tone = dvb_dummy_fe_set_tone, + .set_voltage = ddbridge_dummy_fe_set_voltage, + .set_tone = ddbridge_dummy_fe_set_tone, }; -MODULE_DESCRIPTION ("DVB DUMMY Frontend" ); +MODULE_DESCRIPTION ("ddbridge dummy Frontend" );MODULE_AUTHOR ("Emard" );MODULE_LICENSE ("GPL" );
drivers/media/pci/ddbridge/ddbridge-dummy-fe.h +11 -11
@@ -5,32 +5,32 @@* Written by Emard <[email protected]> */ -#ifndef DVB_DUMMY_FE_H -#define DVB_DUMMY_FE_H +#ifndef DDBRIDGE_DUMMY_FE_H +#define DDBRIDGE_DUMMY_FE_H #include <linux/dvb/frontend.h> #include <media/dvb_frontend.h> -#if IS_REACHABLE (CONFIG_DVB_DUMMY_FE ) -struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ); -struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ); -struct dvb_frontend *dvb_dummy_fe_qam_attach (void ); +#if IS_REACHABLE (CONFIG_DDBRIDGE_DUMMY_FE ) +struct dvb_frontend *ddbridge_dummy_fe_ofdm_attach (void ); +struct dvb_frontend *ddbridge_dummy_fe_qpsk_attach (void ); +struct dvb_frontend *ddbridge_dummy_fe_qam_attach (void );#else -static inline struct dvb_frontend *dvb_dummy_fe_ofdm_attach (void ) +static inline struct dvb_frontend *ddbridge_dummy_fe_ofdm_attach (void ) {pr_warn ("%s: driver disabled by Kconfig\n" , __func__);return NULL ; } -static inline struct dvb_frontend *dvb_dummy_fe_qpsk_attach (void ) +static inline struct dvb_frontend *ddbridge_dummy_fe_qpsk_attach (void ) {pr_warn ("%s: driver disabled by Kconfig\n" , __func__);return NULL ; } -static inline struct dvb_frontend *dvb_dummy_fe_qam_attach (void ) +static inline struct dvb_frontend *ddbridge_dummy_fe_qam_attach (void ) {pr_warn ("%s: driver disabled by Kconfig\n" , __func__);return NULL ; } -#endif /* CONFIG_DVB_DUMMY_FE */ +#endif /* CONFIG_DDBRIDGE_DUMMY_FE */ -#endif // DVB_DUMMY_FE_H +#endif // DDBRIDGE_DUMMY_FE_H
Signature · 1 line
2.25.1
PATCH 5/7 media: ddbridge: use the ddbridge's own dummy fe driver
In reply to Mauro Carvalho ChehabCleanup the ddbridge's dummy driver by removing the parts that aren't needed by ddbridge, adding it to the building system and changing the binding at the driver to use the newer function name.
--- drivers/media/pci/ddbridge/Kconfig | 1 - drivers/media/pci/ddbridge/Makefile | 2 +- drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- .../media/pci/ddbridge/ddbridge-dummy-fe.c | 133 ------------------ .../media/pci/ddbridge/ddbridge-dummy-fe.h | 20 --- 5 files changed, 3 insertions(+), 157 deletions(-)
drivers/media/pci/ddbridge/Kconfig +0 -1
@@ -15,7 +15,6 @@ config DVB_DDBRIDGE select MEDIA_TUNER_TDA18212 if MEDIA_SUBDRV_AUTOSELECT select DVB_MXL5XX if MEDIA_SUBDRV_AUTOSELECT select DVB_CXD2099 if MEDIA_SUBDRV_AUTOSELECT - select DVB_DUMMY_FE if MEDIA_SUBDRV_AUTOSELECT help Support for cards with the Digital Devices PCI express bridge: - Octopus PCIe Bridge
drivers/media/pci/ddbridge/Makefile +1 -1
@@ -7,7 +7,7 @@ ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-ci.o \ ddbridge-hw.o ddbridge-i2c.o ddbridge-max.o ddbridge-mci.o \ ddbridge-sx8.o -obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o +obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o ddbridge-dummy-fe.o ccflags-y += -I $(srctree)/drivers/media/dvb-frontends/ ccflags-y += -I $(srctree)/drivers/media/tuners/
drivers/media/pci/ddbridge/ddbridge-core.c +2 -2
@@ -50,7 +50,7 @@#include "stv6111.h" #include "lnbh25.h" #include "cxd2099.h" -#include "dvb_dummy_fe.h" +#include "ddbridge-dummy-fe.h" /****************************************************************************/
@@ -1265,7 +1265,7 @@ static int demod_attach_dummy(struct ddb_input *input)struct ddb_dvb *dvb = &input->port->dvb[input->nr &1 ];struct device *dev = input->port->dev->dev; - dvb->fe =dvb_attach (dvb_dummy_fe_qam_attach); + dvb->fe =dvb_attach (ddbridge_dummy_fe_qam_attach);if (!dvb->fe) {dev_err (dev,"QAM dummy attach failed!\n" );return -ENODEV ;
drivers/media/pci/ddbridge/ddbridge-dummy-fe.c +0 -133
167 lines not on this page · raw message
drivers/media/pci/ddbridge/ddbridge-dummy-fe.h +0 -20
@@ -11,26 +11,6 @@#include <linux/dvb/frontend.h> #include <media/dvb_frontend.h> -#if IS_REACHABLE (CONFIG_DDBRIDGE_DUMMY_FE ) -struct dvb_frontend *ddbridge_dummy_fe_ofdm_attach (void ); -struct dvb_frontend *ddbridge_dummy_fe_qpsk_attach (void );struct dvb_frontend *ddbridge_dummy_fe_qam_attach (void ); -#else -static inline struct dvb_frontend *ddbridge_dummy_fe_ofdm_attach (void ) -{ -pr_warn ("%s: driver disabled by Kconfig\n" , __func__); -return NULL ; -} -static inline struct dvb_frontend *ddbridge_dummy_fe_qpsk_attach (void ) -{ -pr_warn ("%s: driver disabled by Kconfig\n" , __func__); -return NULL ; -} -static inline struct dvb_frontend *ddbridge_dummy_fe_qam_attach (void ) -{ -pr_warn ("%s: driver disabled by Kconfig\n" , __func__); -return NULL ; -} -#endif /* CONFIG_DDBRIDGE_DUMMY_FE */ #endif // DDBRIDGE_DUMMY_FE_H
Signature · 1 line
2.25.1
PATCH 6/7 media: Kconfig: fix selection for test drivers
In reply to Mauro Carvalho ChehabThere are some long-time mistakes related to build test drivers, with regards to depends on/select. Also, as we now want to build any test driver without needing to enable anything else, change the logic in order to properly filter them.
Please notice that the PCI skeleton is somewhat an exception, as it requires to select *both* SAMPLES and MEDIA_TEST_SUPPORT. I almost changed it to be either one, but decided to keep it as-is, as this is something that we don't really need to be included on any distribution.
The only reason for someone to build it is for COMPILE_TEST purposes.
--- drivers/media/Kconfig | 2 +- drivers/media/dvb-frontends/Kconfig | 9 +++++++-- drivers/media/pci/Kconfig | 10 +++++----- drivers/media/test_drivers/Kconfig | 2 +- 4 files changed, 14 insertions(+), 9 deletions(-)
drivers/media/Kconfig +1 -1
@@ -157,7 +157,7 @@ comment "Video4Linux core enabled to support hybrid TV devices" config VIDEO_DEV tristate prompt "Video4Linux core" if !(MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI) - default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI + default MEDIA_CAMERA_SUPPORT || MEDIA_ANALOG_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT || MEDIA_PLATFORM_SUPPORT || MEDIA_TEST_SUPPORT || MEDIA_HYBRID_USB || MEDIA_HYBRID_PCI help Enables the V4L2 API, used by cameras, analog TV, video grabbers, radio devices and by some input devices.
drivers/media/dvb-frontends/Kconfig +7 -2
@@ -1,3 +1,5 @@ +if MEDIA_DIGITAL_TV_SUPPORT + comment "DVB Frontend drivers hidden by 'Autoselect ancillary drivers'" depends on MEDIA_HIDE_ANCILLARY_SUBDRV
@@ -943,13 +945,16 @@ config DVB_SP2 help CIMaX SP2/SP2HF Common Interface module. +endmenu # Customise DVB Frontends + +endif # MEDIA_DIGITAL_TV_SUPPORT + comment "Tools to develop new frontends" depends on MEDIA_TEST_SUPPORT config DVB_DUMMY_FE tristate "Dummy frontend driver" - depends on DVB_CORE depends on MEDIA_TEST_SUPPORT + select DVB_CORE help Dummy skeleton frontend driver. -endmenu
drivers/media/pci/Kconfig +5 -5
@@ -6,7 +6,7 @@ config MEDIA_HYBRID_PCI depends on VIDEO_CX18 || VIDEO_CX23885 || VIDEO_CX88 || VIDEO_BT848 || VIDEO_SAA7134 || VIDEO_SAA7164 default y -if PCI && MEDIA_SUPPORT +if PCI menuconfig MEDIA_PCI_SUPPORT bool "Media PCI Adapters"
@@ -65,11 +65,11 @@ source "drivers/media/pci/intel/ipu3/Kconfig" config VIDEO_PCI_SKELETON tristate "Skeleton PCI V4L2 driver" - depends on MEDIA_TEST_SUPPORT - depends on PCI depends on SAMPLES - depends on VIDEO_V4L2 && VIDEOBUF2_CORE - depends on VIDEOBUF2_MEMOPS && VIDEOBUF2_DMA_CONTIG + depends on MEDIA_TEST_SUPPORT + depends on PCI && VIDEO_V4L2 + select VIDEOBUF2_MEMOPS + select VIDEOBUF2_DMA_CONTIG help Enable build of the skeleton PCI driver, used as a reference when developing new drivers.
drivers/media/test_drivers/Kconfig +1 -1
@@ -4,7 +4,7 @@ if MEDIA_TEST_SUPPORT menuconfig V4L_TEST_DRIVERS bool "V4L test drivers" - depends on MEDIA_CAMERA_SUPPORT + depends on VIDEO_DEV if V4L_TEST_DRIVERS
Signature · 1 line
2.25.1
PATCH 7/7 media: add SPDX headers on Kconfig and Makefile files
In reply to Mauro Carvalho ChehabMost of media Kconfig/Makefile files already has SPDX, but there are a few ones still missing. Add it to them.
--- drivers/media/dvb-frontends/Kconfig | 2 ++ drivers/media/mc/Kconfig | 2 ++ drivers/media/platform/sunxi/Kconfig | 2 ++ drivers/media/platform/sunxi/Makefile | 2 ++ drivers/media/platform/sunxi/sun4i-csi/Kconfig | 2 ++ drivers/media/platform/sunxi/sun4i-csi/Makefile | 2 ++ drivers/staging/media/hantro/Makefile | 2 ++ drivers/staging/media/rkisp1/Makefile | 2 ++ 8 files changed, 16 insertions(+)
drivers/media/dvb-frontends/Kconfig +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + if MEDIA_DIGITAL_TV_SUPPORT comment "DVB Frontend drivers hidden by 'Autoselect ancillary drivers'"
drivers/media/mc/Kconfig +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + # # Media controller # Selectable only for webcam/grabbers, as other drivers don't use it
drivers/media/platform/sunxi/Kconfig +2 -0
@@ -1,2 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + source "drivers/media/platform/sunxi/sun4i-csi/Kconfig" source "drivers/media/platform/sunxi/sun6i-csi/Kconfig"
drivers/media/platform/sunxi/Makefile +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + obj-y += sun4i-csi/ obj-y += sun6i-csi/ obj-y += sun8i-di/
drivers/media/platform/sunxi/sun4i-csi/Kconfig +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + config VIDEO_SUN4I_CSI tristate "Allwinner A10 CMOS Sensor Interface Support" depends on VIDEO_V4L2 && COMMON_CLK && HAS_DMA
drivers/media/platform/sunxi/sun4i-csi/Makefile +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + sun4i-csi-y += sun4i_csi.o sun4i-csi-y += sun4i_dma.o sun4i-csi-y += sun4i_v4l2.o
drivers/staging/media/hantro/Makefile +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + obj-$(CONFIG_VIDEO_HANTRO) += hantro-vpu.o hantro-vpu-y += \
drivers/staging/media/rkisp1/Makefile +2 -0
@@ -1,3 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0 + obj-$(CONFIG_VIDEO_ROCKCHIP_ISP1) += rockchip-isp1.o rockchip-isp1-objs += rkisp1-capture.o \ rkisp1-common.o \
Signature · 1 line
2.25.1