Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 - some V4L2 API updates needed by embedded devices
 - DVB API extensions for ATSC-MH delivery system, used in US for mobile
   TV
 - new tuners for fc0011/0012/0013 and tua9001
 - a new dvb driver for af9033/9035
 - a new ATSC-MH frontend (lg2160)
 - new remote controller keymaps
 - Removal of a few legacy webcam driver that got replaced by gspca on
   several kernel versions ago
 - a new driver for Exynos 4/5 webcams(s5pp fimc-lite)
 - a new webcam sensor driver (smiapp)
 - a new video input driver for embedded (sta2x1xx)
 - several improvements, fixes, cleanups, etc inside the drivers.

Manually fix up conflicts due to err() -> dev_err() conversion in
drivers/staging/media/easycap/easycap_main.c

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (484 commits)
  [media] saa7134-cards: Remove a PCI entry added by mistake
  [media] radio-sf16fmi: add support for SF16-FMD
  [media] rc-loopback: remove duplicate line
  [media] patch for Asus My Cinema PS3-100 (1043:48cd)
  [media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS
  [media] em28xx: simple comment fix
  [media] [resend] radio-sf16fmr2: add PnP support for SF16-FMD2
  [media] smiapp: Use v4l2_ctrl_new_int_menu() instead of v4l2_ctrl_new_custom()
  [media] smiapp: Add support for 8-bit uncompressed formats
  [media] smiapp: Allow generic quirk registers
  [media] smiapp: Use non-binning limits if the binning limit is zero
  [media] smiapp: Initialise rval in smiapp_read_nvm()
  [media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check
  [media] smiapp: Use 8-bit reads only before identifying the sensor
  [media] smiapp: Quirk for sensors that only do 8-bit reads
  [media] smiapp: Pass struct sensor to register writing commands instead of i2c_client
  [media] smiapp: Allow using external clock from the clock framework
  [media] zl10353: change .read_snr() to report SNR as a 0.1 dB
  [media] media: add support to gspca/pac7302.c for 093a:2627 (Genius FaceCam 300)
  [media] m88rs2000 - only flip bit 2 on reg 0x70 on 16th try
  ...

1 files changed, 50 insertions, 1 deletions

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index cb4428ab81ed..f50d4058c5fb 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -320,7 +320,24 @@ struct dvb_frontend_event {
 
 #define DTV_ENUM_DELSYS         44
 
-#define DTV_MAX_COMMAND                         DTV_ENUM_DELSYS
+/* ATSC-MH */
+#define DTV_ATSCMH_FIC_VER              45
+#define DTV_ATSCMH_PARADE_ID            46
+#define DTV_ATSCMH_NOG                  47
+#define DTV_ATSCMH_TNOG                 48
+#define DTV_ATSCMH_SGN                  49
+#define DTV_ATSCMH_PRC                  50
+#define DTV_ATSCMH_RS_FRAME_MODE        51
+#define DTV_ATSCMH_RS_FRAME_ENSEMBLE    52
+#define DTV_ATSCMH_RS_CODE_MODE_PRI     53
+#define DTV_ATSCMH_RS_CODE_MODE_SEC     54
+#define DTV_ATSCMH_SCCC_BLOCK_MODE      55
+#define DTV_ATSCMH_SCCC_CODE_MODE_A     56
+#define DTV_ATSCMH_SCCC_CODE_MODE_B     57
+#define DTV_ATSCMH_SCCC_CODE_MODE_C     58
+#define DTV_ATSCMH_SCCC_CODE_MODE_D     59
+
+#define DTV_MAX_COMMAND                         DTV_ATSCMH_SCCC_CODE_MODE_D
 
 typedef enum fe_pilot {
         PILOT_ON,
@@ -360,6 +377,38 @@ typedef enum fe_delivery_system {
 
 #define SYS_DVBC_ANNEX_AC       SYS_DVBC_ANNEX_A
 
+/* ATSC-MH */
+
+enum atscmh_sccc_block_mode {
+        ATSCMH_SCCC_BLK_SEP      = 0,
+        ATSCMH_SCCC_BLK_COMB     = 1,
+        ATSCMH_SCCC_BLK_RES      = 2,
+};
+
+enum atscmh_sccc_code_mode {
+        ATSCMH_SCCC_CODE_HLF     = 0,
+        ATSCMH_SCCC_CODE_QTR     = 1,
+        ATSCMH_SCCC_CODE_RES     = 2,
+};
+
+enum atscmh_rs_frame_ensemble {
+        ATSCMH_RSFRAME_ENS_PRI   = 0,
+        ATSCMH_RSFRAME_ENS_SEC   = 1,
+};
+
+enum atscmh_rs_frame_mode {
+        ATSCMH_RSFRAME_PRI_ONLY  = 0,
+        ATSCMH_RSFRAME_PRI_SEC   = 1,
+        ATSCMH_RSFRAME_RES       = 2,
+};
+
+enum atscmh_rs_code_mode {
+        ATSCMH_RSCODE_211_187    = 0,
+        ATSCMH_RSCODE_223_187    = 1,
+        ATSCMH_RSCODE_235_187    = 2,
+        ATSCMH_RSCODE_RES        = 3,
+};
+
 
 struct dtv_cmds_h {
         char    *name;          /* A display name for debugging purposes */