diff options
| author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-10-04 08:52:13 +0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2021-10-04 08:52:13 +0300 |
| commit | c52e7b855b33ff2a3af57b1b1d114720cd39ec7e (patch) | |
| tree | ef07ae81d74bb4dbab3981ac198f1fb147c34243 /drivers/media/usb/em28xx | |
| parent | 4114978dcd24e72415276bba60ff4ff355970bbc (diff) | |
| parent | 9e1ff307c779ce1f0f810c7ecce3d95bbae40896 (diff) | |
| download | linux-c52e7b855b33ff2a3af57b1b1d114720cd39ec7e.tar.xz | |
Merge tag 'v5.15-rc4' into media_tree
Linux 5.15-rc4
* tag 'v5.15-rc4': (320 commits)
Linux 5.15-rc4
elf: don't use MAP_FIXED_NOREPLACE for elf interpreter mappings
objtool: print out the symbol type when complaining about it
kvm: fix objtool relocation warning
cachefiles: Fix oops in trace_cachefiles_mark_buried due to NULL object
drm/i915: fix blank screen booting crashes
hwmon: (w83793) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (w83792d) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (w83791d) Fix NULL pointer dereference by removing unnecessary structure field
hwmon: (pmbus/mp2975) Add missed POUT attribute for page 1 mp2975 controller
hwmon: (pmbus/ibm-cffps) max_power_out swap changes
hwmon: (occ) Fix P10 VRM temp sensors
thermal: Update information in MAINTAINERS
io_uring: kill fasync
sched: Always inline is_percpu_thread()
sched/fair: Null terminate buffer when updating tunable_scaling
sched/fair: Add ancestors of unthrottled undecayed cfs_rq
perf/core: fix userpage->time_enabled of inactive events
perf/x86/intel: Update event constraints for ICX
perf/x86: Reset destroy callback on event init failure
...
Diffstat (limited to 'drivers/media/usb/em28xx')
| -rw-r--r-- | drivers/media/usb/em28xx/em28xx-cards.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c index 948e22e29b42..b207f34af5c6 100644 --- a/drivers/media/usb/em28xx/em28xx-cards.c +++ b/drivers/media/usb/em28xx/em28xx-cards.c @@ -2508,12 +2508,17 @@ const struct em28xx_board em28xx_boards[] = { .def_i2c_bus = 1, .i2c_speed = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_400_KHZ, - .tuner_type = TUNER_ABSENT, + .tuner_type = TUNER_SI2157, .tuner_gpio = hauppauge_dualhd_dvb, .has_dvb = 1, .has_dual_ts = 1, .ir_codes = RC_MAP_HAUPPAUGE, .leds = hauppauge_dualhd_leds, + .input = { { + .type = EM28XX_VMUX_COMPOSITE, + .vmux = TVP5150_COMPOSITE1, + .amux = EM28XX_AMUX_LINE_IN, + } }, }, /* * 2040:026d Hauppauge WinTV-dualHD (model 01595 - ATSC/QAM) Isoc. |