From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Date: Mon, 4 Oct 2021 05:52:13 +0000 (+0200)
Subject: Merge tag 'v5.15-rc4' into media_tree
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c52e7b855b33ff2a3af57b1b1d114720cd39ec7e;p=linux.git

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
  ...
---

c52e7b855b33ff2a3af57b1b1d114720cd39ec7e
diff --cc drivers/media/tuners/tuner-types.c
index 01f61ebabd567,01f61ebabd567..0ed2c5bc082e1
--- a/drivers/media/tuners/tuner-types.c
+++ b/drivers/media/tuners/tuner-types.c
@@@ -1942,6 -1942,6 +1942,10 @@@ struct tunertype tuners[] = 
  		.params = tuner_sony_btf_pg463z_params,
  		.count  = ARRAY_SIZE(tuner_sony_btf_pg463z_params),
  	},
++	[TUNER_SI2157] = {
++		.name   = "Silicon Labs Si2157 tuner",
++		/* see si2157.c for details */
++	},
  };
  EXPORT_SYMBOL(tuners);
  
diff --cc drivers/media/usb/em28xx/em28xx-cards.c
index 948e22e29b42a,c1e0dccb74088..b207f34af5c6f
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@@ -2508,12 -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.
diff --cc include/media/tuner.h
index ff85d7227f916,ff85d7227f916..a7796e0a36592
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@@ -132,6 -132,6 +132,7 @@@
  #define TUNER_SONY_BTF_PG472Z		89	/* PAL+SECAM */
  #define TUNER_SONY_BTF_PK467Z		90	/* NTSC_JP */
  #define TUNER_SONY_BTF_PB463Z		91	/* NTSC */
++#define TUNER_SI2157			92
  
  /* tv card specific */
  #define TDA9887_PRESENT			(1<<0)