325 files changed, 13159 insertions, 6697 deletions

diff --git a/drivers/media/common/cx2341x.c b/drivers/media/common/cx2341x.c
index be763150b8aa..c07b9db51b05 100644
--- a/drivers/media/common/cx2341x.c
+++ b/drivers/media/common/cx2341x.c
@@ -931,6 +931,35 @@ static void cx2341x_calc_audio_properties(struct cx2341x_mpeg_params *params)
         }
 }
 
+/* Check for correctness of the ctrl's value based on the data from
+   struct v4l2_queryctrl and the available menu items. Note that
+   menu_items may be NULL, in that case it is ignored. */
+static int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
+                const char * const *menu_items)
+{
+        if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
+                return -EINVAL;
+        if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED)
+                return -EBUSY;
+        if (qctrl->type == V4L2_CTRL_TYPE_STRING)
+                return 0;
+        if (qctrl->type == V4L2_CTRL_TYPE_BUTTON ||
+            qctrl->type == V4L2_CTRL_TYPE_INTEGER64 ||
+            qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)
+                return 0;
+        if (ctrl->value < qctrl->minimum || ctrl->value > qctrl->maximum)
+                return -ERANGE;
+        if (qctrl->type == V4L2_CTRL_TYPE_MENU && menu_items != NULL) {
+                if (menu_items[ctrl->value] == NULL ||
+                    menu_items[ctrl->value][0] == '\0')
+                        return -EINVAL;
+        }
+        if (qctrl->type == V4L2_CTRL_TYPE_BITMASK &&
+                        (ctrl->value & ~qctrl->maximum))
+                return -ERANGE;
+        return 0;
+}
+
 int cx2341x_ext_ctrls(struct cx2341x_mpeg_params *params, int busy,
                   struct v4l2_ext_controls *ctrls, unsigned int cmd)
 {
diff --git a/drivers/media/common/saa7146/saa7146_core.c b/drivers/media/common/saa7146/saa7146_core.c
index 4418119cf707..1ff9f5323bc3 100644
--- a/drivers/media/common/saa7146/saa7146_core.c
+++ b/drivers/media/common/saa7146/saa7146_core.c
@@ -71,7 +71,7 @@ static inline int saa7146_wait_for_debi_done_sleep(struct saa7146_dev *dev,
                 if (saa7146_read(dev, MC2) & 2)
                         break;
                 if (err) {
-                        pr_err("%s: %s timed out while waiting for registers getting programmed\n",
+                        pr_debug("%s: %s timed out while waiting for registers getting programmed\n",
                                dev->name, __func__);
                         return -ETIMEDOUT;
                 }
diff --git a/drivers/media/common/siano/smsir.c b/drivers/media/common/siano/smsir.c
index 273043ea8f47..35d0e887bd65 100644
--- a/drivers/media/common/siano/smsir.c
+++ b/drivers/media/common/siano/smsir.c
@@ -107,8 +107,7 @@ int sms_ir_init(struct smscore_device_t *coredev)
 
 void sms_ir_exit(struct smscore_device_t *coredev)
 {
-        if (coredev->ir.dev)
-                rc_unregister_device(coredev->ir.dev);
+        rc_unregister_device(coredev->ir.dev);
 
         sms_log("");
 }
diff --git a/drivers/media/common/tveeprom.c b/drivers/media/common/tveeprom.c
index c7dace671a9d..47da0378cad8 100644
--- a/drivers/media/common/tveeprom.c
+++ b/drivers/media/common/tveeprom.c
@@ -286,9 +286,17 @@ static const struct {
         { TUNER_ABSENT,                 "Xceive XC5200C"},
         { TUNER_ABSENT,                 "NXP 18273"},
         { TUNER_ABSENT,                 "Montage M88TS2022"},
-        /* 180-189 */
+        /* 180-188 */
         { TUNER_ABSENT,                 "NXP 18272M"},
         { TUNER_ABSENT,                 "NXP 18272S"},
+
+        { TUNER_ABSENT,                 "Mirics MSi003"},
+        { TUNER_ABSENT,                 "MaxLinear MxL256"},
+        { TUNER_ABSENT,                 "SiLabs Si2158"},
+        { TUNER_ABSENT,                 "SiLabs Si2178"},
+        { TUNER_ABSENT,                 "SiLabs Si2157"},
+        { TUNER_ABSENT,                 "SiLabs Si2177"},
+        { TUNER_ABSENT,                 "ITE IT9137FN"},
 };
 
 /* Use TVEEPROM_AUDPROC_INTERNAL for those audio 'chips' that are
@@ -351,6 +359,16 @@ static const struct {
         { TVEEPROM_AUDPROC_INTERNAL, "CX23887"   },
         { TVEEPROM_AUDPROC_INTERNAL, "SAA7164"   },
         { TVEEPROM_AUDPROC_INTERNAL, "AU8522"    },
+        /* 45-49 */
+        { TVEEPROM_AUDPROC_INTERNAL, "AVF4910B"  },
+        { TVEEPROM_AUDPROC_INTERNAL, "SAA7231"   },
+        { TVEEPROM_AUDPROC_INTERNAL, "CX23102"   },
+        { TVEEPROM_AUDPROC_INTERNAL, "SAA7163"   },
+        { TVEEPROM_AUDPROC_OTHER,    "AK4113"    },
+        /* 50-52 */
+        { TVEEPROM_AUDPROC_OTHER,    "CS5340"    },
+        { TVEEPROM_AUDPROC_OTHER,    "CS8416"    },
+        { TVEEPROM_AUDPROC_OTHER,    "CX20810"   },
 };
 
 /* This list is supplied by Hauppauge. Thanks! */
@@ -371,8 +389,12 @@ static const char *decoderIC[] = {
         "CX25843", "CX23418", "NEC61153", "CX23885", "CX23888",
         /* 35-39 */
         "SAA7131", "CX25837", "CX23887", "CX23885A", "CX23887A",
-        /* 40-42 */
-        "SAA7164", "CX23885B", "AU8522"
+        /* 40-44 */
+        "SAA7164", "CX23885B", "AU8522", "ADV7401", "AVF4910B",
+        /* 45-49 */
+        "SAA7231", "CX23102", "SAA7163", "ADV7441A", "ADV7181C",
+        /* 50-53 */
+        "CX25836", "TDA9955", "TDA19977", "ADV7842"
 };
 
 static int hasRadioTuner(int tunerType)
@@ -548,10 +570,10 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                         tvee->serial_number =
                                 eeprom_data[i+5] +
                                 (eeprom_data[i+6] << 8) +
-                                (eeprom_data[i+7] << 16);
+                                (eeprom_data[i+7] << 16)+
+                                (eeprom_data[i+8] << 24);
 
-                        if ((eeprom_data[i + 8] & 0xf0) &&
-                                        (tvee->serial_number < 0xffffff)) {
+                        if (eeprom_data[i + 8] == 0xf0) {
                                 tvee->MAC_address[0] = 0x00;
                                 tvee->MAC_address[1] = 0x0D;
                                 tvee->MAC_address[2] = 0xFE;
@@ -696,7 +718,7 @@ void tveeprom_hauppauge_analog(struct i2c_client *c, struct tveeprom *tvee,
                 }
         }
 
-        tveeprom_info("Hauppauge model %d, rev %s, serial# %d\n",
+        tveeprom_info("Hauppauge model %d, rev %s, serial# %u\n",
                 tvee->model, tvee->rev_str, tvee->serial_number);
         if (tvee->has_MAC_address == 1)
                 tveeprom_info("MAC address is %pM\n", tvee->MAC_address);
diff --git a/drivers/media/dvb-core/dvb-usb-ids.h b/drivers/media/dvb-core/dvb-usb-ids.h
index e07a84e7bc56..80ab8d0ff6e0 100644
--- a/drivers/media/dvb-core/dvb-usb-ids.h
+++ b/drivers/media/dvb-core/dvb-usb-ids.h
@@ -356,6 +356,7 @@
 #define USB_PID_MSI_DIGI_VOX_MINI_III                   0x8807
 #define USB_PID_SONY_PLAYTV                             0x0003
 #define USB_PID_MYGICA_D689                             0xd811
+#define USB_PID_MYGICA_T230                             0xc688
 #define USB_PID_ELGATO_EYETV_DIVERSITY                  0x0011
 #define USB_PID_ELGATO_EYETV_DTT                        0x0021
 #define USB_PID_ELGATO_EYETV_DTT_2                      0x003f
diff --git a/drivers/media/dvb-core/dvb_net.c b/drivers/media/dvb-core/dvb_net.c
index 059e6117f22b..e4041f074909 100644
--- a/drivers/media/dvb-core/dvb_net.c
+++ b/drivers/media/dvb-core/dvb_net.c
@@ -379,7 +379,9 @@ static void dvb_net_ule( struct net_device *dev, const u8 *buf, size_t buf_len )
                         /* Check TS error conditions: sync_byte, transport_error_indicator, scrambling_control . */
                         if ((ts[0] != TS_SYNC) || (ts[1] & TS_TEI) || ((ts[3] & TS_SC) != 0)) {
                                 printk(KERN_WARNING "%lu: Invalid TS cell: SYNC %#x, TEI %u, SC %#x.\n",
-                                       priv->ts_count, ts[0], ts[1] & TS_TEI >> 7, ts[3] & 0xC0 >> 6);
+                                       priv->ts_count, ts[0],
+                                       (ts[1] & TS_TEI) >> 7,
+                                       (ts[3] & TS_SC) >> 6);
 
                                 /* Drop partly decoded SNDU, reset state, resync on PUSI. */
                                 if (priv->ule_skb) {
diff --git a/drivers/media/dvb-frontends/Kconfig b/drivers/media/dvb-frontends/Kconfig
index 5a134547e325..6c75418222e2 100644
--- a/drivers/media/dvb-frontends/Kconfig
+++ b/drivers/media/dvb-frontends/Kconfig
@@ -648,12 +648,15 @@ config DVB_MB86A20S
           A driver for Fujitsu mb86a20s ISDB-T/ISDB-Tsb demodulator.
           Say Y when you want to support this frontend.
 
+comment "ISDB-S (satellite) & ISDB-T (terrestrial) frontends"
+        depends on DVB_CORE
+
 config DVB_TC90522
         tristate "Toshiba TC90522"
         depends on DVB_CORE && I2C
         default m if !MEDIA_SUBDRV_AUTOSELECT
         help
-          A Toshiba TC90522 2xISDB-T + 2xISDB-S demodulator.
+          Toshiba TC90522 2xISDB-S 8PSK + 2xISDB-T OFDM demodulator.
           Say Y when you want to support this frontend.
 
 comment "Digital terrestrial only tuners/PLL"
diff --git a/drivers/media/dvb-frontends/af9033.c b/drivers/media/dvb-frontends/af9033.c
index 63a89c1c59ff..82ce47bdf5dc 100644
--- a/drivers/media/dvb-frontends/af9033.c
+++ b/drivers/media/dvb-frontends/af9033.c
@@ -291,6 +291,12 @@ static int af9033_init(struct dvb_frontend *fe)
                 if (clock_adc_lut[i].clock == dev->cfg.clock)
                         break;
         }
+        if (i == ARRAY_SIZE(clock_adc_lut)) {
+                dev_err(&dev->client->dev,
+                        "Couldn't find ADC config for clock=%d\n",
+                        dev->cfg.clock);
+                goto err;
+        }
 
         adc_cw = af9033_div(dev, clock_adc_lut[i].adc, 1000000ul, 19ul);
         buf[0] = (adc_cw >>  0) & 0xff;
@@ -580,7 +586,15 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
                                 break;
                         }
                 }
-                ret =  af9033_wr_regs(dev, 0x800001,
+                if (i == ARRAY_SIZE(coeff_lut)) {
+                        dev_err(&dev->client->dev,
+                                "Couldn't find LUT config for clock=%d\n",
+                                dev->cfg.clock);
+                        ret = -EINVAL;
+                        goto err;
+                }
+
+                ret = af9033_wr_regs(dev, 0x800001,
                                 coeff_lut[i].val, sizeof(coeff_lut[i].val));
         }
 
@@ -592,6 +606,13 @@ static int af9033_set_frontend(struct dvb_frontend *fe)
                         if (clock_adc_lut[i].clock == dev->cfg.clock)
                                 break;
                 }
+                if (i == ARRAY_SIZE(clock_adc_lut)) {
+                        dev_err(&dev->client->dev,
+                                "Couldn't find ADC clock for clock=%d\n",
+                                dev->cfg.clock);
+                        ret = -EINVAL;
+                        goto err;
+                }
                 adc_freq = clock_adc_lut[i].adc;
 
                 /* get used IF frequency */
@@ -849,29 +870,97 @@ static int af9033_read_snr(struct dvb_frontend *fe, u16 *snr)
 {
         struct af9033_dev *dev = fe->demodulator_priv;
         struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
+        int ret;
+        u8 u8tmp;
 
         /* use DVBv5 CNR */
-        if (c->cnr.stat[0].scale == FE_SCALE_DECIBEL)
-                *snr = div_s64(c->cnr.stat[0].svalue, 100); /* 1000x => 10x */
-        else
+        if (c->cnr.stat[0].scale == FE_SCALE_DECIBEL) {
+                /* Return 0.1 dB for AF9030 and 0-0xffff for IT9130. */
+                if (dev->is_af9035) {
+                        /* 1000x => 10x (0.1 dB) */
+                        *snr = div_s64(c->cnr.stat[0].svalue, 100);
+                } else {
+                        /* 1000x => 1x (1 dB) */
+                        *snr = div_s64(c->cnr.stat[0].svalue, 1000);
+
+                        /* read current modulation */
+                        ret = af9033_rd_reg(dev, 0x80f903, &u8tmp);
+                        if (ret)
+                                goto err;
+
+                        /* scale value to 0x0000-0xffff */
+                        switch ((u8tmp >> 0) & 3) {
+                        case 0:
+                                *snr = *snr * 0xffff / 23;
+                                break;
+                        case 1:
+                                *snr = *snr * 0xffff / 26;
+                                break;
+                        case 2:
+                                *snr = *snr * 0xffff / 32;
+                                break;
+                        default:
+                                goto err;
+                        }
+                }
+        } else {
                 *snr = 0;
+        }
 
         return 0;
+
+err:
+        dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+
+        return ret;
 }
 
 static int af9033_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
 {
         struct af9033_dev *dev = fe->demodulator_priv;
-        int ret;
-        u8 strength2;
+        struct dtv_frontend_properties *c = &dev->fe.dtv_property_cache;
+        int ret, tmp, power_real;
+        u8 u8tmp, gain_offset, buf[7];
 
-        /* read signal strength of 0-100 scale */
-        ret = af9033_rd_reg(dev, 0x800048, &strength2);
-        if (ret < 0)
-                goto err;
+        if (dev->is_af9035) {
+                /* read signal strength of 0-100 scale */
+                ret = af9033_rd_reg(dev, 0x800048, &u8tmp);
+                if (ret < 0)
+                        goto err;
+
+                /* scale value to 0x0000-0xffff */
+                *strength = u8tmp * 0xffff / 100;
+        } else {
+                ret = af9033_rd_reg(dev, 0x8000f7, &u8tmp);
+                if (ret < 0)
+                        goto err;
+
+                ret = af9033_rd_regs(dev, 0x80f900, buf, 7);
+                if (ret < 0)
+                        goto err;
+
+                if (c->frequency <= 300000000)
+                        gain_offset = 7; /* VHF */
+                else
+                        gain_offset = 4; /* UHF */
+
+                power_real = (u8tmp - 100 - gain_offset) -
+                        power_reference[((buf[3] >> 0) & 3)][((buf[6] >> 0) & 7)];
+
+                if (power_real < -15)
+                        tmp = 0;
+                else if ((power_real >= -15) && (power_real < 0))
+                        tmp = (2 * (power_real + 15)) / 3;
+                else if ((power_real >= 0) && (power_real < 20))
+                        tmp = 4 * power_real + 10;
+                else if ((power_real >= 20) && (power_real < 35))
+                        tmp = (2 * (power_real - 20)) / 3 + 90;
+                else
+                        tmp = 100;
 
-        /* scale value to 0x0000-0xffff */
-        *strength = strength2 * 0xffff / 100;
+                /* scale value to 0x0000-0xffff */
+                *strength = tmp * 0xffff / 100;
+        }
 
         return 0;
 
@@ -1011,6 +1100,33 @@ static void af9033_stat_work(struct work_struct *work)
 
                 snr_val = (buf[2] << 16) | (buf[1] << 8) | (buf[0] << 0);
 
+                /* read superframe number */
+                ret = af9033_rd_reg(dev, 0x80f78b, &u8tmp);
+                if (ret)
+                        goto err;
+
+                if (u8tmp)
+                        snr_val /= u8tmp;
+
+                /* read current transmission mode */
+                ret = af9033_rd_reg(dev, 0x80f900, &u8tmp);
+                if (ret)
+                        goto err;
+
+                switch ((u8tmp >> 0) & 3) {
+                case 0:
+                        snr_val *= 4;
+                        break;
+                case 1:
+                        snr_val *= 1;
+                        break;
+                case 2:
+                        snr_val *= 2;
+                        break;
+                default:
+                        goto err_schedule_delayed_work;
+                }
+
                 /* read current modulation */
                 ret = af9033_rd_reg(dev, 0x80f903, &u8tmp);
                 if (ret)
diff --git a/drivers/media/dvb-frontends/af9033_priv.h b/drivers/media/dvb-frontends/af9033_priv.h
index c12c92cb5855..8e23275148ed 100644
--- a/drivers/media/dvb-frontends/af9033_priv.h
+++ b/drivers/media/dvb-frontends/af9033_priv.h
@@ -181,7 +181,10 @@ static const struct val_snr qam64_snr_lut[] = {
         { 0x05570d, 26 },
         { 0x059feb, 27 },
         { 0x05bf38, 28 },
-        { 0xffffff, 29 },
+        { 0x05f78f, 29 },
+        { 0x0612c3, 30 },
+        { 0x0626be, 31 },
+        { 0xffffff, 32 },
 };
 
 static const struct reg_val ofsm_init[] = {
@@ -2051,4 +2054,10 @@ static const struct reg_val tuner_init_it9135_62[] = {
         { 0x80fd8b, 0x00 },
 };
 
+/* NorDig power reference table */
+static const int power_reference[][5] = {
+        {-93, -91, -90, -89, -88}, /* QPSK 1/2 ~ 7/8 */
+        {-87, -85, -84, -83, -82}, /* 16QAM 1/2 ~ 7/8 */
+        {-82, -80, -78, -77, -76}, /* 64QAM 1/2 ~ 7/8 */
+};
 #endif /* AF9033_PRIV_H */
diff --git a/drivers/media/dvb-frontends/au8522_dig.c b/drivers/media/dvb-frontends/au8522_dig.c
index a68974f6d708..5d06c99b0e97 100644
--- a/drivers/media/dvb-frontends/au8522_dig.c
+++ b/drivers/media/dvb-frontends/au8522_dig.c
@@ -29,6 +29,7 @@
 #include "au8522_priv.h"
 
 static int debug;
+static int zv_mode = 1; /* default to on */
 
 #define dprintk(arg...)\
         do { if (debug)\
@@ -469,6 +470,87 @@ static struct {
         { 0x8526, 0x01 },
 };
 
+static struct {
+        u16 reg;
+        u16 data;
+} QAM256_mod_tab_zv_mode[] = {
+        { 0x80a3, 0x09 },
+        { 0x80a4, 0x00 },
+        { 0x8081, 0xc4 },
+        { 0x80a5, 0x40 },
+        { 0x80b5, 0xfb },
+        { 0x80b6, 0x8e },
+        { 0x80b7, 0x39 },
+        { 0x80aa, 0x77 },
+        { 0x80ad, 0x77 },
+        { 0x80a6, 0x67 },
+        { 0x8262, 0x20 },
+        { 0x821c, 0x30 },
+        { 0x80b8, 0x3e },
+        { 0x80b9, 0xf0 },
+        { 0x80ba, 0x01 },
+        { 0x80bb, 0x18 },
+        { 0x80bc, 0x50 },
+        { 0x80bd, 0x00 },
+        { 0x80be, 0xea },
+        { 0x80bf, 0xef },
+        { 0x80c0, 0xfc },
+        { 0x80c1, 0xbd },
+        { 0x80c2, 0x1f },
+        { 0x80c3, 0xfc },
+        { 0x80c4, 0xdd },
+        { 0x80c5, 0xaf },
+        { 0x80c6, 0x00 },
+        { 0x80c7, 0x38 },
+        { 0x80c8, 0x30 },
+        { 0x80c9, 0x05 },
+        { 0x80ca, 0x4a },
+        { 0x80cb, 0xd0 },
+        { 0x80cc, 0x01 },
+        { 0x80cd, 0xd9 },
+        { 0x80ce, 0x6f },
+        { 0x80cf, 0xf9 },
+        { 0x80d0, 0x70 },
+        { 0x80d1, 0xdf },
+        { 0x80d2, 0xf7 },
+        { 0x80d3, 0xc2 },
+        { 0x80d4, 0xdf },
+        { 0x80d5, 0x02 },
+        { 0x80d6, 0x9a },
+        { 0x80d7, 0xd0 },
+        { 0x8250, 0x0d },
+        { 0x8251, 0xcd },
+        { 0x8252, 0xe0 },
+        { 0x8253, 0x05 },
+        { 0x8254, 0xa7 },
+        { 0x8255, 0xff },
+        { 0x8256, 0xed },
+        { 0x8257, 0x5b },
+        { 0x8258, 0xae },
+        { 0x8259, 0xe6 },
+        { 0x825a, 0x3d },
+        { 0x825b, 0x0f },
+        { 0x825c, 0x0d },
+        { 0x825d, 0xea },
+        { 0x825e, 0xf2 },
+        { 0x825f, 0x51 },
+        { 0x8260, 0xf5 },
+        { 0x8261, 0x06 },
+        { 0x821a, 0x01 },
+        { 0x8546, 0x40 },
+        { 0x8210, 0x26 },
+        { 0x8211, 0xf6 },
+        { 0x8212, 0x84 },
+        { 0x8213, 0x02 },
+        { 0x8502, 0x01 },
+        { 0x8121, 0x04 },
+        { 0x8122, 0x04 },
+        { 0x852e, 0x10 },
+        { 0x80a4, 0xca },
+        { 0x80a7, 0x40 },
+        { 0x8526, 0x01 },
+};
+
 static int au8522_enable_modulation(struct dvb_frontend *fe,
                                     fe_modulation_t m)
 {
@@ -495,12 +577,23 @@ static int au8522_enable_modulation(struct dvb_frontend *fe,
                 au8522_set_if(fe, state->config->qam_if);
                 break;
         case QAM_256:
-                dprintk("%s() QAM 256\n", __func__);
-                for (i = 0; i < ARRAY_SIZE(QAM256_mod_tab); i++)
-                        au8522_writereg(state,
-                                QAM256_mod_tab[i].reg,
-                                QAM256_mod_tab[i].data);
-                au8522_set_if(fe, state->config->qam_if);
+                if (zv_mode) {
+                        dprintk("%s() QAM 256 (zv_mode)\n", __func__);
+                        for (i = 0; i < ARRAY_SIZE(QAM256_mod_tab_zv_mode); i++)
+                                au8522_writereg(state,
+                                        QAM256_mod_tab_zv_mode[i].reg,
+                                        QAM256_mod_tab_zv_mode[i].data);
+                        au8522_set_if(fe, state->config->qam_if);
+                        msleep(100);
+                        au8522_writereg(state, 0x821a, 0x00);
+                } else {
+                        dprintk("%s() QAM 256\n", __func__);
+                        for (i = 0; i < ARRAY_SIZE(QAM256_mod_tab); i++)
+                                au8522_writereg(state,
+                                        QAM256_mod_tab[i].reg,
+                                        QAM256_mod_tab[i].data);
+                        au8522_set_if(fe, state->config->qam_if);
+                }
                 break;
         default:
                 dprintk("%s() Invalid modulation\n", __func__);
@@ -537,7 +630,12 @@ static int au8522_set_frontend(struct dvb_frontend *fe)
                 return ret;
 
         /* Allow the tuner to settle */
-        msleep(100);
+        if (zv_mode) {
+                dprintk("%s() increase tuner settling time for zv_mode\n",
+                        __func__);
+                msleep(250);
+        } else
+                msleep(100);
 
         au8522_enable_modulation(fe, c->modulation);
 
@@ -823,6 +921,11 @@ static struct dvb_frontend_ops au8522_ops = {
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "Enable verbose debug messages");
 
+module_param(zv_mode, int, 0644);
+MODULE_PARM_DESC(zv_mode, "Turn on/off ZeeVee modulator compatability mode (default:on).\n"
+        "\t\ton - modified AU8522 QAM256 initialization.\n"
+        "\t\tProvides faster lock when using ZeeVee modulator based sources");
+
 MODULE_DESCRIPTION("Auvitek AU8522 QAM-B/ATSC Demodulator driver");
 MODULE_AUTHOR("Steven Toth");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/dvb-frontends/cx22700.c b/drivers/media/dvb-frontends/cx22700.c
index 3d399d9a6343..86563260d0f2 100644
--- a/drivers/media/dvb-frontends/cx22700.c
+++ b/drivers/media/dvb-frontends/cx22700.c
@@ -169,6 +169,9 @@ static int cx22700_set_tps(struct cx22700_state *state,
 
         cx22700_writereg (state, 0x04, val);
 
+        if (p->code_rate_HP - FEC_1_2 >= sizeof(fec_tab) ||
+            p->code_rate_LP - FEC_1_2 >= sizeof(fec_tab))
+                return -EINVAL;
         val = fec_tab[p->code_rate_HP - FEC_1_2] << 3;
         val |= fec_tab[p->code_rate_LP - FEC_1_2];
 
diff --git a/drivers/media/dvb-frontends/cx24110.c b/drivers/media/dvb-frontends/cx24110.c
index 95b981cd7115..7b510f2ae20f 100644
--- a/drivers/media/dvb-frontends/cx24110.c
+++ b/drivers/media/dvb-frontends/cx24110.c
@@ -177,47 +177,45 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver
         return 0;
 }
 
-static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec)
+static int cx24110_set_fec(struct cx24110_state* state, fe_code_rate_t fec)
 {
-/* fixme (low): error handling */
-
-        static const int rate[]={-1,1,2,3,5,7,-1};
-        static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1};
-        static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1};
+        static const int rate[FEC_AUTO] = {-1,    1,    2,    3,    5,    7, -1};
+        static const int g1[FEC_AUTO]   = {-1, 0x01, 0x02, 0x05, 0x15, 0x45, -1};
+        static const int g2[FEC_AUTO]   = {-1, 0x01, 0x03, 0x06, 0x1a, 0x7a, -1};
 
         /* Well, the AutoAcq engine of the cx24106 and 24110 automatically
            searches all enabled viterbi rates, and can handle non-standard
            rates as well. */
 
-        if (fec>FEC_AUTO)
-                fec=FEC_AUTO;
+        if (fec > FEC_AUTO)
+                fec = FEC_AUTO;
 
-        if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf);
+        if (fec == FEC_AUTO) { /* (re-)establish AutoAcq behaviour */
+                cx24110_writereg(state, 0x37, cx24110_readreg(state, 0x37) & 0xdf);
                 /* clear AcqVitDis bit */
-                cx24110_writereg(state,0x18,0xae);
+                cx24110_writereg(state, 0x18, 0xae);
                 /* allow all DVB standard code rates */
-                cx24110_writereg(state,0x05,(cx24110_readreg(state,0x05)&0xf0)|0x3);
+                cx24110_writereg(state, 0x05, (cx24110_readreg(state, 0x05) & 0xf0) | 0x3);
                 /* set nominal Viterbi rate 3/4 */
-                cx24110_writereg(state,0x22,(cx24110_readreg(state,0x22)&0xf0)|0x3);
+                cx24110_writereg(state, 0x22, (cx24110_readreg(state, 0x22) & 0xf0) | 0x3);
                 /* set current Viterbi rate 3/4 */
-                cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06);
+                cx24110_writereg(state, 0x1a, 0x05);
+                cx24110_writereg(state, 0x1b, 0x06);
                 /* set the puncture registers for code rate 3/4 */
                 return 0;
         } else {
-                cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20);
+                cx24110_writereg(state, 0x37, cx24110_readreg(state, 0x37) | 0x20);
                 /* set AcqVitDis bit */
-                if(rate[fec]>0) {
-                        cx24110_writereg(state,0x05,(cx24110_readreg(state,0x05)&0xf0)|rate[fec]);
-                        /* set nominal Viterbi rate */
-                        cx24110_writereg(state,0x22,(cx24110_readreg(state,0x22)&0xf0)|rate[fec]);
-                        /* set current Viterbi rate */
-                        cx24110_writereg(state,0x1a,g1[fec]);
-                        cx24110_writereg(state,0x1b,g2[fec]);
-                        /* not sure if this is the right way: I always used AutoAcq mode */
-           } else
-                   return -EOPNOTSUPP;
-/* fixme (low): which is the correct return code? */
+                if (rate[fec] < 0)
+                        return -EINVAL;
+
+                cx24110_writereg(state, 0x05, (cx24110_readreg(state, 0x05) & 0xf0) | rate[fec]);
+                /* set nominal Viterbi rate */
+                cx24110_writereg(state, 0x22, (cx24110_readreg(state, 0x22) & 0xf0) | rate[fec]);
+                /* set current Viterbi rate */
+                cx24110_writereg(state, 0x1a, g1[fec]);
+                cx24110_writereg(state, 0x1b, g2[fec]);
+                /* not sure if this is the right way: I always used AutoAcq mode */
         }
         return 0;
 }
diff --git a/drivers/media/dvb-frontends/cx24117.c b/drivers/media/dvb-frontends/cx24117.c
index a6c3c9e2e897..acb965ce0358 100644
--- a/drivers/media/dvb-frontends/cx24117.c
+++ b/drivers/media/dvb-frontends/cx24117.c
@@ -459,7 +459,7 @@ static int cx24117_firmware_ondemand(struct dvb_frontend *fe)
         if (state->priv->skip_fw_load)
                 return 0;
 
-        /* check if firmware if already running */
+        /* check if firmware is already running */
         if (cx24117_readreg(state, 0xeb) != 0xa) {
                 /* Load firmware */
                 /* request the firmware, this will block until loaded */
diff --git a/drivers/media/dvb-frontends/dib7000p.c b/drivers/media/dvb-frontends/dib7000p.c
index 589134e95175..c505d696f92d 100644
--- a/drivers/media/dvb-frontends/dib7000p.c
+++ b/drivers/media/dvb-frontends/dib7000p.c
@@ -1780,7 +1780,7 @@ static u32 interpolate_value(u32 value, struct linear_segments *segments,
 }
 
 /* FIXME: may require changes - this one was borrowed from dib8000 */
-static u32 dib7000p_get_time_us(struct dvb_frontend *demod, int layer)
+static u32 dib7000p_get_time_us(struct dvb_frontend *demod)
 {
         struct dtv_frontend_properties *c = &demod->dtv_property_cache;
         u64 time_us, tmp64;
@@ -1881,7 +1881,6 @@ static int dib7000p_get_stats(struct dvb_frontend *demod, fe_status_t stat)
 {
         struct dib7000p_state *state = demod->demodulator_priv;
         struct dtv_frontend_properties *c = &demod->dtv_property_cache;
-        int i;
         int show_per_stats = 0;
         u32 time_us = 0, val, snr;
         u64 blocks, ucb;
@@ -1935,7 +1934,7 @@ static int dib7000p_get_stats(struct dvb_frontend *demod, fe_status_t stat)
 
                 /* Estimate the number of packets based on bitrate */
                 if (!time_us)
-                        time_us = dib7000p_get_time_us(demod, -1);
+                        time_us = dib7000p_get_time_us(demod);
 
                 if (time_us) {
                         blocks = 1250000ULL * 1000000ULL;
@@ -1949,7 +1948,7 @@ static int dib7000p_get_stats(struct dvb_frontend *demod, fe_status_t stat)
 
         /* Get post-BER measures */
         if (time_after(jiffies, state->ber_jiffies_stats)) {
-                time_us = dib7000p_get_time_us(demod, -1);
+                time_us = dib7000p_get_time_us(demod);
                 state->ber_jiffies_stats = jiffies + msecs_to_jiffies((time_us + 500) / 1000);
 
                 dprintk("Next all layers stats available in %u us.", time_us);
@@ -1969,7 +1968,7 @@ static int dib7000p_get_stats(struct dvb_frontend *demod, fe_status_t stat)
                 c->block_error.stat[0].scale = FE_SCALE_COUNTER;
                 c->block_error.stat[0].uvalue += val;
 
-                time_us = dib7000p_get_time_us(demod, i);
+                time_us = dib7000p_get_time_us(demod);
                 if (time_us) {
                         blocks = 1250000ULL * 1000000ULL;
                         do_div(blocks, time_us * 8 * 204);
diff --git a/drivers/media/dvb-frontends/drx39xyj/drxj.c b/drivers/media/dvb-frontends/drx39xyj/drxj.c
index 5ec221ffdfca..2bfa7a435974 100644
--- a/drivers/media/dvb-frontends/drx39xyj/drxj.c
+++ b/drivers/media/dvb-frontends/drx39xyj/drxj.c
@@ -12255,8 +12255,7 @@ static void drx39xxj_release(struct dvb_frontend *fe)
         kfree(demod->my_ext_attr);
         kfree(demod->my_common_attr);
         kfree(demod->my_i2c_dev_addr);
-        if (demod->firmware)
-                release_firmware(demod->firmware);
+        release_firmware(demod->firmware);
         kfree(demod);
         kfree(state);
 }
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c
index 672195147d01..d46cf5f7cd2e 100644
--- a/drivers/media/dvb-frontends/drxk_hard.c
+++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -166,9 +166,9 @@ static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages");
 
-#define dprintk(level, fmt, arg...) do {                        \
-if (debug >= level)                                             \
-        pr_debug(fmt, ##arg);                                   \
+#define dprintk(level, fmt, arg...) do {                                \
+if (debug >= level)                                                     \
+        printk(KERN_DEBUG KBUILD_MODNAME ": %s " fmt, __func__, ##arg); \
 } while (0)
 
 
@@ -6310,8 +6310,7 @@ static void drxk_release(struct dvb_frontend *fe)
         struct drxk_state *state = fe->demodulator_priv;
 
         dprintk(1, "\n");
-        if (state->fw)
-                release_firmware(state->fw);
+        release_firmware(state->fw);
 
         kfree(state);
 }
diff --git a/drivers/media/dvb-frontends/m88ds3103.c b/drivers/media/dvb-frontends/m88ds3103.c
index 81657e94c5a4..ba4ee0b48834 100644
--- a/drivers/media/dvb-frontends/m88ds3103.c
+++ b/drivers/media/dvb-frontends/m88ds3103.c
@@ -1,5 +1,5 @@
 /*
- * Montage M88DS3103 demodulator driver
+ * Montage M88DS3103/M88RS6000 demodulator driver
  *
  * Copyright (C) 2013 Antti Palosaari <crope@iki.fi>
  *
@@ -162,7 +162,7 @@ static int m88ds3103_wr_reg_val_tab(struct m88ds3103_priv *priv,
 
         dev_dbg(&priv->i2c->dev, "%s: tab_len=%d\n", __func__, tab_len);
 
-        if (tab_len > 83) {
+        if (tab_len > 86) {
                 ret = -EINVAL;
                 goto err;
         }
@@ -245,9 +245,9 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
         struct dtv_frontend_properties *c = &fe->dtv_property_cache;
         int ret, len;
         const struct m88ds3103_reg_val *init;
-        u8 u8tmp, u8tmp1, u8tmp2;
-        u8 buf[2];
-        u16 u16tmp, divide_ratio;
+        u8 u8tmp, u8tmp1 = 0, u8tmp2 = 0; /* silence compiler warning */
+        u8 buf[3];
+        u16 u16tmp, divide_ratio = 0;
         u32 tuner_frequency, target_mclk;
         s32 s32tmp;
 
@@ -262,6 +262,22 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                 goto err;
         }
 
+        /* reset */
+        ret = m88ds3103_wr_reg(priv, 0x07, 0x80);
+        if (ret)
+                goto err;
+
+        ret = m88ds3103_wr_reg(priv, 0x07, 0x00);
+        if (ret)
+                goto err;
+
+        /* Disable demod clock path */
+        if (priv->chip_id == M88RS6000_CHIP_ID) {
+                ret = m88ds3103_wr_reg(priv, 0x06, 0xe0);
+                if (ret)
+                        goto err;
+        }
+
         /* program tuner */
         if (fe->ops.tuner_ops.set_params) {
                 ret = fe->ops.tuner_ops.set_params(fe);
@@ -282,49 +298,44 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                 tuner_frequency = c->frequency;
         }
 
-        /* reset */
-        ret = m88ds3103_wr_reg(priv, 0x07, 0x80);
-        if (ret)
-                goto err;
-
-        ret = m88ds3103_wr_reg(priv, 0x07, 0x00);
-        if (ret)
-                goto err;
-
-        ret = m88ds3103_wr_reg(priv, 0xb2, 0x01);
-        if (ret)
-                goto err;
+        /* select M88RS6000 demod main mclk and ts mclk from tuner die. */
+        if (priv->chip_id == M88RS6000_CHIP_ID) {
+                if (c->symbol_rate > 45010000)
+                        priv->mclk_khz = 110250;
+                else
+                        priv->mclk_khz = 96000;
 
-        ret = m88ds3103_wr_reg(priv, 0x00, 0x01);
-        if (ret)
-                goto err;
+                if (c->delivery_system == SYS_DVBS)
+                        target_mclk = 96000;
+                else
+                        target_mclk = 144000;
 
-        switch (c->delivery_system) {
-        case SYS_DVBS:
-                len = ARRAY_SIZE(m88ds3103_dvbs_init_reg_vals);
-                init = m88ds3103_dvbs_init_reg_vals;
-                target_mclk = 96000;
-                break;
-        case SYS_DVBS2:
-                len = ARRAY_SIZE(m88ds3103_dvbs2_init_reg_vals);
-                init = m88ds3103_dvbs2_init_reg_vals;
+                /* Enable demod clock path */
+                ret = m88ds3103_wr_reg(priv, 0x06, 0x00);
+                if (ret)
+                        goto err;
+                usleep_range(10000, 20000);
+        } else {
+        /* set M88DS3103 mclk and ts mclk. */
+                priv->mclk_khz = 96000;
 
                 switch (priv->cfg->ts_mode) {
                 case M88DS3103_TS_SERIAL:
                 case M88DS3103_TS_SERIAL_D7:
-                        if (c->symbol_rate < 18000000)
-                                target_mclk = 96000;
-                        else
-                                target_mclk = 144000;
+                        target_mclk = priv->cfg->ts_clk;
                         break;
                 case M88DS3103_TS_PARALLEL:
                 case M88DS3103_TS_CI:
-                        if (c->symbol_rate < 18000000)
+                        if (c->delivery_system == SYS_DVBS)
                                 target_mclk = 96000;
-                        else if (c->symbol_rate < 28000000)
-                                target_mclk = 144000;
-                        else
-                                target_mclk = 192000;
+                        else {
+                                if (c->symbol_rate < 18000000)
+                                        target_mclk = 96000;
+                                else if (c->symbol_rate < 28000000)
+                                        target_mclk = 144000;
+                                else
+                                        target_mclk = 192000;
+                        }
                         break;
                 default:
                         dev_dbg(&priv->i2c->dev, "%s: invalid ts_mode\n",
@@ -332,6 +343,55 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                         ret = -EINVAL;
                         goto err;
                 }
+
+                switch (target_mclk) {
+                case 96000:
+                        u8tmp1 = 0x02; /* 0b10 */
+                        u8tmp2 = 0x01; /* 0b01 */
+                        break;
+                case 144000:
+                        u8tmp1 = 0x00; /* 0b00 */
+                        u8tmp2 = 0x01; /* 0b01 */
+                        break;
+                case 192000:
+                        u8tmp1 = 0x03; /* 0b11 */
+                        u8tmp2 = 0x00; /* 0b00 */
+                        break;
+                }
+                ret = m88ds3103_wr_reg_mask(priv, 0x22, u8tmp1 << 6, 0xc0);
+                if (ret)
+                        goto err;
+                ret = m88ds3103_wr_reg_mask(priv, 0x24, u8tmp2 << 6, 0xc0);
+                if (ret)
+                        goto err;
+        }
+
+        ret = m88ds3103_wr_reg(priv, 0xb2, 0x01);
+        if (ret)
+                goto err;
+
+        ret = m88ds3103_wr_reg(priv, 0x00, 0x01);
+        if (ret)
+                goto err;
+
+        switch (c->delivery_system) {
+        case SYS_DVBS:
+                if (priv->chip_id == M88RS6000_CHIP_ID) {
+                        len = ARRAY_SIZE(m88rs6000_dvbs_init_reg_vals);
+                        init = m88rs6000_dvbs_init_reg_vals;
+                } else {
+                        len = ARRAY_SIZE(m88ds3103_dvbs_init_reg_vals);
+                        init = m88ds3103_dvbs_init_reg_vals;
+                }
+                break;
+        case SYS_DVBS2:
+                if (priv->chip_id == M88RS6000_CHIP_ID) {
+                        len = ARRAY_SIZE(m88rs6000_dvbs2_init_reg_vals);
+                        init = m88rs6000_dvbs2_init_reg_vals;
+                } else {
+                        len = ARRAY_SIZE(m88ds3103_dvbs2_init_reg_vals);
+                        init = m88ds3103_dvbs2_init_reg_vals;
+                }
                 break;
         default:
                 dev_dbg(&priv->i2c->dev, "%s: invalid delivery_system\n",
@@ -347,7 +407,30 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                         goto err;
         }
 
-        u8tmp1 = 0; /* silence compiler warning */
+        if (priv->chip_id == M88RS6000_CHIP_ID) {
+                if ((c->delivery_system == SYS_DVBS2)
+                        && ((c->symbol_rate / 1000) <= 5000)) {
+                        ret = m88ds3103_wr_reg(priv, 0xc0, 0x04);
+                        if (ret)
+                                goto err;
+                        buf[0] = 0x09;
+                        buf[1] = 0x22;
+                        buf[2] = 0x88;
+                        ret = m88ds3103_wr_regs(priv, 0x8a, buf, 3);
+                        if (ret)
+                                goto err;
+                }
+                ret = m88ds3103_wr_reg_mask(priv, 0x9d, 0x08, 0x08);
+                if (ret)
+                        goto err;
+                ret = m88ds3103_wr_reg(priv, 0xf1, 0x01);
+                if (ret)
+                        goto err;
+                ret = m88ds3103_wr_reg_mask(priv, 0x30, 0x80, 0x80);
+                if (ret)
+                        goto err;
+        }
+
         switch (priv->cfg->ts_mode) {
         case M88DS3103_TS_SERIAL:
                 u8tmp1 = 0x00;
@@ -383,16 +466,15 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                 ret = m88ds3103_wr_reg_mask(priv, 0x29, u8tmp1, 0x20);
                 if (ret)
                         goto err;
-        }
-
-        if (priv->cfg->ts_clk) {
-                divide_ratio = DIV_ROUND_UP(target_mclk, priv->cfg->ts_clk);
-                u8tmp1 = divide_ratio / 2;
-                u8tmp2 = DIV_ROUND_UP(divide_ratio, 2);
-        } else {
-                divide_ratio = 0;
                 u8tmp1 = 0;
                 u8tmp2 = 0;
+                break;
+        default:
+                if (priv->cfg->ts_clk) {
+                        divide_ratio = DIV_ROUND_UP(target_mclk, priv->cfg->ts_clk);
+                        u8tmp1 = divide_ratio / 2;
+                        u8tmp2 = DIV_ROUND_UP(divide_ratio, 2);
+                }
         }
 
         dev_dbg(&priv->i2c->dev,
@@ -420,29 +502,6 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-        switch (target_mclk) {
-        case 96000:
-                u8tmp1 = 0x02; /* 0b10 */
-                u8tmp2 = 0x01; /* 0b01 */
-                break;
-        case 144000:
-                u8tmp1 = 0x00; /* 0b00 */
-                u8tmp2 = 0x01; /* 0b01 */
-                break;
-        case 192000:
-                u8tmp1 = 0x03; /* 0b11 */
-                u8tmp2 = 0x00; /* 0b00 */
-                break;
-        }
-
-        ret = m88ds3103_wr_reg_mask(priv, 0x22, u8tmp1 << 6, 0xc0);
-        if (ret)
-                goto err;
-
-        ret = m88ds3103_wr_reg_mask(priv, 0x24, u8tmp2 << 6, 0xc0);
-        if (ret)
-                goto err;
-
         if (c->symbol_rate <= 3000000)
                 u8tmp = 0x20;
         else if (c->symbol_rate <= 10000000)
@@ -466,7 +525,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-        u16tmp = DIV_ROUND_CLOSEST((c->symbol_rate / 1000) << 15, M88DS3103_MCLK_KHZ / 2);
+        u16tmp = DIV_ROUND_CLOSEST((c->symbol_rate / 1000) << 15, priv->mclk_khz / 2);
         buf[0] = (u16tmp >> 0) & 0xff;
         buf[1] = (u16tmp >> 8) & 0xff;
         ret = m88ds3103_wr_regs(priv, 0x61, buf, 2);
@@ -489,7 +548,7 @@ static int m88ds3103_set_frontend(struct dvb_frontend *fe)
                         (tuner_frequency - c->frequency));
 
         s32tmp = 0x10000 * (tuner_frequency - c->frequency);
-        s32tmp = DIV_ROUND_CLOSEST(s32tmp, M88DS3103_MCLK_KHZ);
+        s32tmp = DIV_ROUND_CLOSEST(s32tmp, priv->mclk_khz);
         if (s32tmp < 0)
                 s32tmp += 0x10000;
 
@@ -520,7 +579,7 @@ static int m88ds3103_init(struct dvb_frontend *fe)
         struct m88ds3103_priv *priv = fe->demodulator_priv;
         int ret, len, remaining;
         const struct firmware *fw = NULL;
-        u8 *fw_file = M88DS3103_FIRMWARE;
+        u8 *fw_file;
         u8 u8tmp;
 
         dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
@@ -541,15 +600,6 @@ static int m88ds3103_init(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-        /* reset */
-        ret = m88ds3103_wr_reg(priv, 0x07, 0x60);
-        if (ret)
-                goto err;
-
-        ret = m88ds3103_wr_reg(priv, 0x07, 0x00);
-        if (ret)
-                goto err;
-
         /* firmware status */
         ret = m88ds3103_rd_reg(priv, 0xb9, &u8tmp);
         if (ret)
@@ -560,10 +610,23 @@ static int m88ds3103_init(struct dvb_frontend *fe)
         if (u8tmp)
                 goto skip_fw_download;
 
+        /* global reset, global diseqc reset, golbal fec reset */
+        ret = m88ds3103_wr_reg(priv, 0x07, 0xe0);
+        if (ret)
+                goto err;
+
+        ret = m88ds3103_wr_reg(priv, 0x07, 0x00);
+        if (ret)
+                goto err;
+
         /* cold state - try to download firmware */
         dev_info(&priv->i2c->dev, "%s: found a '%s' in cold state\n",
                         KBUILD_MODNAME, m88ds3103_ops.info.name);
 
+        if (priv->chip_id == M88RS6000_CHIP_ID)
+                fw_file = M88RS6000_FIRMWARE;
+        else
+                fw_file = M88DS3103_FIRMWARE;
         /* request the firmware, this will block and timeout */
         ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
         if (ret) {
@@ -577,7 +640,7 @@ static int m88ds3103_init(struct dvb_frontend *fe)
 
         ret = m88ds3103_wr_reg(priv, 0xb2, 0x01);
         if (ret)
-                goto err;
+                goto error_fw_release;
 
         for (remaining = fw->size; remaining > 0;
                         remaining -= (priv->cfg->i2c_wr_max - 1)) {
@@ -591,13 +654,13 @@ static int m88ds3103_init(struct dvb_frontend *fe)
                         dev_err(&priv->i2c->dev,
                                         "%s: firmware download failed=%d\n",
                                         KBUILD_MODNAME, ret);
-                        goto err;
+                        goto error_fw_release;
                 }
         }
 
         ret = m88ds3103_wr_reg(priv, 0xb2, 0x00);
         if (ret)
-                goto err;
+                goto error_fw_release;
 
         release_firmware(fw);
         fw = NULL;
@@ -623,10 +686,10 @@ skip_fw_download:
         priv->warm = true;
 
         return 0;
-err:
-        if (fw)
-                release_firmware(fw);
 
+error_fw_release:
+        release_firmware(fw);
+err:
         dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
 }
@@ -635,13 +698,18 @@ static int m88ds3103_sleep(struct dvb_frontend *fe)
 {
         struct m88ds3103_priv *priv = fe->demodulator_priv;
         int ret;
+        u8 u8tmp;
 
         dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
 
         priv->delivery_system = SYS_UNDEFINED;
 
         /* TS Hi-Z */
-        ret = m88ds3103_wr_reg_mask(priv, 0x27, 0x00, 0x01);
+        if (priv->chip_id == M88RS6000_CHIP_ID)
+                u8tmp = 0x29;
+        else
+                u8tmp = 0x27;
+        ret = m88ds3103_wr_reg_mask(priv, u8tmp, 0x00, 0x01);
         if (ret)
                 goto err;
 
@@ -830,7 +898,7 @@ static int m88ds3103_get_frontend(struct dvb_frontend *fe)
                 goto err;
 
         c->symbol_rate = 1ull * ((buf[1] << 8) | (buf[0] << 0)) *
-                        M88DS3103_MCLK_KHZ * 1000 / 0x10000;
+                        priv->mclk_khz * 1000 / 0x10000;
 
         return 0;
 err:
@@ -1310,18 +1378,22 @@ struct dvb_frontend *m88ds3103_attach(const struct m88ds3103_config *cfg,
         priv->i2c = i2c;
         mutex_init(&priv->i2c_mutex);
 
-        ret = m88ds3103_rd_reg(priv, 0x01, &chip_id);
+        /* 0x00: chip id[6:0], 0x01: chip ver[7:0], 0x02: chip ver[15:8] */
+        ret = m88ds3103_rd_reg(priv, 0x00, &chip_id);
         if (ret)
                 goto err;
 
-        dev_dbg(&priv->i2c->dev, "%s: chip_id=%02x\n", __func__, chip_id);
+        chip_id >>= 1;
+        dev_info(&priv->i2c->dev, "%s: chip_id=%02x\n", __func__, chip_id);
 
         switch (chip_id) {
-        case 0xd0:
+        case M88RS6000_CHIP_ID:
+        case M88DS3103_CHIP_ID:
                 break;
         default:
                 goto err;
         }
+        priv->chip_id = chip_id;
 
         switch (priv->cfg->clock_out) {
         case M88DS3103_CLOCK_OUT_DISABLED:
@@ -1337,6 +1409,11 @@ struct dvb_frontend *m88ds3103_attach(const struct m88ds3103_config *cfg,
                 goto err;
         }
 
+        /* 0x29 register is defined differently for m88rs6000. */
+        /* set internal tuner address to 0x21 */
+        if (chip_id == M88RS6000_CHIP_ID)
+                u8tmp = 0x00;
+
         ret = m88ds3103_wr_reg(priv, 0x29, u8tmp);
         if (ret)
                 goto err;
@@ -1364,6 +1441,9 @@ struct dvb_frontend *m88ds3103_attach(const struct m88ds3103_config *cfg,
 
         /* create dvb_frontend */
         memcpy(&priv->fe.ops, &m88ds3103_ops, sizeof(struct dvb_frontend_ops));
+        if (priv->chip_id == M88RS6000_CHIP_ID)
+                strncpy(priv->fe.ops.info.name,
+                        "Montage M88RS6000", sizeof(priv->fe.ops.info.name));
         priv->fe.demodulator_priv = priv;
 
         return &priv->fe;
@@ -1423,3 +1503,4 @@ MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Montage M88DS3103 DVB-S/S2 demodulator driver");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(M88DS3103_FIRMWARE);
+MODULE_FIRMWARE(M88RS6000_FIRMWARE);
diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
index 9169fdd143cf..a2c0958111f8 100644
--- a/drivers/media/dvb-frontends/m88ds3103_priv.h
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -25,7 +25,10 @@
 #include <linux/math64.h>
 
 #define M88DS3103_FIRMWARE "dvb-demod-m88ds3103.fw"
+#define M88RS6000_FIRMWARE "dvb-demod-m88rs6000.fw"
 #define M88DS3103_MCLK_KHZ 96000
+#define M88RS6000_CHIP_ID 0x74
+#define M88DS3103_CHIP_ID 0x70
 
 struct m88ds3103_priv {
         struct i2c_adapter *i2c;
@@ -38,6 +41,10 @@ struct m88ds3103_priv {
         u32 ber;
         bool warm; /* FW running */
         struct i2c_adapter *i2c_adapter;
+        /* auto detect chip id to do different config */
+        u8 chip_id;
+        /* main mclk is calculated for M88RS6000 dynamically */
+        u32 mclk_khz;
 };
 
 struct m88ds3103_reg_val {
@@ -214,4 +221,178 @@ static const struct m88ds3103_reg_val m88ds3103_dvbs2_init_reg_vals[] = {
         {0xb8, 0x00},
 };
 
+static const struct m88ds3103_reg_val m88rs6000_dvbs_init_reg_vals[] = {
+        {0x23, 0x07},
+        {0x08, 0x03},
+        {0x0c, 0x02},
+        {0x20, 0x00},
+        {0x21, 0x54},
+        {0x25, 0x82},
+        {0x27, 0x31},
+        {0x30, 0x08},
+        {0x31, 0x40},
+        {0x32, 0x32},
+        {0x33, 0x35},
+        {0x35, 0xff},
+        {0x3a, 0x00},
+        {0x37, 0x10},
+        {0x38, 0x10},
+        {0x39, 0x02},
+        {0x42, 0x60},
+        {0x4a, 0x80},
+        {0x4b, 0x04},
+        {0x4d, 0x91},
+        {0x5d, 0xc8},
+        {0x50, 0x36},
+        {0x51, 0x36},
+        {0x52, 0x36},
+        {0x53, 0x36},
+        {0x63, 0x0f},
+        {0x64, 0x30},
+        {0x65, 0x40},
+        {0x68, 0x26},
+        {0x69, 0x4c},
+        {0x70, 0x20},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x40},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x60},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x80},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0xa0},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x1f},
+        {0x76, 0x38},
+        {0x77, 0xa6},
+        {0x78, 0x0c},
+        {0x79, 0x80},
+        {0x7f, 0x14},
+        {0x7c, 0x00},
+        {0xae, 0x82},
+        {0x80, 0x64},
+        {0x81, 0x66},
+        {0x82, 0x44},
+        {0x85, 0x04},
+        {0xcd, 0xf4},
+        {0x90, 0x33},
+        {0xa0, 0x44},
+        {0xbe, 0x00},
+        {0xc0, 0x08},
+        {0xc3, 0x10},
+        {0xc4, 0x08},
+        {0xc5, 0xf0},
+        {0xc6, 0xff},
+        {0xc7, 0x00},
+        {0xc8, 0x1a},
+        {0xc9, 0x80},
+        {0xe0, 0xf8},
+        {0xe6, 0x8b},
+        {0xd0, 0x40},
+        {0xf8, 0x20},
+        {0xfa, 0x0f},
+        {0x00, 0x00},
+        {0xbd, 0x01},
+        {0xb8, 0x00},
+        {0x29, 0x11},
+};
+
+static const struct m88ds3103_reg_val m88rs6000_dvbs2_init_reg_vals[] = {
+        {0x23, 0x07},
+        {0x08, 0x07},
+        {0x0c, 0x02},
+        {0x20, 0x00},
+        {0x21, 0x54},
+        {0x25, 0x82},
+        {0x27, 0x31},
+        {0x30, 0x08},
+        {0x32, 0x32},
+        {0x33, 0x35},
+        {0x35, 0xff},
+        {0x3a, 0x00},
+        {0x37, 0x10},
+        {0x38, 0x10},
+        {0x39, 0x02},
+        {0x42, 0x60},
+        {0x4a, 0x80},
+        {0x4b, 0x04},
+        {0x4d, 0x91},
+        {0x5d, 0xc8},
+        {0x50, 0x36},
+        {0x51, 0x36},
+        {0x52, 0x36},
+        {0x53, 0x36},
+        {0x63, 0x0f},
+        {0x64, 0x10},
+        {0x65, 0x20},
+        {0x68, 0x46},
+        {0x69, 0xcd},
+        {0x70, 0x20},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x40},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x60},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x80},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0xa0},
+        {0x71, 0x70},
+        {0x72, 0x04},
+        {0x73, 0x00},
+        {0x70, 0x1f},
+        {0x76, 0x38},
+        {0x77, 0xa6},
+        {0x78, 0x0c},
+        {0x79, 0x80},
+        {0x7f, 0x14},
+        {0x85, 0x08},
+        {0xcd, 0xf4},
+        {0x90, 0x33},
+        {0x86, 0x00},
+        {0x87, 0x0f},
+        {0x89, 0x00},
+        {0x8b, 0x44},
+        {0x8c, 0x66},
+        {0x9d, 0xc1},
+        {0x8a, 0x10},
+        {0xad, 0x40},
+        {0xa0, 0x44},
+        {0xbe, 0x00},
+        {0xc0, 0x08},
+        {0xc1, 0x10},
+        {0xc2, 0x08},
+        {0xc3, 0x10},
+        {0xc4, 0x08},
+        {0xc5, 0xf0},
+        {0xc6, 0xff},
+        {0xc7, 0x00},
+        {0xc8, 0x1a},
+        {0xc9, 0x80},
+        {0xca, 0x23},
+        {0xcb, 0x24},
+        {0xcc, 0xf4},
+        {0xce, 0x74},
+        {0x00, 0x00},
+        {0xbd, 0x01},
+        {0xb8, 0x00},
+        {0x29, 0x01},
+};
 #endif
diff --git a/drivers/media/dvb-frontends/mn88472.h b/drivers/media/dvb-frontends/mn88472.h
new file mode 100644
index 000000000000..da4558bce60f
--- /dev/null
+++ b/drivers/media/dvb-frontends/mn88472.h
@@ -0,0 +1,38 @@
+/*
+ * Panasonic MN88472 DVB-T/T2/C demodulator driver
+ *
+ * Copyright (C) 2013 Antti Palosaari <crope@iki.fi>
+ *
+ *    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 of the License, 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 MN88472_H
+#define MN88472_H
+
+#include <linux/dvb/frontend.h>
+
+struct mn88472_config {
+        /*
+         * Max num of bytes given I2C adapter could write at once.
+         * Default: none
+         */
+        u16 i2c_wr_max;
+
+
+        /* Everything after that is returned by the driver. */
+
+        /*
+         * DVB frontend.
+         */
+        struct dvb_frontend **fe;
+};
+
+#endif
diff --git a/drivers/media/dvb-frontends/mn88473.h b/drivers/media/dvb-frontends/mn88473.h
new file mode 100644
index 000000000000..a373ec93cbe0
--- /dev/null
+++ b/drivers/media/dvb-frontends/mn88473.h
@@ -0,0 +1,38 @@
+/*
+ * Panasonic MN88473 DVB-T/T2/C demodulator driver
+ *
+ * Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
+ *
+ *    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 of the License, 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 MN88473_H
+#define MN88473_H
+
+#include <linux/dvb/frontend.h>
+
+struct mn88473_config {
+        /*
+         * Max num of bytes given I2C adapter could write at once.
+         * Default: none
+         */
+        u16 i2c_wr_max;
+
+
+        /* Everything after that is returned by the driver. */
+
+        /*
+         * DVB frontend.
+         */
+        struct dvb_frontend **fe;
+};
+
+#endif
diff --git a/drivers/media/dvb-frontends/rtl2832.c b/drivers/media/dvb-frontends/rtl2832.c
index eb737cf29a36..9026e1aee163 100644
--- a/drivers/media/dvb-frontends/rtl2832.c
+++ b/drivers/media/dvb-frontends/rtl2832.c
@@ -258,13 +258,11 @@ static int rtl2832_rd_regs(struct rtl2832_priv *priv, u8 reg, u8 page, u8 *val,
         return rtl2832_rd(priv, reg, val, len);
 }
 
-#if 0 /* currently not used */
 /* write single register */
 static int rtl2832_wr_reg(struct rtl2832_priv *priv, u8 reg, u8 page, u8 val)
 {
         return rtl2832_wr_regs(priv, reg, page, &val, 1);
 }
-#endif
 
 /* read single register */
 static int rtl2832_rd_reg(struct rtl2832_priv *priv, u8 reg, u8 page, u8 *val)
@@ -599,6 +597,11 @@ static int rtl2832_set_frontend(struct dvb_frontend *fe)
         if (fe->ops.tuner_ops.set_params)
                 fe->ops.tuner_ops.set_params(fe);
 
+        /* PIP mode related */
+        ret = rtl2832_wr_regs(priv, 0x92, 1, "\x00\x0f\xff", 3);
+        if (ret)
+                goto err;
+
         /* If the frontend has get_if_frequency(), use it */
         if (fe->ops.tuner_ops.get_if_frequency) {
                 u32 if_freq;
@@ -661,7 +664,6 @@ static int rtl2832_set_frontend(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-
         /* soft reset */
         ret = rtl2832_wr_demod_reg(priv, DVBT_SOFT_RST, 0x1);
         if (ret)
@@ -1020,6 +1022,58 @@ static int rtl2832_deselect(struct i2c_adapter *adap, void *mux_priv,
         return 0;
 }
 
+int rtl2832_enable_external_ts_if(struct dvb_frontend *fe)
+{
+        struct rtl2832_priv *priv = fe->demodulator_priv;
+        int ret;
+
+        dev_dbg(&priv->i2c->dev, "%s: setting PIP mode\n", __func__);
+
+        ret = rtl2832_wr_regs(priv, 0x0c, 1, "\x5f\xff", 2);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_demod_reg(priv, DVBT_PIP_ON, 0x1);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_reg(priv, 0xbc, 0, 0x18);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_reg(priv, 0x22, 0, 0x01);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_reg(priv, 0x26, 0, 0x1f);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_reg(priv, 0x27, 0, 0xff);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_regs(priv, 0x92, 1, "\x7f\xf7\xff", 3);
+        if (ret)
+                goto err;
+
+        /* soft reset */
+        ret = rtl2832_wr_demod_reg(priv, DVBT_SOFT_RST, 0x1);
+        if (ret)
+                goto err;
+
+        ret = rtl2832_wr_demod_reg(priv, DVBT_SOFT_RST, 0x0);
+        if (ret)
+                goto err;
+
+        return 0;
+err:
+        dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+        return ret;
+
+}
+EXPORT_SYMBOL(rtl2832_enable_external_ts_if);
+
 struct i2c_adapter *rtl2832_get_i2c_adapter(struct dvb_frontend *fe)
 {
         struct rtl2832_priv *priv = fe->demodulator_priv;
diff --git a/drivers/media/dvb-frontends/rtl2832.h b/drivers/media/dvb-frontends/rtl2832.h
index cb3b6b0775b8..5254c1dfc8de 100644
--- a/drivers/media/dvb-frontends/rtl2832.h
+++ b/drivers/media/dvb-frontends/rtl2832.h
@@ -64,6 +64,10 @@ extern struct i2c_adapter *rtl2832_get_private_i2c_adapter(
         struct dvb_frontend *fe
 );
 
+extern int rtl2832_enable_external_ts_if(
+        struct dvb_frontend *fe
+);
+
 #else
 
 static inline struct dvb_frontend *rtl2832_attach(
@@ -89,6 +93,13 @@ static inline struct i2c_adapter *rtl2832_get_private_i2c_adapter(
         return NULL;
 }
 
+static inline int rtl2832_enable_external_ts_if(
+        struct dvb_frontend *fe
+)
+{
+        return -ENODEV;
+}
+
 #endif
 
 
diff --git a/drivers/media/dvb-frontends/rtl2832_sdr.c b/drivers/media/dvb-frontends/rtl2832_sdr.c
index 7bf98cf6bbe1..2896b47c29d8 100644
--- a/drivers/media/dvb-frontends/rtl2832_sdr.c
+++ b/drivers/media/dvb-frontends/rtl2832_sdr.c
@@ -1013,6 +1013,10 @@ static int rtl2832_sdr_start_streaming(struct vb2_queue *vq, unsigned int count)
         if (s->d->props->power_ctrl)
                 s->d->props->power_ctrl(s->d, 1);
 
+        /* enable ADC */
+        if (s->d->props->frontend_ctrl)
+                s->d->props->frontend_ctrl(s->fe, 1);
+
         set_bit(POWER_ON, &s->flags);
 
         ret = rtl2832_sdr_set_tuner(s);
@@ -1064,6 +1068,10 @@ static void rtl2832_sdr_stop_streaming(struct vb2_queue *vq)
 
         clear_bit(POWER_ON, &s->flags);
 
+        /* disable ADC */
+        if (s->d->props->frontend_ctrl)
+                s->d->props->frontend_ctrl(s->fe, 0);
+
         if (s->d->props->power_ctrl)
                 s->d->props->power_ctrl(s->d, 0);
 
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 1cd93be281ed..ce9ab442b4b6 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -308,14 +308,16 @@ static int si2168_set_frontend(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-        memcpy(cmd.args, "\x14\x00\x09\x10\xe3\x18", 6);
+        memcpy(cmd.args, "\x14\x00\x09\x10\xe3\x08", 6);
+        cmd.args[5] |= s->ts_clock_inv ? 0x00 : 0x10;
         cmd.wlen = 6;
         cmd.rlen = 4;
         ret = si2168_cmd_execute(s, &cmd);
         if (ret)
                 goto err;
 
-        memcpy(cmd.args, "\x14\x00\x08\x10\xd7\x15", 6);
+        memcpy(cmd.args, "\x14\x00\x08\x10\xd7\x05", 6);
+        cmd.args[5] |= s->ts_clock_inv ? 0x00 : 0x10;
         cmd.wlen = 6;
         cmd.rlen = 4;
         ret = si2168_cmd_execute(s, &cmd);
@@ -453,27 +455,45 @@ static int si2168_init(struct dvb_frontend *fe)
                         dev_err(&s->client->dev,
                                         "firmware file '%s' not found\n",
                                         fw_file);
-                        goto err;
+                        goto error_fw_release;
                 }
         }
 
         dev_info(&s->client->dev, "downloading firmware from file '%s'\n",
                         fw_file);
 
-        for (remaining = fw->size; remaining > 0; remaining -= i2c_wr_max) {
-                len = remaining;
-                if (len > i2c_wr_max)
-                        len = i2c_wr_max;
-
-                memcpy(cmd.args, &fw->data[fw->size - remaining], len);
-                cmd.wlen = len;
-                cmd.rlen = 1;
-                ret = si2168_cmd_execute(s, &cmd);
-                if (ret) {
-                        dev_err(&s->client->dev,
-                                        "firmware download failed=%d\n",
-                                        ret);
-                        goto err;
+        if ((fw->size % 17 == 0) && (fw->data[0] > 5)) {
+                /* firmware is in the new format */
+                for (remaining = fw->size; remaining > 0; remaining -= 17) {
+                        len = fw->data[fw->size - remaining];
+                        memcpy(cmd.args, &fw->data[(fw->size - remaining) + 1], len);
+                        cmd.wlen = len;
+                        cmd.rlen = 1;
+                        ret = si2168_cmd_execute(s, &cmd);
+                        if (ret) {
+                                dev_err(&s->client->dev,
+                                                "firmware download failed=%d\n",
+                                                ret);
+                                goto error_fw_release;
+                        }
+                }
+        } else {
+                /* firmware is in the old format */
+                for (remaining = fw->size; remaining > 0; remaining -= i2c_wr_max) {
+                        len = remaining;
+                        if (len > i2c_wr_max)
+                                len = i2c_wr_max;
+
+                        memcpy(cmd.args, &fw->data[fw->size - remaining], len);
+                        cmd.wlen = len;
+                        cmd.rlen = 1;
+                        ret = si2168_cmd_execute(s, &cmd);
+                        if (ret) {
+                                dev_err(&s->client->dev,
+                                                "firmware download failed=%d\n",
+                                                ret);
+                                goto error_fw_release;
+                        }
                 }
         }
 
@@ -487,6 +507,17 @@ static int si2168_init(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
+        /* query firmware version */
+        memcpy(cmd.args, "\x11", 1);
+        cmd.wlen = 1;
+        cmd.rlen = 10;
+        ret = si2168_cmd_execute(s, &cmd);
+        if (ret)
+                goto err;
+
+        dev_dbg(&s->client->dev, "firmware version: %c.%c.%d\n",
+                        cmd.args[6], cmd.args[7], cmd.args[8]);
+
         /* set ts mode */
         memcpy(cmd.args, "\x14\x00\x01\x10\x10\x00", 6);
         cmd.args[4] |= s->ts_mode;
@@ -498,17 +529,16 @@ static int si2168_init(struct dvb_frontend *fe)
 
         s->fw_loaded = true;
 
-warm:
         dev_info(&s->client->dev, "found a '%s' in warm state\n",
                         si2168_ops.info.name);
-
+warm:
         s->active = true;
 
         return 0;
-err:
-        if (fw)
-                release_firmware(fw);
 
+error_fw_release:
+        release_firmware(fw);
+err:
         dev_dbg(&s->client->dev, "failed=%d\n", ret);
         return ret;
 }
@@ -670,6 +700,7 @@ static int si2168_probe(struct i2c_client *client,
         *config->i2c_adapter = s->adapter;
         *config->fe = &s->fe;
         s->ts_mode = config->ts_mode;
+        s->ts_clock_inv = config->ts_clock_inv;
         s->fw_loaded = false;
 
         i2c_set_clientdata(client, s);
diff --git a/drivers/media/dvb-frontends/si2168.h b/drivers/media/dvb-frontends/si2168.h
index e086d6719451..87bc12146667 100644
--- a/drivers/media/dvb-frontends/si2168.h
+++ b/drivers/media/dvb-frontends/si2168.h
@@ -37,6 +37,10 @@ struct si2168_config {
 
         /* TS mode */
         u8 ts_mode;
+
+        /* TS clock inverted */
+        bool ts_clock_inv;
+
 };
 
 #define SI2168_TS_PARALLEL      0x06
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
index e13983ed4be1..60bc3349b6c3 100644
--- a/drivers/media/dvb-frontends/si2168_priv.h
+++ b/drivers/media/dvb-frontends/si2168_priv.h
@@ -38,6 +38,7 @@ struct si2168 {
         bool active;
         bool fw_loaded;
         u8 ts_mode;
+        bool ts_clock_inv;
 };
 
 /* firmare command struct */
diff --git a/drivers/media/dvb-frontends/sp2.c b/drivers/media/dvb-frontends/sp2.c
index 15bf4318cb74..cc1ef966f99f 100644
--- a/drivers/media/dvb-frontends/sp2.c
+++ b/drivers/media/dvb-frontends/sp2.c
@@ -92,6 +92,9 @@ static int sp2_write_i2c(struct sp2 *s, u8 reg, u8 *buf, int len)
                         return -EIO;
         }
 
+        dev_dbg(&s->client->dev, "addr=0x%04x, reg = 0x%02x, data = %*ph\n",
+                                client->addr, reg, len, buf);
+
         return 0;
 }
 
@@ -103,9 +106,6 @@ static int sp2_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, u8 acs,
         int mem, ret;
         int (*ci_op_cam)(void*, u8, int, u8, int*) = s->ci_control;
 
-        dev_dbg(&s->client->dev, "slot=%d, acs=0x%02x, addr=0x%04x, data = 0x%02x",
-                        slot, acs, addr, data);
-
         if (slot != 0)
                 return -EINVAL;
 
@@ -140,13 +140,16 @@ static int sp2_ci_op_cam(struct dvb_ca_en50221 *en50221, int slot, u8 acs,
         if (ret)
                 return ret;
 
-        if (read) {
-                dev_dbg(&s->client->dev, "cam read, addr=0x%04x, data = 0x%04x",
-                                addr, mem);
+        dev_dbg(&s->client->dev, "%s: slot=%d, addr=0x%04x, %s, data=%x",
+                        (read) ? "read" : "write", slot, addr,
+                        (acs == SP2_CI_ATTR_ACS) ? "attr" : "io",
+                        (read) ? mem : data);
+
+        if (read)
                 return mem;
-        } else {
+        else
                 return 0;
-        }
+
 }
 
 int sp2_ci_read_attribute_mem(struct dvb_ca_en50221 *en50221,
@@ -407,7 +410,7 @@ err:
 
 static int sp2_remove(struct i2c_client *client)
 {
-        struct si2157 *s = i2c_get_clientdata(client);
+        struct sp2 *s = i2c_get_clientdata(client);
 
         dev_dbg(&client->dev, "\n");
 
diff --git a/drivers/media/dvb-frontends/stb0899_drv.c b/drivers/media/dvb-frontends/stb0899_drv.c
index 07cd5ea7a038..19646fbb061d 100644
--- a/drivers/media/dvb-frontends/stb0899_drv.c
+++ b/drivers/media/dvb-frontends/stb0899_drv.c
@@ -705,7 +705,7 @@ static int stb0899_send_diseqc_msg(struct dvb_frontend *fe, struct dvb_diseqc_ma
         struct stb0899_state *state = fe->demodulator_priv;
         u8 reg, i;
 
-        if (cmd->msg_len > 8)
+        if (cmd->msg_len > sizeof(cmd->msg))
                 return -EINVAL;
 
         /* enable FIFO precharge        */
diff --git a/drivers/media/dvb-frontends/stv090x.c b/drivers/media/dvb-frontends/stv090x.c
index 23e872f84742..0b2a934f53e5 100644
--- a/drivers/media/dvb-frontends/stv090x.c
+++ b/drivers/media/dvb-frontends/stv090x.c
@@ -2146,7 +2146,7 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
 
         u32 reg;
         s32 car_step, steps, cur_step, dir, freq, timeout_lock;
-        int lock = 0;
+        int lock;
 
         if (state->srate >= 10000000)
                 timeout_lock = timeout_dmd / 3;
@@ -2154,98 +2154,96 @@ static int stv090x_get_coldlock(struct stv090x_state *state, s32 timeout_dmd)
                 timeout_lock = timeout_dmd / 2;
 
         lock = stv090x_get_dmdlock(state, timeout_lock); /* cold start wait */
-        if (!lock) {
-                if (state->srate >= 10000000) {
-                        if (stv090x_chk_tmg(state)) {
-                                if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
-                                        goto err;
-                                if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0)
-                                        goto err;
-                                lock = stv090x_get_dmdlock(state, timeout_dmd);
-                        } else {
-                                lock = 0;
-                        }
-                } else {
-                        if (state->srate <= 4000000)
-                                car_step = 1000;
-                        else if (state->srate <= 7000000)
-                                car_step = 2000;
-                        else if (state->srate <= 10000000)
-                                car_step = 3000;
-                        else
-                                car_step = 5000;
-
-                        steps  = (state->search_range / 1000) / car_step;
-                        steps /= 2;
-                        steps  = 2 * (steps + 1);
-                        if (steps < 0)
-                                steps = 2;
-                        else if (steps > 12)
-                                steps = 12;
-
-                        cur_step = 1;
-                        dir = 1;
-
-                        if (!lock) {
-                                freq = state->frequency;
-                                state->tuner_bw = stv090x_car_width(state->srate, state->rolloff) + state->srate;
-                                while ((cur_step <= steps) && (!lock)) {
-                                        if (dir > 0)
-                                                freq += cur_step * car_step;
-                                        else
-                                                freq -= cur_step * car_step;
-
-                                        /* Setup tuner */
-                                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
-                                                goto err;
+        if (lock)
+                return lock;
 
-                                        if (state->config->tuner_set_frequency) {
-                                                if (state->config->tuner_set_frequency(fe, freq) < 0)
-                                                        goto err_gateoff;
-                                        }
+        if (state->srate >= 10000000) {
+                if (stv090x_chk_tmg(state)) {
+                        if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
+                                goto err;
+                        if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0)
+                                goto err;
+                        return stv090x_get_dmdlock(state, timeout_dmd);
+                }
+                return 0;
+        }
 
-                                        if (state->config->tuner_set_bandwidth) {
-                                                if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
-                                                        goto err_gateoff;
-                                        }
+        if (state->srate <= 4000000)
+                car_step = 1000;
+        else if (state->srate <= 7000000)
+                car_step = 2000;
+        else if (state->srate <= 10000000)
+                car_step = 3000;
+        else
+                car_step = 5000;
 
-                                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
-                                                goto err;
+        steps  = (state->search_range / 1000) / car_step;
+        steps /= 2;
+        steps  = 2 * (steps + 1);
+        if (steps < 0)
+                steps = 2;
+        else if (steps > 12)
+                steps = 12;
 
-                                        msleep(50);
+        cur_step = 1;
+        dir = 1;
 
-                                        if (stv090x_i2c_gate_ctrl(state, 1) < 0)
-                                                goto err;
+        freq = state->frequency;
+        state->tuner_bw = stv090x_car_width(state->srate, state->rolloff) + state->srate;
+        while ((cur_step <= steps) && (!lock)) {
+                if (dir > 0)
+                        freq += cur_step * car_step;
+                else
+                        freq -= cur_step * car_step;
 
-                                        if (state->config->tuner_get_status) {
-                                                if (state->config->tuner_get_status(fe, &reg) < 0)
-                                                        goto err_gateoff;
-                                        }
+                /* Setup tuner */
+                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
+                        goto err;
 
-                                        if (reg)
-                                                dprintk(FE_DEBUG, 1, "Tuner phase locked");
-                                        else
-                                                dprintk(FE_DEBUG, 1, "Tuner unlocked");
+                if (state->config->tuner_set_frequency) {
+                        if (state->config->tuner_set_frequency(fe, freq) < 0)
+                                goto err_gateoff;
+                }
 
-                                        if (stv090x_i2c_gate_ctrl(state, 0) < 0)
-                                                goto err;
+                if (state->config->tuner_set_bandwidth) {
+                        if (state->config->tuner_set_bandwidth(fe, state->tuner_bw) < 0)
+                                goto err_gateoff;
+                }
 
-                                        STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c);
-                                        if (STV090x_WRITE_DEMOD(state, CFRINIT1, 0x00) < 0)
-                                                goto err;
-                                        if (STV090x_WRITE_DEMOD(state, CFRINIT0, 0x00) < 0)
-                                                goto err;
-                                        if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
-                                                goto err;
-                                        if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0)
-                                                goto err;
-                                        lock = stv090x_get_dmdlock(state, (timeout_dmd / 3));
+                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
+                        goto err;
 
-                                        dir *= -1;
-                                        cur_step++;
-                                }
-                        }
+                msleep(50);
+
+                if (stv090x_i2c_gate_ctrl(state, 1) < 0)
+                        goto err;
+
+                if (state->config->tuner_get_status) {
+                        if (state->config->tuner_get_status(fe, &reg) < 0)
+                                goto err_gateoff;
                 }
+
+                if (reg)
+                        dprintk(FE_DEBUG, 1, "Tuner phase locked");
+                else
+                        dprintk(FE_DEBUG, 1, "Tuner unlocked");
+
+                if (stv090x_i2c_gate_ctrl(state, 0) < 0)
+                        goto err;
+
+                STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1c);
+                if (STV090x_WRITE_DEMOD(state, CFRINIT1, 0x00) < 0)
+                        goto err;
+                if (STV090x_WRITE_DEMOD(state, CFRINIT0, 0x00) < 0)
+                        goto err;
+                if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x1f) < 0)
+                        goto err;
+                if (STV090x_WRITE_DEMOD(state, DMDISTATE, 0x15) < 0)
+                        goto err;
+                lock = stv090x_get_dmdlock(state, (timeout_dmd / 3));
+
+                dir *= -1;
+                cur_step++;
         }
 
         return lock;
@@ -2663,13 +2661,9 @@ static enum stv090x_signal_state stv090x_get_sig_params(struct stv090x_state *st
                         return STV090x_RANGEOK;
                 else if (abs(offst_freq) <= (stv090x_car_width(state->srate, state->rolloff) / 2000))
                         return STV090x_RANGEOK;
-                else
-                        return STV090x_OUTOFRANGE; /* Out of Range */
         } else {
                 if (abs(offst_freq) <= ((state->search_range / 2000) + 500))
                         return STV090x_RANGEOK;
-                else
-                        return STV090x_OUTOFRANGE;
         }
 
         return STV090x_OUTOFRANGE;
@@ -2789,6 +2783,12 @@ static u8 stv090x_optimize_carloop(struct stv090x_state *state, enum stv090x_mod
                                 aclc = car_loop[i].crl_pilots_off_30;
                 }
         } else { /* 16APSK and 32APSK */
+                /*
+                 * This should never happen in practice, except if
+                 * something is really wrong at the car_loop table.
+                 */
+                if (i >= 11)
+                        i = 10;
                 if (state->srate <= 3000000)
                         aclc = car_loop_apsk_low[i].crl_pilots_on_2;
                 else if (state->srate <= 7000000)
@@ -3470,7 +3470,20 @@ static enum dvbfe_search stv090x_search(struct dvb_frontend *fe)
         if (props->frequency == 0)
                 return DVBFE_ALGO_SEARCH_INVALID;
 
-        state->delsys = props->delivery_system;
+        switch (props->delivery_system) {
+        case SYS_DSS:
+                state->delsys = STV090x_DSS;
+                break;
+        case SYS_DVBS:
+                state->delsys = STV090x_DVBS1;
+                break;
+        case SYS_DVBS2:
+                state->delsys = STV090x_DVBS2;
+                break;
+        default:
+                return DVBFE_ALGO_SEARCH_INVALID;
+        }
+
         state->frequency = props->frequency;
         state->srate = props->symbol_rate;
         state->search_mode = STV090x_SEARCH_AUTO;
@@ -4859,8 +4872,8 @@ err:
         return -1;
 }
 
-int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,
-                u8 xor_value)
+static int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir,
+                            u8 value, u8 xor_value)
 {
         struct stv090x_state *state = fe->demodulator_priv;
         u8 reg = 0;
@@ -4871,7 +4884,6 @@ int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,
 
         return stv090x_write_reg(state, STV090x_GPIOxCFG(gpio), reg);
 }
-EXPORT_SYMBOL(stv090x_set_gpio);
 
 static struct dvb_frontend_ops stv090x_ops = {
         .delsys = { SYS_DVBS, SYS_DVBS2, SYS_DSS },
@@ -4908,7 +4920,7 @@ static struct dvb_frontend_ops stv090x_ops = {
 };
 
 
-struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
+struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
                                     struct i2c_adapter *i2c,
                                     enum stv090x_demodulator demod)
 {
@@ -4969,6 +4981,8 @@ struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
         if (config->diseqc_envelope_mode)
                 stv090x_send_diseqc_burst(&state->frontend, SEC_MINI_A);
 
+        config->set_gpio = stv090x_set_gpio;
+
         dprintk(FE_ERROR, 1, "Attaching %s demodulator(%d) Cut=0x%02x",
                state->device == STV0900 ? "STV0900" : "STV0903",
                demod,
diff --git a/drivers/media/dvb-frontends/stv090x.h b/drivers/media/dvb-frontends/stv090x.h
index 0bd6adcfee8a..742eeda99000 100644
--- a/drivers/media/dvb-frontends/stv090x.h
+++ b/drivers/media/dvb-frontends/stv090x.h
@@ -89,29 +89,29 @@ struct stv090x_config {
 
         bool diseqc_envelope_mode;
 
-        int (*tuner_init) (struct dvb_frontend *fe);
-        int (*tuner_sleep) (struct dvb_frontend *fe);
-        int (*tuner_set_mode) (struct dvb_frontend *fe, enum tuner_mode mode);
-        int (*tuner_set_frequency) (struct dvb_frontend *fe, u32 frequency);
-        int (*tuner_get_frequency) (struct dvb_frontend *fe, u32 *frequency);
-        int (*tuner_set_bandwidth) (struct dvb_frontend *fe, u32 bandwidth);
-        int (*tuner_get_bandwidth) (struct dvb_frontend *fe, u32 *bandwidth);
-        int (*tuner_set_bbgain) (struct dvb_frontend *fe, u32 gain);
-        int (*tuner_get_bbgain) (struct dvb_frontend *fe, u32 *gain);
-        int (*tuner_set_refclk)  (struct dvb_frontend *fe, u32 refclk);
-        int (*tuner_get_status) (struct dvb_frontend *fe, u32 *status);
-        void (*tuner_i2c_lock) (struct dvb_frontend *fe, int lock);
+        int (*tuner_init)(struct dvb_frontend *fe);
+        int (*tuner_sleep)(struct dvb_frontend *fe);
+        int (*tuner_set_mode)(struct dvb_frontend *fe, enum tuner_mode mode);
+        int (*tuner_set_frequency)(struct dvb_frontend *fe, u32 frequency);
+        int (*tuner_get_frequency)(struct dvb_frontend *fe, u32 *frequency);
+        int (*tuner_set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
+        int (*tuner_get_bandwidth)(struct dvb_frontend *fe, u32 *bandwidth);
+        int (*tuner_set_bbgain)(struct dvb_frontend *fe, u32 gain);
+        int (*tuner_get_bbgain)(struct dvb_frontend *fe, u32 *gain);
+        int (*tuner_set_refclk)(struct dvb_frontend *fe, u32 refclk);
+        int (*tuner_get_status)(struct dvb_frontend *fe, u32 *status);
+        void (*tuner_i2c_lock)(struct dvb_frontend *fe, int lock);
+
+        /* dir = 0 -> output, dir = 1 -> input/open-drain */
+        int (*set_gpio)(struct dvb_frontend *fe, u8 gpio, u8 dir, u8 value,
+                        u8 xor_value);
 };
 
 #if IS_ENABLED(CONFIG_DVB_STV090x)
 
-extern struct dvb_frontend *stv090x_attach(const struct stv090x_config *config,
-                                           struct i2c_adapter *i2c,
-                                           enum stv090x_demodulator demod);
-
-/* dir = 0 -> output, dir = 1 -> input/open-drain */
-extern int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio,
-                u8 dir, u8 value, u8 xor_value);
+struct dvb_frontend *stv090x_attach(struct stv090x_config *config,
+                                    struct i2c_adapter *i2c,
+                                    enum stv090x_demodulator demod);
 
 #else
 
@@ -123,12 +123,6 @@ static inline struct dvb_frontend *stv090x_attach(const struct stv090x_config *c
         return NULL;
 }
 
-static inline int stv090x_set_gpio(struct dvb_frontend *fe, u8 gpio,
-                u8 opd, u8 value, u8 xor_value)
-{
-        printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
-        return -ENODEV;
-}
 #endif /* CONFIG_DVB_STV090x */
 
 #endif /* __STV090x_H */
diff --git a/drivers/media/firewire/firedtv-ci.c b/drivers/media/firewire/firedtv-ci.c
index e5ebdbfe8c19..e63f582378bf 100644
--- a/drivers/media/firewire/firedtv-ci.c
+++ b/drivers/media/firewire/firedtv-ci.c
@@ -253,6 +253,5 @@ int fdtv_ca_register(struct firedtv *fdtv)
 
 void fdtv_ca_release(struct firedtv *fdtv)
 {
-        if (fdtv->cadev)
-                dvb_unregister_device(fdtv->cadev);
+        dvb_unregister_device(fdtv->cadev);
 }
diff --git a/drivers/media/firewire/firedtv.h b/drivers/media/firewire/firedtv.h
index c2ba085e0d20..346a85be6de2 100644
--- a/drivers/media/firewire/firedtv.h
+++ b/drivers/media/firewire/firedtv.h
@@ -96,7 +96,7 @@ struct firedtv {
 
         enum model_type         type;
         char                    subunit;
-        char                    isochannel;
+        s8                      isochannel;
         struct fdtv_ir_context  *ir_context;
 
         fe_sec_voltage_t        voltage;
diff --git a/drivers/media/i2c/adv7170.c b/drivers/media/i2c/adv7170.c
index 04bb29720aaf..40a1a95c7ce9 100644
--- a/drivers/media/i2c/adv7170.c
+++ b/drivers/media/i2c/adv7170.c
@@ -63,9 +63,9 @@ static inline struct adv7170 *to_adv7170(struct v4l2_subdev *sd)
 
 static char *inputs[] = { "pass_through", "play_back" };
 
-static enum v4l2_mbus_pixelcode adv7170_codes[] = {
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_UYVY8_1X16,
+static u32 adv7170_codes[] = {
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_UYVY8_1X16,
 };
 
 /* ----------------------------------------------------------------------- */
@@ -263,7 +263,7 @@ static int adv7170_s_routing(struct v4l2_subdev *sd,
 }
 
 static int adv7170_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                enum v4l2_mbus_pixelcode *code)
+                                u32 *code)
 {
         if (index >= ARRAY_SIZE(adv7170_codes))
                 return -EINVAL;
@@ -278,9 +278,9 @@ static int adv7170_g_fmt(struct v4l2_subdev *sd,
         u8 val = adv7170_read(sd, 0x7);
 
         if ((val & 0x40) == (1 << 6))
-                mf->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                mf->code = MEDIA_BUS_FMT_UYVY8_1X16;
         else
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
 
         mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;
         mf->width       = 0;
@@ -297,11 +297,11 @@ static int adv7170_s_fmt(struct v4l2_subdev *sd,
         int ret;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 val &= ~0x40;
                 break;
 
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 val |= 0x40;
                 break;
 
diff --git a/drivers/media/i2c/adv7175.c b/drivers/media/i2c/adv7175.c
index b88f3b3d5ed9..d220af579a64 100644
--- a/drivers/media/i2c/adv7175.c
+++ b/drivers/media/i2c/adv7175.c
@@ -60,9 +60,9 @@ static inline struct adv7175 *to_adv7175(struct v4l2_subdev *sd)
 
 static char *inputs[] = { "pass_through", "play_back", "color_bar" };
 
-static enum v4l2_mbus_pixelcode adv7175_codes[] = {
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_UYVY8_1X16,
+static u32 adv7175_codes[] = {
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_UYVY8_1X16,
 };
 
 /* ----------------------------------------------------------------------- */
@@ -301,7 +301,7 @@ static int adv7175_s_routing(struct v4l2_subdev *sd,
 }
 
 static int adv7175_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                enum v4l2_mbus_pixelcode *code)
+                                u32 *code)
 {
         if (index >= ARRAY_SIZE(adv7175_codes))
                 return -EINVAL;
@@ -316,9 +316,9 @@ static int adv7175_g_fmt(struct v4l2_subdev *sd,
         u8 val = adv7175_read(sd, 0x7);
 
         if ((val & 0x40) == (1 << 6))
-                mf->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                mf->code = MEDIA_BUS_FMT_UYVY8_1X16;
         else
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
 
         mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;
         mf->width       = 0;
@@ -335,11 +335,11 @@ static int adv7175_s_fmt(struct v4l2_subdev *sd,
         int ret;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 val &= ~0x40;
                 break;
 
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 val |= 0x40;
                 break;
 
diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index 821178dcb08e..bffe6eb528a3 100644
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -422,12 +422,12 @@ static void adv7180_exit_controls(struct adv7180_state *state)
 }
 
 static int adv7180_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                 enum v4l2_mbus_pixelcode *code)
+                                 u32 *code)
 {
         if (index > 0)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_YUYV8_2X8;
+        *code = MEDIA_BUS_FMT_YUYV8_2X8;
 
         return 0;
 }
@@ -437,7 +437,7 @@ static int adv7180_mbus_fmt(struct v4l2_subdev *sd,
 {
         struct adv7180_state *state = to_state(sd);
 
-        fmt->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        fmt->code = MEDIA_BUS_FMT_YUYV8_2X8;
         fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
         fmt->field = V4L2_FIELD_INTERLACED;
         fmt->width = 720;
diff --git a/drivers/media/i2c/adv7183.c b/drivers/media/i2c/adv7183.c
index df461b07b2f7..28940cc3a766 100644
--- a/drivers/media/i2c/adv7183.c
+++ b/drivers/media/i2c/adv7183.c
@@ -421,12 +421,12 @@ static int adv7183_g_input_status(struct v4l2_subdev *sd, u32 *status)
 }
 
 static int adv7183_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                enum v4l2_mbus_pixelcode *code)
+                                u32 *code)
 {
         if (index > 0)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_UYVY8_2X8;
+        *code = MEDIA_BUS_FMT_UYVY8_2X8;
         return 0;
 }
 
@@ -435,7 +435,7 @@ static int adv7183_try_mbus_fmt(struct v4l2_subdev *sd,
 {
         struct adv7183 *decoder = to_adv7183(sd);
 
-        fmt->code = V4L2_MBUS_FMT_UYVY8_2X8;
+        fmt->code = MEDIA_BUS_FMT_UYVY8_2X8;
         fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
         if (decoder->std & V4L2_STD_525_60) {
                 fmt->field = V4L2_FIELD_SEQ_TB;
diff --git a/drivers/media/i2c/adv7511.c b/drivers/media/i2c/adv7511.c
index f98acf4aafd4..81736aaf0f31 100644
--- a/drivers/media/i2c/adv7511.c
+++ b/drivers/media/i2c/adv7511.c
@@ -26,6 +26,7 @@
 #include <linux/videodev2.h>
 #include <linux/gpio.h>
 #include <linux/workqueue.h>
+#include <linux/hdmi.h>
 #include <linux/v4l2-dv-timings.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-common.h>
@@ -96,6 +97,10 @@ struct adv7511_state {
         bool have_monitor;
         /* timings from s_dv_timings */
         struct v4l2_dv_timings dv_timings;
+        u32 fmt_code;
+        u32 colorspace;
+        u32 ycbcr_enc;
+        u32 quantization;
         /* controls */
         struct v4l2_ctrl *hdmi_mode_ctrl;
         struct v4l2_ctrl *hotplug_ctrl;
@@ -779,26 +784,234 @@ static int adv7511_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
 {
         struct adv7511_state *state = get_adv7511_state(sd);
 
+        memset(edid->reserved, 0, sizeof(edid->reserved));
+
         if (edid->pad != 0)
                 return -EINVAL;
-        if ((edid->blocks == 0) || (edid->blocks > 256))
-                return -EINVAL;
-        if (!state->edid.segments) {
-                v4l2_dbg(1, debug, sd, "EDID segment 0 not found\n");
-                return -ENODATA;
+
+        if (edid->start_block == 0 && edid->blocks == 0) {
+                edid->blocks = state->edid.segments * 2;
+                return 0;
         }
+
+        if (state->edid.segments == 0)
+                return -ENODATA;
+
         if (edid->start_block >= state->edid.segments * 2)
-                return -E2BIG;
-        if ((edid->blocks + edid->start_block) >= state->edid.segments * 2)
+                return -EINVAL;
+
+        if (edid->start_block + edid->blocks > state->edid.segments * 2)
                 edid->blocks = state->edid.segments * 2 - edid->start_block;
 
         memcpy(edid->edid, &state->edid.data[edid->start_block * 128],
                         128 * edid->blocks);
+
+        return 0;
+}
+
+static int adv7511_enum_mbus_code(struct v4l2_subdev *sd,
+                                  struct v4l2_subdev_fh *fh,
+                                  struct v4l2_subdev_mbus_code_enum *code)
+{
+        if (code->pad != 0)
+                return -EINVAL;
+
+        switch (code->index) {
+        case 0:
+                code->code = MEDIA_BUS_FMT_RGB888_1X24;
+                break;
+        case 1:
+                code->code = MEDIA_BUS_FMT_YUYV8_1X16;
+                break;
+        case 2:
+                code->code = MEDIA_BUS_FMT_UYVY8_1X16;
+                break;
+        default:
+                return -EINVAL;
+        }
+        return 0;
+}
+
+static void adv7511_fill_format(struct adv7511_state *state,
+                                struct v4l2_mbus_framefmt *format)
+{
+        memset(format, 0, sizeof(*format));
+
+        format->width = state->dv_timings.bt.width;
+        format->height = state->dv_timings.bt.height;
+        format->field = V4L2_FIELD_NONE;
+}
+
+static int adv7511_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                              struct v4l2_subdev_format *format)
+{
+        struct adv7511_state *state = get_adv7511_state(sd);
+
+        if (format->pad != 0)
+                return -EINVAL;
+
+        adv7511_fill_format(state, &format->format);
+
+        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+                struct v4l2_mbus_framefmt *fmt;
+
+                fmt = v4l2_subdev_get_try_format(fh, format->pad);
+                format->format.code = fmt->code;
+                format->format.colorspace = fmt->colorspace;
+                format->format.ycbcr_enc = fmt->ycbcr_enc;
+                format->format.quantization = fmt->quantization;
+        } else {
+                format->format.code = state->fmt_code;
+                format->format.colorspace = state->colorspace;
+                format->format.ycbcr_enc = state->ycbcr_enc;
+                format->format.quantization = state->quantization;
+        }
+
+        return 0;
+}
+
+static int adv7511_set_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
+                       struct v4l2_subdev_format *format)
+{
+        struct adv7511_state *state = get_adv7511_state(sd);
+        /*
+         * Bitfield namings come the CEA-861-F standard, table 8 "Auxiliary
+         * Video Information (AVI) InfoFrame Format"
+         *
+         * c = Colorimetry
+         * ec = Extended Colorimetry
+         * y = RGB or YCbCr
+         * q = RGB Quantization Range
+         * yq = YCC Quantization Range
+         */
+        u8 c = HDMI_COLORIMETRY_NONE;
+        u8 ec = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+        u8 y = HDMI_COLORSPACE_RGB;
+        u8 q = HDMI_QUANTIZATION_RANGE_DEFAULT;
+        u8 yq = HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
+
+        if (format->pad != 0)
+                return -EINVAL;
+        switch (format->format.code) {
+        case MEDIA_BUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_RGB888_1X24:
+                break;
+        default:
+                return -EINVAL;
+        }
+
+        adv7511_fill_format(state, &format->format);
+        if (format->which == V4L2_SUBDEV_FORMAT_TRY) {
+                struct v4l2_mbus_framefmt *fmt;
+
+                fmt = v4l2_subdev_get_try_format(fh, format->pad);
+                fmt->code = format->format.code;
+                fmt->colorspace = format->format.colorspace;
+                fmt->ycbcr_enc = format->format.ycbcr_enc;
+                fmt->quantization = format->format.quantization;
+                return 0;
+        }
+
+        switch (format->format.code) {
+        case MEDIA_BUS_FMT_UYVY8_1X16:
+                adv7511_wr_and_or(sd, 0x15, 0xf0, 0x01);
+                adv7511_wr_and_or(sd, 0x16, 0x03, 0xb8);
+                y = HDMI_COLORSPACE_YUV422;
+                break;
+        case MEDIA_BUS_FMT_YUYV8_1X16:
+                adv7511_wr_and_or(sd, 0x15, 0xf0, 0x01);
+                adv7511_wr_and_or(sd, 0x16, 0x03, 0xbc);
+                y = HDMI_COLORSPACE_YUV422;
+                break;
+        case MEDIA_BUS_FMT_RGB888_1X24:
+        default:
+                adv7511_wr_and_or(sd, 0x15, 0xf0, 0x00);
+                adv7511_wr_and_or(sd, 0x16, 0x03, 0x00);
+                break;
+        }
+        state->fmt_code = format->format.code;
+        state->colorspace = format->format.colorspace;
+        state->ycbcr_enc = format->format.ycbcr_enc;
+        state->quantization = format->format.quantization;
+
+        switch (format->format.colorspace) {
+        case V4L2_COLORSPACE_ADOBERGB:
+                c = HDMI_COLORIMETRY_EXTENDED;
+                ec = y ? HDMI_EXTENDED_COLORIMETRY_ADOBE_YCC_601 :
+                         HDMI_EXTENDED_COLORIMETRY_ADOBE_RGB;
+                break;
+        case V4L2_COLORSPACE_SMPTE170M:
+                c = y ? HDMI_COLORIMETRY_ITU_601 : HDMI_COLORIMETRY_NONE;
+                if (y && format->format.ycbcr_enc == V4L2_YCBCR_ENC_XV601) {
+                        c = HDMI_COLORIMETRY_EXTENDED;
+                        ec = HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+                }
+                break;
+        case V4L2_COLORSPACE_REC709:
+                c = y ? HDMI_COLORIMETRY_ITU_709 : HDMI_COLORIMETRY_NONE;
+                if (y && format->format.ycbcr_enc == V4L2_YCBCR_ENC_XV709) {
+                        c = HDMI_COLORIMETRY_EXTENDED;
+                        ec = HDMI_EXTENDED_COLORIMETRY_XV_YCC_709;
+                }
+                break;
+        case V4L2_COLORSPACE_SRGB:
+                c = y ? HDMI_COLORIMETRY_EXTENDED : HDMI_COLORIMETRY_NONE;
+                ec = y ? HDMI_EXTENDED_COLORIMETRY_S_YCC_601 :
+                         HDMI_EXTENDED_COLORIMETRY_XV_YCC_601;
+                break;
+        case V4L2_COLORSPACE_BT2020:
+                c = HDMI_COLORIMETRY_EXTENDED;
+                if (y && format->format.ycbcr_enc == V4L2_YCBCR_ENC_BT2020_CONST_LUM)
+                        ec = 5; /* Not yet available in hdmi.h */
+                else
+                        ec = 6; /* Not yet available in hdmi.h */
+                break;
+        default:
+                break;
+        }
+
+        /*
+         * CEA-861-F says that for RGB formats the YCC range must match the
+         * RGB range, although sources should ignore the YCC range.
+         *
+         * The RGB quantization range shouldn't be non-zero if the EDID doesn't
+         * have the Q bit set in the Video Capabilities Data Block, however this
+         * isn't checked at the moment. The assumption is that the application
+         * knows the EDID and can detect this.
+         *
+         * The same is true for the YCC quantization range: non-standard YCC
+         * quantization ranges should only be sent if the EDID has the YQ bit
+         * set in the Video Capabilities Data Block.
+         */
+        switch (format->format.quantization) {
+        case V4L2_QUANTIZATION_FULL_RANGE:
+                q = y ? HDMI_QUANTIZATION_RANGE_DEFAULT :
+                        HDMI_QUANTIZATION_RANGE_FULL;
+                yq = q ? q - 1 : HDMI_YCC_QUANTIZATION_RANGE_FULL;
+                break;
+        case V4L2_QUANTIZATION_LIM_RANGE:
+                q = y ? HDMI_QUANTIZATION_RANGE_DEFAULT :
+                        HDMI_QUANTIZATION_RANGE_LIMITED;
+                yq = q ? q - 1 : HDMI_YCC_QUANTIZATION_RANGE_LIMITED;
+                break;
+        }
+
+        adv7511_wr_and_or(sd, 0x4a, 0xbf, 0);
+        adv7511_wr_and_or(sd, 0x55, 0x9f, y << 5);
+        adv7511_wr_and_or(sd, 0x56, 0x3f, c << 6);
+        adv7511_wr_and_or(sd, 0x57, 0x83, (ec << 4) | (q << 2));
+        adv7511_wr_and_or(sd, 0x59, 0x0f, yq << 4);
+        adv7511_wr_and_or(sd, 0x4a, 0xff, 1);
+
         return 0;
 }
 
 static const struct v4l2_subdev_pad_ops adv7511_pad_ops = {
         .get_edid = adv7511_get_edid,
+        .enum_mbus_code = adv7511_enum_mbus_code,
+        .get_fmt = adv7511_get_fmt,
+        .set_fmt = adv7511_set_fmt,
         .enum_dv_timings = adv7511_enum_dv_timings,
         .dv_timings_cap = adv7511_dv_timings_cap,
 };
@@ -1116,6 +1329,8 @@ static int adv7511_probe(struct i2c_client *client, const struct i2c_device_id *
                 return -ENODEV;
         }
         memcpy(&state->pdata, pdata, sizeof(state->pdata));
+        state->fmt_code = MEDIA_BUS_FMT_RGB888_1X24;
+        state->colorspace = V4L2_COLORSPACE_SRGB;
 
         sd = &state->sd;
 
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 47795ff71688..e43dd2e2a38a 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -88,7 +88,7 @@ struct adv7604_reg_seq {
 };
 
 struct adv7604_format_info {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u8 op_ch_sel;
         bool rgb_out;
         bool swap_cb_cr;
@@ -749,77 +749,77 @@ static void adv7604_write_reg_seq(struct v4l2_subdev *sd,
  */
 
 static const struct adv7604_format_info adv7604_formats[] = {
-        { V4L2_MBUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,
+        { MEDIA_BUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,
           ADV7604_OP_MODE_SEL_SDR_444 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV10_2X10, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV10_2X10, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_YVYU10_2X10, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU10_2X10, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,
+        { MEDIA_BUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,
+        { MEDIA_BUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_UYVY10_1X20, ADV7604_OP_CH_SEL_RBG, false, false,
+        { MEDIA_BUS_FMT_UYVY10_1X20, ADV7604_OP_CH_SEL_RBG, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_VYUY10_1X20, ADV7604_OP_CH_SEL_RBG, false, true,
+        { MEDIA_BUS_FMT_VYUY10_1X20, ADV7604_OP_CH_SEL_RBG, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_YUYV10_1X20, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV10_1X20, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_YVYU10_1X20, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU10_1X20, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_10BIT },
-        { V4L2_MBUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,
+        { MEDIA_BUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,
+        { MEDIA_BUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
 };
 
 static const struct adv7604_format_info adv7611_formats[] = {
-        { V4L2_MBUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,
+        { MEDIA_BUS_FMT_RGB888_1X24, ADV7604_OP_CH_SEL_RGB, true, false,
           ADV7604_OP_MODE_SEL_SDR_444 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV8_2X8, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU8_2X8, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV12_2X12, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU12_2X12, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422 | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,
+        { MEDIA_BUS_FMT_UYVY8_1X16, ADV7604_OP_CH_SEL_RBG, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,
+        { MEDIA_BUS_FMT_VYUY8_1X16, ADV7604_OP_CH_SEL_RBG, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV8_1X16, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU8_1X16, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_8BIT },
-        { V4L2_MBUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,
+        { MEDIA_BUS_FMT_UYVY12_1X24, ADV7604_OP_CH_SEL_RBG, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,
+        { MEDIA_BUS_FMT_VYUY12_1X24, ADV7604_OP_CH_SEL_RBG, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,
+        { MEDIA_BUS_FMT_YUYV12_1X24, ADV7604_OP_CH_SEL_RGB, false, false,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
-        { V4L2_MBUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,
+        { MEDIA_BUS_FMT_YVYU12_1X24, ADV7604_OP_CH_SEL_RGB, false, true,
           ADV7604_OP_MODE_SEL_SDR_422_2X | ADV7604_OP_FORMAT_SEL_12BIT },
 };
 
 static const struct adv7604_format_info *
-adv7604_format_info(struct adv7604_state *state, enum v4l2_mbus_pixelcode code)
+adv7604_format_info(struct adv7604_state *state, u32 code)
 {
         unsigned int i;
 
@@ -1917,7 +1917,7 @@ static int adv7604_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
 
         info = adv7604_format_info(state, format->format.code);
         if (info == NULL)
-                info = adv7604_format_info(state, V4L2_MBUS_FMT_YUYV8_2X8);
+                info = adv7604_format_info(state, MEDIA_BUS_FMT_YUYV8_2X8);
 
         adv7604_fill_format(state, &format->format);
         format->format.code = info->code;
@@ -1997,19 +1997,7 @@ static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
         struct adv7604_state *state = to_state(sd);
         u8 *data = NULL;
 
-        if (edid->pad > ADV7604_PAD_HDMI_PORT_D)
-                return -EINVAL;
-        if (edid->blocks == 0)
-                return -EINVAL;
-        if (edid->blocks > 2)
-                return -EINVAL;
-        if (edid->start_block > 1)
-                return -EINVAL;
-        if (edid->start_block == 1)
-                edid->blocks = 1;
-
-        if (edid->blocks > state->edid.blocks)
-                edid->blocks = state->edid.blocks;
+        memset(edid->reserved, 0, sizeof(edid->reserved));
 
         switch (edid->pad) {
         case ADV7604_PAD_HDMI_PORT_A:
@@ -2021,14 +2009,24 @@ static int adv7604_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
                 break;
         default:
                 return -EINVAL;
-                break;
         }
-        if (!data)
+
+        if (edid->start_block == 0 && edid->blocks == 0) {
+                edid->blocks = data ? state->edid.blocks : 0;
+                return 0;
+        }
+
+        if (data == NULL)
                 return -ENODATA;
 
-        memcpy(edid->edid,
-               data + edid->start_block * 128,
-               edid->blocks * 128);
+        if (edid->start_block >= state->edid.blocks)
+                return -EINVAL;
+
+        if (edid->start_block + edid->blocks > state->edid.blocks)
+                edid->blocks = state->edid.blocks - edid->start_block;
+
+        memcpy(edid->edid, data + edid->start_block * 128, edid->blocks * 128);
+
         return 0;
 }
 
@@ -2068,6 +2066,8 @@ static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
         int err;
         int i;
 
+        memset(edid->reserved, 0, sizeof(edid->reserved));
+
         if (edid->pad > ADV7604_PAD_HDMI_PORT_D)
                 return -EINVAL;
         if (edid->start_block != 0)
@@ -2164,7 +2164,6 @@ static int adv7604_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
                 return -EIO;
         }
 
-
         /* enable hotplug after 100 ms */
         queue_delayed_work(state->work_queues,
                         &state->delayed_work_enable_hotplug, HZ / 10);
@@ -2807,7 +2806,7 @@ static int adv7604_probe(struct i2c_client *client,
         }
 
         state->timings = cea640x480;
-        state->format = adv7604_format_info(state, V4L2_MBUS_FMT_YUYV8_2X8);
+        state->format = adv7604_format_info(state, MEDIA_BUS_FMT_YUYV8_2X8);
 
         sd = &state->sd;
         v4l2_i2c_subdev_init(sd, client, &adv7604_ops);
diff --git a/drivers/media/i2c/adv7842.c b/drivers/media/i2c/adv7842.c
index 48b628bc6714..75d26dfd0939 100644
--- a/drivers/media/i2c/adv7842.c
+++ b/drivers/media/i2c/adv7842.c
@@ -1877,12 +1877,12 @@ static int adv7842_s_routing(struct v4l2_subdev *sd,
 }
 
 static int adv7842_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                 enum v4l2_mbus_pixelcode *code)
+                                 u32 *code)
 {
         if (index)
                 return -EINVAL;
         /* Good enough for now */
-        *code = V4L2_MBUS_FMT_FIXED;
+        *code = MEDIA_BUS_FMT_FIXED;
         return 0;
 }
 
@@ -1893,7 +1893,7 @@ static int adv7842_g_mbus_fmt(struct v4l2_subdev *sd,
 
         fmt->width = state->timings.bt.width;
         fmt->height = state->timings.bt.height;
-        fmt->code = V4L2_MBUS_FMT_FIXED;
+        fmt->code = MEDIA_BUS_FMT_FIXED;
         fmt->field = V4L2_FIELD_NONE;
 
         if (state->mode == ADV7842_MODE_SDP) {
@@ -2028,16 +2028,7 @@ static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
         struct adv7842_state *state = to_state(sd);
         u8 *data = NULL;
 
-        if (edid->pad > ADV7842_EDID_PORT_VGA)
-                return -EINVAL;
-        if (edid->blocks == 0)
-                return -EINVAL;
-        if (edid->blocks > 2)
-                return -EINVAL;
-        if (edid->start_block > 1)
-                return -EINVAL;
-        if (edid->start_block == 1)
-                edid->blocks = 1;
+        memset(edid->reserved, 0, sizeof(edid->reserved));
 
         switch (edid->pad) {
         case ADV7842_EDID_PORT_A:
@@ -2052,12 +2043,23 @@ static int adv7842_get_edid(struct v4l2_subdev *sd, struct v4l2_edid *edid)
         default:
                 return -EINVAL;
         }
+
+        if (edid->start_block == 0 && edid->blocks == 0) {
+                edid->blocks = data ? 2 : 0;
+                return 0;
+        }
+
         if (!data)
                 return -ENODATA;
 
-        memcpy(edid->edid,
-               data + edid->start_block * 128,
-               edid->blocks * 128);
+        if (edid->start_block >= 2)
+                return -EINVAL;
+
+        if (edid->start_block + edid->blocks > 2)
+                edid->blocks = 2 - edid->start_block;
+
+        memcpy(edid->edid, data + edid->start_block * 128, edid->blocks * 128);
+
         return 0;
 }
 
@@ -2066,12 +2068,16 @@ static int adv7842_set_edid(struct v4l2_subdev *sd, struct v4l2_edid *e)
         struct adv7842_state *state = to_state(sd);
         int err = 0;
 
+        memset(e->reserved, 0, sizeof(e->reserved));
+
         if (e->pad > ADV7842_EDID_PORT_VGA)
                 return -EINVAL;
         if (e->start_block != 0)
                 return -EINVAL;
-        if (e->blocks > 2)
+        if (e->blocks > 2) {
+                e->blocks = 2;
                 return -E2BIG;
+        }
 
         /* todo, per edid */
         state->aspect_ratio = v4l2_calc_aspect_ratio(e->edid[0x15],
diff --git a/drivers/media/i2c/ak881x.c b/drivers/media/i2c/ak881x.c
index c14e66756b98..69aeaf397624 100644
--- a/drivers/media/i2c/ak881x.c
+++ b/drivers/media/i2c/ak881x.c
@@ -102,7 +102,7 @@ static int ak881x_try_g_mbus_fmt(struct v4l2_subdev *sd,
         v4l_bound_align_image(&mf->width, 0, 720, 2,
                               &mf->height, 0, ak881x->lines, 1, 0);
         mf->field       = V4L2_FIELD_INTERLACED;
-        mf->code        = V4L2_MBUS_FMT_YUYV8_2X8;
+        mf->code        = MEDIA_BUS_FMT_YUYV8_2X8;
         mf->colorspace  = V4L2_COLORSPACE_SMPTE170M;
 
         return 0;
@@ -112,19 +112,19 @@ static int ak881x_s_mbus_fmt(struct v4l2_subdev *sd,
                              struct v4l2_mbus_framefmt *mf)
 {
         if (mf->field != V4L2_FIELD_INTERLACED ||
-            mf->code != V4L2_MBUS_FMT_YUYV8_2X8)
+            mf->code != MEDIA_BUS_FMT_YUYV8_2X8)
                 return -EINVAL;
 
         return ak881x_try_g_mbus_fmt(sd, mf);
 }
 
 static int ak881x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                enum v4l2_mbus_pixelcode *code)
+                                u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_YUYV8_2X8;
+        *code = MEDIA_BUS_FMT_YUYV8_2X8;
         return 0;
 }
 
diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index e453a3ffe7d1..573e08826b9b 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -879,7 +879,7 @@ void cx25840_std_setup(struct i2c_client *client)
         /* Sets horizontal blanking delay and active lines */
         cx25840_write(client, 0x470, hblank);
         cx25840_write(client, 0x471,
-                        0xff & (((hblank >> 8) & 0x3) | (hactive << 4)));
+                      (((hblank >> 8) & 0x3) | (hactive << 4)) & 0xff);
         cx25840_write(client, 0x472, hactive >> 4);
 
         /* Sets burst gate delay */
@@ -888,13 +888,13 @@ void cx25840_std_setup(struct i2c_client *client)
         /* Sets vertical blanking delay and active duration */
         cx25840_write(client, 0x474, vblank);
         cx25840_write(client, 0x475,
-                        0xff & (((vblank >> 8) & 0x3) | (vactive << 4)));
+                      (((vblank >> 8) & 0x3) | (vactive << 4)) & 0xff);
         cx25840_write(client, 0x476, vactive >> 4);
         cx25840_write(client, 0x477, vblank656);
 
         /* Sets src decimation rate */
-        cx25840_write(client, 0x478, 0xff & src_decimation);
-        cx25840_write(client, 0x479, 0xff & (src_decimation >> 8));
+        cx25840_write(client, 0x478, src_decimation & 0xff);
+        cx25840_write(client, 0x479, (src_decimation >> 8) & 0xff);
 
         /* Sets Luma and UV Low pass filters */
         cx25840_write(client, 0x47a, luma_lpf << 6 | ((uv_lpf << 4) & 0x30));
@@ -904,8 +904,8 @@ void cx25840_std_setup(struct i2c_client *client)
 
         /* Sets SC Step*/
         cx25840_write(client, 0x47c, sc);
-        cx25840_write(client, 0x47d, 0xff & sc >> 8);
-        cx25840_write(client, 0x47e, 0xff & sc >> 16);
+        cx25840_write(client, 0x47d, (sc >> 8) & 0xff);
+        cx25840_write(client, 0x47e, (sc >> 16) & 0xff);
 
         /* Sets VBI parameters */
         if (std & V4L2_STD_625_50) {
@@ -1373,7 +1373,7 @@ static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
         int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
         int is_50Hz = !(state->std & V4L2_STD_525_60);
 
-        if (fmt->code != V4L2_MBUS_FMT_FIXED)
+        if (fmt->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
 
         fmt->field = V4L2_FIELD_INTERLACED;
diff --git a/drivers/media/i2c/cx25840/cx25840-firmware.c b/drivers/media/i2c/cx25840/cx25840-firmware.c
index b3169f94ece8..9bbb31adc29d 100644
--- a/drivers/media/i2c/cx25840/cx25840-firmware.c
+++ b/drivers/media/i2c/cx25840/cx25840-firmware.c
@@ -113,7 +113,7 @@ int cx25840_loadfw(struct i2c_client *client)
         const u8 *ptr;
         const char *fwname = get_fw_name(client);
         int size, retval;
-        int MAX_BUF_SIZE = FWSEND;
+        int max_buf_size = FWSEND;
         u32 gpio_oe = 0, gpio_da = 0;
 
         if (is_cx2388x(state)) {
@@ -122,10 +122,9 @@ int cx25840_loadfw(struct i2c_client *client)
                 gpio_da = cx25840_read(client, 0x164);
         }
 
-        if (is_cx231xx(state) && MAX_BUF_SIZE > 16) {
-                v4l_err(client, " Firmware download size changed to 16 bytes max length\n");
-                MAX_BUF_SIZE = 16;  /* cx231xx cannot accept more than 16 bytes at a time */
-        }
+        /* cx231xx cannot accept more than 16 bytes at a time */
+        if (is_cx231xx(state) && max_buf_size > 16)
+                max_buf_size = 16;
 
         if (request_firmware(&fw, fwname, FWDEV(client)) != 0) {
                 v4l_err(client, "unable to open firmware %s\n", fwname);
@@ -140,7 +139,7 @@ int cx25840_loadfw(struct i2c_client *client)
         size = fw->size;
         ptr = fw->data;
         while (size > 0) {
-                int len = min(MAX_BUF_SIZE - 2, size);
+                int len = min(max_buf_size - 2, size);
 
                 memcpy(buffer + 2, ptr, len);
 
diff --git a/drivers/media/i2c/ir-kbd-i2c.c b/drivers/media/i2c/ir-kbd-i2c.c
index 8311f1a9a38e..175a76114953 100644
--- a/drivers/media/i2c/ir-kbd-i2c.c
+++ b/drivers/media/i2c/ir-kbd-i2c.c
@@ -464,8 +464,7 @@ static int ir_remove(struct i2c_client *client)
         cancel_delayed_work_sync(&ir->work);
 
         /* unregister device */
-        if (ir->rc)
-                rc_unregister_device(ir->rc);
+        rc_unregister_device(ir->rc);
 
         /* free memory */
         return 0;
diff --git a/drivers/media/i2c/m5mols/m5mols_core.c b/drivers/media/i2c/m5mols/m5mols_core.c
index 8d870b7b43ff..2820f7c38cba 100644
--- a/drivers/media/i2c/m5mols/m5mols_core.c
+++ b/drivers/media/i2c/m5mols/m5mols_core.c
@@ -57,14 +57,14 @@ static struct v4l2_mbus_framefmt m5mols_default_ffmt[M5MOLS_RESTYPE_MAX] = {
         [M5MOLS_RESTYPE_MONITOR] = {
                 .width          = 1920,
                 .height         = 1080,
-                .code           = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
                 .field          = V4L2_FIELD_NONE,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
         },
         [M5MOLS_RESTYPE_CAPTURE] = {
                 .width          = 1920,
                 .height         = 1080,
-                .code           = V4L2_MBUS_FMT_JPEG_1X8,
+                .code           = MEDIA_BUS_FMT_JPEG_1X8,
                 .field          = V4L2_FIELD_NONE,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
         },
@@ -479,7 +479,7 @@ static int m5mols_get_version(struct v4l2_subdev *sd)
  * __find_restype - Lookup M-5MOLS resolution type according to pixel code
  * @code: pixel code
  */
-static enum m5mols_restype __find_restype(enum v4l2_mbus_pixelcode code)
+static enum m5mols_restype __find_restype(u32 code)
 {
         enum m5mols_restype type = M5MOLS_RESTYPE_MONITOR;
 
diff --git a/drivers/media/i2c/ml86v7667.c b/drivers/media/i2c/ml86v7667.c
index 2cace7313a22..d7307862c2c5 100644
--- a/drivers/media/i2c/ml86v7667.c
+++ b/drivers/media/i2c/ml86v7667.c
@@ -192,12 +192,12 @@ static int ml86v7667_g_input_status(struct v4l2_subdev *sd, u32 *status)
 }
 
 static int ml86v7667_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                   enum v4l2_mbus_pixelcode *code)
+                                   u32 *code)
 {
         if (index > 0)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_YUYV8_2X8;
+        *code = MEDIA_BUS_FMT_YUYV8_2X8;
 
         return 0;
 }
@@ -207,7 +207,7 @@ static int ml86v7667_mbus_fmt(struct v4l2_subdev *sd,
 {
         struct ml86v7667_priv *priv = to_ml86v7667(sd);
 
-        fmt->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        fmt->code = MEDIA_BUS_FMT_YUYV8_2X8;
         fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
         /* The top field is always transferred first by the chip */
         fmt->field = V4L2_FIELD_INTERLACED_TB;
diff --git a/drivers/media/i2c/mt9m032.c b/drivers/media/i2c/mt9m032.c
index 85ec3bacdf1c..45b3fca188ca 100644
--- a/drivers/media/i2c/mt9m032.c
+++ b/drivers/media/i2c/mt9m032.c
@@ -323,7 +323,7 @@ static int mt9m032_enum_mbus_code(struct v4l2_subdev *subdev,
         if (code->index != 0)
                 return -EINVAL;
 
-        code->code = V4L2_MBUS_FMT_Y8_1X8;
+        code->code = MEDIA_BUS_FMT_Y8_1X8;
         return 0;
 }
 
@@ -331,7 +331,7 @@ static int mt9m032_enum_frame_size(struct v4l2_subdev *subdev,
                                    struct v4l2_subdev_fh *fh,
                                    struct v4l2_subdev_frame_size_enum *fse)
 {
-        if (fse->index != 0 || fse->code != V4L2_MBUS_FMT_Y8_1X8)
+        if (fse->index != 0 || fse->code != MEDIA_BUS_FMT_Y8_1X8)
                 return -EINVAL;
 
         fse->min_width = MT9M032_COLUMN_SIZE_DEF;
@@ -759,7 +759,7 @@ static int mt9m032_probe(struct i2c_client *client,
 
         sensor->format.width = sensor->crop.width;
         sensor->format.height = sensor->crop.height;
-        sensor->format.code = V4L2_MBUS_FMT_Y8_1X8;
+        sensor->format.code = MEDIA_BUS_FMT_Y8_1X8;
         sensor->format.field = V4L2_FIELD_NONE;
         sensor->format.colorspace = V4L2_COLORSPACE_SRGB;
 
diff --git a/drivers/media/i2c/mt9p031.c b/drivers/media/i2c/mt9p031.c
index e18797ff7faf..edb76bd33d16 100644
--- a/drivers/media/i2c/mt9p031.c
+++ b/drivers/media/i2c/mt9p031.c
@@ -950,9 +950,9 @@ static int mt9p031_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
         format = v4l2_subdev_get_try_format(fh, 0);
 
         if (mt9p031->model == MT9P031_MODEL_MONOCHROME)
-                format->code = V4L2_MBUS_FMT_Y12_1X12;
+                format->code = MEDIA_BUS_FMT_Y12_1X12;
         else
-                format->code = V4L2_MBUS_FMT_SGRBG12_1X12;
+                format->code = MEDIA_BUS_FMT_SGRBG12_1X12;
 
         format->width = MT9P031_WINDOW_WIDTH_DEF;
         format->height = MT9P031_WINDOW_HEIGHT_DEF;
@@ -1120,9 +1120,9 @@ static int mt9p031_probe(struct i2c_client *client,
         mt9p031->crop.top = MT9P031_ROW_START_DEF;
 
         if (mt9p031->model == MT9P031_MODEL_MONOCHROME)
-                mt9p031->format.code = V4L2_MBUS_FMT_Y12_1X12;
+                mt9p031->format.code = MEDIA_BUS_FMT_Y12_1X12;
         else
-                mt9p031->format.code = V4L2_MBUS_FMT_SGRBG12_1X12;
+                mt9p031->format.code = MEDIA_BUS_FMT_SGRBG12_1X12;
 
         mt9p031->format.width = MT9P031_WINDOW_WIDTH_DEF;
         mt9p031->format.height = MT9P031_WINDOW_HEIGHT_DEF;
diff --git a/drivers/media/i2c/mt9t001.c b/drivers/media/i2c/mt9t001.c
index 422e068f5f1b..d9e9889b579f 100644
--- a/drivers/media/i2c/mt9t001.c
+++ b/drivers/media/i2c/mt9t001.c
@@ -333,7 +333,7 @@ static int mt9t001_enum_mbus_code(struct v4l2_subdev *subdev,
         if (code->index > 0)
                 return -EINVAL;
 
-        code->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
         return 0;
 }
 
@@ -341,7 +341,7 @@ static int mt9t001_enum_frame_size(struct v4l2_subdev *subdev,
                                    struct v4l2_subdev_fh *fh,
                                    struct v4l2_subdev_frame_size_enum *fse)
 {
-        if (fse->index >= 8 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10)
+        if (fse->index >= 8 || fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
                 return -EINVAL;
 
         fse->min_width = (MT9T001_WINDOW_WIDTH_DEF + 1) / fse->index;
@@ -792,7 +792,7 @@ static int mt9t001_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
         crop->height = MT9T001_WINDOW_HEIGHT_DEF + 1;
 
         format = v4l2_subdev_get_try_format(fh, 0);
-        format->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format->code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format->width = MT9T001_WINDOW_WIDTH_DEF + 1;
         format->height = MT9T001_WINDOW_HEIGHT_DEF + 1;
         format->field = V4L2_FIELD_NONE;
@@ -917,7 +917,7 @@ static int mt9t001_probe(struct i2c_client *client,
         mt9t001->crop.width = MT9T001_WINDOW_WIDTH_DEF + 1;
         mt9t001->crop.height = MT9T001_WINDOW_HEIGHT_DEF + 1;
 
-        mt9t001->format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        mt9t001->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         mt9t001->format.width = MT9T001_WINDOW_WIDTH_DEF + 1;
         mt9t001->format.height = MT9T001_WINDOW_HEIGHT_DEF + 1;
         mt9t001->format.field = V4L2_FIELD_NONE;
diff --git a/drivers/media/i2c/mt9v011.c b/drivers/media/i2c/mt9v011.c
index 47e475319a24..a10f7f8f0558 100644
--- a/drivers/media/i2c/mt9v011.c
+++ b/drivers/media/i2c/mt9v011.c
@@ -325,18 +325,18 @@ static int mt9v011_reset(struct v4l2_subdev *sd, u32 val)
 }
 
 static int mt9v011_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                        enum v4l2_mbus_pixelcode *code)
+                                        u32 *code)
 {
         if (index > 0)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_SGRBG8_1X8;
+        *code = MEDIA_BUS_FMT_SGRBG8_1X8;
         return 0;
 }
 
 static int mt9v011_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-        if (fmt->code != V4L2_MBUS_FMT_SGRBG8_1X8)
+        if (fmt->code != MEDIA_BUS_FMT_SGRBG8_1X8)
                 return -EINVAL;
 
         v4l_bound_align_image(&fmt->width, 48, 639, 1,
diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index d044bce312e0..93687c1e4097 100644
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -454,7 +454,7 @@ static int mt9v032_enum_mbus_code(struct v4l2_subdev *subdev,
         if (code->index > 0)
                 return -EINVAL;
 
-        code->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
         return 0;
 }
 
@@ -462,7 +462,7 @@ static int mt9v032_enum_frame_size(struct v4l2_subdev *subdev,
                                    struct v4l2_subdev_fh *fh,
                                    struct v4l2_subdev_frame_size_enum *fse)
 {
-        if (fse->index >= 3 || fse->code != V4L2_MBUS_FMT_SGRBG10_1X10)
+        if (fse->index >= 3 || fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
                 return -EINVAL;
 
         fse->min_width = MT9V032_WINDOW_WIDTH_DEF / (1 << fse->index);
@@ -814,9 +814,9 @@ static int mt9v032_open(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh)
         format = v4l2_subdev_get_try_format(fh, 0);
 
         if (mt9v032->model->color)
-                format->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                format->code = MEDIA_BUS_FMT_SGRBG10_1X10;
         else
-                format->code = V4L2_MBUS_FMT_Y10_1X10;
+                format->code = MEDIA_BUS_FMT_Y10_1X10;
 
         format->width = MT9V032_WINDOW_WIDTH_DEF;
         format->height = MT9V032_WINDOW_HEIGHT_DEF;
@@ -966,9 +966,9 @@ static int mt9v032_probe(struct i2c_client *client,
         mt9v032->crop.height = MT9V032_WINDOW_HEIGHT_DEF;
 
         if (mt9v032->model->color)
-                mt9v032->format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                mt9v032->format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         else
-                mt9v032->format.code = V4L2_MBUS_FMT_Y10_1X10;
+                mt9v032->format.code = MEDIA_BUS_FMT_Y10_1X10;
 
         mt9v032->format.width = MT9V032_WINDOW_WIDTH_DEF;
         mt9v032->format.height = MT9V032_WINDOW_HEIGHT_DEF;
diff --git a/drivers/media/i2c/noon010pc30.c b/drivers/media/i2c/noon010pc30.c
index 7eae48766e2b..00c7b26f4823 100644
--- a/drivers/media/i2c/noon010pc30.c
+++ b/drivers/media/i2c/noon010pc30.c
@@ -112,7 +112,7 @@ MODULE_PARM_DESC(debug, "Enable module debug trace. Set to 1 to enable.");
 #define REG_TERM                0xFFFF
 
 struct noon010_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u16 ispctl1_reg;
 };
@@ -175,23 +175,23 @@ static const struct noon010_frmsize noon010_sizes[] = {
 /* Supported pixel formats. */
 static const struct noon010_format noon010_formats[] = {
         {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x03,
         }, {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x02,
         }, {
-                .code           = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0,
         }, {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x01,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_BE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_BE,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x40,
         },
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
index dd3db2458a4f..957927f7a353 100644
--- a/drivers/media/i2c/ov7670.c
+++ b/drivers/media/i2c/ov7670.c
@@ -632,31 +632,31 @@ static int ov7670_detect(struct v4l2_subdev *sd)
  * The magic matrix numbers come from OmniVision.
  */
 static struct ov7670_format_struct {
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
         enum v4l2_colorspace colorspace;
         struct regval_list *regs;
         int cmatrix[CMATRIX_LEN];
 } ov7670_formats[] = {
         {
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .regs           = ov7670_fmt_yuv422,
                 .cmatrix        = { 128, -128, 0, -34, -94, 128 },
         },
         {
-                .mbus_code      = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .regs           = ov7670_fmt_rgb444,
                 .cmatrix        = { 179, -179, 0, -61, -176, 228 },
         },
         {
-                .mbus_code      = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .regs           = ov7670_fmt_rgb565,
                 .cmatrix        = { 179, -179, 0, -61, -176, 228 },
         },
         {
-                .mbus_code      = V4L2_MBUS_FMT_SBGGR8_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .regs           = ov7670_fmt_raw,
                 .cmatrix        = { 0, 0, 0, 0, 0, 0 },
@@ -772,7 +772,7 @@ static void ov7675_get_framerate(struct v4l2_subdev *sd,
                 pll_factor = PLL_FACTOR;
 
         clkrc++;
-        if (info->fmt->mbus_code == V4L2_MBUS_FMT_SBGGR8_1X8)
+        if (info->fmt->mbus_code == MEDIA_BUS_FMT_SBGGR8_1X8)
                 clkrc = (clkrc >> 1);
 
         tpf->numerator = 1;
@@ -810,7 +810,7 @@ static int ov7675_set_framerate(struct v4l2_subdev *sd,
         } else {
                 clkrc = (5 * pll_factor * info->clock_speed * tpf->numerator) /
                         (4 * tpf->denominator);
-                if (info->fmt->mbus_code == V4L2_MBUS_FMT_SBGGR8_1X8)
+                if (info->fmt->mbus_code == MEDIA_BUS_FMT_SBGGR8_1X8)
                         clkrc = (clkrc << 1);
                 clkrc--;
         }
@@ -900,7 +900,7 @@ static int ov7670_set_hw(struct v4l2_subdev *sd, int hstart, int hstop,
 
 
 static int ov7670_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                        enum v4l2_mbus_pixelcode *code)
+                                        u32 *code)
 {
         if (index >= N_OV7670_FMTS)
                 return -EINVAL;
diff --git a/drivers/media/i2c/ov9650.c b/drivers/media/i2c/ov9650.c
index 4da90c621f7e..2246bd5436ad 100644
--- a/drivers/media/i2c/ov9650.c
+++ b/drivers/media/i2c/ov9650.c
@@ -384,17 +384,17 @@ static const struct ov965x_framesize ov965x_framesizes[] = {
 };
 
 struct ov965x_pixfmt {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u32 colorspace;
         /* REG_TSLB value, only bits [3:2] may be set. */
         u8 tslb_reg;
 };
 
 static const struct ov965x_pixfmt ov965x_formats[] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 0x00},
-        { V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG, 0x04},
-        { V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG, 0x0c},
-        { V4L2_MBUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG, 0x08},
+        { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 0x00},
+        { MEDIA_BUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG, 0x04},
+        { MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG, 0x0c},
+        { MEDIA_BUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG, 0x08},
 };
 
 /*
diff --git a/drivers/media/i2c/s5c73m3/s5c73m3.h b/drivers/media/i2c/s5c73m3/s5c73m3.h
index 9656b6723dc6..13aed59f0f5d 100644
--- a/drivers/media/i2c/s5c73m3/s5c73m3.h
+++ b/drivers/media/i2c/s5c73m3/s5c73m3.h
@@ -27,8 +27,8 @@
 
 #define DRIVER_NAME                     "S5C73M3"
 
-#define S5C73M3_ISP_FMT                 V4L2_MBUS_FMT_VYUY8_2X8
-#define S5C73M3_JPEG_FMT                V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8
+#define S5C73M3_ISP_FMT                 MEDIA_BUS_FMT_VYUY8_2X8
+#define S5C73M3_JPEG_FMT                MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8
 
 /* Subdevs pad index definitions */
 enum s5c73m3_pads {
@@ -402,7 +402,7 @@ struct s5c73m3 {
 
         const struct s5c73m3_frame_size *sensor_pix_size[2];
         const struct s5c73m3_frame_size *oif_pix_size[2];
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 
         const struct s5c73m3_interval *fiv;
 
diff --git a/drivers/media/i2c/s5k4ecgx.c b/drivers/media/i2c/s5k4ecgx.c
index 1fcc76fd1bbf..d1c50c9d43ae 100644
--- a/drivers/media/i2c/s5k4ecgx.c
+++ b/drivers/media/i2c/s5k4ecgx.c
@@ -151,7 +151,7 @@ static const struct s5k4ecgx_frmsize s5k4ecgx_prev_sizes[] = {
 #define S5K4ECGX_NUM_PREV ARRAY_SIZE(s5k4ecgx_prev_sizes)
 
 struct s5k4ecgx_pixfmt {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u32 colorspace;
         /* REG_TC_PCFG_Format register value */
         u16 reg_p_format;
@@ -159,7 +159,7 @@ struct s5k4ecgx_pixfmt {
 
 /* By default value, output from sensor will be YUV422 0-255 */
 static const struct s5k4ecgx_pixfmt s5k4ecgx_formats[] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 },
+        { MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG, 5 },
 };
 
 static const char * const s5k4ecgx_supply_names[] = {
diff --git a/drivers/media/i2c/s5k5baf.c b/drivers/media/i2c/s5k5baf.c
index 0e461a6fd065..60a74d8d38d5 100644
--- a/drivers/media/i2c/s5k5baf.c
+++ b/drivers/media/i2c/s5k5baf.c
@@ -248,7 +248,7 @@ enum s5k5baf_gpio_id {
 #define NUM_ISP_PADS 2
 
 struct s5k5baf_pixfmt {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u32 colorspace;
         /* REG_P_FMT(x) register value */
         u16 reg_p_fmt;
@@ -331,10 +331,10 @@ struct s5k5baf {
 };
 
 static const struct s5k5baf_pixfmt s5k5baf_formats[] = {
-        { V4L2_MBUS_FMT_VYUY8_2X8,      V4L2_COLORSPACE_JPEG,   5 },
+        { MEDIA_BUS_FMT_VYUY8_2X8,      V4L2_COLORSPACE_JPEG,   5 },
         /* range 16-240 */
-        { V4L2_MBUS_FMT_VYUY8_2X8,      V4L2_COLORSPACE_REC709, 6 },
-        { V4L2_MBUS_FMT_RGB565_2X8_BE,  V4L2_COLORSPACE_JPEG,   0 },
+        { MEDIA_BUS_FMT_VYUY8_2X8,      V4L2_COLORSPACE_REC709, 6 },
+        { MEDIA_BUS_FMT_RGB565_2X8_BE,  V4L2_COLORSPACE_JPEG,   0 },
 };
 
 static struct v4l2_rect s5k5baf_cis_rect = {
@@ -1206,7 +1206,7 @@ static int s5k5baf_enum_mbus_code(struct v4l2_subdev *sd,
         if (code->pad == PAD_CIS) {
                 if (code->index > 0)
                         return -EINVAL;
-                code->code = V4L2_MBUS_FMT_FIXED;
+                code->code = MEDIA_BUS_FMT_FIXED;
                 return 0;
         }
 
@@ -1227,7 +1227,7 @@ static int s5k5baf_enum_frame_size(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         if (fse->pad == PAD_CIS) {
-                fse->code = V4L2_MBUS_FMT_FIXED;
+                fse->code = MEDIA_BUS_FMT_FIXED;
                 fse->min_width = S5K5BAF_CIS_WIDTH;
                 fse->max_width = S5K5BAF_CIS_WIDTH;
                 fse->min_height = S5K5BAF_CIS_HEIGHT;
@@ -1252,7 +1252,7 @@ static void s5k5baf_try_cis_format(struct v4l2_mbus_framefmt *mf)
 {
         mf->width = S5K5BAF_CIS_WIDTH;
         mf->height = S5K5BAF_CIS_HEIGHT;
-        mf->code = V4L2_MBUS_FMT_FIXED;
+        mf->code = MEDIA_BUS_FMT_FIXED;
         mf->colorspace = V4L2_COLORSPACE_JPEG;
         mf->field = V4L2_FIELD_NONE;
 }
diff --git a/drivers/media/i2c/s5k6a3.c b/drivers/media/i2c/s5k6a3.c
index c11a40850ed1..91b841a1b850 100644
--- a/drivers/media/i2c/s5k6a3.c
+++ b/drivers/media/i2c/s5k6a3.c
@@ -80,7 +80,7 @@ static inline struct s5k6a3 *sd_to_s5k6a3(struct v4l2_subdev *sd)
 
 static const struct v4l2_mbus_framefmt s5k6a3_formats[] = {
         {
-                .code = V4L2_MBUS_FMT_SGRBG10_1X10,
+                .code = MEDIA_BUS_FMT_SGRBG10_1X10,
                 .colorspace = V4L2_COLORSPACE_SRGB,
                 .field = V4L2_FIELD_NONE,
         }
diff --git a/drivers/media/i2c/s5k6aa.c b/drivers/media/i2c/s5k6aa.c
index 629a5cdadd3a..2851581e0061 100644
--- a/drivers/media/i2c/s5k6aa.c
+++ b/drivers/media/i2c/s5k6aa.c
@@ -191,7 +191,7 @@ struct s5k6aa_regval {
 };
 
 struct s5k6aa_pixfmt {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u32 colorspace;
         /* REG_P_FMT(x) register value */
         u16 reg_p_fmt;
@@ -285,10 +285,10 @@ static struct s5k6aa_regval s5k6aa_analog_config[] = {
 
 /* TODO: Add RGB888 and Bayer format */
 static const struct s5k6aa_pixfmt s5k6aa_formats[] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_JPEG,   5 },
+        { MEDIA_BUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_JPEG,   5 },
         /* range 16-240 */
-        { V4L2_MBUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_REC709, 6 },
-        { V4L2_MBUS_FMT_RGB565_2X8_BE,  V4L2_COLORSPACE_JPEG,   0 },
+        { MEDIA_BUS_FMT_YUYV8_2X8,      V4L2_COLORSPACE_REC709, 6 },
+        { MEDIA_BUS_FMT_RGB565_2X8_BE,  V4L2_COLORSPACE_JPEG,   0 },
 };
 
 static const struct s5k6aa_interval s5k6aa_intervals[] = {
diff --git a/drivers/media/i2c/saa6752hs.c b/drivers/media/i2c/saa6752hs.c
index 4024ea6f1371..f14c0e6435a3 100644
--- a/drivers/media/i2c/saa6752hs.c
+++ b/drivers/media/i2c/saa6752hs.c
@@ -562,7 +562,7 @@ static int saa6752hs_g_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
                 h->video_format = SAA6752HS_VF_D1;
         f->width = v4l2_format_table[h->video_format].fmt.pix.width;
         f->height = v4l2_format_table[h->video_format].fmt.pix.height;
-        f->code = V4L2_MBUS_FMT_FIXED;
+        f->code = MEDIA_BUS_FMT_FIXED;
         f->field = V4L2_FIELD_INTERLACED;
         f->colorspace = V4L2_COLORSPACE_SMPTE170M;
         return 0;
@@ -572,7 +572,7 @@ static int saa6752hs_try_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_frame
 {
         int dist_352, dist_480, dist_720;
 
-        f->code = V4L2_MBUS_FMT_FIXED;
+        f->code = MEDIA_BUS_FMT_FIXED;
 
         dist_352 = abs(f->width - 352);
         dist_480 = abs(f->width - 480);
@@ -599,7 +599,7 @@ static int saa6752hs_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefm
 {
         struct saa6752hs_state *h = to_state(sd);
 
-        if (f->code != V4L2_MBUS_FMT_FIXED)
+        if (f->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
 
         /*
diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index 35a44648150e..7147c8b68fac 100644
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -1172,7 +1172,7 @@ static int saa711x_s_sliced_fmt(struct v4l2_subdev *sd, struct v4l2_sliced_vbi_f
 
 static int saa711x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
 {
-        if (fmt->code != V4L2_MBUS_FMT_FIXED)
+        if (fmt->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
         fmt->field = V4L2_FIELD_INTERLACED;
         fmt->colorspace = V4L2_COLORSPACE_SMPTE170M;
diff --git a/drivers/media/i2c/saa717x.c b/drivers/media/i2c/saa717x.c
index 6922a9f9a5cd..0d0f9a917cd3 100644
--- a/drivers/media/i2c/saa717x.c
+++ b/drivers/media/i2c/saa717x.c
@@ -998,7 +998,7 @@ static int saa717x_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
 
         v4l2_dbg(1, debug, sd, "decoder set size\n");
 
-        if (fmt->code != V4L2_MBUS_FMT_FIXED)
+        if (fmt->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
 
         /* FIXME need better bounds checking here */
diff --git a/drivers/media/i2c/smiapp-pll.c b/drivers/media/i2c/smiapp-pll.c
index 2335529b195c..e40d9027df3d 100644
--- a/drivers/media/i2c/smiapp-pll.c
+++ b/drivers/media/i2c/smiapp-pll.c
@@ -65,26 +65,89 @@ static int bounds_check(struct device *dev, uint32_t val,
 
 static void print_pll(struct device *dev, struct smiapp_pll *pll)
 {
-        dev_dbg(dev, "pre_pll_clk_div\t%d\n",  pll->pre_pll_clk_div);
-        dev_dbg(dev, "pll_multiplier \t%d\n",  pll->pll_multiplier);
-        if (pll->flags != SMIAPP_PLL_FLAG_NO_OP_CLOCKS) {
-                dev_dbg(dev, "op_sys_clk_div \t%d\n", pll->op_sys_clk_div);
-                dev_dbg(dev, "op_pix_clk_div \t%d\n", pll->op_pix_clk_div);
+        dev_dbg(dev, "pre_pll_clk_div\t%u\n",  pll->pre_pll_clk_div);
+        dev_dbg(dev, "pll_multiplier \t%u\n",  pll->pll_multiplier);
+        if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) {
+                dev_dbg(dev, "op_sys_clk_div \t%u\n", pll->op.sys_clk_div);
+                dev_dbg(dev, "op_pix_clk_div \t%u\n", pll->op.pix_clk_div);
         }
-        dev_dbg(dev, "vt_sys_clk_div \t%d\n",  pll->vt_sys_clk_div);
-        dev_dbg(dev, "vt_pix_clk_div \t%d\n",  pll->vt_pix_clk_div);
-
-        dev_dbg(dev, "ext_clk_freq_hz \t%d\n", pll->ext_clk_freq_hz);
-        dev_dbg(dev, "pll_ip_clk_freq_hz \t%d\n", pll->pll_ip_clk_freq_hz);
-        dev_dbg(dev, "pll_op_clk_freq_hz \t%d\n", pll->pll_op_clk_freq_hz);
-        if (pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS) {
-                dev_dbg(dev, "op_sys_clk_freq_hz \t%d\n",
-                        pll->op_sys_clk_freq_hz);
-                dev_dbg(dev, "op_pix_clk_freq_hz \t%d\n",
-                        pll->op_pix_clk_freq_hz);
+        dev_dbg(dev, "vt_sys_clk_div \t%u\n",  pll->vt.sys_clk_div);
+        dev_dbg(dev, "vt_pix_clk_div \t%u\n",  pll->vt.pix_clk_div);
+
+        dev_dbg(dev, "ext_clk_freq_hz \t%u\n", pll->ext_clk_freq_hz);
+        dev_dbg(dev, "pll_ip_clk_freq_hz \t%u\n", pll->pll_ip_clk_freq_hz);
+        dev_dbg(dev, "pll_op_clk_freq_hz \t%u\n", pll->pll_op_clk_freq_hz);
+        if (!(pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)) {
+                dev_dbg(dev, "op_sys_clk_freq_hz \t%u\n",
+                        pll->op.sys_clk_freq_hz);
+                dev_dbg(dev, "op_pix_clk_freq_hz \t%u\n",
+                        pll->op.pix_clk_freq_hz);
         }
-        dev_dbg(dev, "vt_sys_clk_freq_hz \t%d\n", pll->vt_sys_clk_freq_hz);
-        dev_dbg(dev, "vt_pix_clk_freq_hz \t%d\n", pll->vt_pix_clk_freq_hz);
+        dev_dbg(dev, "vt_sys_clk_freq_hz \t%u\n", pll->vt.sys_clk_freq_hz);
+        dev_dbg(dev, "vt_pix_clk_freq_hz \t%u\n", pll->vt.pix_clk_freq_hz);
+}
+
+static int check_all_bounds(struct device *dev,
+                            const struct smiapp_pll_limits *limits,
+                            const struct smiapp_pll_branch_limits *op_limits,
+                            struct smiapp_pll *pll,
+                            struct smiapp_pll_branch *op_pll)
+{
+        int rval;
+
+        rval = bounds_check(dev, pll->pll_ip_clk_freq_hz,
+                            limits->min_pll_ip_freq_hz,
+                            limits->max_pll_ip_freq_hz,
+                            "pll_ip_clk_freq_hz");
+        if (!rval)
+                rval = bounds_check(
+                        dev, pll->pll_multiplier,
+                        limits->min_pll_multiplier, limits->max_pll_multiplier,
+                        "pll_multiplier");
+        if (!rval)
+                rval = bounds_check(
+                        dev, pll->pll_op_clk_freq_hz,
+                        limits->min_pll_op_freq_hz, limits->max_pll_op_freq_hz,
+                        "pll_op_clk_freq_hz");
+        if (!rval)
+                rval = bounds_check(
+                        dev, op_pll->sys_clk_div,
+                        op_limits->min_sys_clk_div, op_limits->max_sys_clk_div,
+                        "op_sys_clk_div");
+        if (!rval)
+                rval = bounds_check(
+                        dev, op_pll->sys_clk_freq_hz,
+                        op_limits->min_sys_clk_freq_hz,
+                        op_limits->max_sys_clk_freq_hz,
+                        "op_sys_clk_freq_hz");
+        if (!rval)
+                rval = bounds_check(
+                        dev, op_pll->pix_clk_freq_hz,
+                        op_limits->min_pix_clk_freq_hz,
+                        op_limits->max_pix_clk_freq_hz,
+                        "op_pix_clk_freq_hz");
+
+        /*
+         * If there are no OP clocks, the VT clocks are contained in
+         * the OP clock struct.
+         */
+        if (pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS)
+                return rval;
+
+        if (!rval)
+                rval = bounds_check(
+                        dev, pll->vt.sys_clk_freq_hz,
+                        limits->vt.min_sys_clk_freq_hz,
+                        limits->vt.max_sys_clk_freq_hz,
+                        "vt_sys_clk_freq_hz");
+        if (!rval)
+                rval = bounds_check(
+                        dev, pll->vt.pix_clk_freq_hz,
+                        limits->vt.min_pix_clk_freq_hz,
+                        limits->vt.max_pix_clk_freq_hz,
+                        "vt_pix_clk_freq_hz");
+
+        return rval;
 }
 
 /*
@@ -98,10 +161,11 @@ static void print_pll(struct device *dev, struct smiapp_pll *pll)
  *
  * @return Zero on success, error code on error.
  */
-static int __smiapp_pll_calculate(struct device *dev,
-                                  const struct smiapp_pll_limits *limits,
-                                  struct smiapp_pll *pll, uint32_t mul,
-                                  uint32_t div, uint32_t lane_op_clock_ratio)
+static int __smiapp_pll_calculate(
+        struct device *dev, const struct smiapp_pll_limits *limits,
+        const struct smiapp_pll_branch_limits *op_limits,
+        struct smiapp_pll *pll, struct smiapp_pll_branch *op_pll, uint32_t mul,
+        uint32_t div, uint32_t lane_op_clock_ratio)
 {
         uint32_t sys_div;
         uint32_t best_pix_div = INT_MAX >> 1;
@@ -117,17 +181,16 @@ static int __smiapp_pll_calculate(struct device *dev,
         uint32_t min_vt_div, max_vt_div, vt_div;
         uint32_t min_sys_div, max_sys_div;
         unsigned int i;
-        int rval;
 
         /*
          * Get pre_pll_clk_div so that our pll_op_clk_freq_hz won't be
          * too high.
          */
-        dev_dbg(dev, "pre_pll_clk_div %d\n", pll->pre_pll_clk_div);
+        dev_dbg(dev, "pre_pll_clk_div %u\n", pll->pre_pll_clk_div);
 
         /* Don't go above max pll multiplier. */
         more_mul_max = limits->max_pll_multiplier / mul;
-        dev_dbg(dev, "more_mul_max: max_pll_multiplier check: %d\n",
+        dev_dbg(dev, "more_mul_max: max_pll_multiplier check: %u\n",
                 more_mul_max);
         /* Don't go above max pll op frequency. */
         more_mul_max =
@@ -135,30 +198,30 @@ static int __smiapp_pll_calculate(struct device *dev,
                       more_mul_max,
                       limits->max_pll_op_freq_hz
                       / (pll->ext_clk_freq_hz / pll->pre_pll_clk_div * mul));
-        dev_dbg(dev, "more_mul_max: max_pll_op_freq_hz check: %d\n",
+        dev_dbg(dev, "more_mul_max: max_pll_op_freq_hz check: %u\n",
                 more_mul_max);
         /* Don't go above the division capability of op sys clock divider. */
         more_mul_max = min(more_mul_max,
-                           limits->op.max_sys_clk_div * pll->pre_pll_clk_div
+                           op_limits->max_sys_clk_div * pll->pre_pll_clk_div
                            / div);
-        dev_dbg(dev, "more_mul_max: max_op_sys_clk_div check: %d\n",
+        dev_dbg(dev, "more_mul_max: max_op_sys_clk_div check: %u\n",
                 more_mul_max);
         /* Ensure we won't go above min_pll_multiplier. */
         more_mul_max = min(more_mul_max,
                            DIV_ROUND_UP(limits->max_pll_multiplier, mul));
-        dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %d\n",
+        dev_dbg(dev, "more_mul_max: min_pll_multiplier check: %u\n",
                 more_mul_max);
 
         /* Ensure we won't go below min_pll_op_freq_hz. */
         more_mul_min = DIV_ROUND_UP(limits->min_pll_op_freq_hz,
                                     pll->ext_clk_freq_hz / pll->pre_pll_clk_div
                                     * mul);
-        dev_dbg(dev, "more_mul_min: min_pll_op_freq_hz check: %d\n",
+        dev_dbg(dev, "more_mul_min: min_pll_op_freq_hz check: %u\n",
                 more_mul_min);
         /* Ensure we won't go below min_pll_multiplier. */
         more_mul_min = max(more_mul_min,
                            DIV_ROUND_UP(limits->min_pll_multiplier, mul));
-        dev_dbg(dev, "more_mul_min: min_pll_multiplier check: %d\n",
+        dev_dbg(dev, "more_mul_min: min_pll_multiplier check: %u\n",
                 more_mul_min);
 
         if (more_mul_min > more_mul_max) {
@@ -168,23 +231,23 @@ static int __smiapp_pll_calculate(struct device *dev,
         }
 
         more_mul_factor = lcm(div, pll->pre_pll_clk_div) / div;
-        dev_dbg(dev, "more_mul_factor: %d\n", more_mul_factor);
-        more_mul_factor = lcm(more_mul_factor, limits->op.min_sys_clk_div);
+        dev_dbg(dev, "more_mul_factor: %u\n", more_mul_factor);
+        more_mul_factor = lcm(more_mul_factor, op_limits->min_sys_clk_div);
         dev_dbg(dev, "more_mul_factor: min_op_sys_clk_div: %d\n",
                 more_mul_factor);
         i = roundup(more_mul_min, more_mul_factor);
         if (!is_one_or_even(i))
                 i <<= 1;
 
-        dev_dbg(dev, "final more_mul: %d\n", i);
+        dev_dbg(dev, "final more_mul: %u\n", i);
         if (i > more_mul_max) {
-                dev_dbg(dev, "final more_mul is bad, max %d\n", more_mul_max);
+                dev_dbg(dev, "final more_mul is bad, max %u\n", more_mul_max);
                 return -EINVAL;
         }
 
         pll->pll_multiplier = mul * i;
-        pll->op_sys_clk_div = div * i / pll->pre_pll_clk_div;
-        dev_dbg(dev, "op_sys_clk_div: %d\n", pll->op_sys_clk_div);
+        op_pll->sys_clk_div = div * i / pll->pre_pll_clk_div;
+        dev_dbg(dev, "op_sys_clk_div: %u\n", op_pll->sys_clk_div);
 
         pll->pll_ip_clk_freq_hz = pll->ext_clk_freq_hz
                 / pll->pre_pll_clk_div;
@@ -193,14 +256,19 @@ static int __smiapp_pll_calculate(struct device *dev,
                 * pll->pll_multiplier;
 
         /* Derive pll_op_clk_freq_hz. */
-        pll->op_sys_clk_freq_hz =
-                pll->pll_op_clk_freq_hz / pll->op_sys_clk_div;
+        op_pll->sys_clk_freq_hz =
+                pll->pll_op_clk_freq_hz / op_pll->sys_clk_div;
+
+        op_pll->pix_clk_div = pll->bits_per_pixel;
+        dev_dbg(dev, "op_pix_clk_div: %u\n", op_pll->pix_clk_div);
 
-        pll->op_pix_clk_div = pll->bits_per_pixel;
-        dev_dbg(dev, "op_pix_clk_div: %d\n", pll->op_pix_clk_div);
+        op_pll->pix_clk_freq_hz =
+                op_pll->sys_clk_freq_hz / op_pll->pix_clk_div;
 
-        pll->op_pix_clk_freq_hz =
-                pll->op_sys_clk_freq_hz / pll->op_pix_clk_div;
+        if (pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS) {
+                /* No OP clocks --- VT clocks are used instead. */
+                goto out_skip_vt_calc;
+        }
 
         /*
          * Some sensors perform analogue binning and some do this
@@ -214,7 +282,7 @@ static int __smiapp_pll_calculate(struct device *dev,
                 vt_op_binning_div = pll->binning_horizontal;
         else
                 vt_op_binning_div = 1;
-        dev_dbg(dev, "vt_op_binning_div: %d\n", vt_op_binning_div);
+        dev_dbg(dev, "vt_op_binning_div: %u\n", vt_op_binning_div);
 
         /*
          * Profile 2 supports vt_pix_clk_div E [4, 10]
@@ -227,30 +295,30 @@ static int __smiapp_pll_calculate(struct device *dev,
          *
          * Find absolute limits for the factor of vt divider.
          */
-        dev_dbg(dev, "scale_m: %d\n", pll->scale_m);
-        min_vt_div = DIV_ROUND_UP(pll->op_pix_clk_div * pll->op_sys_clk_div
+        dev_dbg(dev, "scale_m: %u\n", pll->scale_m);
+        min_vt_div = DIV_ROUND_UP(op_pll->pix_clk_div * op_pll->sys_clk_div
                                   * pll->scale_n,
                                   lane_op_clock_ratio * vt_op_binning_div
                                   * pll->scale_m);
 
         /* Find smallest and biggest allowed vt divisor. */
-        dev_dbg(dev, "min_vt_div: %d\n", min_vt_div);
+        dev_dbg(dev, "min_vt_div: %u\n", min_vt_div);
         min_vt_div = max(min_vt_div,
                          DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
                                       limits->vt.max_pix_clk_freq_hz));
-        dev_dbg(dev, "min_vt_div: max_vt_pix_clk_freq_hz: %d\n",
+        dev_dbg(dev, "min_vt_div: max_vt_pix_clk_freq_hz: %u\n",
                 min_vt_div);
         min_vt_div = max_t(uint32_t, min_vt_div,
                            limits->vt.min_pix_clk_div
                            * limits->vt.min_sys_clk_div);
-        dev_dbg(dev, "min_vt_div: min_vt_clk_div: %d\n", min_vt_div);
+        dev_dbg(dev, "min_vt_div: min_vt_clk_div: %u\n", min_vt_div);
 
         max_vt_div = limits->vt.max_sys_clk_div * limits->vt.max_pix_clk_div;
-        dev_dbg(dev, "max_vt_div: %d\n", max_vt_div);
+        dev_dbg(dev, "max_vt_div: %u\n", max_vt_div);
         max_vt_div = min(max_vt_div,
                          DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
                                       limits->vt.min_pix_clk_freq_hz));
-        dev_dbg(dev, "max_vt_div: min_vt_pix_clk_freq_hz: %d\n",
+        dev_dbg(dev, "max_vt_div: min_vt_pix_clk_freq_hz: %u\n",
                 max_vt_div);
 
         /*
@@ -258,28 +326,28 @@ static int __smiapp_pll_calculate(struct device *dev,
          * with all values of pix_clk_div.
          */
         min_sys_div = limits->vt.min_sys_clk_div;
-        dev_dbg(dev, "min_sys_div: %d\n", min_sys_div);
+        dev_dbg(dev, "min_sys_div: %u\n", min_sys_div);
         min_sys_div = max(min_sys_div,
                           DIV_ROUND_UP(min_vt_div,
                                        limits->vt.max_pix_clk_div));
-        dev_dbg(dev, "min_sys_div: max_vt_pix_clk_div: %d\n", min_sys_div);
+        dev_dbg(dev, "min_sys_div: max_vt_pix_clk_div: %u\n", min_sys_div);
         min_sys_div = max(min_sys_div,
                           pll->pll_op_clk_freq_hz
                           / limits->vt.max_sys_clk_freq_hz);
-        dev_dbg(dev, "min_sys_div: max_pll_op_clk_freq_hz: %d\n", min_sys_div);
+        dev_dbg(dev, "min_sys_div: max_pll_op_clk_freq_hz: %u\n", min_sys_div);
         min_sys_div = clk_div_even_up(min_sys_div);
-        dev_dbg(dev, "min_sys_div: one or even: %d\n", min_sys_div);
+        dev_dbg(dev, "min_sys_div: one or even: %u\n", min_sys_div);
 
         max_sys_div = limits->vt.max_sys_clk_div;
-        dev_dbg(dev, "max_sys_div: %d\n", max_sys_div);
+        dev_dbg(dev, "max_sys_div: %u\n", max_sys_div);
         max_sys_div = min(max_sys_div,
                           DIV_ROUND_UP(max_vt_div,
                                        limits->vt.min_pix_clk_div));
-        dev_dbg(dev, "max_sys_div: min_vt_pix_clk_div: %d\n", max_sys_div);
+        dev_dbg(dev, "max_sys_div: min_vt_pix_clk_div: %u\n", max_sys_div);
         max_sys_div = min(max_sys_div,
                           DIV_ROUND_UP(pll->pll_op_clk_freq_hz,
                                        limits->vt.min_pix_clk_freq_hz));
-        dev_dbg(dev, "max_sys_div: min_vt_pix_clk_freq_hz: %d\n", max_sys_div);
+        dev_dbg(dev, "max_sys_div: min_vt_pix_clk_freq_hz: %u\n", max_sys_div);
 
         /*
          * Find pix_div such that a legal pix_div * sys_div results
@@ -296,7 +364,7 @@ static int __smiapp_pll_calculate(struct device *dev,
                         if (pix_div < limits->vt.min_pix_clk_div
                             || pix_div > limits->vt.max_pix_clk_div) {
                                 dev_dbg(dev,
-                                        "pix_div %d too small or too big (%d--%d)\n",
+                                        "pix_div %u too small or too big (%u--%u)\n",
                                         pix_div,
                                         limits->vt.min_pix_clk_div,
                                         limits->vt.max_pix_clk_div);
@@ -312,73 +380,28 @@ static int __smiapp_pll_calculate(struct device *dev,
                         break;
         }
 
-        pll->vt_sys_clk_div = DIV_ROUND_UP(min_vt_div, best_pix_div);
-        pll->vt_pix_clk_div = best_pix_div;
+        pll->vt.sys_clk_div = DIV_ROUND_UP(min_vt_div, best_pix_div);
+        pll->vt.pix_clk_div = best_pix_div;
 
-        pll->vt_sys_clk_freq_hz =
-                pll->pll_op_clk_freq_hz / pll->vt_sys_clk_div;
-        pll->vt_pix_clk_freq_hz =
-                pll->vt_sys_clk_freq_hz / pll->vt_pix_clk_div;
+        pll->vt.sys_clk_freq_hz =
+                pll->pll_op_clk_freq_hz / pll->vt.sys_clk_div;
+        pll->vt.pix_clk_freq_hz =
+                pll->vt.sys_clk_freq_hz / pll->vt.pix_clk_div;
 
+out_skip_vt_calc:
         pll->pixel_rate_csi =
-                pll->op_pix_clk_freq_hz * lane_op_clock_ratio;
+                op_pll->pix_clk_freq_hz * lane_op_clock_ratio;
+        pll->pixel_rate_pixel_array = pll->vt.pix_clk_freq_hz;
 
-        rval = bounds_check(dev, pll->pll_ip_clk_freq_hz,
-                            limits->min_pll_ip_freq_hz,
-                            limits->max_pll_ip_freq_hz,
-                            "pll_ip_clk_freq_hz");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->pll_multiplier,
-                        limits->min_pll_multiplier, limits->max_pll_multiplier,
-                        "pll_multiplier");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->pll_op_clk_freq_hz,
-                        limits->min_pll_op_freq_hz, limits->max_pll_op_freq_hz,
-                        "pll_op_clk_freq_hz");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->op_sys_clk_div,
-                        limits->op.min_sys_clk_div, limits->op.max_sys_clk_div,
-                        "op_sys_clk_div");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->op_pix_clk_div,
-                        limits->op.min_pix_clk_div, limits->op.max_pix_clk_div,
-                        "op_pix_clk_div");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->op_sys_clk_freq_hz,
-                        limits->op.min_sys_clk_freq_hz,
-                        limits->op.max_sys_clk_freq_hz,
-                        "op_sys_clk_freq_hz");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->op_pix_clk_freq_hz,
-                        limits->op.min_pix_clk_freq_hz,
-                        limits->op.max_pix_clk_freq_hz,
-                        "op_pix_clk_freq_hz");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->vt_sys_clk_freq_hz,
-                        limits->vt.min_sys_clk_freq_hz,
-                        limits->vt.max_sys_clk_freq_hz,
-                        "vt_sys_clk_freq_hz");
-        if (!rval)
-                rval = bounds_check(
-                        dev, pll->vt_pix_clk_freq_hz,
-                        limits->vt.min_pix_clk_freq_hz,
-                        limits->vt.max_pix_clk_freq_hz,
-                        "vt_pix_clk_freq_hz");
-
-        return rval;
+        return check_all_bounds(dev, limits, op_limits, pll, op_pll);
 }
 
 int smiapp_pll_calculate(struct device *dev,
                          const struct smiapp_pll_limits *limits,
                          struct smiapp_pll *pll)
 {
+        const struct smiapp_pll_branch_limits *op_limits = &limits->op;
+        struct smiapp_pll_branch *op_pll = &pll->op;
         uint16_t min_pre_pll_clk_div;
         uint16_t max_pre_pll_clk_div;
         uint32_t lane_op_clock_ratio;
@@ -386,13 +409,23 @@ int smiapp_pll_calculate(struct device *dev,
         unsigned int i;
         int rval = -EINVAL;
 
+        if (pll->flags & SMIAPP_PLL_FLAG_NO_OP_CLOCKS) {
+                /*
+                 * If there's no OP PLL at all, use the VT values
+                 * instead. The OP values are ignored for the rest of
+                 * the PLL calculation.
+                 */
+                op_limits = &limits->vt;
+                op_pll = &pll->vt;
+        }
+
         if (pll->flags & SMIAPP_PLL_FLAG_OP_PIX_CLOCK_PER_LANE)
                 lane_op_clock_ratio = pll->csi2.lanes;
         else
                 lane_op_clock_ratio = 1;
-        dev_dbg(dev, "lane_op_clock_ratio: %d\n", lane_op_clock_ratio);
+        dev_dbg(dev, "lane_op_clock_ratio: %u\n", lane_op_clock_ratio);
 
-        dev_dbg(dev, "binning: %dx%d\n", pll->binning_horizontal,
+        dev_dbg(dev, "binning: %ux%u\n", pll->binning_horizontal,
                 pll->binning_vertical);
 
         switch (pll->bus_type) {
@@ -411,7 +444,7 @@ int smiapp_pll_calculate(struct device *dev,
         }
 
         /* Figure out limits for pre-pll divider based on extclk */
-        dev_dbg(dev, "min / max pre_pll_clk_div: %d / %d\n",
+        dev_dbg(dev, "min / max pre_pll_clk_div: %u / %u\n",
                 limits->min_pre_pll_clk_div, limits->max_pre_pll_clk_div);
         max_pre_pll_clk_div =
                 min_t(uint16_t, limits->max_pre_pll_clk_div,
@@ -422,26 +455,27 @@ int smiapp_pll_calculate(struct device *dev,
                       clk_div_even_up(
                               DIV_ROUND_UP(pll->ext_clk_freq_hz,
                                            limits->max_pll_ip_freq_hz)));
-        dev_dbg(dev, "pre-pll check: min / max pre_pll_clk_div: %d / %d\n",
+        dev_dbg(dev, "pre-pll check: min / max pre_pll_clk_div: %u / %u\n",
                 min_pre_pll_clk_div, max_pre_pll_clk_div);
 
         i = gcd(pll->pll_op_clk_freq_hz, pll->ext_clk_freq_hz);
         mul = div_u64(pll->pll_op_clk_freq_hz, i);
         div = pll->ext_clk_freq_hz / i;
-        dev_dbg(dev, "mul %d / div %d\n", mul, div);
+        dev_dbg(dev, "mul %u / div %u\n", mul, div);
 
         min_pre_pll_clk_div =
                 max_t(uint16_t, min_pre_pll_clk_div,
                       clk_div_even_up(
                               DIV_ROUND_UP(mul * pll->ext_clk_freq_hz,
                                            limits->max_pll_op_freq_hz)));
-        dev_dbg(dev, "pll_op check: min / max pre_pll_clk_div: %d / %d\n",
+        dev_dbg(dev, "pll_op check: min / max pre_pll_clk_div: %u / %u\n",
                 min_pre_pll_clk_div, max_pre_pll_clk_div);
 
         for (pll->pre_pll_clk_div = min_pre_pll_clk_div;
              pll->pre_pll_clk_div <= max_pre_pll_clk_div;
              pll->pre_pll_clk_div += 2 - (pll->pre_pll_clk_div & 1)) {
-                rval = __smiapp_pll_calculate(dev, limits, pll, mul, div,
+                rval = __smiapp_pll_calculate(dev, limits, op_limits, pll,
+                                              op_pll, mul, div,
                                               lane_op_clock_ratio);
                 if (rval)
                         continue;
diff --git a/drivers/media/i2c/smiapp-pll.h b/drivers/media/i2c/smiapp-pll.h
index 5ce2b61da3c5..e8f035a50c76 100644
--- a/drivers/media/i2c/smiapp-pll.h
+++ b/drivers/media/i2c/smiapp-pll.h
@@ -35,6 +35,13 @@
 #define SMIAPP_PLL_FLAG_OP_PIX_CLOCK_PER_LANE                   (1 << 0)
 #define SMIAPP_PLL_FLAG_NO_OP_CLOCKS                            (1 << 1)
 
+struct smiapp_pll_branch {
+        uint16_t sys_clk_div;
+        uint16_t pix_clk_div;
+        uint32_t sys_clk_freq_hz;
+        uint32_t pix_clk_freq_hz;
+};
+
 struct smiapp_pll {
         /* input values */
         uint8_t bus_type;
@@ -53,24 +60,18 @@ struct smiapp_pll {
         uint8_t scale_n;
         uint8_t bits_per_pixel;
         uint32_t link_freq;
+        uint32_t ext_clk_freq_hz;
 
         /* output values */
         uint16_t pre_pll_clk_div;
         uint16_t pll_multiplier;
-        uint16_t op_sys_clk_div;
-        uint16_t op_pix_clk_div;
-        uint16_t vt_sys_clk_div;
-        uint16_t vt_pix_clk_div;
-
-        uint32_t ext_clk_freq_hz;
         uint32_t pll_ip_clk_freq_hz;
         uint32_t pll_op_clk_freq_hz;
-        uint32_t op_sys_clk_freq_hz;
-        uint32_t op_pix_clk_freq_hz;
-        uint32_t vt_sys_clk_freq_hz;
-        uint32_t vt_pix_clk_freq_hz;
+        struct smiapp_pll_branch vt;
+        struct smiapp_pll_branch op;
 
         uint32_t pixel_rate_csi;
+        uint32_t pixel_rate_pixel_array;
 };
 
 struct smiapp_pll_branch_limits {
diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c
index b10aaeda2bb4..0df5070e73c7 100644
--- a/drivers/media/i2c/smiapp/smiapp-core.c
+++ b/drivers/media/i2c/smiapp/smiapp-core.c
@@ -205,12 +205,12 @@ static int smiapp_pll_configure(struct smiapp_sensor *sensor)
         int rval;
 
         rval = smiapp_write(
-                sensor, SMIAPP_REG_U16_VT_PIX_CLK_DIV, pll->vt_pix_clk_div);
+                sensor, SMIAPP_REG_U16_VT_PIX_CLK_DIV, pll->vt.pix_clk_div);
         if (rval < 0)
                 return rval;
 
         rval = smiapp_write(
-                sensor, SMIAPP_REG_U16_VT_SYS_CLK_DIV, pll->vt_sys_clk_div);
+                sensor, SMIAPP_REG_U16_VT_SYS_CLK_DIV, pll->vt.sys_clk_div);
         if (rval < 0)
                 return rval;
 
@@ -227,20 +227,21 @@ static int smiapp_pll_configure(struct smiapp_sensor *sensor)
         /* Lane op clock ratio does not apply here. */
         rval = smiapp_write(
                 sensor, SMIAPP_REG_U32_REQUESTED_LINK_BIT_RATE_MBPS,
-                DIV_ROUND_UP(pll->op_sys_clk_freq_hz, 1000000 / 256 / 256));
+                DIV_ROUND_UP(pll->op.sys_clk_freq_hz, 1000000 / 256 / 256));
         if (rval < 0 || sensor->minfo.smiapp_profile == SMIAPP_PROFILE_0)
                 return rval;
 
         rval = smiapp_write(
-                sensor, SMIAPP_REG_U16_OP_PIX_CLK_DIV, pll->op_pix_clk_div);
+                sensor, SMIAPP_REG_U16_OP_PIX_CLK_DIV, pll->op.pix_clk_div);
         if (rval < 0)
                 return rval;
 
         return smiapp_write(
-                sensor, SMIAPP_REG_U16_OP_SYS_CLK_DIV, pll->op_sys_clk_div);
+                sensor, SMIAPP_REG_U16_OP_SYS_CLK_DIV, pll->op.sys_clk_div);
 }
 
-static int smiapp_pll_update(struct smiapp_sensor *sensor)
+static int smiapp_pll_try(struct smiapp_sensor *sensor,
+                          struct smiapp_pll *pll)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
         struct smiapp_pll_limits lim = {
@@ -274,19 +275,15 @@ static int smiapp_pll_update(struct smiapp_sensor *sensor)
                 .min_line_length_pck_bin = sensor->limits[SMIAPP_LIMIT_MIN_LINE_LENGTH_PCK_BIN],
                 .min_line_length_pck = sensor->limits[SMIAPP_LIMIT_MIN_LINE_LENGTH_PCK],
         };
+
+        return smiapp_pll_calculate(&client->dev, &lim, pll);
+}
+
+static int smiapp_pll_update(struct smiapp_sensor *sensor)
+{
         struct smiapp_pll *pll = &sensor->pll;
         int rval;
 
-        if (sensor->minfo.smiapp_profile == SMIAPP_PROFILE_0) {
-                /*
-                 * Fill in operational clock divisors limits from the
-                 * video timing ones. On profile 0 sensors the
-                 * requirements regarding them are essentially the
-                 * same as on VT ones.
-                 */
-                lim.op = lim.vt;
-        }
-
         pll->binning_horizontal = sensor->binning_horizontal;
         pll->binning_vertical = sensor->binning_vertical;
         pll->link_freq =
@@ -294,12 +291,12 @@ static int smiapp_pll_update(struct smiapp_sensor *sensor)
         pll->scale_m = sensor->scale_m;
         pll->bits_per_pixel = sensor->csi_format->compressed;
 
-        rval = smiapp_pll_calculate(&client->dev, &lim, pll);
+        rval = smiapp_pll_try(sensor, pll);
         if (rval < 0)
                 return rval;
 
         __v4l2_ctrl_s_ctrl_int64(sensor->pixel_rate_parray,
-                                 pll->vt_pix_clk_freq_hz);
+                                 pll->pixel_rate_pixel_array);
         __v4l2_ctrl_s_ctrl_int64(sensor->pixel_rate_csi, pll->pixel_rate_csi);
 
         return 0;
@@ -333,22 +330,22 @@ static void __smiapp_update_exposure_limits(struct smiapp_sensor *sensor)
  *    orders must be defined.
  */
 static const struct smiapp_csi_data_format smiapp_csi_data_formats[] = {
-        { V4L2_MBUS_FMT_SGRBG12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_GRBG, },
-        { V4L2_MBUS_FMT_SRGGB12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_RGGB, },
-        { V4L2_MBUS_FMT_SBGGR12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_BGGR, },
-        { V4L2_MBUS_FMT_SGBRG12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_GBRG, },
-        { V4L2_MBUS_FMT_SGRBG10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_GRBG, },
-        { V4L2_MBUS_FMT_SRGGB10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_RGGB, },
-        { V4L2_MBUS_FMT_SBGGR10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_BGGR, },
-        { V4L2_MBUS_FMT_SGBRG10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_GBRG, },
-        { V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_GRBG, },
-        { V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_RGGB, },
-        { V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_BGGR, },
-        { V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_GBRG, },
-        { V4L2_MBUS_FMT_SGRBG8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_GRBG, },
-        { V4L2_MBUS_FMT_SRGGB8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_RGGB, },
-        { V4L2_MBUS_FMT_SBGGR8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_BGGR, },
-        { V4L2_MBUS_FMT_SGBRG8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_GBRG, },
+        { MEDIA_BUS_FMT_SGRBG12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_GRBG, },
+        { MEDIA_BUS_FMT_SRGGB12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_RGGB, },
+        { MEDIA_BUS_FMT_SBGGR12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_BGGR, },
+        { MEDIA_BUS_FMT_SGBRG12_1X12, 12, 12, SMIAPP_PIXEL_ORDER_GBRG, },
+        { MEDIA_BUS_FMT_SGRBG10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_GRBG, },
+        { MEDIA_BUS_FMT_SRGGB10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_RGGB, },
+        { MEDIA_BUS_FMT_SBGGR10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_BGGR, },
+        { MEDIA_BUS_FMT_SGBRG10_1X10, 10, 10, SMIAPP_PIXEL_ORDER_GBRG, },
+        { MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_GRBG, },
+        { MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_RGGB, },
+        { MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_BGGR, },
+        { MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8, 10, 8, SMIAPP_PIXEL_ORDER_GBRG, },
+        { MEDIA_BUS_FMT_SGRBG8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_GRBG, },
+        { MEDIA_BUS_FMT_SRGGB8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_RGGB, },
+        { MEDIA_BUS_FMT_SBGGR8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_BGGR, },
+        { MEDIA_BUS_FMT_SGBRG8_1X8, 8, 8, SMIAPP_PIXEL_ORDER_GBRG, },
 };
 
 const char *pixel_order_str[] = { "GRBG", "RGGB", "BGGR", "GBRG" };
@@ -526,6 +523,8 @@ static const struct v4l2_ctrl_ops smiapp_ctrl_ops = {
 static int smiapp_init_controls(struct smiapp_sensor *sensor)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
+        unsigned long *valid_link_freqs = &sensor->valid_link_freqs[
+                sensor->csi_format->compressed - SMIAPP_COMPRESSED_BASE];
         unsigned int max, i;
         int rval;
 
@@ -608,8 +607,8 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor)
 
         sensor->link_freq = v4l2_ctrl_new_int_menu(
                 &sensor->src->ctrl_handler, &smiapp_ctrl_ops,
-                V4L2_CID_LINK_FREQ, max, 0,
-                sensor->platform_data->op_sys_clock);
+                V4L2_CID_LINK_FREQ, __fls(*valid_link_freqs),
+                __ffs(*valid_link_freqs), sensor->platform_data->op_sys_clock);
 
         sensor->pixel_rate_csi = v4l2_ctrl_new_std(
                 &sensor->src->ctrl_handler, &smiapp_ctrl_ops,
@@ -745,6 +744,7 @@ static int smiapp_get_limits_binning(struct smiapp_sensor *sensor)
 static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd);
+        struct smiapp_pll *pll = &sensor->pll;
         unsigned int type, n;
         unsigned int i, pixel_order;
         int rval;
@@ -808,14 +808,57 @@ static int smiapp_get_mbus_formats(struct smiapp_sensor *sensor)
                         dev_dbg(&client->dev, "jolly good! %d\n", j);
 
                         sensor->default_mbus_frame_fmts |= 1 << j;
-                        if (!sensor->csi_format
-                            || f->width > sensor->csi_format->width
-                            || (f->width == sensor->csi_format->width
-                                && f->compressed
-                                > sensor->csi_format->compressed)) {
-                                sensor->csi_format = f;
-                                sensor->internal_csi_format = f;
-                        }
+                }
+        }
+
+        /* Figure out which BPP values can be used with which formats. */
+        pll->binning_horizontal = 1;
+        pll->binning_vertical = 1;
+        pll->scale_m = sensor->scale_m;
+
+        for (i = 0; i < ARRAY_SIZE(smiapp_csi_data_formats); i++) {
+                const struct smiapp_csi_data_format *f =
+                        &smiapp_csi_data_formats[i];
+                unsigned long *valid_link_freqs =
+                        &sensor->valid_link_freqs[
+                                f->compressed - SMIAPP_COMPRESSED_BASE];
+                unsigned int j;
+
+                BUG_ON(f->compressed < SMIAPP_COMPRESSED_BASE);
+                BUG_ON(f->compressed > SMIAPP_COMPRESSED_MAX);
+
+                if (!(sensor->default_mbus_frame_fmts & 1 << i))
+                        continue;
+
+                pll->bits_per_pixel = f->compressed;
+
+                for (j = 0; sensor->platform_data->op_sys_clock[j]; j++) {
+                        pll->link_freq = sensor->platform_data->op_sys_clock[j];
+
+                        rval = smiapp_pll_try(sensor, pll);
+                        dev_dbg(&client->dev, "link freq %u Hz, bpp %u %s\n",
+                                pll->link_freq, pll->bits_per_pixel,
+                                rval ? "not ok" : "ok");
+                        if (rval)
+                                continue;
+
+                        set_bit(j, valid_link_freqs);
+                }
+
+                if (!*valid_link_freqs) {
+                        dev_info(&client->dev,
+                                 "no valid link frequencies for %u bpp\n",
+                                 f->compressed);
+                        sensor->default_mbus_frame_fmts &= ~BIT(i);
+                        continue;
+                }
+
+                if (!sensor->csi_format
+                    || f->width > sensor->csi_format->width
+                    || (f->width == sensor->csi_format->width
+                        && f->compressed > sensor->csi_format->compressed)) {
+                        sensor->csi_format = f;
+                        sensor->internal_csi_format = f;
                 }
         }
 
@@ -904,7 +947,7 @@ static int smiapp_update_mode(struct smiapp_sensor *sensor)
         dev_dbg(&client->dev, "hblank\t\t%d\n", sensor->hblank->val);
 
         dev_dbg(&client->dev, "real timeperframe\t100/%d\n",
-                sensor->pll.vt_pix_clk_freq_hz /
+                sensor->pll.pixel_rate_pixel_array /
                 ((sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC].width
                   + sensor->hblank->val) *
                  (sensor->pixel_array->crop[SMIAPP_PA_PAD_SRC].height
@@ -1687,51 +1730,77 @@ static const struct smiapp_csi_data_format
         return csi_format;
 }
 
-static int smiapp_set_format(struct v4l2_subdev *subdev,
-                             struct v4l2_subdev_fh *fh,
-                             struct v4l2_subdev_format *fmt)
+static int smiapp_set_format_source(struct v4l2_subdev *subdev,
+                                    struct v4l2_subdev_fh *fh,
+                                    struct v4l2_subdev_format *fmt)
 {
         struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);
-        struct smiapp_subdev *ssd = to_smiapp_subdev(subdev);
-        struct v4l2_rect *crops[SMIAPP_PADS];
+        const struct smiapp_csi_data_format *csi_format,
+                *old_csi_format = sensor->csi_format;
+        unsigned long *valid_link_freqs;
+        u32 code = fmt->format.code;
+        unsigned int i;
+        int rval;
 
-        mutex_lock(&sensor->mutex);
+        rval = __smiapp_get_format(subdev, fh, fmt);
+        if (rval)
+                return rval;
 
         /*
          * Media bus code is changeable on src subdev's source pad. On
          * other source pads we just get format here.
          */
-        if (fmt->pad == ssd->source_pad) {
-                u32 code = fmt->format.code;
-                int rval = __smiapp_get_format(subdev, fh, fmt);
-                bool range_changed = false;
-                unsigned int i;
+        if (subdev != &sensor->src->sd)
+                return 0;
 
-                if (!rval && subdev == &sensor->src->sd) {
-                        const struct smiapp_csi_data_format *csi_format =
-                                smiapp_validate_csi_data_format(sensor, code);
+        csi_format = smiapp_validate_csi_data_format(sensor, code);
 
-                        if (fmt->which == V4L2_SUBDEV_FORMAT_ACTIVE) {
-                                if (csi_format->width !=
-                                    sensor->csi_format->width)
-                                        range_changed = true;
+        fmt->format.code = csi_format->code;
 
-                                sensor->csi_format = csi_format;
-                        }
-
-                        fmt->format.code = csi_format->code;
-                }
+        if (fmt->which != V4L2_SUBDEV_FORMAT_ACTIVE)
+                return 0;
 
-                mutex_unlock(&sensor->mutex);
-                if (rval || !range_changed)
-                        return rval;
+        sensor->csi_format = csi_format;
 
+        if (csi_format->width != old_csi_format->width)
                 for (i = 0; i < ARRAY_SIZE(sensor->test_data); i++)
-                        v4l2_ctrl_modify_range(
-                                sensor->test_data[i],
-                                0, (1 << sensor->csi_format->width) - 1, 1, 0);
+                        __v4l2_ctrl_modify_range(
+                                sensor->test_data[i], 0,
+                                (1 << csi_format->width) - 1, 1, 0);
 
+        if (csi_format->compressed == old_csi_format->compressed)
                 return 0;
+
+        valid_link_freqs = 
+                &sensor->valid_link_freqs[sensor->csi_format->compressed
+                                          - SMIAPP_COMPRESSED_BASE];
+
+        __v4l2_ctrl_modify_range(
+                sensor->link_freq, 0,
+                __fls(*valid_link_freqs), ~*valid_link_freqs,
+                __ffs(*valid_link_freqs));
+
+        return smiapp_pll_update(sensor);
+}
+
+static int smiapp_set_format(struct v4l2_subdev *subdev,
+                             struct v4l2_subdev_fh *fh,
+                             struct v4l2_subdev_format *fmt)
+{
+        struct smiapp_sensor *sensor = to_smiapp_sensor(subdev);
+        struct smiapp_subdev *ssd = to_smiapp_subdev(subdev);
+        struct v4l2_rect *crops[SMIAPP_PADS];
+
+        mutex_lock(&sensor->mutex);
+
+        if (fmt->pad == ssd->source_pad) {
+                int rval;
+
+                rval = smiapp_set_format_source(subdev, fh, fmt);
+
+                mutex_unlock(&sensor->mutex);
+
+                return rval;
         }
 
         /* Sink pad. Width and height are changeable here. */
@@ -2023,6 +2092,11 @@ static int __smiapp_sel_supported(struct v4l2_subdev *subdev,
                     == SMIAPP_DIGITAL_CROP_CAPABILITY_INPUT_CROP)
                         return 0;
                 return -EINVAL;
+        case V4L2_SEL_TGT_NATIVE_SIZE:
+                if (ssd == sensor->pixel_array
+                    && sel->pad == SMIAPP_PA_PAD_SRC)
+                        return 0;
+                return -EINVAL;
         case V4L2_SEL_TGT_COMPOSE:
         case V4L2_SEL_TGT_COMPOSE_BOUNDS:
                 if (sel->pad == ssd->source_pad)
@@ -2121,7 +2195,9 @@ static int __smiapp_get_selection(struct v4l2_subdev *subdev,
 
         switch (sel->target) {
         case V4L2_SEL_TGT_CROP_BOUNDS:
+        case V4L2_SEL_TGT_NATIVE_SIZE:
                 if (ssd == sensor->pixel_array) {
+                        sel->r.left = sel->r.top = 0;
                         sel->r.width =
                                 sensor->limits[SMIAPP_LIMIT_X_ADDR_MAX] + 1;
                         sel->r.height =
@@ -2482,12 +2558,6 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
                 goto out_power_off;
         }
 
-        rval = smiapp_get_mbus_formats(sensor);
-        if (rval) {
-                rval = -ENODEV;
-                goto out_power_off;
-        }
-
         if (sensor->limits[SMIAPP_LIMIT_BINNING_CAPABILITY]) {
                 u32 val;
 
@@ -2569,6 +2639,22 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
 
         sensor->scale_m = sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN];
 
+        /* prepare PLL configuration input values */
+        pll->bus_type = SMIAPP_PLL_BUS_TYPE_CSI2;
+        pll->csi2.lanes = sensor->platform_data->lanes;
+        pll->ext_clk_freq_hz = sensor->platform_data->ext_clk;
+        pll->flags = smiapp_call_quirk(sensor, pll_flags);
+        pll->scale_n = sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN];
+        /* Profile 0 sensors have no separate OP clock branch. */
+        if (sensor->minfo.smiapp_profile == SMIAPP_PROFILE_0)
+                pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS;
+
+        rval = smiapp_get_mbus_formats(sensor);
+        if (rval) {
+                rval = -ENODEV;
+                goto out_nvm_release;
+        }
+
         for (i = 0; i < SMIAPP_SUBDEVS; i++) {
                 struct {
                         struct smiapp_subdev *ssd;
@@ -2666,18 +2752,9 @@ static int smiapp_registered(struct v4l2_subdev *subdev)
         if (rval < 0)
                 goto out_nvm_release;
 
-        /* prepare PLL configuration input values */
-        pll->bus_type = SMIAPP_PLL_BUS_TYPE_CSI2;
-        pll->csi2.lanes = sensor->platform_data->lanes;
-        pll->ext_clk_freq_hz = sensor->platform_data->ext_clk;
-        pll->flags = smiapp_call_quirk(sensor, pll_flags);
-
-        /* Profile 0 sensors have no separate OP clock branch. */
-        if (sensor->minfo.smiapp_profile == SMIAPP_PROFILE_0)
-                pll->flags |= SMIAPP_PLL_FLAG_NO_OP_CLOCKS;
-        pll->scale_n = sensor->limits[SMIAPP_LIMIT_SCALER_N_MIN];
-
+        mutex_lock(&sensor->mutex);
         rval = smiapp_update_mode(sensor);
+        mutex_unlock(&sensor->mutex);
         if (rval) {
                 dev_err(&client->dev, "update mode failed\n");
                 goto out_nvm_release;
diff --git a/drivers/media/i2c/smiapp/smiapp.h b/drivers/media/i2c/smiapp/smiapp.h
index 874b49ffd88f..f88f8ec344d3 100644
--- a/drivers/media/i2c/smiapp/smiapp.h
+++ b/drivers/media/i2c/smiapp/smiapp.h
@@ -156,6 +156,11 @@ struct smiapp_csi_data_format {
 #define SMIAPP_PAD_SRC                  1
 #define SMIAPP_PADS                     2
 
+#define SMIAPP_COMPRESSED_BASE          8
+#define SMIAPP_COMPRESSED_MAX           12
+#define SMIAPP_NR_OF_COMPRESSED         (SMIAPP_COMPRESSED_MAX - \
+                                         SMIAPP_COMPRESSED_BASE + 1)
+
 struct smiapp_binning_subtype {
         u8 horizontal:4;
         u8 vertical:4;
@@ -232,6 +237,9 @@ struct smiapp_sensor {
 
         struct smiapp_pll pll;
 
+        /* Is a default format supported for a given BPP? */
+        unsigned long valid_link_freqs[SMIAPP_NR_OF_COMPRESSED];
+
         /* Pixel array controls */
         struct v4l2_ctrl *analog_gain;
         struct v4l2_ctrl *exposure;
diff --git a/drivers/media/i2c/soc_camera/imx074.c b/drivers/media/i2c/soc_camera/imx074.c
index 5b915936c3f3..ec89cfa927a2 100644
--- a/drivers/media/i2c/soc_camera/imx074.c
+++ b/drivers/media/i2c/soc_camera/imx074.c
@@ -71,7 +71,7 @@
 
 /* IMX074 has only one fixed colorspace per pixelcode */
 struct imx074_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
@@ -82,7 +82,7 @@ struct imx074 {
 };
 
 static const struct imx074_datafmt imx074_colour_fmts[] = {
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static struct imx074 *to_imx074(const struct i2c_client *client)
@@ -91,7 +91,7 @@ static struct imx074 *to_imx074(const struct i2c_client *client)
 }
 
 /* Find a data format by a pixel code in an array */
-static const struct imx074_datafmt *imx074_find_datafmt(enum v4l2_mbus_pixelcode code)
+static const struct imx074_datafmt *imx074_find_datafmt(u32 code)
 {
         int i;
 
@@ -236,7 +236,7 @@ static int imx074_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a)
 }
 
 static int imx074_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if ((unsigned int)index >= ARRAY_SIZE(imx074_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/mt9m001.c b/drivers/media/i2c/soc_camera/mt9m001.c
index dbd8c142d6ef..2e9a53502551 100644
--- a/drivers/media/i2c/soc_camera/mt9m001.c
+++ b/drivers/media/i2c/soc_camera/mt9m001.c
@@ -53,13 +53,13 @@
 
 /* MT9M001 has only one fixed colorspace per pixelcode */
 struct mt9m001_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct mt9m001_datafmt *mt9m001_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct mt9m001_datafmt *fmt,
+        u32 code, const struct mt9m001_datafmt *fmt,
         int n)
 {
         int i;
@@ -75,14 +75,14 @@ static const struct mt9m001_datafmt mt9m001_colour_fmts[] = {
          * Order important: first natively supported,
          * second supported with a GPIO extender
          */
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static const struct mt9m001_datafmt mt9m001_monochrome_fmts[] = {
         /* Order important - see above */
-        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 struct mt9m001 {
@@ -563,7 +563,7 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = {
 };
 
 static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9m001 *mt9m001 = to_mt9m001(client);
diff --git a/drivers/media/i2c/soc_camera/mt9m111.c b/drivers/media/i2c/soc_camera/mt9m111.c
index b51e8562e775..5992ea93257a 100644
--- a/drivers/media/i2c/soc_camera/mt9m111.c
+++ b/drivers/media/i2c/soc_camera/mt9m111.c
@@ -182,23 +182,23 @@ static struct mt9m111_context context_b = {
 
 /* MT9M111 has only one fixed colorspace per pixelcode */
 struct mt9m111_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 static const struct mt9m111_datafmt mt9m111_colour_fmts[] = {
-        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_BGR565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_BGR565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_VYUY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_BGR565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_BGR565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
 };
 
 struct mt9m111 {
@@ -218,7 +218,7 @@ struct mt9m111 {
 
 /* Find a data format by a pixel code */
 static const struct mt9m111_datafmt *mt9m111_find_datafmt(struct mt9m111 *mt9m111,
-                                                enum v4l2_mbus_pixelcode code)
+                                                u32 code)
 {
         int i;
         for (i = 0; i < ARRAY_SIZE(mt9m111_colour_fmts); i++)
@@ -331,7 +331,7 @@ static int mt9m111_setup_rect_ctx(struct mt9m111 *mt9m111,
 }
 
 static int mt9m111_setup_geometry(struct mt9m111 *mt9m111, struct v4l2_rect *rect,
-                        int width, int height, enum v4l2_mbus_pixelcode code)
+                        int width, int height, u32 code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
         int ret;
@@ -345,7 +345,7 @@ static int mt9m111_setup_geometry(struct mt9m111 *mt9m111, struct v4l2_rect *rec
         if (!ret)
                 ret = reg_write(WINDOW_HEIGHT, rect->height);
 
-        if (code != V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (code != MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* IFP in use, down-scaling possible */
                 if (!ret)
                         ret = mt9m111_setup_rect_ctx(mt9m111, &context_b,
@@ -393,8 +393,8 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, const struct v4l2_crop *a)
         if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE)
                 return -EINVAL;
 
-        if (mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-            mt9m111->fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (mt9m111->fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+            mt9m111->fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* Bayer format - even size lengths */
                 rect.width      = ALIGN(rect.width, 2);
                 rect.height     = ALIGN(rect.height, 2);
@@ -462,7 +462,7 @@ static int mt9m111_g_fmt(struct v4l2_subdev *sd,
 }
 
 static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
-                              enum v4l2_mbus_pixelcode code)
+                              u32 code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(&mt9m111->subdev);
         u16 data_outfmt2, mask_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER |
@@ -474,46 +474,46 @@ static int mt9m111_set_pixfmt(struct mt9m111 *mt9m111,
         int ret;
 
         switch (code) {
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 data_outfmt2 = MT9M111_OUTFMT_PROCESSED_BAYER |
                         MT9M111_OUTFMT_RGB;
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE:
                 data_outfmt2 = MT9M111_OUTFMT_BYPASS_IFP | MT9M111_OUTFMT_RGB;
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB555;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565;
                 break;
-        case V4L2_MBUS_FMT_BGR565_2X8_BE:
+        case MEDIA_BUS_FMT_BGR565_2X8_BE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_BGR565_2X8_LE:
+        case MEDIA_BUS_FMT_BGR565_2X8_LE:
                 data_outfmt2 = MT9M111_OUTFMT_RGB | MT9M111_OUTFMT_RGB565 |
                         MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 data_outfmt2 = 0;
                 break;
-        case V4L2_MBUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN;
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 data_outfmt2 = MT9M111_OUTFMT_SWAP_YCbCr_C_Y_RGB_EVEN |
                         MT9M111_OUTFMT_SWAP_YCbCr_Cb_Cr_RGB_R_B;
                 break;
@@ -542,8 +542,8 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd,
 
         fmt = mt9m111_find_datafmt(mt9m111, mf->code);
 
-        bayer = fmt->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-                fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE;
+        bayer = fmt->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+                fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE;
 
         /*
          * With Bayer format enforce even side lengths, but let the user play
@@ -554,7 +554,7 @@ static int mt9m111_try_fmt(struct v4l2_subdev *sd,
                 rect->height = ALIGN(rect->height, 2);
         }
 
-        if (fmt->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE) {
+        if (fmt->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE) {
                 /* IFP bypass mode, no scaling */
                 mf->width = rect->width;
                 mf->height = rect->height;
@@ -840,7 +840,7 @@ static struct v4l2_subdev_core_ops mt9m111_subdev_core_ops = {
 };
 
 static int mt9m111_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         if (index >= ARRAY_SIZE(mt9m111_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/mt9t031.c b/drivers/media/i2c/soc_camera/mt9t031.c
index f8358c4071a9..35d9c8d25589 100644
--- a/drivers/media/i2c/soc_camera/mt9t031.c
+++ b/drivers/media/i2c/soc_camera/mt9t031.c
@@ -345,7 +345,7 @@ static int mt9t031_g_fmt(struct v4l2_subdev *sd,
 
         mf->width       = mt9t031->rect.width / mt9t031->xskip;
         mf->height      = mt9t031->rect.height / mt9t031->yskip;
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
         mf->field       = V4L2_FIELD_NONE;
 
@@ -367,7 +367,7 @@ static int mt9t031_s_fmt(struct v4l2_subdev *sd,
         xskip = mt9t031_skip(&rect.width, mf->width, MT9T031_MAX_WIDTH);
         yskip = mt9t031_skip(&rect.height, mf->height, MT9T031_MAX_HEIGHT);
 
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         /* mt9t031_set_params() doesn't change width and height */
@@ -385,7 +385,7 @@ static int mt9t031_try_fmt(struct v4l2_subdev *sd,
                 &mf->width, MT9T031_MIN_WIDTH, MT9T031_MAX_WIDTH, 1,
                 &mf->height, MT9T031_MIN_HEIGHT, MT9T031_MAX_HEIGHT, 1, 0);
 
-        mf->code        = V4L2_MBUS_FMT_SBGGR10_1X10;
+        mf->code        = MEDIA_BUS_FMT_SBGGR10_1X10;
         mf->colorspace  = V4L2_COLORSPACE_SRGB;
 
         return 0;
@@ -673,12 +673,12 @@ static struct v4l2_subdev_core_ops mt9t031_subdev_core_ops = {
 };
 
 static int mt9t031_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_SBGGR10_1X10;
+        *code = MEDIA_BUS_FMT_SBGGR10_1X10;
         return 0;
 }
 
diff --git a/drivers/media/i2c/soc_camera/mt9t112.c b/drivers/media/i2c/soc_camera/mt9t112.c
index 996d7b4007a5..64f08365e6b2 100644
--- a/drivers/media/i2c/soc_camera/mt9t112.c
+++ b/drivers/media/i2c/soc_camera/mt9t112.c
@@ -77,7 +77,7 @@
                         struct
 ************************************************************************/
 struct mt9t112_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u16 fmt;
         u16 order;
@@ -103,32 +103,32 @@ struct mt9t112_priv {
 
 static const struct mt9t112_format mt9t112_cfmts[] = {
         {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 0,
         }, {
-                .code           = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 1,
         }, {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 2,
         }, {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .fmt            = 1,
                 .order          = 3,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .fmt            = 8,
                 .order          = 2,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .fmt            = 4,
                 .order          = 2,
@@ -840,7 +840,7 @@ static int mt9t112_s_stream(struct v4l2_subdev *sd, int enable)
 
 static int mt9t112_set_params(struct mt9t112_priv *priv,
                               const struct v4l2_rect *rect,
-                              enum v4l2_mbus_pixelcode code)
+                              u32 code)
 {
         int i;
 
@@ -953,7 +953,7 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
                         break;
 
         if (i == priv->num_formats) {
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         } else {
                 mf->colorspace  = mt9t112_cfmts[i].colorspace;
@@ -967,7 +967,7 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9t112_priv *priv = to_mt9t112(client);
@@ -1101,7 +1101,7 @@ static int mt9t112_probe(struct i2c_client *client,
 
         /* Cannot fail: using the default supported pixel code */
         if (!ret)
-                mt9t112_set_params(priv, &rect, V4L2_MBUS_FMT_UYVY8_2X8);
+                mt9t112_set_params(priv, &rect, MEDIA_BUS_FMT_UYVY8_2X8);
         else
                 v4l2_clk_put(priv->clk);
 
diff --git a/drivers/media/i2c/soc_camera/mt9v022.c b/drivers/media/i2c/soc_camera/mt9v022.c
index 99022c8d76eb..a246d4d64b8b 100644
--- a/drivers/media/i2c/soc_camera/mt9v022.c
+++ b/drivers/media/i2c/soc_camera/mt9v022.c
@@ -85,13 +85,13 @@ MODULE_PARM_DESC(sensor_type, "Sensor type: \"colour\" or \"monochrome\"");
 
 /* MT9V022 has only one fixed colorspace per pixelcode */
 struct mt9v022_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct mt9v022_datafmt *mt9v022_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct mt9v022_datafmt *fmt,
+        u32 code, const struct mt9v022_datafmt *fmt,
         int n)
 {
         int i;
@@ -107,14 +107,14 @@ static const struct mt9v022_datafmt mt9v022_colour_fmts[] = {
          * Order important: first natively supported,
          * second supported with a GPIO extender
          */
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR8_1X8, V4L2_COLORSPACE_SRGB},
 };
 
 static const struct mt9v022_datafmt mt9v022_monochrome_fmts[] = {
         /* Order important - see above */
-        {V4L2_MBUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y10_1X10, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_Y8_1X8, V4L2_COLORSPACE_JPEG},
 };
 
 /* only registers with different addresses on different mt9v02x sensors */
@@ -410,13 +410,13 @@ static int mt9v022_s_fmt(struct v4l2_subdev *sd,
          * .try_mbus_fmt(), datawidth is from our supported format list
          */
         switch (mf->code) {
-        case V4L2_MBUS_FMT_Y8_1X8:
-        case V4L2_MBUS_FMT_Y10_1X10:
+        case MEDIA_BUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_Y10_1X10:
                 if (mt9v022->model != MT9V022IX7ATM)
                         return -EINVAL;
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
                 if (mt9v022->model != MT9V022IX7ATC)
                         return -EINVAL;
                 break;
@@ -443,8 +443,8 @@ static int mt9v022_try_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9v022 *mt9v022 = to_mt9v022(client);
         const struct mt9v022_datafmt *fmt;
-        int align = mf->code == V4L2_MBUS_FMT_SBGGR8_1X8 ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_1X10;
+        int align = mf->code == MEDIA_BUS_FMT_SBGGR8_1X8 ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_1X10;
 
         v4l_bound_align_image(&mf->width, MT9V022_MIN_WIDTH,
                 MT9V022_MAX_WIDTH, align,
@@ -759,7 +759,7 @@ static struct v4l2_subdev_core_ops mt9v022_subdev_core_ops = {
 };
 
 static int mt9v022_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                            enum v4l2_mbus_pixelcode *code)
+                            u32 *code)
 {
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct mt9v022 *mt9v022 = to_mt9v022(client);
diff --git a/drivers/media/i2c/soc_camera/ov2640.c b/drivers/media/i2c/soc_camera/ov2640.c
index 6c6b1c3b45e3..6f2dd9093d94 100644
--- a/drivers/media/i2c/soc_camera/ov2640.c
+++ b/drivers/media/i2c/soc_camera/ov2640.c
@@ -302,7 +302,7 @@ struct ov2640_win_size {
 struct ov2640_priv {
         struct v4l2_subdev              subdev;
         struct v4l2_ctrl_handler        hdl;
-        enum v4l2_mbus_pixelcode        cfmt_code;
+        u32     cfmt_code;
         struct v4l2_clk                 *clk;
         const struct ov2640_win_size    *win;
 };
@@ -623,11 +623,11 @@ static const struct regval_list ov2640_rgb565_le_regs[] = {
         ENDMARKER,
 };
 
-static enum v4l2_mbus_pixelcode ov2640_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_RGB565_2X8_BE,
-        V4L2_MBUS_FMT_RGB565_2X8_LE,
+static u32 ov2640_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_RGB565_2X8_BE,
+        MEDIA_BUS_FMT_RGB565_2X8_LE,
 };
 
 /*
@@ -785,7 +785,7 @@ static const struct ov2640_win_size *ov2640_select_win(u32 *width, u32 *height)
 }
 
 static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
-                             enum v4l2_mbus_pixelcode code)
+                             u32 code)
 {
         struct ov2640_priv       *priv = to_ov2640(client);
         const struct regval_list *selected_cfmt_regs;
@@ -797,20 +797,20 @@ static int ov2640_set_params(struct i2c_client *client, u32 *width, u32 *height,
         /* select format */
         priv->cfmt_code = 0;
         switch (code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 dev_dbg(&client->dev, "%s: Selected cfmt RGB565 BE", __func__);
                 selected_cfmt_regs = ov2640_rgb565_be_regs;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 dev_dbg(&client->dev, "%s: Selected cfmt RGB565 LE", __func__);
                 selected_cfmt_regs = ov2640_rgb565_le_regs;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 dev_dbg(&client->dev, "%s: Selected cfmt YUYV (YUV422)", __func__);
                 selected_cfmt_regs = ov2640_yuyv_regs;
                 break;
         default:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__);
                 selected_cfmt_regs = ov2640_uyvy_regs;
         }
@@ -869,7 +869,7 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
         if (!priv->win) {
                 u32 width = W_SVGA, height = H_SVGA;
                 priv->win = ov2640_select_win(&width, &height);
-                priv->cfmt_code = V4L2_MBUS_FMT_UYVY8_2X8;
+                priv->cfmt_code = MEDIA_BUS_FMT_UYVY8_2X8;
         }
 
         mf->width       = priv->win->width;
@@ -877,13 +877,13 @@ static int ov2640_g_fmt(struct v4l2_subdev *sd,
         mf->code        = priv->cfmt_code;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
         mf->field       = V4L2_FIELD_NONE;
@@ -899,14 +899,14 @@ static int ov2640_s_fmt(struct v4l2_subdev *sd,
 
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -926,14 +926,14 @@ static int ov2640_try_fmt(struct v4l2_subdev *sd,
         mf->field       = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -941,7 +941,7 @@ static int ov2640_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov2640_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov2640_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov5642.c b/drivers/media/i2c/soc_camera/ov5642.c
index d2daa6a8f272..93ae031bdafb 100644
--- a/drivers/media/i2c/soc_camera/ov5642.c
+++ b/drivers/media/i2c/soc_camera/ov5642.c
@@ -602,7 +602,7 @@ static struct regval_list ov5642_default_regs_finalise[] = {
 };
 
 struct ov5642_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
@@ -618,7 +618,7 @@ struct ov5642 {
 };
 
 static const struct ov5642_datafmt ov5642_colour_fmts[] = {
-        {V4L2_MBUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_UYVY8_2X8, V4L2_COLORSPACE_JPEG},
 };
 
 static struct ov5642 *to_ov5642(const struct i2c_client *client)
@@ -628,7 +628,7 @@ static struct ov5642 *to_ov5642(const struct i2c_client *client)
 
 /* Find a data format by a pixel code in an array */
 static const struct ov5642_datafmt
-                        *ov5642_find_datafmt(enum v4l2_mbus_pixelcode code)
+                        *ov5642_find_datafmt(u32 code)
 {
         int i;
 
@@ -840,7 +840,7 @@ static int ov5642_g_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov5642_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov5642_colour_fmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov6650.c b/drivers/media/i2c/soc_camera/ov6650.c
index ab01598ec83f..f4eef2fa6f6f 100644
--- a/drivers/media/i2c/soc_camera/ov6650.c
+++ b/drivers/media/i2c/soc_camera/ov6650.c
@@ -202,18 +202,18 @@ struct ov6650 {
         unsigned long           pclk_limit;     /* from host */
         unsigned long           pclk_max;       /* from resolution and format */
         struct v4l2_fract       tpf;            /* as requested with s_parm */
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace    colorspace;
 };
 
 
-static enum v4l2_mbus_pixelcode ov6650_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8,
-        V4L2_MBUS_FMT_VYUY8_2X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_Y8_1X8,
+static u32 ov6650_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_YVYU8_2X8,
+        MEDIA_BUS_FMT_VYUY8_2X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_Y8_1X8,
 };
 
 /* read a register */
@@ -555,29 +555,29 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         .height = mf->height << half_scale,
                 },
         };
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         unsigned long mclk, pclk;
         u8 coma_set = 0, coma_mask = 0, coml_set, coml_mask, clkrc;
         int ret;
 
         /* select color matrix configuration for given color encoding */
         switch (code) {
-        case V4L2_MBUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_Y8_1X8:
                 dev_dbg(&client->dev, "pixel format GREY8_1X8\n");
                 coma_mask |= COMA_RGB | COMA_WORD_SWAP | COMA_BYTE_SWAP;
                 coma_set |= COMA_BW;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 dev_dbg(&client->dev, "pixel format YUYV8_2X8_LE\n");
                 coma_mask |= COMA_RGB | COMA_BW | COMA_BYTE_SWAP;
                 coma_set |= COMA_WORD_SWAP;
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 dev_dbg(&client->dev, "pixel format YVYU8_2X8_LE (untested)\n");
                 coma_mask |= COMA_RGB | COMA_BW | COMA_WORD_SWAP |
                                 COMA_BYTE_SWAP;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 dev_dbg(&client->dev, "pixel format YUYV8_2X8_BE\n");
                 if (half_scale) {
                         coma_mask |= COMA_RGB | COMA_BW | COMA_WORD_SWAP;
@@ -587,7 +587,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         coma_set |= COMA_BYTE_SWAP | COMA_WORD_SWAP;
                 }
                 break;
-        case V4L2_MBUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
                 dev_dbg(&client->dev, "pixel format YVYU8_2X8_BE (untested)\n");
                 if (half_scale) {
                         coma_mask |= COMA_RGB | COMA_BW;
@@ -597,7 +597,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                         coma_set |= COMA_BYTE_SWAP;
                 }
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 dev_dbg(&client->dev, "pixel format SBGGR8_1X8 (untested)\n");
                 coma_mask |= COMA_BW | COMA_BYTE_SWAP | COMA_WORD_SWAP;
                 coma_set |= COMA_RAW_RGB | COMA_RGB;
@@ -608,8 +608,8 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
         }
         priv->code = code;
 
-        if (code == V4L2_MBUS_FMT_Y8_1X8 ||
-                        code == V4L2_MBUS_FMT_SBGGR8_1X8) {
+        if (code == MEDIA_BUS_FMT_Y8_1X8 ||
+                        code == MEDIA_BUS_FMT_SBGGR8_1X8) {
                 coml_mask = COML_ONE_CHANNEL;
                 coml_set = 0;
                 priv->pclk_max = 4000000;
@@ -619,7 +619,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf)
                 priv->pclk_max = 8000000;
         }
 
-        if (code == V4L2_MBUS_FMT_SBGGR8_1X8)
+        if (code == MEDIA_BUS_FMT_SBGGR8_1X8)
                 priv->colorspace = V4L2_COLORSPACE_SRGB;
         else if (code != 0)
                 priv->colorspace = V4L2_COLORSPACE_JPEG;
@@ -697,18 +697,18 @@ static int ov6650_try_fmt(struct v4l2_subdev *sd,
         mf->field = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_Y10_1X10:
-                mf->code = V4L2_MBUS_FMT_Y8_1X8;
-        case V4L2_MBUS_FMT_Y8_1X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_Y10_1X10:
+                mf->code = MEDIA_BUS_FMT_Y8_1X8;
+        case MEDIA_BUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_SBGGR8_1X8;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+                mf->code = MEDIA_BUS_FMT_SBGGR8_1X8;
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         }
@@ -717,7 +717,7 @@ static int ov6650_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov6650_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov6650_codes))
                 return -EINVAL;
@@ -1013,7 +1013,7 @@ static int ov6650_probe(struct i2c_client *client,
         priv->rect.width  = W_CIF;
         priv->rect.height = H_CIF;
         priv->half_scale  = false;
-        priv->code        = V4L2_MBUS_FMT_YUYV8_2X8;
+        priv->code        = MEDIA_BUS_FMT_YUYV8_2X8;
         priv->colorspace  = V4L2_COLORSPACE_JPEG;
 
         priv->clk = v4l2_clk_get(&client->dev, "mclk");
diff --git a/drivers/media/i2c/soc_camera/ov772x.c b/drivers/media/i2c/soc_camera/ov772x.c
index 970a04e1e56e..8daac88b33fe 100644
--- a/drivers/media/i2c/soc_camera/ov772x.c
+++ b/drivers/media/i2c/soc_camera/ov772x.c
@@ -376,7 +376,7 @@
  */
 
 struct ov772x_color_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u8 dsp3;
         u8 dsp4;
@@ -408,7 +408,7 @@ struct ov772x_priv {
  */
 static const struct ov772x_color_format ov772x_cfmts[] = {
         {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -416,7 +416,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = UV_ON,
                 .dsp4           = DSP_OFMT_YUV,
@@ -424,7 +424,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -432,7 +432,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = OFMT_YUV,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -440,7 +440,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+                .code           = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -448,7 +448,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB555 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -456,7 +456,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                 .com7           = FMT_RGB565 | OFMT_RGB,
         },
         {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_BE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_BE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_YUV,
@@ -468,7 +468,7 @@ static const struct ov772x_color_format ov772x_cfmts[] = {
                  * regardless of the COM7 value. We can thus only support 10-bit
                  * Bayer until someone figures it out.
                  */
-                .code           = V4L2_MBUS_FMT_SBGGR10_1X10,
+                .code           = MEDIA_BUS_FMT_SBGGR10_1X10,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
                 .dsp3           = 0x0,
                 .dsp4           = DSP_OFMT_RAW10,
@@ -990,7 +990,7 @@ static struct v4l2_subdev_core_ops ov772x_subdev_core_ops = {
 };
 
 static int ov772x_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov772x_cfmts))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov9640.c b/drivers/media/i2c/soc_camera/ov9640.c
index bc74224503e7..aa93d2e88572 100644
--- a/drivers/media/i2c/soc_camera/ov9640.c
+++ b/drivers/media/i2c/soc_camera/ov9640.c
@@ -159,10 +159,10 @@ static const struct ov9640_reg ov9640_regs_rgb[] = {
         { OV9640_MTXS,  0x65 },
 };
 
-static enum v4l2_mbus_pixelcode ov9640_codes[] = {
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
-        V4L2_MBUS_FMT_RGB565_2X8_LE,
+static u32 ov9640_codes[] = {
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
+        MEDIA_BUS_FMT_RGB565_2X8_LE,
 };
 
 /* read a register */
@@ -351,22 +351,22 @@ static void ov9640_res_roundup(u32 *width, u32 *height)
 }
 
 /* Prepare necessary register changes depending on color encoding */
-static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
+static void ov9640_alter_regs(u32 code,
                               struct ov9640_reg_alt *alt)
 {
         switch (code) {
         default:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 alt->com12      = OV9640_COM12_YUV_AVG;
                 alt->com13      = OV9640_COM13_Y_DELAY_EN |
                                         OV9640_COM13_YUV_DLY(0x01);
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_555;
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 alt->com7       = OV9640_COM7_RGB;
                 alt->com13      = OV9640_COM13_RGB_AVG;
                 alt->com15      = OV9640_COM15_RGB_565;
@@ -376,7 +376,7 @@ static void ov9640_alter_regs(enum v4l2_mbus_pixelcode code,
 
 /* Setup registers according to resolution and color encoding */
 static int ov9640_write_regs(struct i2c_client *client, u32 width,
-                enum v4l2_mbus_pixelcode code, struct ov9640_reg_alt *alts)
+                u32 code, struct ov9640_reg_alt *alts)
 {
         const struct ov9640_reg *ov9640_regs, *matrix_regs;
         int                     ov9640_regs_len, matrix_regs_len;
@@ -419,7 +419,7 @@ static int ov9640_write_regs(struct i2c_client *client, u32 width,
         }
 
         /* select color matrix configuration for given color encoding */
-        if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 matrix_regs     = ov9640_regs_yuv;
                 matrix_regs_len = ARRAY_SIZE(ov9640_regs_yuv);
         } else {
@@ -487,7 +487,7 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct ov9640_reg_alt alts = {0};
         enum v4l2_colorspace cspace;
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         int ret;
 
         ov9640_res_roundup(&mf->width, &mf->height);
@@ -500,13 +500,13 @@ static int ov9640_s_fmt(struct v4l2_subdev *sd,
                 return ret;
 
         switch (code) {
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 cspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 cspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -527,13 +527,13 @@ static int ov9640_try_fmt(struct v4l2_subdev *sd,
         mf->field = V4L2_FIELD_NONE;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 mf->colorspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
-                mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+                mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 mf->colorspace = V4L2_COLORSPACE_JPEG;
         }
 
@@ -541,7 +541,7 @@ static int ov9640_try_fmt(struct v4l2_subdev *sd,
 }
 
 static int ov9640_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov9640_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/ov9740.c b/drivers/media/i2c/soc_camera/ov9740.c
index ee9eb635d540..841dc55457cf 100644
--- a/drivers/media/i2c/soc_camera/ov9740.c
+++ b/drivers/media/i2c/soc_camera/ov9740.c
@@ -392,8 +392,8 @@ static const struct ov9740_reg ov9740_defaults[] = {
         { OV9740_ISP_CTRL19,            0x02 },
 };
 
-static enum v4l2_mbus_pixelcode ov9740_codes[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
+static u32 ov9740_codes[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
 };
 
 /* read a register */
@@ -674,13 +674,13 @@ static int ov9740_s_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct ov9740_priv *priv = to_ov9740(sd);
         enum v4l2_colorspace cspace;
-        enum v4l2_mbus_pixelcode code = mf->code;
+        u32 code = mf->code;
         int ret;
 
         ov9740_res_roundup(&mf->width, &mf->height);
 
         switch (code) {
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 cspace = V4L2_COLORSPACE_SRGB;
                 break;
         default:
@@ -710,14 +710,14 @@ static int ov9740_try_fmt(struct v4l2_subdev *sd,
         ov9740_res_roundup(&mf->width, &mf->height);
 
         mf->field = V4L2_FIELD_NONE;
-        mf->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        mf->code = MEDIA_BUS_FMT_YUYV8_2X8;
         mf->colorspace = V4L2_COLORSPACE_SRGB;
 
         return 0;
 }
 
 static int ov9740_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(ov9740_codes))
                 return -EINVAL;
diff --git a/drivers/media/i2c/soc_camera/rj54n1cb0c.c b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
index 7e6d97847874..1752428c43c5 100644
--- a/drivers/media/i2c/soc_camera/rj54n1cb0c.c
+++ b/drivers/media/i2c/soc_camera/rj54n1cb0c.c
@@ -111,13 +111,13 @@
 
 /* RJ54N1CB0C has only one fixed colorspace per pixelcode */
 struct rj54n1_datafmt {
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         enum v4l2_colorspace            colorspace;
 };
 
 /* Find a data format by a pixel code in an array */
 static const struct rj54n1_datafmt *rj54n1_find_datafmt(
-        enum v4l2_mbus_pixelcode code, const struct rj54n1_datafmt *fmt,
+        u32 code, const struct rj54n1_datafmt *fmt,
         int n)
 {
         int i;
@@ -129,15 +129,15 @@ static const struct rj54n1_datafmt *rj54n1_find_datafmt(
 }
 
 static const struct rj54n1_datafmt rj54n1_colour_fmts[] = {
-        {V4L2_MBUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
-        {V4L2_MBUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE, V4L2_COLORSPACE_SRGB},
-        {V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_YUYV8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_YVYU8_2X8, V4L2_COLORSPACE_JPEG},
+        {MEDIA_BUS_FMT_RGB565_2X8_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_RGB565_2X8_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE, V4L2_COLORSPACE_SRGB},
+        {MEDIA_BUS_FMT_SBGGR10_1X10, V4L2_COLORSPACE_SRGB},
 };
 
 struct rj54n1_clock_div {
@@ -486,7 +486,7 @@ static int reg_write_multiple(struct i2c_client *client,
 }
 
 static int rj54n1_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index >= ARRAY_SIZE(rj54n1_colour_fmts))
                 return -EINVAL;
@@ -965,11 +965,11 @@ static int rj54n1_try_fmt(struct v4l2_subdev *sd,
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct rj54n1 *rj54n1 = to_rj54n1(client);
         const struct rj54n1_datafmt *fmt;
-        int align = mf->code == V4L2_MBUS_FMT_SBGGR10_1X10 ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE ||
-                mf->code == V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE;
+        int align = mf->code == MEDIA_BUS_FMT_SBGGR10_1X10 ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE ||
+                mf->code == MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE;
 
         dev_dbg(&client->dev, "%s: code = %d, width = %u, height = %u\n",
                 __func__, mf->code, mf->width, mf->height);
@@ -1025,55 +1025,55 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
 
         /* RA_SEL_UL is only relevant for raw modes, ignored otherwise. */
         switch (mf->code) {
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 0x11);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 8, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 0);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 4);
                 if (!ret)
                         ret = reg_set(client, RJ54N1_BYTE_SWAP, 0, 8);
                 if (!ret)
                         ret = reg_write(client, RJ54N1_RA_SEL_UL, 8);
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
                 ret = reg_write(client, RJ54N1_OUT_SEL, 5);
                 break;
         default:
@@ -1083,7 +1083,7 @@ static int rj54n1_s_fmt(struct v4l2_subdev *sd,
         /* Special case: a raw mode with 10 bits of data per clock tick */
         if (!ret)
                 ret = reg_set(client, RJ54N1_OCLK_SEL_EN,
-                              (mf->code == V4L2_MBUS_FMT_SBGGR10_1X10) << 1, 2);
+                              (mf->code == MEDIA_BUS_FMT_SBGGR10_1X10) << 1, 2);
 
         if (ret < 0)
                 return ret;
diff --git a/drivers/media/i2c/soc_camera/tw9910.c b/drivers/media/i2c/soc_camera/tw9910.c
index 416402eb4f82..9b853215d146 100644
--- a/drivers/media/i2c/soc_camera/tw9910.c
+++ b/drivers/media/i2c/soc_camera/tw9910.c
@@ -705,7 +705,7 @@ static int tw9910_g_fmt(struct v4l2_subdev *sd,
 
         mf->width       = priv->scale->width;
         mf->height      = priv->scale->height;
-        mf->code        = V4L2_MBUS_FMT_UYVY8_2X8;
+        mf->code        = MEDIA_BUS_FMT_UYVY8_2X8;
         mf->colorspace  = V4L2_COLORSPACE_JPEG;
         mf->field       = V4L2_FIELD_INTERLACED_BT;
 
@@ -724,7 +724,7 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd,
         /*
          * check color format
          */
-        if (mf->code != V4L2_MBUS_FMT_UYVY8_2X8)
+        if (mf->code != MEDIA_BUS_FMT_UYVY8_2X8)
                 return -EINVAL;
 
         mf->colorspace = V4L2_COLORSPACE_JPEG;
@@ -751,7 +751,7 @@ static int tw9910_try_fmt(struct v4l2_subdev *sd,
                 return -EINVAL;
         }
 
-        mf->code = V4L2_MBUS_FMT_UYVY8_2X8;
+        mf->code = MEDIA_BUS_FMT_UYVY8_2X8;
         mf->colorspace = V4L2_COLORSPACE_JPEG;
 
         /*
@@ -822,12 +822,12 @@ static struct v4l2_subdev_core_ops tw9910_subdev_core_ops = {
 };
 
 static int tw9910_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                           enum v4l2_mbus_pixelcode *code)
+                           u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_UYVY8_2X8;
+        *code = MEDIA_BUS_FMT_UYVY8_2X8;
         return 0;
 }
 
diff --git a/drivers/media/i2c/sr030pc30.c b/drivers/media/i2c/sr030pc30.c
index 118f8ee88465..10c735c3a082 100644
--- a/drivers/media/i2c/sr030pc30.c
+++ b/drivers/media/i2c/sr030pc30.c
@@ -165,7 +165,7 @@ struct sr030pc30_info {
 };
 
 struct sr030pc30_format {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         enum v4l2_colorspace colorspace;
         u16 ispctl1_reg;
 };
@@ -201,23 +201,23 @@ static const struct sr030pc30_frmsize sr030pc30_sizes[] = {
 /* supported pixel formats */
 static const struct sr030pc30_format sr030pc30_formats[] = {
         {
-                .code           = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code           = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x03,
         }, {
-                .code           = V4L2_MBUS_FMT_YVYU8_2X8,
+                .code           = MEDIA_BUS_FMT_YVYU8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x02,
         }, {
-                .code           = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code           = MEDIA_BUS_FMT_VYUY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0,
         }, {
-                .code           = V4L2_MBUS_FMT_UYVY8_2X8,
+                .code           = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x01,
         }, {
-                .code           = V4L2_MBUS_FMT_RGB565_2X8_BE,
+                .code           = MEDIA_BUS_FMT_RGB565_2X8_BE,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
                 .ispctl1_reg    = 0x40,
         },
@@ -472,7 +472,7 @@ static int sr030pc30_s_ctrl(struct v4l2_ctrl *ctrl)
 }
 
 static int sr030pc30_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                              enum v4l2_mbus_pixelcode *code)
+                              u32 *code)
 {
         if (!code || index >= ARRAY_SIZE(sr030pc30_formats))
                 return -EINVAL;
diff --git a/drivers/media/i2c/tvp514x.c b/drivers/media/i2c/tvp514x.c
index b9dabc9f4050..204204259ac6 100644
--- a/drivers/media/i2c/tvp514x.c
+++ b/drivers/media/i2c/tvp514x.c
@@ -756,12 +756,12 @@ static int tvp514x_s_ctrl(struct v4l2_ctrl *ctrl)
  */
 static int
 tvp514x_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                        enum v4l2_mbus_pixelcode *code)
+                                        u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_YUYV10_2X10;
+        *code = MEDIA_BUS_FMT_YUYV10_2X10;
         return 0;
 }
 
@@ -784,7 +784,7 @@ tvp514x_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f)
         /* Calculate height and width based on current standard */
         current_std = decoder->current_std;
 
-        f->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        f->code = MEDIA_BUS_FMT_YUYV8_2X8;
         f->width = decoder->std_list[current_std].width;
         f->height = decoder->std_list[current_std].height;
         f->field = V4L2_FIELD_INTERLACED;
@@ -942,7 +942,7 @@ static int tvp514x_enum_mbus_code(struct v4l2_subdev *sd,
         if (index != 0)
                 return -EINVAL;
 
-        code->code = V4L2_MBUS_FMT_YUYV8_2X8;
+        code->code = MEDIA_BUS_FMT_YUYV8_2X8;
 
         return 0;
 }
@@ -967,7 +967,7 @@ static int tvp514x_get_pad_format(struct v4l2_subdev *sd,
                 return 0;
         }
 
-        format->format.code = V4L2_MBUS_FMT_YUYV8_2X8;
+        format->format.code = MEDIA_BUS_FMT_YUYV8_2X8;
         format->format.width = tvp514x_std_list[decoder->current_std].width;
         format->format.height = tvp514x_std_list[decoder->current_std].height;
         format->format.colorspace = V4L2_COLORSPACE_SMPTE170M;
@@ -991,7 +991,7 @@ static int tvp514x_set_pad_format(struct v4l2_subdev *sd,
         struct tvp514x_decoder *decoder = to_decoder(sd);
 
         if (fmt->format.field != V4L2_FIELD_INTERLACED ||
-            fmt->format.code != V4L2_MBUS_FMT_YUYV8_2X8 ||
+            fmt->format.code != MEDIA_BUS_FMT_YUYV8_2X8 ||
             fmt->format.colorspace != V4L2_COLORSPACE_SMPTE170M ||
             fmt->format.width != tvp514x_std_list[decoder->current_std].width ||
             fmt->format.height != tvp514x_std_list[decoder->current_std].height)
diff --git a/drivers/media/i2c/tvp5150.c b/drivers/media/i2c/tvp5150.c
index 193e7d6c29c8..68cdab9c0903 100644
--- a/drivers/media/i2c/tvp5150.c
+++ b/drivers/media/i2c/tvp5150.c
@@ -818,12 +818,12 @@ static v4l2_std_id tvp5150_read_std(struct v4l2_subdev *sd)
 }
 
 static int tvp5150_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                                enum v4l2_mbus_pixelcode *code)
+                                                u32 *code)
 {
         if (index)
                 return -EINVAL;
 
-        *code = V4L2_MBUS_FMT_UYVY8_2X8;
+        *code = MEDIA_BUS_FMT_UYVY8_2X8;
         return 0;
 }
 
@@ -840,7 +840,7 @@ static int tvp5150_mbus_fmt(struct v4l2_subdev *sd,
         f->width = decoder->rect.width;
         f->height = decoder->rect.height;
 
-        f->code = V4L2_MBUS_FMT_UYVY8_2X8;
+        f->code = MEDIA_BUS_FMT_UYVY8_2X8;
         f->field = V4L2_FIELD_SEQ_TB;
         f->colorspace = V4L2_COLORSPACE_SMPTE170M;
 
diff --git a/drivers/media/i2c/tvp7002.c b/drivers/media/i2c/tvp7002.c
index 51bac762638b..fe4870e22cfe 100644
--- a/drivers/media/i2c/tvp7002.c
+++ b/drivers/media/i2c/tvp7002.c
@@ -626,7 +626,7 @@ static int tvp7002_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *f
 
         f->width = bt->width;
         f->height = bt->height;
-        f->code = V4L2_MBUS_FMT_YUYV10_1X20;
+        f->code = MEDIA_BUS_FMT_YUYV10_1X20;
         f->field = device->current_timings->scanmode;
         f->colorspace = device->current_timings->color_space;
 
@@ -756,12 +756,12 @@ static int tvp7002_s_register(struct v4l2_subdev *sd,
  */
 
 static int tvp7002_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                        enum v4l2_mbus_pixelcode *code)
+                                        u32 *code)
 {
         /* Check requested format index is within range */
         if (index)
                 return -EINVAL;
-        *code = V4L2_MBUS_FMT_YUYV10_1X20;
+        *code = MEDIA_BUS_FMT_YUYV10_1X20;
         return 0;
 }
 
@@ -859,7 +859,7 @@ tvp7002_enum_mbus_code(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
         if (code->index != 0)
                 return -EINVAL;
 
-        code->code = V4L2_MBUS_FMT_YUYV10_1X20;
+        code->code = MEDIA_BUS_FMT_YUYV10_1X20;
 
         return 0;
 }
@@ -878,7 +878,7 @@ tvp7002_get_pad_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
 {
         struct tvp7002 *tvp7002 = to_tvp7002(sd);
 
-        fmt->format.code = V4L2_MBUS_FMT_YUYV10_1X20;
+        fmt->format.code = MEDIA_BUS_FMT_YUYV10_1X20;
         fmt->format.width = tvp7002->current_timings->timings.bt.width;
         fmt->format.height = tvp7002->current_timings->timings.bt.height;
         fmt->format.field = tvp7002->current_timings->scanmode;
diff --git a/drivers/media/i2c/vs6624.c b/drivers/media/i2c/vs6624.c
index 373f2df52492..00e7f043977e 100644
--- a/drivers/media/i2c/vs6624.c
+++ b/drivers/media/i2c/vs6624.c
@@ -45,19 +45,19 @@ struct vs6624 {
 };
 
 static const struct vs6624_format {
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
         enum v4l2_colorspace colorspace;
 } vs6624_formats[] = {
         {
-                .mbus_code      = V4L2_MBUS_FMT_UYVY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_UYVY8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
         },
         {
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .colorspace     = V4L2_COLORSPACE_JPEG,
         },
         {
-                .mbus_code      = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .colorspace     = V4L2_COLORSPACE_SRGB,
         },
 };
@@ -65,7 +65,7 @@ static const struct vs6624_format {
 static struct v4l2_mbus_framefmt vs6624_default_fmt = {
         .width = VGA_WIDTH,
         .height = VGA_HEIGHT,
-        .code = V4L2_MBUS_FMT_UYVY8_2X8,
+        .code = MEDIA_BUS_FMT_UYVY8_2X8,
         .field = V4L2_FIELD_NONE,
         .colorspace = V4L2_COLORSPACE_JPEG,
 };
@@ -558,7 +558,7 @@ static int vs6624_s_ctrl(struct v4l2_ctrl *ctrl)
 }
 
 static int vs6624_enum_mbus_fmt(struct v4l2_subdev *sd, unsigned index,
-                                enum v4l2_mbus_pixelcode *code)
+                                u32 *code)
 {
         if (index >= ARRAY_SIZE(vs6624_formats))
                 return -EINVAL;
@@ -605,15 +605,15 @@ static int vs6624_s_mbus_fmt(struct v4l2_subdev *sd,
 
         /* set image format */
         switch (fmt->code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 vs6624_write(sd, VS6624_IMG_FMT0, 0x0);
                 vs6624_write(sd, VS6624_YUV_SETUP, 0x1);
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 vs6624_write(sd, VS6624_IMG_FMT0, 0x0);
                 vs6624_write(sd, VS6624_YUV_SETUP, 0x3);
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 vs6624_write(sd, VS6624_IMG_FMT0, 0x4);
                 vs6624_write(sd, VS6624_RGB_SETUP, 0x0);
                 break;
diff --git a/drivers/media/media-entity.c b/drivers/media/media-entity.c
index 37c334edc7e8..4d8e01c7b1b2 100644
--- a/drivers/media/media-entity.c
+++ b/drivers/media/media-entity.c
@@ -279,8 +279,14 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity,
                                 continue;
 
                         ret = entity->ops->link_validate(link);
-                        if (ret < 0 && ret != -ENOIOCTLCMD)
+                        if (ret < 0 && ret != -ENOIOCTLCMD) {
+                                dev_dbg(entity->parent->dev,
+                                        "link validation failed for \"%s\":%u -> \"%s\":%u, error %d\n",
+                                        entity->name, link->source->index,
+                                        link->sink->entity->name,
+                                        link->sink->index, ret);
                                 goto error;
+                        }
                 }
 
                 /* Either no links or validated links are fine. */
@@ -288,6 +294,11 @@ __must_check int media_entity_pipeline_start(struct media_entity *entity,
 
                 if (!bitmap_full(active, entity->num_pads)) {
                         ret = -EPIPE;
+                        dev_dbg(entity->parent->dev,
+                                "\"%s\":%u must be connected by an enabled link\n",
+                                entity->name,
+                                (unsigned)find_first_zero_bit(
+                                        active, entity->num_pads));
                         goto error;
                 }
         }
diff --git a/drivers/media/pci/Kconfig b/drivers/media/pci/Kconfig
index f8cec8e8cf82..218144a99016 100644
--- a/drivers/media/pci/Kconfig
+++ b/drivers/media/pci/Kconfig
@@ -46,6 +46,7 @@ source "drivers/media/pci/pt3/Kconfig"
 source "drivers/media/pci/mantis/Kconfig"
 source "drivers/media/pci/ngene/Kconfig"
 source "drivers/media/pci/ddbridge/Kconfig"
+source "drivers/media/pci/smipcie/Kconfig"
 endif
 
 endif #MEDIA_PCI_SUPPORT
diff --git a/drivers/media/pci/Makefile b/drivers/media/pci/Makefile
index a12926e4b51f..0baf0d2967ee 100644
--- a/drivers/media/pci/Makefile
+++ b/drivers/media/pci/Makefile
@@ -11,7 +11,8 @@ obj-y        +=	ttpci/		\
                 mantis/         \
                 ngene/          \
                 ddbridge/       \
-                saa7146/
+                saa7146/        \
+                smipcie/
 
 obj-$(CONFIG_VIDEO_IVTV) += ivtv/
 obj-$(CONFIG_VIDEO_ZORAN) += zoran/
diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index d8ec583c154c..41055606b969 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -3870,10 +3870,10 @@ static void osprey_eeprom(struct bttv *btv, const u8 ee[256])
         } else {
                 unsigned short type;
 
-                for (i = 4*16; i < 8*16; i += 16) {
-                        u16 checksum = ip_compute_csum(ee + i, 16);
+                for (i = 4 * 16; i < 8 * 16; i += 16) {
+                        u16 checksum = (__force u16)ip_compute_csum(ee + i, 16);
 
-                        if ((checksum&0xff) + (checksum>>8) == 0xff)
+                        if ((checksum & 0xff) + (checksum >> 8) == 0xff)
                                 break;
                 }
                 if (i >= 8*16)
diff --git a/drivers/media/pci/bt8xx/bttv-risc.c b/drivers/media/pci/bt8xx/bttv-risc.c
index 82cc47d2e3fa..4d3f05a19af3 100644
--- a/drivers/media/pci/bt8xx/bttv-risc.c
+++ b/drivers/media/pci/bt8xx/bttv-risc.c
@@ -84,7 +84,7 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
                         continue;
                 while (offset && offset >= sg_dma_len(sg)) {
                         offset -= sg_dma_len(sg);
-                        sg++;
+                        sg = sg_next(sg);
                 }
                 if (bpl <= sg_dma_len(sg)-offset) {
                         /* fits into current chunk */
@@ -100,13 +100,13 @@ bttv_risc_packed(struct bttv *btv, struct btcx_riscmem *risc,
                         *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
                         todo -= (sg_dma_len(sg)-offset);
                         offset = 0;
-                        sg++;
+                        sg = sg_next(sg);
                         while (todo > sg_dma_len(sg)) {
                                 *(rp++)=cpu_to_le32(BT848_RISC_WRITE|
                                                     sg_dma_len(sg));
                                 *(rp++)=cpu_to_le32(sg_dma_address(sg));
                                 todo -= sg_dma_len(sg);
-                                sg++;
+                                sg = sg_next(sg);
                         }
                         *(rp++)=cpu_to_le32(BT848_RISC_WRITE|BT848_RISC_EOL|
                                             todo);
@@ -187,15 +187,15 @@ bttv_risc_planar(struct bttv *btv, struct btcx_riscmem *risc,
                         /* go to next sg entry if needed */
                         while (yoffset && yoffset >= sg_dma_len(ysg)) {
                                 yoffset -= sg_dma_len(ysg);
-                                ysg++;
+                                ysg = sg_next(ysg);
                         }
                         while (uoffset && uoffset >= sg_dma_len(usg)) {
                                 uoffset -= sg_dma_len(usg);
-                                usg++;
+                                usg = sg_next(usg);
                         }
                         while (voffset && voffset >= sg_dma_len(vsg)) {
                                 voffset -= sg_dma_len(vsg);
-                                vsg++;
+                                vsg = sg_next(vsg);
                         }
 
                         /* calculate max number of bytes we can write */
diff --git a/drivers/media/pci/cx18/cx18-av-core.c b/drivers/media/pci/cx18/cx18-av-core.c
index 2d3afe0431a9..5a55630d09db 100644
--- a/drivers/media/pci/cx18/cx18-av-core.c
+++ b/drivers/media/pci/cx18/cx18-av-core.c
@@ -490,8 +490,8 @@ void cx18_av_std_setup(struct cx18 *cx)
 
         /* Sets horizontal blanking delay and active lines */
         cx18_av_write(cx, 0x470, hblank);
-        cx18_av_write(cx, 0x471, 0xff & (((hblank >> 8) & 0x3) |
-                                                (hactive << 4)));
+        cx18_av_write(cx, 0x471,
+                      (((hblank >> 8) & 0x3) | (hactive << 4)) & 0xff);
         cx18_av_write(cx, 0x472, hactive >> 4);
 
         /* Sets burst gate delay */
@@ -499,14 +499,14 @@ void cx18_av_std_setup(struct cx18 *cx)
 
         /* Sets vertical blanking delay and active duration */
         cx18_av_write(cx, 0x474, vblank);
-        cx18_av_write(cx, 0x475, 0xff & (((vblank >> 8) & 0x3) |
-                                                (vactive << 4)));
+        cx18_av_write(cx, 0x475,
+                      (((vblank >> 8) & 0x3) | (vactive << 4)) & 0xff);
         cx18_av_write(cx, 0x476, vactive >> 4);
         cx18_av_write(cx, 0x477, vblank656);
 
         /* Sets src decimation rate */
-        cx18_av_write(cx, 0x478, 0xff & src_decimation);
-        cx18_av_write(cx, 0x479, 0xff & (src_decimation >> 8));
+        cx18_av_write(cx, 0x478, src_decimation & 0xff);
+        cx18_av_write(cx, 0x479, (src_decimation >> 8) & 0xff);
 
         /* Sets Luma and UV Low pass filters */
         cx18_av_write(cx, 0x47a, luma_lpf << 6 | ((uv_lpf << 4) & 0x30));
@@ -516,8 +516,8 @@ void cx18_av_std_setup(struct cx18 *cx)
 
         /* Sets SC Step*/
         cx18_av_write(cx, 0x47c, sc);
-        cx18_av_write(cx, 0x47d, 0xff & sc >> 8);
-        cx18_av_write(cx, 0x47e, 0xff & sc >> 16);
+        cx18_av_write(cx, 0x47d, (sc >> 8) & 0xff);
+        cx18_av_write(cx, 0x47e, (sc >> 16) & 0xff);
 
         if (std & V4L2_STD_625_50) {
                 state->slicer_line_delay = 1;
@@ -952,7 +952,7 @@ static int cx18_av_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
         int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
         int is_50Hz = !(state->std & V4L2_STD_525_60);
 
-        if (fmt->code != V4L2_MBUS_FMT_FIXED)
+        if (fmt->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
 
         fmt->field = V4L2_FIELD_INTERLACED;
diff --git a/drivers/media/pci/cx18/cx18-cards.h b/drivers/media/pci/cx18/cx18-cards.h
index add7391ecaba..f6b921f3b0ac 100644
--- a/drivers/media/pci/cx18/cx18-cards.h
+++ b/drivers/media/pci/cx18/cx18-cards.h
@@ -57,7 +57,8 @@
 /* V4L2 capability aliases */
 #define CX18_CAP_ENCODER (V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_TUNER | \
                           V4L2_CAP_AUDIO | V4L2_CAP_READWRITE | \
-                          V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE)
+                          V4L2_CAP_STREAMING | V4L2_CAP_VBI_CAPTURE | \
+                          V4L2_CAP_SLICED_VBI_CAPTURE)
 
 struct cx18_card_video_input {
         u8  video_type;         /* video input type */
diff --git a/drivers/media/pci/cx18/cx18-controls.c b/drivers/media/pci/cx18/cx18-controls.c
index 282a3d29fdaa..4aeb7c6b8ce1 100644
--- a/drivers/media/pci/cx18/cx18-controls.c
+++ b/drivers/media/pci/cx18/cx18-controls.c
@@ -98,7 +98,7 @@ static int cx18_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val)
         /* fix videodecoder resolution */
         fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);
         fmt.height = cxhdl->height;
-        fmt.code = V4L2_MBUS_FMT_FIXED;
+        fmt.code = MEDIA_BUS_FMT_FIXED;
         v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &fmt);
         return 0;
 }
diff --git a/drivers/media/pci/cx18/cx18-driver.h b/drivers/media/pci/cx18/cx18-driver.h
index 57f4688ea55b..dcfd7a1d317e 100644
--- a/drivers/media/pci/cx18/cx18-driver.h
+++ b/drivers/media/pci/cx18/cx18-driver.h
@@ -379,6 +379,7 @@ struct cx18_stream {
         const char *name;               /* name of the stream */
         int type;                       /* stream type */
         u32 handle;                     /* task handle */
+        u32 v4l2_dev_caps;              /* device capabilities */
         unsigned int mdl_base_idx;
 
         u32 id;
diff --git a/drivers/media/pci/cx18/cx18-ioctl.c b/drivers/media/pci/cx18/cx18-ioctl.c
index 6f2b59042b73..b8e4b68a9196 100644
--- a/drivers/media/pci/cx18/cx18-ioctl.c
+++ b/drivers/media/pci/cx18/cx18-ioctl.c
@@ -294,7 +294,7 @@ static int cx18_s_fmt_vid_cap(struct file *file, void *fh,
 
         mbus_fmt.width = cx->cxhdl.width = w;
         mbus_fmt.height = cx->cxhdl.height = h;
-        mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+        mbus_fmt.code = MEDIA_BUS_FMT_FIXED;
         v4l2_subdev_call(cx->sd_av, video, s_mbus_fmt, &mbus_fmt);
         return cx18_g_fmt_vid_cap(file, fh, fmt);
 }
@@ -393,15 +393,16 @@ static int cx18_querycap(struct file *file, void *fh,
                                 struct v4l2_capability *vcap)
 {
         struct cx18_open_id *id = fh2id(fh);
+        struct cx18_stream *s = video_drvdata(file);
         struct cx18 *cx = id->cx;
 
         strlcpy(vcap->driver, CX18_DRIVER_NAME, sizeof(vcap->driver));
         strlcpy(vcap->card, cx->card_name, sizeof(vcap->card));
         snprintf(vcap->bus_info, sizeof(vcap->bus_info),
                  "PCI:%s", pci_name(cx->pci_dev));
-        vcap->capabilities = cx->v4l2_cap;          /* capabilities */
-        if (id->type == CX18_ENC_STREAM_TYPE_YUV)
-                vcap->capabilities |= V4L2_CAP_STREAMING;
+        vcap->capabilities = cx->v4l2_cap;      /* capabilities */
+        vcap->device_caps = s->v4l2_dev_caps;   /* device capabilities */
+        vcap->capabilities |= V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/pci/cx18/cx18-streams.c b/drivers/media/pci/cx18/cx18-streams.c
index f3541b5156ce..369445fcf3e5 100644
--- a/drivers/media/pci/cx18/cx18-streams.c
+++ b/drivers/media/pci/cx18/cx18-streams.c
@@ -58,11 +58,14 @@ static struct {
         int vfl_type;
         int num_offset;
         int dma;
+        u32 caps;
 } cx18_stream_info[] = {
         {       /* CX18_ENC_STREAM_TYPE_MPG */
                 "encoder MPEG",
                 VFL_TYPE_GRABBER, 0,
                 PCI_DMA_FROMDEVICE,
+                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                V4L2_CAP_AUDIO | V4L2_CAP_TUNER
         },
         {       /* CX18_ENC_STREAM_TYPE_TS */
                 "TS",
@@ -73,11 +76,15 @@ static struct {
                 "encoder YUV",
                 VFL_TYPE_GRABBER, CX18_V4L2_ENC_YUV_OFFSET,
                 PCI_DMA_FROMDEVICE,
+                V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_READWRITE |
+                V4L2_CAP_STREAMING | V4L2_CAP_AUDIO | V4L2_CAP_TUNER
         },
         {       /* CX18_ENC_STREAM_TYPE_VBI */
                 "encoder VBI",
                 VFL_TYPE_VBI, 0,
                 PCI_DMA_FROMDEVICE,
+                V4L2_CAP_VBI_CAPTURE | V4L2_CAP_SLICED_VBI_CAPTURE |
+                V4L2_CAP_READWRITE | V4L2_CAP_TUNER
         },
         {       /* CX18_ENC_STREAM_TYPE_PCM */
                 "encoder PCM audio",
@@ -93,6 +100,7 @@ static struct {
                 "encoder radio",
                 VFL_TYPE_RADIO, 0,
                 PCI_DMA_NONE,
+                V4L2_CAP_RADIO | V4L2_CAP_TUNER
         },
 };
 
@@ -260,6 +268,7 @@ static void cx18_stream_init(struct cx18 *cx, int type)
         s->handle = CX18_INVALID_TASK_HANDLE;
 
         s->dma = cx18_stream_info[type].dma;
+        s->v4l2_dev_caps = cx18_stream_info[type].caps;
         s->buffers = cx->stream_buffers[type];
         s->buf_size = cx->stream_buf_size[type];
         INIT_LIST_HEAD(&s->buf_pool);
diff --git a/drivers/media/pci/cx23885/cx23885-417.c b/drivers/media/pci/cx23885/cx23885-417.c
index 3948db386fb5..e4901a503c73 100644
--- a/drivers/media/pci/cx23885/cx23885-417.c
+++ b/drivers/media/pci/cx23885/cx23885-417.c
@@ -1148,6 +1148,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         dev->ts1.ts_packet_count = mpeglines;
         *num_planes = 1;
         sizes[0] = mpeglinesize * mpeglines;
+        alloc_ctxs[0] = dev->alloc_ctx;
         *num_buffers = mpegbufs;
         return 0;
 }
@@ -1166,11 +1167,8 @@ static void buffer_finish(struct vb2_buffer *vb)
         struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
         struct cx23885_buffer *buf = container_of(vb,
                 struct cx23885_buffer, vb);
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
 
         cx23885_free_buffer(dev, buf);
-
-        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
 static void buffer_queue(struct vb2_buffer *vb)
diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c
index 88c257d1161b..db99ca2613ba 100644
--- a/drivers/media/pci/cx23885/cx23885-cards.c
+++ b/drivers/media/pci/cx23885/cx23885-cards.c
@@ -680,6 +680,32 @@ struct cx23885_board cx23885_boards[] = {
                 .portb          = CX23885_MPEG_DVB,
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_DVBSKY_T980C] = {
+                .name           = "DVBSky T980C",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S950C] = {
+                .name           = "DVBSky S950C",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_TT_CT2_4500_CI] = {
+                .name           = "Technotrend TT-budget CT2-4500 CI",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S950] = {
+                .name           = "DVBSky S950",
+                .portb          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_S952] = {
+                .name           = "DVBSky S952",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
+        [CX23885_BOARD_DVBSKY_T982] = {
+                .name           = "DVBSky T982",
+                .portb          = CX23885_MPEG_DVB,
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -939,6 +965,30 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x4254,
                 .subdevice = 0x9580,
                 .card      = CX23885_BOARD_DVBSKY_T9580,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x980c,
+                .card      = CX23885_BOARD_DVBSKY_T980C,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x950c,
+                .card      = CX23885_BOARD_DVBSKY_S950C,
+        }, {
+                .subvendor = 0x13c2,
+                .subdevice = 0x3013,
+                .card      = CX23885_BOARD_TT_CT2_4500_CI,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0950,
+                .card      = CX23885_BOARD_DVBSKY_S950,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0952,
+                .card      = CX23885_BOARD_DVBSKY_S952,
+        }, {
+                .subvendor = 0x4254,
+                .subdevice = 0x0982,
+                .card      = CX23885_BOARD_DVBSKY_T982,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -1534,6 +1584,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(60);
                 break;
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 /* enable GPIO3-18 pins */
                 cx_write(MC417_CTL, 0x00000037);
                 cx23885_gpio_enable(dev, GPIO_2 | GPIO_11, 1);
@@ -1541,6 +1593,45 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 mdelay(100);
                 cx23885_gpio_set(dev, GPIO_2 | GPIO_11);
                 break;
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+                /*
+                 * GPIO-0 INTA from CiMax, input
+                 * GPIO-1 reset CiMax, output, high active
+                 * GPIO-2 reset demod, output, low active
+                 * GPIO-3 to GPIO-10 data/addr for CAM
+                 * GPIO-11 ~CS0 to CiMax1
+                 * GPIO-12 ~CS1 to CiMax2
+                 * GPIO-13 ADL0 load LSB addr
+                 * GPIO-14 ADL1 load MSB addr
+                 * GPIO-15 ~RDY from CiMax
+                 * GPIO-17 ~RD to CiMax
+                 * GPIO-18 ~WR to CiMax
+                 */
+
+                cx_set(GP0_IO, 0x00060002); /* GPIO 1/2 as output */
+                cx_clear(GP0_IO, 0x00010004); /* GPIO 0 as input */
+                mdelay(100); /* reset delay */
+                cx_set(GP0_IO, 0x00060004); /* GPIO as out, reset high */
+                cx_clear(GP0_IO, 0x00010002);
+                cx_write(MC417_CTL, 0x00000037); /* enable GPIO3-18 pins */
+
+                /* GPIO-15 IN as ~ACK, rest as OUT */
+                cx_write(MC417_OEN, 0x00001000);
+
+                /* ~RD, ~WR high; ADL0, ADL1 low; ~CS0, ~CS1 high */
+                cx_write(MC417_RWD, 0x0000c300);
+
+                /* enable irq */
+                cx_write(GPIO_ISM, 0x00000000); /* INTERRUPTS active low */
+                break;
+        case CX23885_BOARD_DVBSKY_S950:
+                cx23885_gpio_enable(dev, GPIO_2, 1);
+                cx23885_gpio_clear(dev, GPIO_2);
+                msleep(100);
+                cx23885_gpio_set(dev, GPIO_2);
+                break;
         }
 }
 
@@ -1621,6 +1712,13 @@ int cx23885_ir_init(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 if (!enable_885_ir)
                         break;
                 dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE);
@@ -1667,6 +1765,13 @@ void cx23885_ir_fini(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 cx23885_irq_remove(dev, PCI_MSK_AV_CORE);
                 /* sd_ir is a duplicate pointer to the AV Core, just clear it */
                 dev->sd_ir = NULL;
@@ -1714,6 +1819,13 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 if (dev->sd_ir)
                         cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE);
                 break;
@@ -1817,6 +1929,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_TEVII_S471:
         case CX23885_BOARD_DVBWORLD_2005:
         case CX23885_BOARD_PROF_8000:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -1865,6 +1981,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T982:
                 ts1->gen_ctrl_val  = 0x5; /* Parallel */
                 ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
@@ -1872,6 +1989,14 @@ void cx23885_card_setup(struct cx23885_dev *dev)
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
                 ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
                 break;
+        case CX23885_BOARD_DVBSKY_S952:
+                ts1->gen_ctrl_val  = 0x5; /* Parallel */
+                ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                ts2->gen_ctrl_val  = 0xe; /* Serial bus */
+                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
+                ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;
+                break;
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
@@ -1935,6 +2060,12 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
                                 "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/pci/cx23885/cx23885-core.c b/drivers/media/pci/cx23885/cx23885-core.c
index 3bd386c371f7..1d9d0f86ca8c 100644
--- a/drivers/media/pci/cx23885/cx23885-core.c
+++ b/drivers/media/pci/cx23885/cx23885-core.c
@@ -1453,17 +1453,12 @@ int cx23885_buf_prepare(struct cx23885_buffer *buf, struct cx23885_tsport *port)
         struct cx23885_dev *dev = port->dev;
         int size = port->ts_packet_size * port->ts_packet_count;
         struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0);
-        int rc;
 
         dprintk(1, "%s: %p\n", __func__, buf);
         if (vb2_plane_size(&buf->vb, 0) < size)
                 return -EINVAL;
         vb2_set_plane_payload(&buf->vb, 0, size);
 
-        rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
-        if (!rc)
-                return -EIO;
-
         cx23885_risc_databuffer(dev->pci, &buf->risc,
                                 sgt->sgl,
                                 port->ts_packet_size, port->ts_packet_count, 0);
@@ -1997,9 +1992,14 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
         if (!pci_dma_supported(pci_dev, 0xffffffff)) {
                 printk("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
                 err = -EIO;
-                goto fail_irq;
+                goto fail_context;
         }
 
+        dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
+        if (IS_ERR(dev->alloc_ctx)) {
+                err = PTR_ERR(dev->alloc_ctx);
+                goto fail_context;
+        }
         err = request_irq(pci_dev->irq, cx23885_irq,
                           IRQF_SHARED, dev->name, dev);
         if (err < 0) {
@@ -2028,6 +2028,8 @@ static int cx23885_initdev(struct pci_dev *pci_dev,
         return 0;
 
 fail_irq:
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
+fail_context:
         cx23885_dev_unregister(dev);
 fail_ctrl:
         v4l2_ctrl_handler_free(hdl);
@@ -2053,6 +2055,7 @@ static void cx23885_finidev(struct pci_dev *pci_dev)
         free_irq(pci_dev->irq, dev);
 
         cx23885_dev_unregister(dev);
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
         v4l2_ctrl_handler_free(&dev->ctrl_handler);
         v4l2_device_unregister(v4l2_dev);
         kfree(dev);
diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
index 4cb90317ff45..c47d18270cfc 100644
--- a/drivers/media/pci/cx23885/cx23885-dvb.c
+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
@@ -71,6 +71,7 @@
 #include "si2165.h"
 #include "si2168.h"
 #include "si2157.h"
+#include "sp2.h"
 #include "m88ds3103.h"
 #include "m88ts2022.h"
 
@@ -101,6 +102,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         port->ts_packet_count = 32;
         *num_planes = 1;
         sizes[0] = port->ts_packet_size * port->ts_packet_count;
+        alloc_ctxs[0] = port->dev->alloc_ctx;
         *num_buffers = 32;
         return 0;
 }
@@ -121,11 +123,8 @@ static void buffer_finish(struct vb2_buffer *vb)
         struct cx23885_dev *dev = port->dev;
         struct cx23885_buffer *buf = container_of(vb,
                 struct cx23885_buffer, vb);
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
 
         cx23885_free_buffer(dev, buf);
-
-        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
 static void buffer_queue(struct vb2_buffer *vb)
@@ -616,6 +615,103 @@ static int dvbsky_t9580_set_voltage(struct dvb_frontend *fe,
         return 0;
 }
 
+static int dvbsky_s952_portc_set_voltage(struct dvb_frontend *fe,
+                                        fe_sec_voltage_t voltage)
+{
+        struct cx23885_tsport *port = fe->dvb->priv;
+        struct cx23885_dev *dev = port->dev;
+
+        cx23885_gpio_enable(dev, GPIO_12 | GPIO_13, 1);
+
+        switch (voltage) {
+        case SEC_VOLTAGE_13:
+                cx23885_gpio_set(dev, GPIO_13);
+                cx23885_gpio_clear(dev, GPIO_12);
+                break;
+        case SEC_VOLTAGE_18:
+                cx23885_gpio_set(dev, GPIO_13);
+                cx23885_gpio_set(dev, GPIO_12);
+                break;
+        case SEC_VOLTAGE_OFF:
+                cx23885_gpio_clear(dev, GPIO_13);
+                cx23885_gpio_clear(dev, GPIO_12);
+                break;
+        }
+        /* call the frontend set_voltage function */
+        return port->fe_set_voltage(fe, voltage);
+}
+
+static int cx23885_sp2_ci_ctrl(void *priv, u8 read, int addr,
+                                u8 data, int *mem)
+{
+        /* MC417 */
+        #define SP2_DATA              0x000000ff
+        #define SP2_WR                0x00008000
+        #define SP2_RD                0x00004000
+        #define SP2_ACK               0x00001000
+        #define SP2_ADHI              0x00000800
+        #define SP2_ADLO              0x00000400
+        #define SP2_CS1               0x00000200
+        #define SP2_CS0               0x00000100
+        #define SP2_EN_ALL            0x00001000
+        #define SP2_CTRL_OFF          (SP2_CS1 | SP2_CS0 | SP2_WR | SP2_RD)
+
+        struct cx23885_tsport *port = priv;
+        struct cx23885_dev *dev = port->dev;
+        int ret;
+        int tmp = 0;
+        unsigned long timeout;
+
+        mutex_lock(&dev->gpio_lock);
+
+        /* write addr */
+        cx_write(MC417_OEN, SP2_EN_ALL);
+        cx_write(MC417_RWD, SP2_CTRL_OFF |
+                                SP2_ADLO | (0xff & addr));
+        cx_clear(MC417_RWD, SP2_ADLO);
+        cx_write(MC417_RWD, SP2_CTRL_OFF |
+                                SP2_ADHI | (0xff & (addr >> 8)));
+        cx_clear(MC417_RWD, SP2_ADHI);
+
+        if (read)
+                /* data in */
+                cx_write(MC417_OEN, SP2_EN_ALL | SP2_DATA);
+        else
+                /* data out */
+                cx_write(MC417_RWD, SP2_CTRL_OFF | data);
+
+        /* chip select 0 */
+        cx_clear(MC417_RWD, SP2_CS0);
+
+        /* read/write */
+        cx_clear(MC417_RWD, (read) ? SP2_RD : SP2_WR);
+
+        /* wait for a maximum of 1 msec */
+        timeout = jiffies + msecs_to_jiffies(1);
+        while (!time_after(jiffies, timeout)) {
+                tmp = cx_read(MC417_RWD);
+                if ((tmp & SP2_ACK) == 0)
+                        break;
+                usleep_range(50, 100);
+        }
+
+        cx_set(MC417_RWD, SP2_CTRL_OFF);
+        *mem = tmp & 0xff;
+
+        mutex_unlock(&dev->gpio_lock);
+
+        if (!read) {
+                if (*mem < 0) {
+                        ret = -EREMOTEIO;
+                        goto err;
+                }
+        }
+
+        return 0;
+err:
+        return ret;
+}
+
 static int cx23885_dvb_set_frontend(struct dvb_frontend *fe)
 {
         struct dtv_frontend_properties *p = &fe->dtv_property_cache;
@@ -793,6 +889,32 @@ static const struct m88ds3103_config dvbsky_t9580_m88ds3103_config = {
         .agc = 0x99,
 };
 
+static const struct m88ds3103_config dvbsky_s950c_m88ds3103_config = {
+        .i2c_addr = 0x68,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .clock_out = 0,
+        .ts_mode = M88DS3103_TS_CI,
+        .ts_clk = 10000,
+        .ts_clk_pol = 1,
+        .lnb_en_pol = 1,
+        .lnb_hv_pol = 0,
+        .agc = 0x99,
+};
+
+static const struct m88ds3103_config dvbsky_s952_portc_m88ds3103_config = {
+        .i2c_addr = 0x68,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .clock_out = 0,
+        .ts_mode = M88DS3103_TS_SERIAL,
+        .ts_clk = 96000,
+        .ts_clk_pol = 0,
+        .lnb_en_pol = 1,
+        .lnb_hv_pol = 0,
+        .agc = 0x99,
+};
+
 static int netup_altera_fpga_rw(void *device, int flag, int data, int read)
 {
         struct cx23885_dev *dev = (struct cx23885_dev *)device;
@@ -944,11 +1066,13 @@ static int dvb_register(struct cx23885_tsport *port)
         struct vb2_dvb_frontend *fe0, *fe1 = NULL;
         struct si2168_config si2168_config;
         struct si2157_config si2157_config;
+        struct sp2_config sp2_config;
         struct m88ts2022_config m88ts2022_config;
         struct i2c_board_info info;
         struct i2c_adapter *adapter;
-        struct i2c_client *client_demod;
-        struct i2c_client *client_tuner;
+        struct i2c_client *client_demod = NULL, *client_tuner = NULL, *client_ci = NULL;
+        const struct m88ds3103_config *p_m88ds3103_config = NULL;
+        int (*p_set_voltage)(struct dvb_frontend *fe, fe_sec_voltage_t voltage) = NULL;
         int mfe_shared = 0; /* bus not shared by default */
         int ret;
 
@@ -973,11 +1097,11 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(s5h1409_attach,
                                                 &hauppauge_generic_config,
                                                 &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(mt2131_attach, fe0->dvb.frontend,
-                                   &i2c_bus->i2c_adap,
-                                   &hauppauge_generic_tunerconfig, 0);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(mt2131_attach, fe0->dvb.frontend,
+                           &i2c_bus->i2c_adap,
+                           &hauppauge_generic_tunerconfig, 0);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1270:
         case CX23885_BOARD_HAUPPAUGE_HVR1275:
@@ -985,11 +1109,11 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(lgdt3305_attach,
                                                &hauppauge_lgdt3305_config,
                                                &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                   0x60, &dev->i2c_bus[1].i2c_adap,
-                                   &hauppauge_hvr127x_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                           0x60, &dev->i2c_bus[1].i2c_adap,
+                           &hauppauge_hvr127x_config);
                 if (dev->board == CX23885_BOARD_HAUPPAUGE_HVR1275)
                         cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                 break;
@@ -999,11 +1123,12 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(s5h1411_attach,
                                                &hcw_s5h1411_config,
                                                &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                   0x60, &dev->i2c_bus[1].i2c_adap,
-                                   &hauppauge_tda18271_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+
+                dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                           0x60, &dev->i2c_bus[1].i2c_adap,
+                           &hauppauge_tda18271_config);
 
                 tda18271_attach(&dev->ts1.analog_fe,
                         0x60, &dev->i2c_bus[1].i2c_adap,
@@ -1018,14 +1143,15 @@ static int dvb_register(struct cx23885_tsport *port)
                                 dvb_attach(s5h1409_attach,
                                            &hauppauge_ezqam_config,
                                            &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                dvb_attach(tda829x_attach, fe0->dvb.frontend,
-                                           &dev->i2c_bus[1].i2c_adap, 0x42,
-                                           &tda829x_no_probe);
-                                dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                           0x60, &dev->i2c_bus[1].i2c_adap,
-                                           &hauppauge_tda18271_config);
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+
+                        dvb_attach(tda829x_attach, fe0->dvb.frontend,
+                                   &dev->i2c_bus[1].i2c_adap, 0x42,
+                                   &tda829x_no_probe);
+                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                                   0x60, &dev->i2c_bus[1].i2c_adap,
+                                   &hauppauge_tda18271_config);
                         break;
                 case 0:
                 default:
@@ -1033,11 +1159,11 @@ static int dvb_register(struct cx23885_tsport *port)
                                 dvb_attach(s5h1409_attach,
                                            &hauppauge_generic_config,
                                            &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL)
-                                dvb_attach(mt2131_attach, fe0->dvb.frontend,
-                                           &i2c_bus->i2c_adap,
-                                           &hauppauge_generic_tunerconfig, 0);
-                        break;
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        dvb_attach(mt2131_attach, fe0->dvb.frontend,
+                                   &i2c_bus->i2c_adap,
+                                   &hauppauge_generic_tunerconfig, 0);
                 }
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
@@ -1045,32 +1171,33 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(s5h1409_attach,
                                                 &hauppauge_hvr1800lp_config,
                                                 &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(mt2131_attach, fe0->dvb.frontend,
-                                   &i2c_bus->i2c_adap,
-                                   &hauppauge_generic_tunerconfig, 0);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(mt2131_attach, fe0->dvb.frontend,
+                           &i2c_bus->i2c_adap,
+                           &hauppauge_generic_tunerconfig, 0);
                 break;
         case CX23885_BOARD_DVICO_FUSIONHDTV_5_EXP:
                 i2c_bus = &dev->i2c_bus[0];
                 fe0->dvb.frontend = dvb_attach(lgdt330x_attach,
                                                 &fusionhdtv_5_express,
                                                 &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
-                                   &i2c_bus->i2c_adap, 0x61,
-                                   TUNER_LG_TDVS_H06XF);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(simple_tuner_attach, fe0->dvb.frontend,
+                           &i2c_bus->i2c_adap, 0x61,
+                           TUNER_LG_TDVS_H06XF);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
                 i2c_bus = &dev->i2c_bus[1];
                 fe0->dvb.frontend = dvb_attach(s5h1409_attach,
                                                 &hauppauge_hvr1500q_config,
                                                 &dev->i2c_bus[0].i2c_adap);
-                if (fe0->dvb.frontend != NULL)
-                        dvb_attach(xc5000_attach, fe0->dvb.frontend,
-                                   &i2c_bus->i2c_adap,
-                                   &hauppauge_hvr1500q_tunerconfig);
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(xc5000_attach, fe0->dvb.frontend,
+                           &i2c_bus->i2c_adap,
+                           &hauppauge_hvr1500q_tunerconfig);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
                 i2c_bus = &dev->i2c_bus[1];
@@ -1101,14 +1228,14 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(tda10048_attach,
                         &hauppauge_hvr1200_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(tda829x_attach, fe0->dvb.frontend,
-                                &dev->i2c_bus[1].i2c_adap, 0x42,
-                                &tda829x_no_probe);
-                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                0x60, &dev->i2c_bus[1].i2c_adap,
-                                &hauppauge_hvr1200_tuner_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(tda829x_attach, fe0->dvb.frontend,
+                           &dev->i2c_bus[1].i2c_adap, 0x42,
+                           &tda829x_no_probe);
+                dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                           0x60, &dev->i2c_bus[1].i2c_adap,
+                           &hauppauge_hvr1200_tuner_config);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1210:
                 i2c_bus = &dev->i2c_bus[0];
@@ -1367,12 +1494,10 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(lgs8gxx_attach,
                         &mygica_x8506_lgs8gl5_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(xc5000_attach,
-                                fe0->dvb.frontend,
-                                &i2c_bus2->i2c_adap,
-                                &mygica_x8506_xc5000_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(xc5000_attach, fe0->dvb.frontend,
+                           &i2c_bus2->i2c_adap, &mygica_x8506_xc5000_config);
                 cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                 break;
         case CX23885_BOARD_MYGICA_X8507:
@@ -1381,12 +1506,12 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(mb86a20s_attach,
                         &mygica_x8507_mb86a20s_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(xc5000_attach,
-                        fe0->dvb.frontend,
-                        &i2c_bus2->i2c_adap,
-                        &mygica_x8507_xc5000_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+
+                dvb_attach(xc5000_attach, fe0->dvb.frontend,
+                           &i2c_bus2->i2c_adap,
+                           &mygica_x8507_xc5000_config);
                 cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                 break;
         case CX23885_BOARD_MAGICPRO_PROHDTVE2:
@@ -1395,12 +1520,11 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(lgs8gxx_attach,
                         &magicpro_prohdtve2_lgs8g75_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(xc5000_attach,
-                                fe0->dvb.frontend,
-                                &i2c_bus2->i2c_adap,
-                                &magicpro_prohdtve2_xc5000_config);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(xc5000_attach, fe0->dvb.frontend,
+                           &i2c_bus2->i2c_adap,
+                           &magicpro_prohdtve2_xc5000_config);
                 cx23885_set_frontend_hook(port, fe0->dvb.frontend);
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
@@ -1408,10 +1532,11 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(s5h1411_attach,
                         &hcw_s5h1411_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL)
-                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                0x60, &dev->i2c_bus[0].i2c_adap,
-                                &hauppauge_tda18271_config);
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                           0x60, &dev->i2c_bus[0].i2c_adap,
+                           &hauppauge_tda18271_config);
 
                 tda18271_attach(&dev->ts1.analog_fe,
                         0x60, &dev->i2c_bus[1].i2c_adap,
@@ -1423,10 +1548,11 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(s5h1411_attach,
                         &hcw_s5h1411_config,
                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL)
-                        dvb_attach(tda18271_attach, fe0->dvb.frontend,
-                                0x60, &dev->i2c_bus[0].i2c_adap,
-                                &hauppauge_tda18271_config);
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(tda18271_attach, fe0->dvb.frontend,
+                           0x60, &dev->i2c_bus[0].i2c_adap,
+                           &hauppauge_tda18271_config);
                 break;
         case CX23885_BOARD_MYGICA_X8558PRO:
                 switch (port->nr) {
@@ -1436,12 +1562,11 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend = dvb_attach(atbm8830_attach,
                                 &mygica_x8558pro_atbm8830_cfg1,
                                 &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                dvb_attach(max2165_attach,
-                                        fe0->dvb.frontend,
-                                        &i2c_bus->i2c_adap,
-                                        &mygic_x8558pro_max2165_cfg1);
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        dvb_attach(max2165_attach, fe0->dvb.frontend,
+                                   &i2c_bus->i2c_adap,
+                                   &mygic_x8558pro_max2165_cfg1);
                         break;
                 /* port C */
                 case 2:
@@ -1449,13 +1574,11 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend = dvb_attach(atbm8830_attach,
                                 &mygica_x8558pro_atbm8830_cfg2,
                                 &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                dvb_attach(max2165_attach,
-                                        fe0->dvb.frontend,
-                                        &i2c_bus->i2c_adap,
-                                        &mygic_x8558pro_max2165_cfg2);
-                        }
-                        break;
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        dvb_attach(max2165_attach, fe0->dvb.frontend,
+                                   &i2c_bus->i2c_adap,
+                                   &mygic_x8558pro_max2165_cfg2);
                 }
                 break;
         case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:
@@ -1467,15 +1590,15 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(stv0367ter_attach,
                                         &netup_stv0367_config[port->nr - 1],
                                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        if (NULL == dvb_attach(xc5000_attach,
-                                        fe0->dvb.frontend,
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                if (NULL == dvb_attach(xc5000_attach, fe0->dvb.frontend,
                                         &i2c_bus->i2c_adap,
                                         &netup_xc5000_config[port->nr - 1]))
-                                goto frontend_detach;
-                        /* load xc5000 firmware */
-                        fe0->dvb.frontend->ops.tuner_ops.init(fe0->dvb.frontend);
-                }
+                        goto frontend_detach;
+                /* load xc5000 firmware */
+                fe0->dvb.frontend->ops.tuner_ops.init(fe0->dvb.frontend);
+
                 /* MFE frontend 2 */
                 fe1 = vb2_dvb_get_frontend(&port->frontends, 2);
                 if (fe1 == NULL)
@@ -1484,14 +1607,15 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe1->dvb.frontend = dvb_attach(stv0367cab_attach,
                                         &netup_stv0367_config[port->nr - 1],
                                         &i2c_bus->i2c_adap);
-                if (fe1->dvb.frontend != NULL) {
-                        fe1->dvb.frontend->id = 1;
-                        if (NULL == dvb_attach(xc5000_attach,
-                                        fe1->dvb.frontend,
-                                        &i2c_bus->i2c_adap,
-                                        &netup_xc5000_config[port->nr - 1]))
-                                goto frontend_detach;
-                }
+                if (fe1->dvb.frontend == NULL)
+                        break;
+
+                fe1->dvb.frontend->id = 1;
+                if (NULL == dvb_attach(xc5000_attach,
+                                       fe1->dvb.frontend,
+                                       &i2c_bus->i2c_adap,
+                                       &netup_xc5000_config[port->nr - 1]))
+                        goto frontend_detach;
                 break;
         case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL:
                 i2c_bus = &dev->i2c_bus[0];
@@ -1503,26 +1627,26 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend = dvb_attach(drxk_attach,
                                         &terratec_drxk_config[0],
                                         &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                if (!dvb_attach(mt2063_attach,
-                                                fe0->dvb.frontend,
-                                                &terratec_mt2063_config[0],
-                                                &i2c_bus2->i2c_adap))
-                                        goto frontend_detach;
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        if (!dvb_attach(mt2063_attach,
+                                        fe0->dvb.frontend,
+                                        &terratec_mt2063_config[0],
+                                        &i2c_bus2->i2c_adap))
+                                goto frontend_detach;
                         break;
                 /* port c */
                 case 2:
                         fe0->dvb.frontend = dvb_attach(drxk_attach,
                                         &terratec_drxk_config[1],
                                         &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                if (!dvb_attach(mt2063_attach,
-                                                fe0->dvb.frontend,
-                                                &terratec_mt2063_config[1],
-                                                &i2c_bus2->i2c_adap))
-                                        goto frontend_detach;
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        if (!dvb_attach(mt2063_attach,
+                                        fe0->dvb.frontend,
+                                        &terratec_mt2063_config[1],
+                                        &i2c_bus2->i2c_adap))
+                                goto frontend_detach;
                         break;
                 }
                 break;
@@ -1532,10 +1656,10 @@ static int dvb_register(struct cx23885_tsport *port)
                 fe0->dvb.frontend = dvb_attach(ds3000_attach,
                                         &tevii_ds3000_config,
                                         &i2c_bus->i2c_adap);
-                if (fe0->dvb.frontend != NULL) {
-                        dvb_attach(ts2020_attach, fe0->dvb.frontend,
-                                &tevii_ts2020_config, &i2c_bus->i2c_adap);
-                }
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                dvb_attach(ts2020_attach, fe0->dvb.frontend,
+                           &tevii_ts2020_config, &i2c_bus->i2c_adap);
                 break;
         case CX23885_BOARD_PROF_8000:
                 i2c_bus = &dev->i2c_bus[0];
@@ -1544,15 +1668,15 @@ static int dvb_register(struct cx23885_tsport *port)
                                                 &prof_8000_stv090x_config,
                                                 &i2c_bus->i2c_adap,
                                                 STV090x_DEMODULATOR_0);
-                if (fe0->dvb.frontend != NULL) {
-                        if (!dvb_attach(stb6100_attach,
-                                        fe0->dvb.frontend,
-                                        &prof_8000_stb6100_config,
-                                        &i2c_bus->i2c_adap))
-                                goto frontend_detach;
+                if (fe0->dvb.frontend == NULL)
+                        break;
+                if (!dvb_attach(stb6100_attach,
+                                fe0->dvb.frontend,
+                                &prof_8000_stb6100_config,
+                                &i2c_bus->i2c_adap))
+                        goto frontend_detach;
 
-                        fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
-                }
+                fe0->dvb.frontend->ops.set_voltage = p8000_set_voltage;
                 break;
         case CX23885_BOARD_HAUPPAUGE_HVR4400:
                 i2c_bus = &dev->i2c_bus[0];
@@ -1563,30 +1687,31 @@ static int dvb_register(struct cx23885_tsport *port)
                         fe0->dvb.frontend = dvb_attach(tda10071_attach,
                                                 &hauppauge_tda10071_config,
                                                 &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                if (!dvb_attach(a8293_attach, fe0->dvb.frontend,
-                                                &i2c_bus->i2c_adap,
-                                                &hauppauge_a8293_config))
-                                        goto frontend_detach;
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        if (!dvb_attach(a8293_attach, fe0->dvb.frontend,
+                                        &i2c_bus->i2c_adap,
+                                        &hauppauge_a8293_config))
+                                goto frontend_detach;
                         break;
                 /* port c */
                 case 2:
                         fe0->dvb.frontend = dvb_attach(si2165_attach,
                                         &hauppauge_hvr4400_si2165_config,
                                         &i2c_bus->i2c_adap);
-                        if (fe0->dvb.frontend != NULL) {
-                                fe0->dvb.frontend->ops.i2c_gate_ctrl = NULL;
-                                if (!dvb_attach(tda18271_attach,
-                                                fe0->dvb.frontend,
-                                                0x60, &i2c_bus2->i2c_adap,
-                                          &hauppauge_hvr4400_tuner_config))
-                                        goto frontend_detach;
-                        }
+                        if (fe0->dvb.frontend == NULL)
+                                break;
+                        fe0->dvb.frontend->ops.i2c_gate_ctrl = NULL;
+                        if (!dvb_attach(tda18271_attach,
+                                        fe0->dvb.frontend,
+                                        0x60, &i2c_bus2->i2c_adap,
+                                  &hauppauge_hvr4400_tuner_config))
+                                goto frontend_detach;
                         break;
                 }
                 break;
         case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_S950:
                 i2c_bus = &dev->i2c_bus[0];
                 i2c_bus2 = &dev->i2c_bus[1];
                 switch (port->nr) {
@@ -1680,6 +1805,201 @@ static int dvb_register(struct cx23885_tsport *port)
                         break;
                 }
                 break;
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+                i2c_bus = &dev->i2c_bus[1];
+                i2c_bus2 = &dev->i2c_bus[0];
+
+                /* attach frontend */
+                memset(&si2168_config, 0, sizeof(si2168_config));
+                si2168_config.i2c_adapter = &adapter;
+                si2168_config.fe = &fe0->dvb.frontend;
+                si2168_config.ts_mode = SI2168_TS_PARALLEL;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+                info.addr = 0x64;
+                info.platform_data = &si2168_config;
+                request_module(info.type);
+                client_demod = i2c_new_device(&i2c_bus->i2c_adap, &info);
+                if (client_demod == NULL ||
+                                client_demod->dev.driver == NULL)
+                        goto frontend_detach;
+                if (!try_module_get(client_demod->dev.driver->owner)) {
+                        i2c_unregister_device(client_demod);
+                        goto frontend_detach;
+                }
+                port->i2c_client_demod = client_demod;
+
+                /* attach tuner */
+                memset(&si2157_config, 0, sizeof(si2157_config));
+                si2157_config.fe = fe0->dvb.frontend;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &si2157_config;
+                request_module(info.type);
+                client_tuner = i2c_new_device(adapter, &info);
+                if (client_tuner == NULL ||
+                                client_tuner->dev.driver == NULL) {
+                        module_put(client_demod->dev.driver->owner);
+                        i2c_unregister_device(client_demod);
+                        goto frontend_detach;
+                }
+                if (!try_module_get(client_tuner->dev.driver->owner)) {
+                        i2c_unregister_device(client_tuner);
+                        module_put(client_demod->dev.driver->owner);
+                        i2c_unregister_device(client_demod);
+                        goto frontend_detach;
+                }
+                port->i2c_client_tuner = client_tuner;
+                break;
+        case CX23885_BOARD_DVBSKY_S950C:
+                i2c_bus = &dev->i2c_bus[1];
+                i2c_bus2 = &dev->i2c_bus[0];
+
+                /* attach frontend */
+                fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
+                                &dvbsky_s950c_m88ds3103_config,
+                                &i2c_bus->i2c_adap, &adapter);
+                if (fe0->dvb.frontend == NULL)
+                        break;
+
+                /* attach tuner */
+                memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
+                m88ts2022_config.fe = fe0->dvb.frontend;
+                m88ts2022_config.clock = 27000000;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &m88ts2022_config;
+                request_module(info.type);
+                client_tuner = i2c_new_device(adapter, &info);
+                if (client_tuner == NULL ||
+                                client_tuner->dev.driver == NULL)
+                        goto frontend_detach;
+                if (!try_module_get(client_tuner->dev.driver->owner)) {
+                        i2c_unregister_device(client_tuner);
+                        goto frontend_detach;
+                }
+
+                /* delegate signal strength measurement to tuner */
+                fe0->dvb.frontend->ops.read_signal_strength =
+                        fe0->dvb.frontend->ops.tuner_ops.get_rf_strength;
+
+                port->i2c_client_tuner = client_tuner;
+                break;
+        case CX23885_BOARD_DVBSKY_S952:
+                switch (port->nr) {
+                /* port b */
+                case 1:
+                        i2c_bus = &dev->i2c_bus[1];
+                        p_m88ds3103_config = &dvbsky_t9580_m88ds3103_config;
+                        p_set_voltage = dvbsky_t9580_set_voltage;
+                        break;
+                /* port c */
+                case 2:
+                        i2c_bus = &dev->i2c_bus[0];
+                        p_m88ds3103_config = &dvbsky_s952_portc_m88ds3103_config;
+                        p_set_voltage = dvbsky_s952_portc_set_voltage;
+                        break;
+                }
+
+                /* attach frontend */
+                fe0->dvb.frontend = dvb_attach(m88ds3103_attach,
+                                p_m88ds3103_config,
+                                &i2c_bus->i2c_adap, &adapter);
+                if (fe0->dvb.frontend == NULL)
+                        break;
+
+                /* attach tuner */
+                memset(&m88ts2022_config, 0, sizeof(m88ts2022_config));
+                m88ts2022_config.fe = fe0->dvb.frontend;
+                m88ts2022_config.clock = 27000000;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &m88ts2022_config;
+                request_module(info.type);
+                client_tuner = i2c_new_device(adapter, &info);
+                if (client_tuner == NULL ||
+                                client_tuner->dev.driver == NULL)
+                        goto frontend_detach;
+                if (!try_module_get(client_tuner->dev.driver->owner)) {
+                        i2c_unregister_device(client_tuner);
+                        goto frontend_detach;
+                }
+
+                /* delegate signal strength measurement to tuner */
+                fe0->dvb.frontend->ops.read_signal_strength =
+                        fe0->dvb.frontend->ops.tuner_ops.get_rf_strength;
+
+                /*
+                 * for setting the voltage we need to set GPIOs on
+                 * the card.
+                 */
+                port->fe_set_voltage =
+                        fe0->dvb.frontend->ops.set_voltage;
+                fe0->dvb.frontend->ops.set_voltage = p_set_voltage;
+
+                port->i2c_client_tuner = client_tuner;
+                break;
+        case CX23885_BOARD_DVBSKY_T982:
+                memset(&si2168_config, 0, sizeof(si2168_config));
+                switch (port->nr) {
+                /* port b */
+                case 1:
+                        i2c_bus = &dev->i2c_bus[1];
+                        si2168_config.ts_mode = SI2168_TS_PARALLEL;
+                        break;
+                /* port c */
+                case 2:
+                        i2c_bus = &dev->i2c_bus[0];
+                        si2168_config.ts_mode = SI2168_TS_SERIAL;
+                        break;
+                }
+
+                /* attach frontend */
+                si2168_config.i2c_adapter = &adapter;
+                si2168_config.fe = &fe0->dvb.frontend;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+                info.addr = 0x64;
+                info.platform_data = &si2168_config;
+                request_module(info.type);
+                client_demod = i2c_new_device(&i2c_bus->i2c_adap, &info);
+                if (client_demod == NULL ||
+                                client_demod->dev.driver == NULL)
+                        goto frontend_detach;
+                if (!try_module_get(client_demod->dev.driver->owner)) {
+                        i2c_unregister_device(client_demod);
+                        goto frontend_detach;
+                }
+                port->i2c_client_demod = client_demod;
+
+                /* attach tuner */
+                memset(&si2157_config, 0, sizeof(si2157_config));
+                si2157_config.fe = fe0->dvb.frontend;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+                info.addr = 0x60;
+                info.platform_data = &si2157_config;
+                request_module(info.type);
+                client_tuner = i2c_new_device(adapter, &info);
+                if (client_tuner == NULL ||
+                                client_tuner->dev.driver == NULL) {
+                        module_put(client_demod->dev.driver->owner);
+                        i2c_unregister_device(client_demod);
+                        goto frontend_detach;
+                }
+                if (!try_module_get(client_tuner->dev.driver->owner)) {
+                        i2c_unregister_device(client_tuner);
+                        module_put(client_demod->dev.driver->owner);
+                        i2c_unregister_device(client_demod);
+                        port->i2c_client_demod = NULL;
+                        goto frontend_detach;
+                }
+                port->i2c_client_tuner = client_tuner;
+                break;
         default:
                 printk(KERN_INFO "%s: The frontend of your DVB/ATSC card "
                         " isn't supported yet\n",
@@ -1754,7 +2074,10 @@ static int dvb_register(struct cx23885_tsport *port)
                 memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xa0, 6);
                 break;
                 }
-        case CX23885_BOARD_DVBSKY_T9580: {
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982: {
                 u8 eeprom[256]; /* 24C02 i2c eeprom */
 
                 if (port->nr > 2)
@@ -1764,12 +2087,67 @@ static int dvb_register(struct cx23885_tsport *port)
                 dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
                 tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
                                 sizeof(eeprom));
-                printk(KERN_INFO "DVBSky T9580 port %d MAC address: %pM\n",
-                        port->nr, eeprom + 0xc0 + (port->nr-1) * 8);
+                printk(KERN_INFO "%s port %d MAC address: %pM\n",
+                        cx23885_boards[dev->board].name, port->nr,
+                        eeprom + 0xc0 + (port->nr-1) * 8);
                 memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xc0 +
                         (port->nr-1) * 8, 6);
                 break;
                 }
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_TT_CT2_4500_CI: {
+                u8 eeprom[256]; /* 24C02 i2c eeprom */
+
+                /* attach CI */
+                memset(&sp2_config, 0, sizeof(sp2_config));
+                sp2_config.dvb_adap = &port->frontends.adapter;
+                sp2_config.priv = port;
+                sp2_config.ci_control = cx23885_sp2_ci_ctrl;
+                memset(&info, 0, sizeof(struct i2c_board_info));
+                strlcpy(info.type, "sp2", I2C_NAME_SIZE);
+                info.addr = 0x40;
+                info.platform_data = &sp2_config;
+                request_module(info.type);
+                client_ci = i2c_new_device(&i2c_bus2->i2c_adap, &info);
+                if (client_ci == NULL ||
+                                client_ci->dev.driver == NULL) {
+                        if (client_tuner) {
+                                module_put(client_tuner->dev.driver->owner);
+                                i2c_unregister_device(client_tuner);
+                        }
+                        if (client_demod) {
+                                module_put(client_demod->dev.driver->owner);
+                                i2c_unregister_device(client_demod);
+                        }
+                        goto frontend_detach;
+                }
+                if (!try_module_get(client_ci->dev.driver->owner)) {
+                        i2c_unregister_device(client_ci);
+                        if (client_tuner) {
+                                module_put(client_tuner->dev.driver->owner);
+                                i2c_unregister_device(client_tuner);
+                        }
+                        if (client_demod) {
+                                module_put(client_demod->dev.driver->owner);
+                                i2c_unregister_device(client_demod);
+                        }
+                        goto frontend_detach;
+                }
+                port->i2c_client_ci = client_ci;
+
+                if (port->nr != 1)
+                        break;
+
+                /* Read entire EEPROM */
+                dev->i2c_bus[0].i2c_client.addr = 0xa0 >> 1;
+                tveeprom_read(&dev->i2c_bus[0].i2c_client, eeprom,
+                                sizeof(eeprom));
+                printk(KERN_INFO "%s MAC address: %pM\n",
+                        cx23885_boards[dev->board].name, eeprom + 0xc0);
+                memcpy(port->frontends.adapter.proposed_mac, eeprom + 0xc0, 6);
+                break;
+                }
         }
 
         return ret;
@@ -1810,7 +2188,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
 
                 fe0 = vb2_dvb_get_frontend(&port->frontends, i);
                 if (!fe0)
-                        err = -EINVAL;
+                        return -EINVAL;
 
                 dprintk(1, "%s\n", __func__);
                 dprintk(1, " ->probed by Card=%d Name=%s, PCI %02x:%02x\n",
@@ -1853,6 +2231,13 @@ int cx23885_dvb_unregister(struct cx23885_tsport *port)
         struct vb2_dvb_frontend *fe0;
         struct i2c_client *client;
 
+        /* remove I2C client for CI */
+        client = port->i2c_client_ci;
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
+
         /* remove I2C client for tuner */
         client = port->i2c_client_tuner;
         if (client) {
diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c
index 9d37fe661691..088799c3b49b 100644
--- a/drivers/media/pci/cx23885/cx23885-input.c
+++ b/drivers/media/pci/cx23885/cx23885-input.c
@@ -87,6 +87,13 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
         case CX23885_BOARD_MYGICA_X8507:
         case CX23885_BOARD_TBS_6980:
         case CX23885_BOARD_TBS_6981:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 /*
                  * The only boards we handle right now.  However other boards
                  * using the CX2388x integrated IR controller should be similar
@@ -139,6 +146,13 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
         case CX23885_BOARD_MYGICA_X8507:
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_TT_CT2_4500_CI:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
                 /*
                  * The IR controller on this board only returns pulse widths.
                  * Any other mode setting will fail to set up the device.
@@ -305,6 +319,23 @@ int cx23885_input_init(struct cx23885_dev *dev)
                 /* A guess at the remote */
                 rc_map = RC_MAP_TBS_NEC;
                 break;
+        case CX23885_BOARD_DVBSKY_T9580:
+        case CX23885_BOARD_DVBSKY_T980C:
+        case CX23885_BOARD_DVBSKY_S950C:
+        case CX23885_BOARD_DVBSKY_S950:
+        case CX23885_BOARD_DVBSKY_S952:
+        case CX23885_BOARD_DVBSKY_T982:
+                /* Integrated CX23885 IR controller */
+                driver_type = RC_DRIVER_IR_RAW;
+                allowed_protos = RC_BIT_ALL;
+                rc_map = RC_MAP_DVBSKY;
+                break;
+        case CX23885_BOARD_TT_CT2_4500_CI:
+                /* Integrated CX23885 IR controller */
+                driver_type = RC_DRIVER_IR_RAW;
+                allowed_protos = RC_BIT_ALL;
+                rc_map = RC_MAP_TT_1500;
+                break;
         default:
                 return -ENODEV;
         }
diff --git a/drivers/media/pci/cx23885/cx23885-vbi.c b/drivers/media/pci/cx23885/cx23885-vbi.c
index a7c6ef8f3ea3..d362d3838c84 100644
--- a/drivers/media/pci/cx23885/cx23885-vbi.c
+++ b/drivers/media/pci/cx23885/cx23885-vbi.c
@@ -132,6 +132,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                 lines = VBI_NTSC_LINE_COUNT;
         *num_planes = 1;
         sizes[0] = lines * VBI_LINE_LENGTH * 2;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 
@@ -142,7 +143,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
                 struct cx23885_buffer, vb);
         struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
         unsigned lines = VBI_PAL_LINE_COUNT;
-        int ret;
 
         if (dev->tvnorm & V4L2_STD_525_60)
                 lines = VBI_NTSC_LINE_COUNT;
@@ -151,10 +151,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
                 return -EINVAL;
         vb2_set_plane_payload(vb, 0, lines * VBI_LINE_LENGTH * 2);
 
-        ret = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
-
         cx23885_risc_vbibuffer(dev->pci, &buf->risc,
                          sgt->sgl,
                          0, VBI_LINE_LENGTH * lines,
@@ -165,14 +161,10 @@ static int buffer_prepare(struct vb2_buffer *vb)
 
 static void buffer_finish(struct vb2_buffer *vb)
 {
-        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
         struct cx23885_buffer *buf = container_of(vb,
                 struct cx23885_buffer, vb);
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
 
         cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
-
-        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
 /*
diff --git a/drivers/media/pci/cx23885/cx23885-video.c b/drivers/media/pci/cx23885/cx23885-video.c
index 682a4f95df6b..5e93c682a3f5 100644
--- a/drivers/media/pci/cx23885/cx23885-video.c
+++ b/drivers/media/pci/cx23885/cx23885-video.c
@@ -323,6 +323,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
 
         *num_planes = 1;
         sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 
@@ -334,7 +335,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
         u32 line0_offset, line1_offset;
         struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
         int field_tff;
-        int ret;
 
         buf->bpl = (dev->width * dev->fmt->depth) >> 3;
 
@@ -342,10 +342,6 @@ static int buffer_prepare(struct vb2_buffer *vb)
                 return -EINVAL;
         vb2_set_plane_payload(vb, 0, dev->height * buf->bpl);
 
-        ret = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
-
         switch (dev->field) {
         case V4L2_FIELD_TOP:
                 cx23885_risc_buffer(dev->pci, &buf->risc,
@@ -413,14 +409,10 @@ static int buffer_prepare(struct vb2_buffer *vb)
 
 static void buffer_finish(struct vb2_buffer *vb)
 {
-        struct cx23885_dev *dev = vb->vb2_queue->drv_priv;
         struct cx23885_buffer *buf = container_of(vb,
                 struct cx23885_buffer, vb);
-        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
 
         cx23885_free_buffer(vb->vb2_queue->drv_priv, buf);
-
-        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
 /*
@@ -608,7 +600,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         dev->field      = f->fmt.pix.field;
         dprintk(2, "%s() width=%d height=%d field=%d\n", __func__,
                 dev->width, dev->height, dev->field);
-        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, MEDIA_BUS_FMT_FIXED);
         call_all(dev, video, s_mbus_fmt, &mbus_fmt);
         v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
         /* s_mbus_fmt overwrites f->fmt.pix.field, restore it */
diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h
index 6c35e6115969..f55cd12da0fd 100644
--- a/drivers/media/pci/cx23885/cx23885.h
+++ b/drivers/media/pci/cx23885/cx23885.h
@@ -93,6 +93,12 @@
 #define CX23885_BOARD_HAUPPAUGE_IMPACTVCBE     43
 #define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP2 44
 #define CX23885_BOARD_DVBSKY_T9580             45
+#define CX23885_BOARD_DVBSKY_T980C             46
+#define CX23885_BOARD_DVBSKY_S950C             47
+#define CX23885_BOARD_TT_CT2_4500_CI           48
+#define CX23885_BOARD_DVBSKY_S950              49
+#define CX23885_BOARD_DVBSKY_S952              50
+#define CX23885_BOARD_DVBSKY_T982              51
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
@@ -296,6 +302,7 @@ struct cx23885_tsport {
 
         struct i2c_client *i2c_client_demod;
         struct i2c_client *i2c_client_tuner;
+        struct i2c_client *i2c_client_ci;
 
         int (*set_frontend)(struct dvb_frontend *fe);
         int (*fe_set_voltage)(struct dvb_frontend *fe,
@@ -418,6 +425,7 @@ struct cx23885_dev {
         struct vb2_queue           vb2_vidq;
         struct cx23885_dmaqueue    vbiq;
         struct vb2_queue           vb2_vbiq;
+        void                       *alloc_ctx;
 
         spinlock_t                 slock;
 
diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index e81173c41e5a..389fffd2f36f 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -996,7 +996,7 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,
         for (line = 0; line < lines; line++) {
                 while (offset && offset >= sg_dma_len(sg)) {
                         offset -= sg_dma_len(sg);
-                        sg++;
+                        sg = sg_next(sg);
                 }
                 if (bpl <= sg_dma_len(sg) - offset) {
                         /* fits into current chunk */
@@ -1014,14 +1014,14 @@ static __le32 *cx25821_risc_field(__le32 * rp, struct scatterlist *sglist,
                         *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
                         todo -= (sg_dma_len(sg) - offset);
                         offset = 0;
-                        sg++;
+                        sg = sg_next(sg);
                         while (todo > sg_dma_len(sg)) {
                                 *(rp++) = cpu_to_le32(RISC_WRITE |
                                                 sg_dma_len(sg));
                                 *(rp++) = cpu_to_le32(sg_dma_address(sg));
                                 *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
                                 todo -= sg_dma_len(sg);
-                                sg++;
+                                sg = sg_next(sg);
                         }
                         *(rp++) = cpu_to_le32(RISC_WRITE | RISC_EOL | todo);
                         *(rp++) = cpu_to_le32(sg_dma_address(sg));
@@ -1101,7 +1101,7 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,
         for (line = 0; line < lines; line++) {
                 while (offset && offset >= sg_dma_len(sg)) {
                         offset -= sg_dma_len(sg);
-                        sg++;
+                        sg = sg_next(sg);
                 }
 
                 if (lpi && line > 0 && !(line % lpi))
@@ -1125,14 +1125,14 @@ static __le32 *cx25821_risc_field_audio(__le32 * rp, struct scatterlist *sglist,
                         *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
                         todo -= (sg_dma_len(sg) - offset);
                         offset = 0;
-                        sg++;
+                        sg = sg_next(sg);
                         while (todo > sg_dma_len(sg)) {
                                 *(rp++) = cpu_to_le32(RISC_WRITE |
                                                 sg_dma_len(sg));
                                 *(rp++) = cpu_to_le32(sg_dma_address(sg));
                                 *(rp++) = cpu_to_le32(0);       /* bits 63-32 */
                                 todo -= sg_dma_len(sg);
-                                sg++;
+                                sg = sg_next(sg);
                         }
                         *(rp++) = cpu_to_le32(RISC_WRITE | RISC_EOL | todo);
                         *(rp++) = cpu_to_le32(sg_dma_address(sg));
diff --git a/drivers/media/pci/cx88/Kconfig b/drivers/media/pci/cx88/Kconfig
index a63a9ad163b2..14b813d634a8 100644
--- a/drivers/media/pci/cx88/Kconfig
+++ b/drivers/media/pci/cx88/Kconfig
@@ -2,8 +2,7 @@ config VIDEO_CX88
         tristate "Conexant 2388x (bt878 successor) support"
         depends on VIDEO_DEV && PCI && I2C && RC_CORE
         select I2C_ALGOBIT
-        select VIDEO_BTCX
-        select VIDEOBUF_DMA_SG
+        select VIDEOBUF2_DMA_SG
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
         select VIDEO_WM8775 if MEDIA_SUBDRV_AUTOSELECT
@@ -45,7 +44,7 @@ config VIDEO_CX88_BLACKBIRD
 config VIDEO_CX88_DVB
         tristate "DVB/ATSC Support for cx2388x based TV cards"
         depends on VIDEO_CX88 && DVB_CORE
-        select VIDEOBUF_DVB
+        select VIDEOBUF2_DVB
         select DVB_PLL if MEDIA_SUBDRV_AUTOSELECT
         select DVB_MT352 if MEDIA_SUBDRV_AUTOSELECT
         select DVB_ZL10353 if MEDIA_SUBDRV_AUTOSELECT
diff --git a/drivers/media/pci/cx88/Makefile b/drivers/media/pci/cx88/Makefile
index 8619c1becee2..d3679c3ee248 100644
--- a/drivers/media/pci/cx88/Makefile
+++ b/drivers/media/pci/cx88/Makefile
@@ -11,7 +11,6 @@ obj-$(CONFIG_VIDEO_CX88_DVB) += cx88-dvb.o
 obj-$(CONFIG_VIDEO_CX88_VP3054) += cx88-vp3054-i2c.o
 
 ccflags-y += -Idrivers/media/i2c
-ccflags-y += -Idrivers/media/common
 ccflags-y += -Idrivers/media/tuners
 ccflags-y += -Idrivers/media/dvb-core
 ccflags-y += -Idrivers/media/dvb-frontends
diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index a72579a9f67f..7f8dc60028d5 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -61,8 +61,11 @@
 
 struct cx88_audio_buffer {
         unsigned int               bpl;
-        struct btcx_riscmem        risc;
-        struct videobuf_dmabuf     dma;
+        struct cx88_riscmem        risc;
+        void                    *vaddr;
+        struct scatterlist      *sglist;
+        int                     sglen;
+        int                     nr_pages;
 };
 
 struct cx88_audio_dev {
@@ -84,8 +87,6 @@ struct cx88_audio_dev {
         unsigned int               period_size;
         unsigned int               num_periods;
 
-        struct videobuf_dmabuf     *dma_risc;
-
         struct cx88_audio_buffer   *buf;
 
         struct snd_pcm_substream   *substream;
@@ -290,19 +291,97 @@ static irqreturn_t cx8801_irq(int irq, void *dev_id)
         return IRQ_RETVAL(handled);
 }
 
+static int cx88_alsa_dma_init(struct cx88_audio_dev *chip, int nr_pages)
+{
+        struct cx88_audio_buffer *buf = chip->buf;
+        struct page *pg;
+        int i;
+
+        buf->vaddr = vmalloc_32(nr_pages << PAGE_SHIFT);
+        if (NULL == buf->vaddr) {
+                dprintk(1, "vmalloc_32(%d pages) failed\n", nr_pages);
+                return -ENOMEM;
+        }
+
+        dprintk(1, "vmalloc is at addr 0x%08lx, size=%d\n",
+                                (unsigned long)buf->vaddr,
+                                nr_pages << PAGE_SHIFT);
+
+        memset(buf->vaddr, 0, nr_pages << PAGE_SHIFT);
+        buf->nr_pages = nr_pages;
+
+        buf->sglist = vzalloc(buf->nr_pages * sizeof(*buf->sglist));
+        if (NULL == buf->sglist)
+                goto vzalloc_err;
+
+        sg_init_table(buf->sglist, buf->nr_pages);
+        for (i = 0; i < buf->nr_pages; i++) {
+                pg = vmalloc_to_page(buf->vaddr + i * PAGE_SIZE);
+                if (NULL == pg)
+                        goto vmalloc_to_page_err;
+                sg_set_page(&buf->sglist[i], pg, PAGE_SIZE, 0);
+        }
+        return 0;
+
+vmalloc_to_page_err:
+        vfree(buf->sglist);
+        buf->sglist = NULL;
+vzalloc_err:
+        vfree(buf->vaddr);
+        buf->vaddr = NULL;
+        return -ENOMEM;
+}
+
+static int cx88_alsa_dma_map(struct cx88_audio_dev *dev)
+{
+        struct cx88_audio_buffer *buf = dev->buf;
+
+        buf->sglen = dma_map_sg(&dev->pci->dev, buf->sglist,
+                        buf->nr_pages, PCI_DMA_FROMDEVICE);
+
+        if (0 == buf->sglen) {
+                pr_warn("%s: cx88_alsa_map_sg failed\n", __func__);
+                return -ENOMEM;
+        }
+        return 0;
+}
+
+static int cx88_alsa_dma_unmap(struct cx88_audio_dev *dev)
+{
+        struct cx88_audio_buffer *buf = dev->buf;
+
+        if (!buf->sglen)
+                return 0;
+
+        dma_unmap_sg(&dev->pci->dev, buf->sglist, buf->sglen, PCI_DMA_FROMDEVICE);
+        buf->sglen = 0;
+        return 0;
+}
+
+static int cx88_alsa_dma_free(struct cx88_audio_buffer *buf)
+{
+        vfree(buf->sglist);
+        buf->sglist = NULL;
+        vfree(buf->vaddr);
+        buf->vaddr = NULL;
+        return 0;
+}
+
 
 static int dsp_buffer_free(snd_cx88_card_t *chip)
 {
+        struct cx88_riscmem *risc = &chip->buf->risc;
+
         BUG_ON(!chip->dma_size);
 
         dprintk(2,"Freeing buffer\n");
-        videobuf_dma_unmap(&chip->pci->dev, chip->dma_risc);
-        videobuf_dma_free(chip->dma_risc);
-        btcx_riscmem_free(chip->pci,&chip->buf->risc);
+        cx88_alsa_dma_unmap(chip);
+        cx88_alsa_dma_free(chip->buf);
+        if (risc->cpu)
+                pci_free_consistent(chip->pci, risc->size, risc->cpu, risc->dma);
         kfree(chip->buf);
 
-        chip->dma_risc = NULL;
-        chip->dma_size = 0;
+        chip->buf = NULL;
 
         return 0;
 }
@@ -387,7 +466,6 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
                               struct snd_pcm_hw_params * hw_params)
 {
         snd_cx88_card_t *chip = snd_pcm_substream_chip(substream);
-        struct videobuf_dmabuf *dma;
 
         struct cx88_audio_buffer *buf;
         int ret;
@@ -408,20 +486,19 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         if (NULL == buf)
                 return -ENOMEM;
 
+        chip->buf = buf;
         buf->bpl = chip->period_size;
 
-        dma = &buf->dma;
-        videobuf_dma_init(dma);
-        ret = videobuf_dma_init_kernel(dma, PCI_DMA_FROMDEVICE,
+        ret = cx88_alsa_dma_init(chip,
                         (PAGE_ALIGN(chip->dma_size) >> PAGE_SHIFT));
         if (ret < 0)
                 goto error;
 
-        ret = videobuf_dma_map(&chip->pci->dev, dma);
+        ret = cx88_alsa_dma_map(chip);
         if (ret < 0)
                 goto error;
 
-        ret = cx88_risc_databuffer(chip->pci, &buf->risc, dma->sglist,
+        ret = cx88_risc_databuffer(chip->pci, &buf->risc, buf->sglist,
                                    chip->period_size, chip->num_periods, 1);
         if (ret < 0)
                 goto error;
@@ -430,10 +507,7 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream,
         buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP|RISC_IRQ1|RISC_CNT_INC);
         buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
 
-        chip->buf = buf;
-        chip->dma_risc = dma;
-
-        substream->runtime->dma_area = chip->dma_risc->vaddr;
+        substream->runtime->dma_area = chip->buf->vaddr;
         substream->runtime->dma_bytes = chip->dma_size;
         substream->runtime->dma_addr = 0;
         return 0;
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index 150bb76e7839..4160ca4e5413 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -45,10 +45,6 @@ MODULE_AUTHOR("Jelle Foks <jelle@foks.us>, Gerd Knorr <kraxel@bytesex.org> [SuSE
 MODULE_LICENSE("GPL");
 MODULE_VERSION(CX88_VERSION);
 
-static unsigned int mpegbufs = 32;
-module_param(mpegbufs,int,0644);
-MODULE_PARM_DESC(mpegbufs,"number of mpeg buffers, range 2-32");
-
 static unsigned int debug;
 module_param(debug,int,0644);
 MODULE_PARM_DESC(debug,"enable debug messages [blackbird]");
@@ -326,13 +322,13 @@ static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 dat
         memory_read(dev->core, dev->mailbox - 4, &value);
         if (value != 0x12345678) {
                 dprintk(0, "Firmware and/or mailbox pointer not initialized or corrupted\n");
-                return -1;
+                return -EIO;
         }
 
         memory_read(dev->core, dev->mailbox, &flag);
         if (flag) {
                 dprintk(0, "ERROR: Mailbox appears to be in use (%x)\n", flag);
-                return -1;
+                return -EIO;
         }
 
         flag |= 1; /* tell 'em we're working on it */
@@ -352,14 +348,14 @@ static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 dat
         memory_write(dev->core, dev->mailbox, flag);
 
         /* wait for firmware to handle the API command */
-        timeout = jiffies + msecs_to_jiffies(10);
+        timeout = jiffies + msecs_to_jiffies(1000);
         for (;;) {
                 memory_read(dev->core, dev->mailbox, &flag);
                 if (0 != (flag & 4))
                         break;
                 if (time_after(jiffies,timeout)) {
-                        dprintk(0, "ERROR: API Mailbox timeout\n");
-                        return -1;
+                        dprintk(0, "ERROR: API Mailbox timeout %x\n", command);
+                        return -EIO;
                 }
                 udelay(10);
         }
@@ -420,7 +416,7 @@ static int blackbird_find_mailbox(struct cx8802_dev *dev)
                 }
         }
         dprintk(0, "Mailbox signature values not found!\n");
-        return -1;
+        return -EIO;
 }
 
 static int blackbird_load_firmware(struct cx8802_dev *dev)
@@ -432,7 +428,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         int i, retval = 0;
         u32 value = 0;
         u32 checksum = 0;
-        u32 *dataptr;
+        __le32 *dataptr;
 
         retval  = register_write(dev->core, IVTV_REG_VPU, 0xFFFFFFED);
         retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
@@ -449,29 +445,28 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
 
 
         if (retval != 0) {
-                dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n",
+                pr_err("Hotplug firmware request failed (%s).\n",
                         CX2341X_FIRM_ENC_FILENAME);
-                dprintk(0, "Please fix your hotplug setup, the board will "
-                        "not work without firmware loaded!\n");
-                return -1;
+                pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n");
+                return -EIO;
         }
 
         if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
-                dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
+                pr_err("Firmware size mismatch (have %zd, expected %d)\n",
                         firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
                 release_firmware(firmware);
-                return -1;
+                return -EINVAL;
         }
 
         if (0 != memcmp(firmware->data, magic, 8)) {
-                dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");
+                pr_err("Firmware magic mismatch, wrong file?\n");
                 release_firmware(firmware);
-                return -1;
+                return -EINVAL;
         }
 
         /* transfer to the chip */
         dprintk(1,"Loading firmware ...\n");
-        dataptr = (u32*)firmware->data;
+        dataptr = (__le32 *)firmware->data;
         for (i = 0; i < (firmware->size >> 2); i++) {
                 value = le32_to_cpu(*dataptr);
                 checksum += ~value;
@@ -484,12 +479,11 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
                 memory_read(dev->core, i, &value);
                 checksum -= ~value;
         }
+        release_firmware(firmware);
         if (checksum) {
-                dprintk(0, "ERROR: Firmware load failed (checksum mismatch).\n");
-                release_firmware(firmware);
-                return -1;
+                pr_err("Firmware load might have failed (checksum mismatch).\n");
+                return -EIO;
         }
-        release_firmware(firmware);
         dprintk(0, "Firmware upload successful.\n");
 
         retval |= register_write(dev->core, IVTV_REG_HW_BLOCKS, IVTV_CMD_HW_BLOCKS_RST);
@@ -521,12 +515,14 @@ DB* DVD | MPEG2 | 720x576PAL | CBR     | 600 :Good    | 6000 Kbps  | 25fps   | M
 
 static void blackbird_codec_settings(struct cx8802_dev *dev)
 {
+        struct cx88_core *core = dev->core;
+
         /* assign frame size */
         blackbird_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,
-                                dev->height, dev->width);
+                                core->height, core->width);
 
-        dev->cxhdl.width = dev->width;
-        dev->cxhdl.height = dev->height;
+        dev->cxhdl.width = core->width;
+        dev->cxhdl.height = core->height;
         cx2341x_handler_set_50hz(&dev->cxhdl, dev->core->tvnorm & V4L2_STD_625_50);
         cx2341x_handler_setup(&dev->cxhdl);
 }
@@ -540,9 +536,6 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
         dprintk(1,"Initialize codec\n");
         retval = blackbird_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */
         if (retval < 0) {
-
-                dev->mpeg_active = 0;
-
                 /* ping was not successful, reset and upload firmware */
                 cx_write(MO_SRST_IO, 0); /* SYS_RSTO=0 */
                 cx_write(MO_SRST_IO, 1); /* SYS_RSTO=1 */
@@ -589,9 +582,8 @@ static int blackbird_initialize_codec(struct cx8802_dev *dev)
         return 0;
 }
 
-static int blackbird_start_codec(struct file *file, void *priv)
+static int blackbird_start_codec(struct cx8802_dev *dev)
 {
-        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
         struct cx88_core *core = dev->core;
         /* start capturing to the host interface */
         u32 reg;
@@ -627,7 +619,6 @@ static int blackbird_start_codec(struct file *file, void *priv)
                         BLACKBIRD_RAW_BITS_NONE
                 );
 
-        dev->mpeg_active = 1;
         return 0;
 }
 
@@ -641,51 +632,139 @@ static int blackbird_stop_codec(struct cx8802_dev *dev)
 
         cx2341x_handler_set_busy(&dev->cxhdl, 0);
 
-        dev->mpeg_active = 0;
         return 0;
 }
 
 /* ------------------------------------------------------------------ */
 
-static int bb_buf_setup(struct videobuf_queue *q,
-                        unsigned int *count, unsigned int *size)
+static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct cx8802_fh *fh = q->priv_data;
-
-        fh->dev->ts_packet_size  = 188 * 4; /* was: 512 */
-        fh->dev->ts_packet_count = mpegbufs; /* was: 100 */
+        struct cx8802_dev *dev = q->drv_priv;
 
-        *size = fh->dev->ts_packet_size * fh->dev->ts_packet_count;
-        *count = fh->dev->ts_packet_count;
+        *num_planes = 1;
+        dev->ts_packet_size  = 188 * 4;
+        dev->ts_packet_count  = 32;
+        sizes[0] = dev->ts_packet_size * dev->ts_packet_count;
         return 0;
 }
 
-static int
-bb_buf_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-               enum v4l2_field field)
+static int buffer_prepare(struct vb2_buffer *vb)
 {
-        struct cx8802_fh *fh = q->priv_data;
-        return cx8802_buf_prepare(q, fh->dev, (struct cx88_buffer*)vb, field);
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+
+        return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
 }
 
-static void
-bb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static void buffer_finish(struct vb2_buffer *vb)
 {
-        struct cx8802_fh *fh = q->priv_data;
-        cx8802_buf_queue(fh->dev, (struct cx88_buffer*)vb);
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        struct cx88_riscmem *risc = &buf->risc;
+
+        if (risc->cpu)
+                pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
+        memset(risc, 0, sizeof(*risc));
+
+        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
-static void
-bb_buf_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static void buffer_queue(struct vb2_buffer *vb)
 {
-        cx88_free_buffer(q, (struct cx88_buffer*)vb);
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+
+        cx8802_buf_queue(dev, buf);
+}
+
+static int start_streaming(struct vb2_queue *q, unsigned int count)
+{
+        struct cx8802_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->mpegq;
+        struct cx8802_driver *drv;
+        struct cx88_buffer *buf;
+        unsigned long flags;
+        int err;
+
+        /* Make sure we can acquire the hardware */
+        drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
+        if (!drv) {
+                dprintk(1, "%s: blackbird driver is not loaded\n", __func__);
+                err = -ENODEV;
+                goto fail;
+        }
+
+        err = drv->request_acquire(drv);
+        if (err != 0) {
+                dprintk(1, "%s: Unable to acquire hardware, %d\n", __func__, err);
+                goto fail;
+        }
+
+        if (blackbird_initialize_codec(dev) < 0) {
+                drv->request_release(drv);
+                err = -EINVAL;
+                goto fail;
+        }
+
+        err = blackbird_start_codec(dev);
+        if (err == 0) {
+                buf = list_entry(dmaq->active.next, struct cx88_buffer, list);
+                cx8802_start_dma(dev, dmaq, buf);
+                return 0;
+        }
+
+fail:
+        spin_lock_irqsave(&dev->slock, flags);
+        while (!list_empty(&dmaq->active)) {
+                struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_QUEUED);
+        }
+        spin_unlock_irqrestore(&dev->slock, flags);
+        return err;
 }
 
-static struct videobuf_queue_ops blackbird_qops = {
-        .buf_setup    = bb_buf_setup,
-        .buf_prepare  = bb_buf_prepare,
-        .buf_queue    = bb_buf_queue,
-        .buf_release  = bb_buf_release,
+static void stop_streaming(struct vb2_queue *q)
+{
+        struct cx8802_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->mpegq;
+        struct cx8802_driver *drv = NULL;
+        unsigned long flags;
+
+        cx8802_cancel_buffers(dev);
+        blackbird_stop_codec(dev);
+
+        /* Make sure we release the hardware */
+        drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
+        WARN_ON(!drv);
+        if (drv)
+                drv->request_release(drv);
+
+        spin_lock_irqsave(&dev->slock, flags);
+        while (!list_empty(&dmaq->active)) {
+                struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+        }
+        spin_unlock_irqrestore(&dev->slock, flags);
+}
+
+static struct vb2_ops blackbird_qops = {
+        .queue_setup    = queue_setup,
+        .buf_prepare  = buffer_prepare,
+        .buf_finish = buffer_finish,
+        .buf_queue    = buffer_queue,
+        .wait_prepare = vb2_ops_wait_prepare,
+        .wait_finish = vb2_ops_wait_finish,
+        .start_streaming = start_streaming,
+        .stop_streaming = stop_streaming,
 };
 
 /* ------------------------------------------------------------------ */
@@ -693,8 +772,8 @@ static struct videobuf_queue_ops blackbird_qops = {
 static int vidioc_querycap(struct file *file, void  *priv,
                                         struct v4l2_capability *cap)
 {
-        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
-        struct cx88_core  *core = dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         strcpy(cap->driver, "cx88_blackbird");
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
@@ -714,131 +793,111 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_g_fmt_vid_cap (struct file *file, void *priv,
+static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
+        f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count;
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
-        f->fmt.pix.width        = dev->width;
-        f->fmt.pix.height       = dev->height;
-        f->fmt.pix.field        = fh->mpegq.field;
-        dprintk(1, "VIDIOC_G_FMT: w: %d, h: %d, f: %d\n",
-                dev->width, dev->height, fh->mpegq.field );
+        f->fmt.pix.width        = core->width;
+        f->fmt.pix.height       = core->height;
+        f->fmt.pix.field        = core->field;
         return 0;
 }
 
-static int vidioc_try_fmt_vid_cap (struct file *file, void *priv,
+static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                         struct v4l2_format *f)
 {
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
+        unsigned maxw, maxh;
+        enum v4l2_field field;
 
         f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
         f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
+        f->fmt.pix.sizeimage    = dev->ts_packet_size * dev->ts_packet_count;
         f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
-        dprintk(1, "VIDIOC_TRY_FMT: w: %d, h: %d, f: %d\n",
-                dev->width, dev->height, fh->mpegq.field );
+
+        maxw = norm_maxw(core->tvnorm);
+        maxh = norm_maxh(core->tvnorm);
+
+        field = f->fmt.pix.field;
+
+        switch (field) {
+        case V4L2_FIELD_TOP:
+        case V4L2_FIELD_BOTTOM:
+        case V4L2_FIELD_INTERLACED:
+        case V4L2_FIELD_SEQ_BT:
+        case V4L2_FIELD_SEQ_TB:
+                break;
+        default:
+                field = (f->fmt.pix.height > maxh / 2)
+                        ? V4L2_FIELD_INTERLACED
+                        : V4L2_FIELD_BOTTOM;
+                break;
+        }
+        if (V4L2_FIELD_HAS_T_OR_B(field))
+                maxh /= 2;
+
+        v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2,
+                              &f->fmt.pix.height, 32, maxh, 0, 0);
+        f->fmt.pix.field = field;
         return 0;
 }
 
-static int vidioc_s_fmt_vid_cap (struct file *file, void *priv,
+static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
+        struct cx8802_dev *dev = video_drvdata(file);
         struct cx88_core  *core = dev->core;
 
-        f->fmt.pix.pixelformat  = V4L2_PIX_FMT_MPEG;
-        f->fmt.pix.bytesperline = 0;
-        f->fmt.pix.sizeimage    = 188 * 4 * mpegbufs; /* 188 * 4 * 1024; */
-        f->fmt.pix.colorspace   = V4L2_COLORSPACE_SMPTE170M;
-        dev->width              = f->fmt.pix.width;
-        dev->height             = f->fmt.pix.height;
-        fh->mpegq.field         = f->fmt.pix.field;
+        if (vb2_is_busy(&dev->vb2_mpegq))
+                return -EBUSY;
+        if (core->v4ldev && (vb2_is_busy(&core->v4ldev->vb2_vidq) ||
+                             vb2_is_busy(&core->v4ldev->vb2_vbiq)))
+                return -EBUSY;
+        vidioc_try_fmt_vid_cap(file, priv, f);
+        core->width = f->fmt.pix.width;
+        core->height = f->fmt.pix.height;
+        core->field = f->fmt.pix.field;
         cx88_set_scale(core, f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field);
         blackbird_api_cmd(dev, CX2341X_ENC_SET_FRAME_SIZE, 2, 0,
                                 f->fmt.pix.height, f->fmt.pix.width);
-        dprintk(1, "VIDIOC_S_FMT: w: %d, h: %d, f: %d\n",
-                f->fmt.pix.width, f->fmt.pix.height, f->fmt.pix.field );
         return 0;
 }
 
-static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)
-{
-        struct cx8802_fh  *fh   = priv;
-        return (videobuf_reqbufs(&fh->mpegq, p));
-}
-
-static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        struct cx8802_fh  *fh   = priv;
-        return (videobuf_querybuf(&fh->mpegq, p));
-}
-
-static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        struct cx8802_fh  *fh   = priv;
-        return (videobuf_qbuf(&fh->mpegq, p));
-}
-
-static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        struct cx8802_fh  *fh   = priv;
-        return (videobuf_dqbuf(&fh->mpegq, p,
-                                file->f_flags & O_NONBLOCK));
-}
-
-static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
-{
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
-
-        if (!dev->mpeg_active)
-                blackbird_start_codec(file, fh);
-        return videobuf_streamon(&fh->mpegq);
-}
-
-static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
-{
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
-
-        if (dev->mpeg_active)
-                blackbird_stop_codec(dev);
-        return videobuf_streamoff(&fh->mpegq);
-}
-
 static int vidioc_s_frequency (struct file *file, void *priv,
                                 const struct v4l2_frequency *f)
 {
-        struct cx8802_fh  *fh   = priv;
-        struct cx8802_dev *dev  = fh->dev;
-        struct cx88_core  *core = dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
+        bool streaming;
 
         if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
         if (unlikely(f->tuner != 0))
                 return -EINVAL;
-        if (dev->mpeg_active)
+        streaming = vb2_start_streaming_called(&dev->vb2_mpegq);
+        if (streaming)
                 blackbird_stop_codec(dev);
 
         cx88_set_freq (core,f);
         blackbird_initialize_codec(dev);
-        cx88_set_scale(dev->core, dev->width, dev->height,
-                        fh->mpegq.field);
+        cx88_set_scale(core, core->width, core->height,
+                        core->field);
+        if (streaming)
+                blackbird_start_codec(dev);
         return 0;
 }
 
 static int vidioc_log_status (struct file *file, void *priv)
 {
-        struct cx8802_dev *dev  = ((struct cx8802_fh *)priv)->dev;
-        struct cx88_core  *core = dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         char name[32 + 2];
 
         snprintf(name, sizeof(name), "%s/2", core->name);
@@ -850,15 +909,16 @@ static int vidioc_log_status (struct file *file, void *priv)
 static int vidioc_enum_input (struct file *file, void *priv,
                                 struct v4l2_input *i)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         return cx88_enum_input (core,i);
 }
 
 static int vidioc_g_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct cx8802_fh  *fh   = priv;
-        struct cx88_core  *core = fh->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
@@ -873,7 +933,8 @@ static int vidioc_g_frequency (struct file *file, void *priv,
 
 static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         *i = core->input;
         return 0;
@@ -881,24 +942,24 @@ static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
 
 static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (i >= 4)
                 return -EINVAL;
         if (0 == INPUT(i).type)
                 return -EINVAL;
 
-        mutex_lock(&core->lock);
         cx88_newstation(core);
         cx88_video_mux(core,i);
-        mutex_unlock(&core->lock);
         return 0;
 }
 
 static int vidioc_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         u32 reg;
 
         if (unlikely(UNSET == core->board.tuner_type))
@@ -920,7 +981,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,
 static int vidioc_s_tuner (struct file *file, void *priv,
                                 const struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (UNSET == core->board.tuner_type)
                 return -EINVAL;
@@ -933,7 +995,8 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 
 static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm)
 {
-        struct cx88_core *core = ((struct cx8802_fh *)priv)->dev->core;
+        struct cx8802_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         *tvnorm = core->tvnorm;
         return 0;
@@ -941,155 +1004,20 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm)
 
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id id)
 {
-        struct cx88_core  *core = ((struct cx8802_fh *)priv)->dev->core;
-
-        mutex_lock(&core->lock);
-        cx88_set_tvnorm(core, id);
-        mutex_unlock(&core->lock);
-        return 0;
-}
-
-/* FIXME: cx88_ioctl_hook not implemented */
-
-static int mpeg_open(struct file *file)
-{
-        struct video_device *vdev = video_devdata(file);
         struct cx8802_dev *dev = video_drvdata(file);
-        struct cx8802_fh *fh;
-        struct cx8802_driver *drv = NULL;
-        int err;
-
-        dprintk( 1, "%s\n", __func__);
-
-        mutex_lock(&dev->core->lock);
-
-        /* Make sure we can acquire the hardware */
-        drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
-        if (!drv) {
-                dprintk(1, "%s: blackbird driver is not loaded\n", __func__);
-                mutex_unlock(&dev->core->lock);
-                return -ENODEV;
-        }
-
-        err = drv->request_acquire(drv);
-        if (err != 0) {
-                dprintk(1,"%s: Unable to acquire hardware, %d\n", __func__, err);
-                mutex_unlock(&dev->core->lock);
-                return err;
-        }
-
-        if (!dev->core->mpeg_users && blackbird_initialize_codec(dev) < 0) {
-                drv->request_release(drv);
-                mutex_unlock(&dev->core->lock);
-                return -EINVAL;
-        }
-        dprintk(1, "open dev=%s\n", video_device_node_name(vdev));
-
-        /* allocate + initialize per filehandle data */
-        fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (NULL == fh) {
-                drv->request_release(drv);
-                mutex_unlock(&dev->core->lock);
-                return -ENOMEM;
-        }
-        v4l2_fh_init(&fh->fh, vdev);
-        file->private_data = fh;
-        fh->dev      = dev;
-
-        videobuf_queue_sg_init(&fh->mpegq, &blackbird_qops,
-                            &dev->pci->dev, &dev->slock,
-                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                            V4L2_FIELD_INTERLACED,
-                            sizeof(struct cx88_buffer),
-                            fh, NULL);
-
-        /* FIXME: locking against other video device */
-        cx88_set_scale(dev->core, dev->width, dev->height,
-                        fh->mpegq.field);
-
-        dev->core->mpeg_users++;
-        mutex_unlock(&dev->core->lock);
-        v4l2_fh_add(&fh->fh);
-        return 0;
-}
-
-static int mpeg_release(struct file *file)
-{
-        struct cx8802_fh  *fh  = file->private_data;
-        struct cx8802_dev *dev = fh->dev;
-        struct cx8802_driver *drv = NULL;
-
-        mutex_lock(&dev->core->lock);
-
-        if (dev->mpeg_active && dev->core->mpeg_users == 1)
-                blackbird_stop_codec(dev);
-
-        cx8802_cancel_buffers(fh->dev);
-        /* stop mpeg capture */
-        videobuf_stop(&fh->mpegq);
-
-        videobuf_mmap_free(&fh->mpegq);
-
-        v4l2_fh_del(&fh->fh);
-        v4l2_fh_exit(&fh->fh);
-        file->private_data = NULL;
-        kfree(fh);
-
-        /* Make sure we release the hardware */
-        drv = cx8802_get_driver(dev, CX88_MPEG_BLACKBIRD);
-        WARN_ON(!drv);
-        if (drv)
-                drv->request_release(drv);
-
-        dev->core->mpeg_users--;
-
-        mutex_unlock(&dev->core->lock);
-
-        return 0;
-}
-
-static ssize_t
-mpeg_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
-{
-        struct cx8802_fh *fh = file->private_data;
-        struct cx8802_dev *dev = fh->dev;
-
-        if (!dev->mpeg_active)
-                blackbird_start_codec(file, fh);
-
-        return videobuf_read_stream(&fh->mpegq, data, count, ppos, 0,
-                                    file->f_flags & O_NONBLOCK);
-}
-
-static unsigned int
-mpeg_poll(struct file *file, struct poll_table_struct *wait)
-{
-        unsigned long req_events = poll_requested_events(wait);
-        struct cx8802_fh *fh = file->private_data;
-        struct cx8802_dev *dev = fh->dev;
-
-        if (!dev->mpeg_active && (req_events & (POLLIN | POLLRDNORM)))
-                blackbird_start_codec(file, fh);
-
-        return v4l2_ctrl_poll(file, wait) | videobuf_poll_stream(file, &fh->mpegq, wait);
-}
-
-static int
-mpeg_mmap(struct file *file, struct vm_area_struct * vma)
-{
-        struct cx8802_fh *fh = file->private_data;
+        struct cx88_core *core = dev->core;
 
-        return videobuf_mmap_mapper(&fh->mpegq, vma);
+        return cx88_set_tvnorm(core, id);
 }
 
 static const struct v4l2_file_operations mpeg_fops =
 {
         .owner         = THIS_MODULE,
-        .open          = mpeg_open,
-        .release       = mpeg_release,
-        .read          = mpeg_read,
-        .poll          = mpeg_poll,
-        .mmap          = mpeg_mmap,
+        .open          = v4l2_fh_open,
+        .release       = vb2_fop_release,
+        .read          = vb2_fop_read,
+        .poll          = vb2_fop_poll,
+        .mmap          = vb2_fop_mmap,
         .unlocked_ioctl = video_ioctl2,
 };
 
@@ -1099,12 +1027,12 @@ static const struct v4l2_ioctl_ops mpeg_ioctl_ops = {
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap   = vidioc_try_fmt_vid_cap,
         .vidioc_s_fmt_vid_cap     = vidioc_s_fmt_vid_cap,
-        .vidioc_reqbufs       = vidioc_reqbufs,
-        .vidioc_querybuf      = vidioc_querybuf,
-        .vidioc_qbuf          = vidioc_qbuf,
-        .vidioc_dqbuf         = vidioc_dqbuf,
-        .vidioc_streamon      = vidioc_streamon,
-        .vidioc_streamoff     = vidioc_streamoff,
+        .vidioc_reqbufs       = vb2_ioctl_reqbufs,
+        .vidioc_querybuf      = vb2_ioctl_querybuf,
+        .vidioc_qbuf          = vb2_ioctl_qbuf,
+        .vidioc_dqbuf         = vb2_ioctl_dqbuf,
+        .vidioc_streamon      = vb2_ioctl_streamon,
+        .vidioc_streamoff     = vb2_ioctl_streamoff,
         .vidioc_s_frequency   = vidioc_s_frequency,
         .vidioc_log_status    = vidioc_log_status,
         .vidioc_enum_input    = vidioc_enum_input,
@@ -1189,11 +1117,12 @@ static int blackbird_register_video(struct cx8802_dev *dev)
 {
         int err;
 
-        dev->mpeg_dev = cx88_vdev_init(dev->core,dev->pci,
-                                       &cx8802_mpeg_template,"mpeg");
+        dev->mpeg_dev = cx88_vdev_init(dev->core, dev->pci,
+                                       &cx8802_mpeg_template, "mpeg");
         dev->mpeg_dev->ctrl_handler = &dev->cxhdl.hdl;
         video_set_drvdata(dev->mpeg_dev, dev);
-        err = video_register_device(dev->mpeg_dev,VFL_TYPE_GRABBER, -1);
+        dev->mpeg_dev->queue = &dev->vb2_mpegq;
+        err = video_register_device(dev->mpeg_dev, VFL_TYPE_GRABBER, -1);
         if (err < 0) {
                 printk(KERN_INFO "%s/2: can't register mpeg device\n",
                        dev->core->name);
@@ -1210,6 +1139,7 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
 {
         struct cx88_core *core = drv->core;
         struct cx8802_dev *dev = core->dvbdev;
+        struct vb2_queue *q;
         int err;
 
         dprintk( 1, "%s\n", __func__);
@@ -1223,15 +1153,9 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
         if (!(core->board.mpeg & CX88_MPEG_BLACKBIRD))
                 goto fail_core;
 
-        dev->width = 720;
-        if (core->tvnorm & V4L2_STD_525_60) {
-                dev->height = 480;
-        } else {
-                dev->height = 576;
-        }
         dev->cxhdl.port = CX2341X_PORT_STREAMING;
-        dev->cxhdl.width = dev->width;
-        dev->cxhdl.height = dev->height;
+        dev->cxhdl.width = core->width;
+        dev->cxhdl.height = core->height;
         dev->cxhdl.func = blackbird_mbox_func;
         dev->cxhdl.priv = dev;
         err = cx2341x_handler_init(&dev->cxhdl, 36);
@@ -1250,13 +1174,30 @@ static int cx8802_blackbird_probe(struct cx8802_driver *drv)
 //      init_controls(core);
         cx88_set_tvnorm(core,core->tvnorm);
         cx88_video_mux(core,0);
-        cx2341x_handler_set_50hz(&dev->cxhdl, dev->height == 576);
+        cx2341x_handler_set_50hz(&dev->cxhdl, core->height == 576);
         cx2341x_handler_setup(&dev->cxhdl);
+
+        q = &dev->vb2_mpegq;
+        q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;
+        q->gfp_flags = GFP_DMA32;
+        q->min_buffers_needed = 2;
+        q->drv_priv = dev;
+        q->buf_struct_size = sizeof(struct cx88_buffer);
+        q->ops = &blackbird_qops;
+        q->mem_ops = &vb2_dma_sg_memops;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->lock = &core->lock;
+
+        err = vb2_queue_init(q);
+        if (err < 0)
+                goto fail_core;
+
         blackbird_register_video(dev);
 
         return 0;
 
- fail_core:
+fail_core:
         return err;
 }
 
diff --git a/drivers/media/pci/cx88/cx88-cards.c b/drivers/media/pci/cx88/cx88-cards.c
index 851754bf1291..8f2556ec3971 100644
--- a/drivers/media/pci/cx88/cx88-cards.c
+++ b/drivers/media/pci/cx88/cx88-cards.c
@@ -347,7 +347,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_IODATA_GVVCP3PCI] = {
                 .name           = "IODATA GV-VCP3/PCI",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -436,7 +436,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_KWORLD_DVB_T] = {
                 .name           = "KWorld/VStream XPert DVB-T",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -455,7 +455,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1] = {
                 .name           = "DViCO FusionHDTV DVB-T1",
-                .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+                .tuner_type     = UNSET, /* No analog tuner */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -542,7 +542,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_HAUPPAUGE_DVB_T1] = {
                 .name           = "Hauppauge Nova-T DVB-T",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -554,7 +554,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_CONEXANT_DVB_T1] = {
                 .name           = "Conexant DVB-T reference design",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -579,7 +579,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS] = {
                 .name           = "DViCO FusionHDTV DVB-T Plus",
-                .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+                .tuner_type     = UNSET, /* No analog tuner */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -596,7 +596,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DNTV_LIVE_DVB_T] = {
                 .name           = "digitalnow DNTV Live! DVB-T",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -787,7 +787,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_ADSTECH_DVB_T_PCI] = {
                 .name           = "ADS Tech Instant TV DVB-T PCI",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -806,7 +806,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_TERRATEC_CINERGY_1400_DVB_T1] = {
                 .name           = "TerraTec Cinergy 1400 DVB-T",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .input          = { {
                         .type   = CX88_VMUX_DVB,
                         .vmux   = 0,
@@ -924,7 +924,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_WINFAST_DTV1000] = {
                 .name           = "WinFast DTV1000-T",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -972,7 +972,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1] = {
                 .name           = "Hauppauge Nova-S-Plus DVB-S",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -998,7 +998,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_HAUPPAUGE_NOVASE2_S1] = {
                 .name           = "Hauppauge Nova-SE2 DVB-S",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1010,7 +1010,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_KWORLD_DVBS_100] = {
                 .name           = "KWorld DVB-S 100",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1102,7 +1102,7 @@ static const struct cx88_board cx88_boards[] = {
                 /* DTT 7579 Conexant CX22702-19 Conexant CX2388x  */
                 /* Manenti Marco <marco_manenti@colman.it> */
                 .name           = "KWorld/VStream XPert DVB-T with cx22702",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1121,7 +1121,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL] = {
                 .name           = "DViCO FusionHDTV DVB-T Dual Digital",
-                .tuner_type     = TUNER_ABSENT, /* No analog tuner */
+                .tuner_type     = UNSET, /* No analog tuner */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1356,7 +1356,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_GENIATECH_DVBS] = {
                 .name          = "Geniatech DVB-S",
-                .tuner_type    = TUNER_ABSENT,
+                .tuner_type    = UNSET,
                 .radio_type    = UNSET,
                 .tuner_addr    = ADDR_UNSET,
                 .radio_addr    = ADDR_UNSET,
@@ -1494,7 +1494,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_SAMSUNG_SMT_7020] = {
                 .name           = "Samsung SMT 7020 DVB-S",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1506,7 +1506,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_ADSTECH_PTV_390] = {
                 .name           = "ADS Tech Instant Video PCI",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1553,7 +1553,7 @@ static const struct cx88_board cx88_boards[] = {
         [CX88_BOARD_DVICO_FUSIONHDTV_5_PCI_NANO] = {
                 .name           = "DViCO FusionHDTV 5 PCI nano",
                 /* xc3008 tuner, digital only for now */
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2069,7 +2069,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_TBS_8920] = {
                 .name           = "TBS 8920 DVB-S/S2",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2304,7 +2304,7 @@ static const struct cx88_board cx88_boards[] = {
         },
         [CX88_BOARD_TWINHAN_VP1027_DVBS] = {
                 .name           = "Twinhan VP-1027 DVB-S",
-                .tuner_type     = TUNER_ABSENT,
+                .tuner_type     = UNSET,
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -2921,33 +2921,33 @@ static const struct {
         int  fm;
         const char *name;
 } gdi_tuner[] = {
-        [ 0x01 ] = { .id   = TUNER_ABSENT,
+        [ 0x01 ] = { .id   = UNSET,
                      .name = "NTSC_M" },
-        [ 0x02 ] = { .id   = TUNER_ABSENT,
+        [ 0x02 ] = { .id   = UNSET,
                      .name = "PAL_B" },
-        [ 0x03 ] = { .id   = TUNER_ABSENT,
+        [ 0x03 ] = { .id   = UNSET,
                      .name = "PAL_I" },
-        [ 0x04 ] = { .id   = TUNER_ABSENT,
+        [ 0x04 ] = { .id   = UNSET,
                      .name = "PAL_D" },
-        [ 0x05 ] = { .id   = TUNER_ABSENT,
+        [ 0x05 ] = { .id   = UNSET,
                      .name = "SECAM" },
 
-        [ 0x10 ] = { .id   = TUNER_ABSENT,
+        [ 0x10 ] = { .id   = UNSET,
                      .fm   = 1,
                      .name = "TEMIC_4049" },
         [ 0x11 ] = { .id   = TUNER_TEMIC_4136FY5,
                      .name = "TEMIC_4136" },
-        [ 0x12 ] = { .id   = TUNER_ABSENT,
+        [ 0x12 ] = { .id   = UNSET,
                      .name = "TEMIC_4146" },
 
         [ 0x20 ] = { .id   = TUNER_PHILIPS_FQ1216ME,
                      .fm   = 1,
                      .name = "PHILIPS_FQ1216_MK3" },
-        [ 0x21 ] = { .id   = TUNER_ABSENT, .fm = 1,
+        [ 0x21 ] = { .id   = UNSET, .fm = 1,
                      .name = "PHILIPS_FQ1236_MK3" },
-        [ 0x22 ] = { .id   = TUNER_ABSENT,
+        [ 0x22 ] = { .id   = UNSET,
                      .name = "PHILIPS_FI1236_MK3" },
-        [ 0x23 ] = { .id   = TUNER_ABSENT,
+        [ 0x23 ] = { .id   = UNSET,
                      .name = "PHILIPS_FI1216_MK3" },
 };
 
@@ -3564,7 +3564,7 @@ static void cx88_card_setup(struct cx88_core *core)
                 mode_mask &= ~T_RADIO;
         }
 
-        if (core->board.tuner_type != TUNER_ABSENT) {
+        if (core->board.tuner_type != UNSET) {
                 tun_setup.mode_mask      = mode_mask;
                 tun_setup.type           = core->board.tuner_type;
                 tun_setup.addr           = core->board.tuner_addr;
@@ -3691,6 +3691,11 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
         core->nr = nr;
         sprintf(core->name, "cx88[%d]", core->nr);
 
+        core->tvnorm = V4L2_STD_NTSC_M;
+        core->width   = 320;
+        core->height  = 240;
+        core->field   = V4L2_FIELD_INTERLACED;
+
         strcpy(core->v4l2_dev.name, core->name);
         if (v4l2_device_register(NULL, &core->v4l2_dev)) {
                 kfree(core);
@@ -3772,7 +3777,7 @@ struct cx88_core *cx88_core_create(struct pci_dev *pci, int nr)
         cx88_i2c_init(core, pci);
 
         /* load tuner module, if needed */
-        if (TUNER_ABSENT != core->board.tuner_type) {
+        if (UNSET != core->board.tuner_type) {
                 /* Ignore 0x6b and 0x6f on cx88 boards.
                  * FusionHDTV5 RT Gold has an ir receiver at 0x6b
                  * and an RTC at 0x6f which can get corrupted if probed. */
diff --git a/drivers/media/pci/cx88/cx88-core.c b/drivers/media/pci/cx88/cx88-core.c
index 71630238027b..dee177ed5fe9 100644
--- a/drivers/media/pci/cx88/cx88-core.c
+++ b/drivers/media/pci/cx88/cx88-core.c
@@ -76,11 +76,16 @@ static DEFINE_MUTEX(devlist);
 static __le32* cx88_risc_field(__le32 *rp, struct scatterlist *sglist,
                             unsigned int offset, u32 sync_line,
                             unsigned int bpl, unsigned int padding,
-                            unsigned int lines, unsigned int lpi)
+                            unsigned int lines, unsigned int lpi, bool jump)
 {
         struct scatterlist *sg;
         unsigned int line,todo,sol;
 
+        if (jump) {
+                (*rp++) = cpu_to_le32(RISC_JUMP);
+                (*rp++) = 0;
+        }
+
         /* sync instruction */
         if (sync_line != NO_SYNC_LINE)
                 *(rp++) = cpu_to_le32(RISC_RESYNC | sync_line);
@@ -90,7 +95,7 @@ static __le32* cx88_risc_field(__le32 *rp, struct scatterlist *sglist,
         for (line = 0; line < lines; line++) {
                 while (offset && offset >= sg_dma_len(sg)) {
                         offset -= sg_dma_len(sg);
-                        sg++;
+                        sg = sg_next(sg);
                 }
                 if (lpi && line>0 && !(line % lpi))
                         sol = RISC_SOL | RISC_IRQ1 | RISC_CNT_INC;
@@ -109,13 +114,13 @@ static __le32* cx88_risc_field(__le32 *rp, struct scatterlist *sglist,
                         *(rp++)=cpu_to_le32(sg_dma_address(sg)+offset);
                         todo -= (sg_dma_len(sg)-offset);
                         offset = 0;
-                        sg++;
+                        sg = sg_next(sg);
                         while (todo > sg_dma_len(sg)) {
                                 *(rp++)=cpu_to_le32(RISC_WRITE|
                                                     sg_dma_len(sg));
                                 *(rp++)=cpu_to_le32(sg_dma_address(sg));
                                 todo -= sg_dma_len(sg);
-                                sg++;
+                                sg = sg_next(sg);
                         }
                         *(rp++)=cpu_to_le32(RISC_WRITE|RISC_EOL|todo);
                         *(rp++)=cpu_to_le32(sg_dma_address(sg));
@@ -127,14 +132,13 @@ static __le32* cx88_risc_field(__le32 *rp, struct scatterlist *sglist,
         return rp;
 }
 
-int cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+int cx88_risc_buffer(struct pci_dev *pci, struct cx88_riscmem *risc,
                      struct scatterlist *sglist,
                      unsigned int top_offset, unsigned int bottom_offset,
                      unsigned int bpl, unsigned int padding, unsigned int lines)
 {
         u32 instructions,fields;
         __le32 *rp;
-        int rc;
 
         fields = 0;
         if (UNSET != top_offset)
@@ -147,18 +151,21 @@ int cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
            can cause next bpl to start close to a page border.  First DMA
            region may be smaller than PAGE_SIZE */
         instructions  = fields * (1 + ((bpl + padding) * lines) / PAGE_SIZE + lines);
-        instructions += 2;
-        if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
-                return rc;
+        instructions += 4;
+        risc->size = instructions * 8;
+        risc->dma = 0;
+        risc->cpu = pci_zalloc_consistent(pci, risc->size, &risc->dma);
+        if (NULL == risc->cpu)
+                return -ENOMEM;
 
         /* write risc instructions */
         rp = risc->cpu;
         if (UNSET != top_offset)
                 rp = cx88_risc_field(rp, sglist, top_offset, 0,
-                                     bpl, padding, lines, 0);
+                                     bpl, padding, lines, 0, true);
         if (UNSET != bottom_offset)
                 rp = cx88_risc_field(rp, sglist, bottom_offset, 0x200,
-                                     bpl, padding, lines, 0);
+                                     bpl, padding, lines, 0, top_offset == UNSET);
 
         /* save pointer to jmp instruction address */
         risc->jmp = rp;
@@ -166,26 +173,28 @@ int cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
         return 0;
 }
 
-int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+int cx88_risc_databuffer(struct pci_dev *pci, struct cx88_riscmem *risc,
                          struct scatterlist *sglist, unsigned int bpl,
                          unsigned int lines, unsigned int lpi)
 {
         u32 instructions;
         __le32 *rp;
-        int rc;
 
         /* estimate risc mem: worst case is one write per page border +
            one write per scan line + syncs + jump (all 2 dwords).  Here
            there is no padding and no sync.  First DMA region may be smaller
            than PAGE_SIZE */
         instructions  = 1 + (bpl * lines) / PAGE_SIZE + lines;
-        instructions += 1;
-        if ((rc = btcx_riscmem_alloc(pci,risc,instructions*8)) < 0)
-                return rc;
+        instructions += 3;
+        risc->size = instructions * 8;
+        risc->dma = 0;
+        risc->cpu = pci_zalloc_consistent(pci, risc->size, &risc->dma);
+        if (NULL == risc->cpu)
+                return -ENOMEM;
 
         /* write risc instructions */
         rp = risc->cpu;
-        rp = cx88_risc_field(rp, sglist, 0, NO_SYNC_LINE, bpl, 0, lines, lpi);
+        rp = cx88_risc_field(rp, sglist, 0, NO_SYNC_LINE, bpl, 0, lines, lpi, !lpi);
 
         /* save pointer to jmp instruction address */
         risc->jmp = rp;
@@ -193,39 +202,6 @@ int cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
         return 0;
 }
 
-int cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
-                      u32 reg, u32 mask, u32 value)
-{
-        __le32 *rp;
-        int rc;
-
-        if ((rc = btcx_riscmem_alloc(pci, risc, 4*16)) < 0)
-                return rc;
-
-        /* write risc instructions */
-        rp = risc->cpu;
-        *(rp++) = cpu_to_le32(RISC_WRITECR  | RISC_IRQ2 | RISC_IMM);
-        *(rp++) = cpu_to_le32(reg);
-        *(rp++) = cpu_to_le32(value);
-        *(rp++) = cpu_to_le32(mask);
-        *(rp++) = cpu_to_le32(RISC_JUMP);
-        *(rp++) = cpu_to_le32(risc->dma);
-        return 0;
-}
-
-void
-cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf)
-{
-        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
-
-        BUG_ON(in_interrupt());
-        videobuf_waiton(q, &buf->vb, 0, 0);
-        videobuf_dma_unmap(q->dev, dma);
-        videobuf_dma_free(dma);
-        btcx_riscmem_free(to_pci_dev(q->dev), &buf->risc);
-        buf->vb.state = VIDEOBUF_NEEDS_INIT;
-}
-
 /* ------------------------------------------------------------------ */
 /* our SRAM memory layout                                             */
 
@@ -539,33 +515,12 @@ void cx88_wakeup(struct cx88_core *core,
                  struct cx88_dmaqueue *q, u32 count)
 {
         struct cx88_buffer *buf;
-        int bc;
-
-        for (bc = 0;; bc++) {
-                if (list_empty(&q->active))
-                        break;
-                buf = list_entry(q->active.next,
-                                 struct cx88_buffer, vb.queue);
-                /* count comes from the hw and is is 16bit wide --
-                 * this trick handles wrap-arounds correctly for
-                 * up to 32767 buffers in flight... */
-                if ((s16) (count - buf->count) < 0)
-                        break;
-                v4l2_get_timestamp(&buf->vb.ts);
-                dprintk(2,"[%p/%d] wakeup reg=%d buf=%d\n",buf,buf->vb.i,
-                        count, buf->count);
-                buf->vb.state = VIDEOBUF_DONE;
-                list_del(&buf->vb.queue);
-                wake_up(&buf->vb.done);
-        }
-        if (list_empty(&q->active)) {
-                del_timer(&q->timeout);
-        } else {
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-        }
-        if (bc != 1)
-                dprintk(2, "%s: %d buffers handled (should be 1)\n",
-                        __func__, bc);
+
+        buf = list_entry(q->active.next,
+                         struct cx88_buffer, list);
+        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        list_del(&buf->list);
+        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
 }
 
 void cx88_shutdown(struct cx88_core *core)
@@ -909,6 +864,13 @@ int cx88_set_tvnorm(struct cx88_core *core, v4l2_std_id norm)
         u32 bdelay,agcdelay,htotal;
         u32 cxiformat, cxoformat;
 
+        if (norm == core->tvnorm)
+                return 0;
+        if (core->v4ldev && (vb2_is_busy(&core->v4ldev->vb2_vidq) ||
+                             vb2_is_busy(&core->v4ldev->vb2_vbiq)))
+                return -EBUSY;
+        if (core->dvbdev && vb2_is_busy(&core->dvbdev->vb2_mpegq))
+                return -EBUSY;
         core->tvnorm = norm;
         fsc8       = norm_fsc8(norm);
         adc_clock  = xtal;
@@ -1043,6 +1005,7 @@ struct video_device *cx88_vdev_init(struct cx88_core *core,
         vfd->v4l2_dev = &core->v4l2_dev;
         vfd->dev_parent = &pci->dev;
         vfd->release = video_device_release;
+        vfd->lock = &core->lock;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  core->name, type, core->board.name);
         return vfd;
@@ -1114,8 +1077,6 @@ EXPORT_SYMBOL(cx88_shutdown);
 
 EXPORT_SYMBOL(cx88_risc_buffer);
 EXPORT_SYMBOL(cx88_risc_databuffer);
-EXPORT_SYMBOL(cx88_risc_stopper);
-EXPORT_SYMBOL(cx88_free_buffer);
 
 EXPORT_SYMBOL(cx88_sram_channels);
 EXPORT_SYMBOL(cx88_sram_channel_setup);
diff --git a/drivers/media/pci/cx88/cx88-dvb.c b/drivers/media/pci/cx88/cx88-dvb.c
index 053ed1ba1d85..c344bfd0b896 100644
--- a/drivers/media/pci/cx88/cx88-dvb.c
+++ b/drivers/media/pci/cx88/cx88-dvb.c
@@ -82,43 +82,89 @@ DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 /* ------------------------------------------------------------------ */
 
-static int dvb_buf_setup(struct videobuf_queue *q,
-                         unsigned int *count, unsigned int *size)
+static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct cx8802_dev *dev = q->priv_data;
+        struct cx8802_dev *dev = q->drv_priv;
 
+        *num_planes = 1;
         dev->ts_packet_size  = 188 * 4;
         dev->ts_packet_count = dvb_buf_tscnt;
-
-        *size  = dev->ts_packet_size * dev->ts_packet_count;
-        *count = dvb_buf_tscnt;
+        sizes[0] = dev->ts_packet_size * dev->ts_packet_count;
+        *num_buffers = dvb_buf_tscnt;
         return 0;
 }
 
-static int dvb_buf_prepare(struct videobuf_queue *q,
-                           struct videobuf_buffer *vb, enum v4l2_field field)
+static int buffer_prepare(struct vb2_buffer *vb)
+{
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+
+        return cx8802_buf_prepare(vb->vb2_queue, dev, buf);
+}
+
+static void buffer_finish(struct vb2_buffer *vb)
+{
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        struct cx88_riscmem *risc = &buf->risc;
+
+        if (risc->cpu)
+                pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
+        memset(risc, 0, sizeof(*risc));
+
+        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
+}
+
+static void buffer_queue(struct vb2_buffer *vb)
 {
-        struct cx8802_dev *dev = q->priv_data;
-        return cx8802_buf_prepare(q, dev, (struct cx88_buffer*)vb,field);
+        struct cx8802_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
+
+        cx8802_buf_queue(dev, buf);
 }
 
-static void dvb_buf_queue(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static int start_streaming(struct vb2_queue *q, unsigned int count)
 {
-        struct cx8802_dev *dev = q->priv_data;
-        cx8802_buf_queue(dev, (struct cx88_buffer*)vb);
+        struct cx8802_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->mpegq;
+        struct cx88_buffer *buf;
+
+        buf = list_entry(dmaq->active.next, struct cx88_buffer, list);
+        cx8802_start_dma(dev, dmaq, buf);
+        return 0;
 }
 
-static void dvb_buf_release(struct videobuf_queue *q,
-                            struct videobuf_buffer *vb)
+static void stop_streaming(struct vb2_queue *q)
 {
-        cx88_free_buffer(q, (struct cx88_buffer*)vb);
+        struct cx8802_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->mpegq;
+        unsigned long flags;
+
+        cx8802_cancel_buffers(dev);
+
+        spin_lock_irqsave(&dev->slock, flags);
+        while (!list_empty(&dmaq->active)) {
+                struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+        }
+        spin_unlock_irqrestore(&dev->slock, flags);
 }
 
-static const struct videobuf_queue_ops dvb_qops = {
-        .buf_setup    = dvb_buf_setup,
-        .buf_prepare  = dvb_buf_prepare,
-        .buf_queue    = dvb_buf_queue,
-        .buf_release  = dvb_buf_release,
+static struct vb2_ops dvb_qops = {
+        .queue_setup    = queue_setup,
+        .buf_prepare  = buffer_prepare,
+        .buf_finish = buffer_finish,
+        .buf_queue    = buffer_queue,
+        .wait_prepare = vb2_ops_wait_prepare,
+        .wait_finish = vb2_ops_wait_finish,
+        .start_streaming = start_streaming,
+        .stop_streaming = stop_streaming,
 };
 
 /* ------------------------------------------------------------------ */
@@ -130,7 +176,7 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
         int ret = 0;
         int fe_id;
 
-        fe_id = videobuf_dvb_find_frontend(&dev->frontends, fe);
+        fe_id = vb2_dvb_find_frontend(&dev->frontends, fe);
         if (!fe_id) {
                 printk(KERN_ERR "%s() No frontend found\n", __func__);
                 return -EINVAL;
@@ -154,8 +200,8 @@ static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
 
 static void cx88_dvb_gate_ctrl(struct cx88_core  *core, int open)
 {
-        struct videobuf_dvb_frontends *f;
-        struct videobuf_dvb_frontend *fe;
+        struct vb2_dvb_frontends *f;
+        struct vb2_dvb_frontend *fe;
 
         if (!core->dvbdev)
                 return;
@@ -166,9 +212,9 @@ static void cx88_dvb_gate_ctrl(struct cx88_core  *core, int open)
                 return;
 
         if (f->gate <= 1) /* undefined or fe0 */
-                fe = videobuf_dvb_get_frontend(f, 1);
+                fe = vb2_dvb_get_frontend(f, 1);
         else
-                fe = videobuf_dvb_get_frontend(f, f->gate);
+                fe = vb2_dvb_get_frontend(f, f->gate);
 
         if (fe && fe->dvb.frontend && fe->dvb.frontend->ops.i2c_gate_ctrl)
                 fe->dvb.frontend->ops.i2c_gate_ctrl(fe->dvb.frontend, open);
@@ -565,7 +611,7 @@ static const struct xc5000_config dvico_fusionhdtv7_tuner_config = {
 static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
 {
         struct dvb_frontend *fe;
-        struct videobuf_dvb_frontend *fe0 = NULL;
+        struct vb2_dvb_frontend *fe0 = NULL;
         struct xc2028_ctrl ctl;
         struct xc2028_config cfg = {
                 .i2c_adap  = &dev->core->i2c_adap,
@@ -574,7 +620,7 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
         };
 
         /* Get the first frontend */
-        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
+        fe0 = vb2_dvb_get_frontend(&dev->frontends, 1);
         if (!fe0)
                 return -EINVAL;
 
@@ -611,10 +657,10 @@ static int attach_xc3028(u8 addr, struct cx8802_dev *dev)
 static int attach_xc4000(struct cx8802_dev *dev, struct xc4000_config *cfg)
 {
         struct dvb_frontend *fe;
-        struct videobuf_dvb_frontend *fe0 = NULL;
+        struct vb2_dvb_frontend *fe0 = NULL;
 
         /* Get the first frontend */
-        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
+        fe0 = vb2_dvb_get_frontend(&dev->frontends, 1);
         if (!fe0)
                 return -EINVAL;
 
@@ -745,7 +791,7 @@ static const struct stv0288_config tevii_tuner_earda_config = {
 static int cx8802_alloc_frontends(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
-        struct videobuf_dvb_frontend *fe = NULL;
+        struct vb2_dvb_frontend *fe = NULL;
         int i;
 
         mutex_init(&dev->frontends.lock);
@@ -757,10 +803,10 @@ static int cx8802_alloc_frontends(struct cx8802_dev *dev)
         printk(KERN_INFO "%s() allocating %d frontend(s)\n", __func__,
                          core->board.num_frontends);
         for (i = 1; i <= core->board.num_frontends; i++) {
-                fe = videobuf_dvb_alloc_frontend(&dev->frontends, i);
+                fe = vb2_dvb_alloc_frontend(&dev->frontends, i);
                 if (!fe) {
                         printk(KERN_ERR "%s() failed to alloc\n", __func__);
-                        videobuf_dvb_dealloc_frontends(&dev->frontends);
+                        vb2_dvb_dealloc_frontends(&dev->frontends);
                         return -ENOMEM;
                 }
         }
@@ -958,7 +1004,7 @@ static const struct stv0299_config samsung_stv0299_config = {
 static int dvb_register(struct cx8802_dev *dev)
 {
         struct cx88_core *core = dev->core;
-        struct videobuf_dvb_frontend *fe0, *fe1 = NULL;
+        struct vb2_dvb_frontend *fe0, *fe1 = NULL;
         int mfe_shared = 0; /* bus not shared by default */
         int res = -EINVAL;
 
@@ -968,7 +1014,7 @@ static int dvb_register(struct cx8802_dev *dev)
         }
 
         /* Get the first frontend */
-        fe0 = videobuf_dvb_get_frontend(&dev->frontends, 1);
+        fe0 = vb2_dvb_get_frontend(&dev->frontends, 1);
         if (!fe0)
                 goto frontend_detach;
 
@@ -1046,7 +1092,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
-                fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
+                fe1 = vb2_dvb_get_frontend(&dev->frontends, 2);
                 if (!fe1)
                         goto frontend_detach;
                 /* DVB-T init */
@@ -1415,7 +1461,7 @@ static int dvb_register(struct cx8802_dev *dev)
                                 goto frontend_detach;
                 }
                 /* MFE frontend 2 */
-                fe1 = videobuf_dvb_get_frontend(&dev->frontends, 2);
+                fe1 = vb2_dvb_get_frontend(&dev->frontends, 2);
                 if (!fe1)
                         goto frontend_detach;
                 /* DVB-T Init */
@@ -1594,7 +1640,7 @@ static int dvb_register(struct cx8802_dev *dev)
         call_all(core, core, s_power, 0);
 
         /* register everything */
-        res = videobuf_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
+        res = vb2_dvb_register_bus(&dev->frontends, THIS_MODULE, dev,
                 &dev->pci->dev, adapter_nr, mfe_shared);
         if (res)
                 goto frontend_detach;
@@ -1602,7 +1648,7 @@ static int dvb_register(struct cx8802_dev *dev)
 
 frontend_detach:
         core->gate_ctrl = NULL;
-        videobuf_dvb_dealloc_frontends(&dev->frontends);
+        vb2_dvb_dealloc_frontends(&dev->frontends);
         return res;
 }
 
@@ -1697,7 +1743,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
         struct cx88_core *core = drv->core;
         struct cx8802_dev *dev = drv->core->dvbdev;
         int err;
-        struct videobuf_dvb_frontend *fe;
+        struct vb2_dvb_frontend *fe;
         int i;
 
         dprintk( 1, "%s\n", __func__);
@@ -1726,19 +1772,31 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
 
         err = -ENODEV;
         for (i = 1; i <= core->board.num_frontends; i++) {
-                fe = videobuf_dvb_get_frontend(&core->dvbdev->frontends, i);
+                struct vb2_queue *q;
+
+                fe = vb2_dvb_get_frontend(&core->dvbdev->frontends, i);
                 if (fe == NULL) {
                         printk(KERN_ERR "%s() failed to get frontend(%d)\n",
                                         __func__, i);
                         goto fail_probe;
                 }
-                videobuf_queue_sg_init(&fe->dvb.dvbq, &dvb_qops,
-                                    &dev->pci->dev, &dev->slock,
-                                    V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                                    V4L2_FIELD_TOP,
-                                    sizeof(struct cx88_buffer),
-                                    dev, NULL);
-                /* init struct videobuf_dvb */
+                q = &fe->dvb.dvbq;
+                q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;
+                q->gfp_flags = GFP_DMA32;
+                q->min_buffers_needed = 2;
+                q->drv_priv = dev;
+                q->buf_struct_size = sizeof(struct cx88_buffer);
+                q->ops = &dvb_qops;
+                q->mem_ops = &vb2_dma_sg_memops;
+                q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+                q->lock = &core->lock;
+
+                err = vb2_queue_init(q);
+                if (err < 0)
+                        goto fail_probe;
+
+                /* init struct vb2_dvb */
                 fe->dvb.name = dev->core->name;
         }
 
@@ -1749,7 +1807,7 @@ static int cx8802_dvb_probe(struct cx8802_driver *drv)
                        core->name, err);
         return err;
 fail_probe:
-        videobuf_dvb_dealloc_frontends(&core->dvbdev->frontends);
+        vb2_dvb_dealloc_frontends(&core->dvbdev->frontends);
 fail_core:
         return err;
 }
@@ -1761,7 +1819,7 @@ static int cx8802_dvb_remove(struct cx8802_driver *drv)
 
         dprintk( 1, "%s\n", __func__);
 
-        videobuf_dvb_unregister_bus(&dev->frontends);
+        vb2_dvb_unregister_bus(&dev->frontends);
 
         vp3054_i2c_remove(dev);
 
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 74b7b8614c23..f181a3a10389 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -86,21 +86,21 @@ static LIST_HEAD(cx8802_devlist);
 static DEFINE_MUTEX(cx8802_mutex);
 /* ------------------------------------------------------------------ */
 
-static int cx8802_start_dma(struct cx8802_dev    *dev,
+int cx8802_start_dma(struct cx8802_dev    *dev,
                             struct cx88_dmaqueue *q,
                             struct cx88_buffer   *buf)
 {
         struct cx88_core *core = dev->core;
 
         dprintk(1, "cx8802_start_dma w: %d, h: %d, f: %d\n",
-                buf->vb.width, buf->vb.height, buf->vb.field);
+                core->width, core->height, core->field);
 
         /* setup fifo + format */
         cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH28],
                                 dev->ts_packet_size, buf->risc.dma);
 
         /* write TS length to chip */
-        cx_write(MO_TS_LNGTH, buf->vb.width);
+        cx_write(MO_TS_LNGTH, dev->ts_packet_size);
 
         /* FIXME: this needs a review.
          * also: move to cx88-blackbird + cx88-dvb source files? */
@@ -210,83 +210,44 @@ static int cx8802_restart_queue(struct cx8802_dev    *dev,
 
         dprintk( 1, "cx8802_restart_queue\n" );
         if (list_empty(&q->active))
-        {
-                struct cx88_buffer *prev;
-                prev = NULL;
-
-                dprintk(1, "cx8802_restart_queue: queue is empty\n" );
-
-                for (;;) {
-                        if (list_empty(&q->queued))
-                                return 0;
-                        buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
-                        if (NULL == prev) {
-                                list_move_tail(&buf->vb.queue, &q->active);
-                                cx8802_start_dma(dev, q, buf);
-                                buf->vb.state = VIDEOBUF_ACTIVE;
-                                buf->count    = q->count++;
-                                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                                dprintk(1,"[%p/%d] restart_queue - first active\n",
-                                        buf,buf->vb.i);
-
-                        } else if (prev->vb.width  == buf->vb.width  &&
-                                   prev->vb.height == buf->vb.height &&
-                                   prev->fmt       == buf->fmt) {
-                                list_move_tail(&buf->vb.queue, &q->active);
-                                buf->vb.state = VIDEOBUF_ACTIVE;
-                                buf->count    = q->count++;
-                                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-                                dprintk(1,"[%p/%d] restart_queue - move to active\n",
-                                        buf,buf->vb.i);
-                        } else {
-                                return 0;
-                        }
-                        prev = buf;
-                }
                 return 0;
-        }
 
-        buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
+        buf = list_entry(q->active.next, struct cx88_buffer, list);
         dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                buf, buf->vb.i);
+                buf, buf->vb.v4l2_buf.index);
         cx8802_start_dma(dev, q, buf);
-        list_for_each_entry(buf, &q->active, vb.queue)
+        list_for_each_entry(buf, &q->active, list)
                 buf->count = q->count++;
-        mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
         return 0;
 }
 
 /* ------------------------------------------------------------------ */
 
-int cx8802_buf_prepare(struct videobuf_queue *q, struct cx8802_dev *dev,
-                        struct cx88_buffer *buf, enum v4l2_field field)
+int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
+                        struct cx88_buffer *buf)
 {
         int size = dev->ts_packet_size * dev->ts_packet_count;
-        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(&buf->vb, 0);
+        struct cx88_riscmem *risc = &buf->risc;
         int rc;
 
-        dprintk(1, "%s: %p\n", __func__, buf);
-        if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
+        if (vb2_plane_size(&buf->vb, 0) < size)
                 return -EINVAL;
+        vb2_set_plane_payload(&buf->vb, 0, size);
 
-        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
-                buf->vb.width  = dev->ts_packet_size;
-                buf->vb.height = dev->ts_packet_count;
-                buf->vb.size   = size;
-                buf->vb.field  = field /*V4L2_FIELD_TOP*/;
-
-                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
-                        goto fail;
-                cx88_risc_databuffer(dev->pci, &buf->risc,
-                                     dma->sglist,
-                                     buf->vb.width, buf->vb.height, 0);
+        rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
+        if (!rc)
+                return -EIO;
+
+        rc = cx88_risc_databuffer(dev->pci, risc, sgt->sgl,
+                             dev->ts_packet_size, dev->ts_packet_count, 0);
+        if (rc) {
+                if (risc->cpu)
+                        pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
+                memset(risc, 0, sizeof(*risc));
+                return rc;
         }
-        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
-
- fail:
-        cx88_free_buffer(q,buf);
-        return rc;
 }
 
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
@@ -295,35 +256,33 @@ void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf)
         struct cx88_dmaqueue  *cx88q = &dev->mpegq;
 
         dprintk( 1, "cx8802_buf_queue\n" );
-        /* add jump to stopper */
-        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
-        buf->risc.jmp[1] = cpu_to_le32(cx88q->stopper.dma);
+        /* add jump to start */
+        buf->risc.cpu[1] = cpu_to_le32(buf->risc.dma + 8);
+        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_CNT_INC);
+        buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma + 8);
 
         if (list_empty(&cx88q->active)) {
                 dprintk( 1, "queue is empty - first active\n" );
-                list_add_tail(&buf->vb.queue,&cx88q->active);
-                cx8802_start_dma(dev, cx88q, buf);
-                buf->vb.state = VIDEOBUF_ACTIVE;
+                list_add_tail(&buf->list, &cx88q->active);
                 buf->count    = cx88q->count++;
-                mod_timer(&cx88q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(1,"[%p/%d] %s - first active\n",
-                        buf, buf->vb.i, __func__);
+                        buf, buf->vb.v4l2_buf.index, __func__);
 
         } else {
+                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
                 dprintk( 1, "queue is not empty - append to active\n" );
-                prev = list_entry(cx88q->active.prev, struct cx88_buffer, vb.queue);
-                list_add_tail(&buf->vb.queue,&cx88q->active);
-                buf->vb.state = VIDEOBUF_ACTIVE;
+                prev = list_entry(cx88q->active.prev, struct cx88_buffer, list);
+                list_add_tail(&buf->list, &cx88q->active);
                 buf->count    = cx88q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk( 1, "[%p/%d] %s - append to active\n",
-                        buf, buf->vb.i, __func__);
+                        buf, buf->vb.v4l2_buf.index, __func__);
         }
 }
 
 /* ----------------------------------------------------------- */
 
-static void do_cancel_buffers(struct cx8802_dev *dev, const char *reason, int restart)
+static void do_cancel_buffers(struct cx8802_dev *dev)
 {
         struct cx88_dmaqueue *q = &dev->mpegq;
         struct cx88_buffer *buf;
@@ -331,41 +290,18 @@ static void do_cancel_buffers(struct cx8802_dev *dev, const char *reason, int re
 
         spin_lock_irqsave(&dev->slock,flags);
         while (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
-                list_del(&buf->vb.queue);
-                buf->vb.state = VIDEOBUF_ERROR;
-                wake_up(&buf->vb.done);
-                dprintk(1,"[%p/%d] %s - dma=0x%08lx\n",
-                        buf, buf->vb.i, reason, (unsigned long)buf->risc.dma);
-        }
-        if (restart)
-        {
-                dprintk(1, "restarting queue\n" );
-                cx8802_restart_queue(dev,q);
+                buf = list_entry(q->active.next, struct cx88_buffer, list);
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
         }
         spin_unlock_irqrestore(&dev->slock,flags);
 }
 
 void cx8802_cancel_buffers(struct cx8802_dev *dev)
 {
-        struct cx88_dmaqueue *q = &dev->mpegq;
-
         dprintk( 1, "cx8802_cancel_buffers" );
-        del_timer_sync(&q->timeout);
         cx8802_stop_dma(dev);
-        do_cancel_buffers(dev,"cancel",0);
-}
-
-static void cx8802_timeout(unsigned long data)
-{
-        struct cx8802_dev *dev = (struct cx8802_dev*)data;
-
-        dprintk(1, "%s\n",__func__);
-
-        if (debug)
-                cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH28]);
-        cx8802_stop_dma(dev);
-        do_cancel_buffers(dev,"timeout",1);
+        do_cancel_buffers(dev);
 }
 
 static const char * cx88_mpeg_irqs[32] = {
@@ -411,19 +347,11 @@ static void cx8802_mpeg_irq(struct cx8802_dev *dev)
                 spin_unlock(&dev->slock);
         }
 
-        /* risc2 y */
-        if (status & 0x10) {
-                spin_lock(&dev->slock);
-                cx8802_restart_queue(dev,&dev->mpegq);
-                spin_unlock(&dev->slock);
-        }
-
         /* other general errors */
         if (status & 0x1f0100) {
                 dprintk( 0, "general errors: 0x%08x\n", status & 0x1f0100 );
                 spin_lock(&dev->slock);
                 cx8802_stop_dma(dev);
-                cx8802_restart_queue(dev,&dev->mpegq);
                 spin_unlock(&dev->slock);
         }
 }
@@ -490,12 +418,6 @@ static int cx8802_init_common(struct cx8802_dev *dev)
 
         /* init dma queue */
         INIT_LIST_HEAD(&dev->mpegq.active);
-        INIT_LIST_HEAD(&dev->mpegq.queued);
-        dev->mpegq.timeout.function = cx8802_timeout;
-        dev->mpegq.timeout.data     = (unsigned long)dev;
-        init_timer(&dev->mpegq.timeout);
-        cx88_risc_stopper(dev->pci,&dev->mpegq.stopper,
-                          MO_TS_DMACNTRL,0x11,0x00);
 
         /* get irq */
         err = request_irq(dev->pci->irq, cx8802_irq,
@@ -520,9 +442,6 @@ static void cx8802_fini_common(struct cx8802_dev *dev)
 
         /* unregister stuff */
         free_irq(dev->pci->irq, dev);
-
-        /* free memory */
-        btcx_riscmem_free(dev->pci,&dev->mpegq.stopper);
 }
 
 /* ----------------------------------------------------------- */
@@ -539,7 +458,6 @@ static int cx8802_suspend_common(struct pci_dev *pci_dev, pm_message_t state)
                 dprintk( 2, "suspend\n" );
                 printk("%s: suspend mpeg\n", core->name);
                 cx8802_stop_dma(dev);
-                del_timer(&dev->mpegq.timeout);
         }
         spin_unlock_irqrestore(&dev->slock, flags);
 
@@ -907,6 +825,7 @@ module_pci_driver(cx8802_pci_driver);
 EXPORT_SYMBOL(cx8802_buf_prepare);
 EXPORT_SYMBOL(cx8802_buf_queue);
 EXPORT_SYMBOL(cx8802_cancel_buffers);
+EXPORT_SYMBOL(cx8802_start_dma);
 
 EXPORT_SYMBOL(cx8802_register_driver);
 EXPORT_SYMBOL(cx8802_unregister_driver);
diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c
index f8f8389c0362..6ab6e27648f6 100644
--- a/drivers/media/pci/cx88/cx88-vbi.c
+++ b/drivers/media/pci/cx88/cx88-vbi.c
@@ -6,10 +6,6 @@
 
 #include "cx88.h"
 
-static unsigned int vbibufs = 4;
-module_param(vbibufs,int,0644);
-MODULE_PARM_DESC(vbibufs,"number of vbi buffers, range 2-32");
-
 static unsigned int vbi_debug;
 module_param(vbi_debug,int,0644);
 MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
@@ -22,26 +18,27 @@ MODULE_PARM_DESC(vbi_debug,"enable debug messages [vbi]");
 int cx8800_vbi_fmt (struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
-        struct cx8800_fh  *fh   = priv;
-        struct cx8800_dev *dev  = fh->dev;
+        struct cx8800_dev *dev = video_drvdata(file);
 
         f->fmt.vbi.samples_per_line = VBI_LINE_LENGTH;
         f->fmt.vbi.sample_format = V4L2_PIX_FMT_GREY;
         f->fmt.vbi.offset = 244;
-        f->fmt.vbi.count[0] = VBI_LINE_COUNT;
-        f->fmt.vbi.count[1] = VBI_LINE_COUNT;
 
         if (dev->core->tvnorm & V4L2_STD_525_60) {
                 /* ntsc */
                 f->fmt.vbi.sampling_rate = 28636363;
                 f->fmt.vbi.start[0] = 10;
                 f->fmt.vbi.start[1] = 273;
+                f->fmt.vbi.count[0] = VBI_LINE_NTSC_COUNT;
+                f->fmt.vbi.count[1] = VBI_LINE_NTSC_COUNT;
 
         } else if (dev->core->tvnorm & V4L2_STD_625_50) {
                 /* pal */
                 f->fmt.vbi.sampling_rate = 35468950;
-                f->fmt.vbi.start[0] = 7 -1;
-                f->fmt.vbi.start[1] = 319 -1;
+                f->fmt.vbi.start[0] = V4L2_VBI_ITU_625_F1_START + 5;
+                f->fmt.vbi.start[1] = V4L2_VBI_ITU_625_F2_START + 5;
+                f->fmt.vbi.count[0] = VBI_LINE_PAL_COUNT;
+                f->fmt.vbi.count[1] = VBI_LINE_PAL_COUNT;
         }
         return 0;
 }
@@ -54,7 +51,7 @@ static int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
 
         /* setup fifo + format */
         cx88_sram_channel_setup(dev->core, &cx88_sram_channels[SRAM_CH24],
-                                buf->vb.width, buf->risc.dma);
+                                VBI_LINE_LENGTH, buf->risc.dma);
 
         cx_write(MO_VBOS_CONTROL, ( (1 << 18) |  // comb filter delay fixup
                                     (1 << 15) |  // enable vbi capture
@@ -78,7 +75,7 @@ static int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
         return 0;
 }
 
-int cx8800_stop_vbi_dma(struct cx8800_dev *dev)
+void cx8800_stop_vbi_dma(struct cx8800_dev *dev)
 {
         struct cx88_core *core = dev->core;
 
@@ -91,7 +88,6 @@ int cx8800_stop_vbi_dma(struct cx8800_dev *dev)
         /* disable irqs */
         cx_clear(MO_PCI_INTMSK, PCI_INT_VIDINT);
         cx_clear(MO_VID_INTMSK, 0x0f0088);
-        return 0;
 }
 
 int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
@@ -102,144 +98,144 @@ int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
         if (list_empty(&q->active))
                 return 0;
 
-        buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
+        buf = list_entry(q->active.next, struct cx88_buffer, list);
         dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                buf, buf->vb.i);
+                buf, buf->vb.v4l2_buf.index);
         cx8800_start_vbi_dma(dev, q, buf);
-        list_for_each_entry(buf, &q->active, vb.queue)
+        list_for_each_entry(buf, &q->active, list)
                 buf->count = q->count++;
-        mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
         return 0;
 }
 
-void cx8800_vbi_timeout(unsigned long data)
-{
-        struct cx8800_dev *dev = (struct cx8800_dev*)data;
-        struct cx88_core *core = dev->core;
-        struct cx88_dmaqueue *q = &dev->vbiq;
-        struct cx88_buffer *buf;
-        unsigned long flags;
-
-        cx88_sram_channel_dump(dev->core, &cx88_sram_channels[SRAM_CH24]);
-
-        cx_clear(MO_VID_DMACNTRL, 0x88);
-        cx_clear(VID_CAPTURE_CONTROL, 0x18);
-
-        spin_lock_irqsave(&dev->slock,flags);
-        while (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
-                list_del(&buf->vb.queue);
-                buf->vb.state = VIDEOBUF_ERROR;
-                wake_up(&buf->vb.done);
-                printk("%s/0: [%p/%d] timeout - dma=0x%08lx\n", dev->core->name,
-                       buf, buf->vb.i, (unsigned long)buf->risc.dma);
-        }
-        cx8800_restart_vbi_queue(dev,q);
-        spin_unlock_irqrestore(&dev->slock,flags);
-}
-
 /* ------------------------------------------------------------------ */
 
-static int
-vbi_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
+static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[])
 {
-        *size = VBI_LINE_COUNT * VBI_LINE_LENGTH * 2;
-        if (0 == *count)
-                *count = vbibufs;
-        if (*count < 2)
-                *count = 2;
-        if (*count > 32)
-                *count = 32;
+        struct cx8800_dev *dev = q->drv_priv;
+
+        *num_planes = 1;
+        if (dev->core->tvnorm & V4L2_STD_525_60)
+                sizes[0] = VBI_LINE_NTSC_COUNT * VBI_LINE_LENGTH * 2;
+        else
+                sizes[0] = VBI_LINE_PAL_COUNT * VBI_LINE_LENGTH * 2;
         return 0;
 }
 
-static int
-vbi_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-            enum v4l2_field field)
+
+static int buffer_prepare(struct vb2_buffer *vb)
 {
-        struct cx8800_fh   *fh  = q->priv_data;
-        struct cx8800_dev  *dev = fh->dev;
-        struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        unsigned int lines;
         unsigned int size;
         int rc;
 
-        size = VBI_LINE_COUNT * VBI_LINE_LENGTH * 2;
-        if (0 != buf->vb.baddr  &&  buf->vb.bsize < size)
+        if (dev->core->tvnorm & V4L2_STD_525_60)
+                lines = VBI_LINE_NTSC_COUNT;
+        else
+                lines = VBI_LINE_PAL_COUNT;
+        size = lines * VBI_LINE_LENGTH * 2;
+        if (vb2_plane_size(vb, 0) < size)
                 return -EINVAL;
+        vb2_set_plane_payload(vb, 0, size);
 
-        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
-                struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
-                buf->vb.width  = VBI_LINE_LENGTH;
-                buf->vb.height = VBI_LINE_COUNT;
-                buf->vb.size   = size;
-                buf->vb.field  = V4L2_FIELD_SEQ_TB;
-
-                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
-                        goto fail;
-                cx88_risc_buffer(dev->pci, &buf->risc,
-                                 dma->sglist,
-                                 0, buf->vb.width * buf->vb.height,
-                                 buf->vb.width, 0,
-                                 buf->vb.height);
-        }
-        buf->vb.state = VIDEOBUF_PREPARED;
+        rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
+        if (!rc)
+                return -EIO;
+
+        cx88_risc_buffer(dev->pci, &buf->risc, sgt->sgl,
+                         0, VBI_LINE_LENGTH * lines,
+                         VBI_LINE_LENGTH, 0,
+                         lines);
         return 0;
+}
 
- fail:
-        cx88_free_buffer(q,buf);
-        return rc;
+static void buffer_finish(struct vb2_buffer *vb)
+{
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        struct cx88_riscmem *risc = &buf->risc;
+
+        if (risc->cpu)
+                pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
+        memset(risc, 0, sizeof(*risc));
+
+        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
-static void
-vbi_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+static void buffer_queue(struct vb2_buffer *vb)
 {
-        struct cx88_buffer    *buf = container_of(vb,struct cx88_buffer,vb);
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
         struct cx88_buffer    *prev;
-        struct cx8800_fh      *fh   = vq->priv_data;
-        struct cx8800_dev     *dev  = fh->dev;
         struct cx88_dmaqueue  *q    = &dev->vbiq;
 
-        /* add jump to stopper */
-        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
-        buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+        /* add jump to start */
+        buf->risc.cpu[1] = cpu_to_le32(buf->risc.dma + 8);
+        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_CNT_INC);
+        buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma + 8);
 
         if (list_empty(&q->active)) {
-                list_add_tail(&buf->vb.queue,&q->active);
+                list_add_tail(&buf->list, &q->active);
                 cx8800_start_vbi_dma(dev, q, buf);
-                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = q->count++;
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(2,"[%p/%d] vbi_queue - first active\n",
-                        buf, buf->vb.i);
+                        buf, buf->vb.v4l2_buf.index);
 
         } else {
-                prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
-                list_add_tail(&buf->vb.queue,&q->active);
-                buf->vb.state = VIDEOBUF_ACTIVE;
+                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
+                prev = list_entry(q->active.prev, struct cx88_buffer, list);
+                list_add_tail(&buf->list, &q->active);
                 buf->count    = q->count++;
                 prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
                 dprintk(2,"[%p/%d] buffer_queue - append to active\n",
-                        buf, buf->vb.i);
+                        buf, buf->vb.v4l2_buf.index);
         }
 }
 
-static void vbi_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static int start_streaming(struct vb2_queue *q, unsigned int count)
 {
-        struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
+        struct cx8800_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->vbiq;
+        struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
 
-        cx88_free_buffer(q,buf);
+        cx8800_start_vbi_dma(dev, dmaq, buf);
+        return 0;
 }
 
-const struct videobuf_queue_ops cx8800_vbi_qops = {
-        .buf_setup    = vbi_setup,
-        .buf_prepare  = vbi_prepare,
-        .buf_queue    = vbi_queue,
-        .buf_release  = vbi_release,
-};
+static void stop_streaming(struct vb2_queue *q)
+{
+        struct cx8800_dev *dev = q->drv_priv;
+        struct cx88_core *core = dev->core;
+        struct cx88_dmaqueue *dmaq = &dev->vbiq;
+        unsigned long flags;
 
-/* ------------------------------------------------------------------ */
-/*
- * Local variables:
- * c-basic-offset: 8
- * End:
- */
+        cx_clear(MO_VID_DMACNTRL, 0x11);
+        cx_clear(VID_CAPTURE_CONTROL, 0x06);
+        cx8800_stop_vbi_dma(dev);
+        spin_lock_irqsave(&dev->slock, flags);
+        while (!list_empty(&dmaq->active)) {
+                struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+        }
+        spin_unlock_irqrestore(&dev->slock, flags);
+}
+
+const struct vb2_ops cx8800_vbi_qops = {
+        .queue_setup    = queue_setup,
+        .buf_prepare  = buffer_prepare,
+        .buf_finish = buffer_finish,
+        .buf_queue    = buffer_queue,
+        .wait_prepare = vb2_ops_wait_prepare,
+        .wait_finish = vb2_ops_wait_finish,
+        .start_streaming = start_streaming,
+        .stop_streaming = stop_streaming,
+};
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index ce27e6d4f16e..a64ae31ae142 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -70,10 +70,6 @@ static unsigned int irq_debug;
 module_param(irq_debug,int,0644);
 MODULE_PARM_DESC(irq_debug,"enable debug messages [IRQ handler]");
 
-static unsigned int vid_limit = 16;
-module_param(vid_limit,int,0644);
-MODULE_PARM_DESC(vid_limit,"capture memory limit in megabytes");
-
 #define dprintk(level,fmt, arg...)      if (video_debug >= level) \
         printk(KERN_DEBUG "%s/0: " fmt, core->name , ## arg)
 
@@ -297,56 +293,6 @@ enum {
         CX8800_AUD_CTLS = ARRAY_SIZE(cx8800_aud_ctls),
 };
 
-/* ------------------------------------------------------------------- */
-/* resource management                                                 */
-
-static int res_get(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bit)
-{
-        struct cx88_core *core = dev->core;
-        if (fh->resources & bit)
-                /* have it already allocated */
-                return 1;
-
-        /* is it free? */
-        mutex_lock(&core->lock);
-        if (dev->resources & bit) {
-                /* no, someone else uses it */
-                mutex_unlock(&core->lock);
-                return 0;
-        }
-        /* it's free, grab it */
-        fh->resources  |= bit;
-        dev->resources |= bit;
-        dprintk(1,"res: get %d\n",bit);
-        mutex_unlock(&core->lock);
-        return 1;
-}
-
-static
-int res_check(struct cx8800_fh *fh, unsigned int bit)
-{
-        return (fh->resources & bit);
-}
-
-static
-int res_locked(struct cx8800_dev *dev, unsigned int bit)
-{
-        return (dev->resources & bit);
-}
-
-static
-void res_free(struct cx8800_dev *dev, struct cx8800_fh *fh, unsigned int bits)
-{
-        struct cx88_core *core = dev->core;
-        BUG_ON((fh->resources & bits) != bits);
-
-        mutex_lock(&core->lock);
-        fh->resources  &= ~bits;
-        dev->resources &= ~bits;
-        dprintk(1,"res: put %d\n",bits);
-        mutex_unlock(&core->lock);
-}
-
 /* ------------------------------------------------------------------ */
 
 int cx88_video_mux(struct cx88_core *core, unsigned int input)
@@ -419,8 +365,8 @@ static int start_video_dma(struct cx8800_dev    *dev,
         /* setup fifo + format */
         cx88_sram_channel_setup(core, &cx88_sram_channels[SRAM_CH21],
                                 buf->bpl, buf->risc.dma);
-        cx88_set_scale(core, buf->vb.width, buf->vb.height, buf->vb.field);
-        cx_write(MO_COLOR_CTRL, buf->fmt->cxformat | ColorFormatGamma);
+        cx88_set_scale(core, core->width, core->height, core->field);
+        cx_write(MO_COLOR_CTRL, dev->fmt->cxformat | ColorFormatGamma);
 
         /* reset counter */
         cx_write(MO_VIDY_GPCNTRL,GP_COUNT_CONTROL_RESET);
@@ -470,433 +416,211 @@ static int restart_video_queue(struct cx8800_dev    *dev,
                                struct cx88_dmaqueue *q)
 {
         struct cx88_core *core = dev->core;
-        struct cx88_buffer *buf, *prev;
+        struct cx88_buffer *buf;
 
         if (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
+                buf = list_entry(q->active.next, struct cx88_buffer, list);
                 dprintk(2,"restart_queue [%p/%d]: restart dma\n",
-                        buf, buf->vb.i);
+                        buf, buf->vb.v4l2_buf.index);
                 start_video_dma(dev, q, buf);
-                list_for_each_entry(buf, &q->active, vb.queue)
+                list_for_each_entry(buf, &q->active, list)
                         buf->count = q->count++;
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                return 0;
-        }
-
-        prev = NULL;
-        for (;;) {
-                if (list_empty(&q->queued))
-                        return 0;
-                buf = list_entry(q->queued.next, struct cx88_buffer, vb.queue);
-                if (NULL == prev) {
-                        list_move_tail(&buf->vb.queue, &q->active);
-                        start_video_dma(dev, q, buf);
-                        buf->vb.state = VIDEOBUF_ACTIVE;
-                        buf->count    = q->count++;
-                        mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
-                        dprintk(2,"[%p/%d] restart_queue - first active\n",
-                                buf,buf->vb.i);
-
-                } else if (prev->vb.width  == buf->vb.width  &&
-                           prev->vb.height == buf->vb.height &&
-                           prev->fmt       == buf->fmt) {
-                        list_move_tail(&buf->vb.queue, &q->active);
-                        buf->vb.state = VIDEOBUF_ACTIVE;
-                        buf->count    = q->count++;
-                        prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-                        dprintk(2,"[%p/%d] restart_queue - move to active\n",
-                                buf,buf->vb.i);
-                } else {
-                        return 0;
-                }
-                prev = buf;
         }
+        return 0;
 }
 
 /* ------------------------------------------------------------------ */
 
-static int
-buffer_setup(struct videobuf_queue *q, unsigned int *count, unsigned int *size)
+static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
+                           unsigned int *num_buffers, unsigned int *num_planes,
+                           unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct cx8800_fh *fh = q->priv_data;
-        struct cx8800_dev  *dev = fh->dev;
-
-        *size = dev->fmt->depth * dev->width * dev->height >> 3;
-        if (0 == *count)
-                *count = 32;
-        if (*size * *count > vid_limit * 1024 * 1024)
-                *count = (vid_limit * 1024 * 1024) / *size;
+        struct cx8800_dev *dev = q->drv_priv;
+        struct cx88_core *core = dev->core;
+
+        *num_planes = 1;
+        sizes[0] = (dev->fmt->depth * core->width * core->height) >> 3;
         return 0;
 }
 
-static int
-buffer_prepare(struct videobuf_queue *q, struct videobuf_buffer *vb,
-               enum v4l2_field field)
+static int buffer_prepare(struct vb2_buffer *vb)
 {
-        struct cx8800_fh   *fh  = q->priv_data;
-        struct cx8800_dev  *dev = fh->dev;
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
         struct cx88_core *core = dev->core;
-        struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
-        struct videobuf_dmabuf *dma=videobuf_to_dma(&buf->vb);
-        int rc, init_buffer = 0;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        int rc;
 
-        BUG_ON(NULL == dev->fmt);
-        if (dev->width  < 48 || dev->width  > norm_maxw(core->tvnorm) ||
-            dev->height < 32 || dev->height > norm_maxh(core->tvnorm))
-                return -EINVAL;
-        buf->vb.size = (dev->width * dev->height * dev->fmt->depth) >> 3;
-        if (0 != buf->vb.baddr  &&  buf->vb.bsize < buf->vb.size)
-                return -EINVAL;
+        buf->bpl = core->width * dev->fmt->depth >> 3;
 
-        if (buf->fmt       != dev->fmt    ||
-            buf->vb.width  != dev->width  ||
-            buf->vb.height != dev->height ||
-            buf->vb.field  != field) {
-                buf->fmt       = dev->fmt;
-                buf->vb.width  = dev->width;
-                buf->vb.height = dev->height;
-                buf->vb.field  = field;
-                init_buffer = 1;
-        }
+        if (vb2_plane_size(vb, 0) < core->height * buf->bpl)
+                return -EINVAL;
+        vb2_set_plane_payload(vb, 0, core->height * buf->bpl);
 
-        if (VIDEOBUF_NEEDS_INIT == buf->vb.state) {
-                init_buffer = 1;
-                if (0 != (rc = videobuf_iolock(q,&buf->vb,NULL)))
-                        goto fail;
-        }
+        rc = dma_map_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
+        if (!rc)
+                return -EIO;
 
-        if (init_buffer) {
-                buf->bpl = buf->vb.width * buf->fmt->depth >> 3;
-                switch (buf->vb.field) {
-                case V4L2_FIELD_TOP:
-                        cx88_risc_buffer(dev->pci, &buf->risc,
-                                         dma->sglist, 0, UNSET,
-                                         buf->bpl, 0, buf->vb.height);
-                        break;
-                case V4L2_FIELD_BOTTOM:
-                        cx88_risc_buffer(dev->pci, &buf->risc,
-                                         dma->sglist, UNSET, 0,
-                                         buf->bpl, 0, buf->vb.height);
-                        break;
-                case V4L2_FIELD_INTERLACED:
-                        cx88_risc_buffer(dev->pci, &buf->risc,
-                                         dma->sglist, 0, buf->bpl,
-                                         buf->bpl, buf->bpl,
-                                         buf->vb.height >> 1);
-                        break;
-                case V4L2_FIELD_SEQ_TB:
-                        cx88_risc_buffer(dev->pci, &buf->risc,
-                                         dma->sglist,
-                                         0, buf->bpl * (buf->vb.height >> 1),
-                                         buf->bpl, 0,
-                                         buf->vb.height >> 1);
-                        break;
-                case V4L2_FIELD_SEQ_BT:
-                        cx88_risc_buffer(dev->pci, &buf->risc,
-                                         dma->sglist,
-                                         buf->bpl * (buf->vb.height >> 1), 0,
-                                         buf->bpl, 0,
-                                         buf->vb.height >> 1);
-                        break;
-                default:
-                        BUG();
-                }
+        switch (core->field) {
+        case V4L2_FIELD_TOP:
+                cx88_risc_buffer(dev->pci, &buf->risc,
+                                 sgt->sgl, 0, UNSET,
+                                 buf->bpl, 0, core->height);
+                break;
+        case V4L2_FIELD_BOTTOM:
+                cx88_risc_buffer(dev->pci, &buf->risc,
+                                 sgt->sgl, UNSET, 0,
+                                 buf->bpl, 0, core->height);
+                break;
+        case V4L2_FIELD_SEQ_TB:
+                cx88_risc_buffer(dev->pci, &buf->risc,
+                                 sgt->sgl,
+                                 0, buf->bpl * (core->height >> 1),
+                                 buf->bpl, 0,
+                                 core->height >> 1);
+                break;
+        case V4L2_FIELD_SEQ_BT:
+                cx88_risc_buffer(dev->pci, &buf->risc,
+                                 sgt->sgl,
+                                 buf->bpl * (core->height >> 1), 0,
+                                 buf->bpl, 0,
+                                 core->height >> 1);
+                break;
+        case V4L2_FIELD_INTERLACED:
+        default:
+                cx88_risc_buffer(dev->pci, &buf->risc,
+                                 sgt->sgl, 0, buf->bpl,
+                                 buf->bpl, buf->bpl,
+                                 core->height >> 1);
+                break;
         }
         dprintk(2,"[%p/%d] buffer_prepare - %dx%d %dbpp \"%s\" - dma=0x%08lx\n",
-                buf, buf->vb.i,
-                dev->width, dev->height, dev->fmt->depth, dev->fmt->name,
+                buf, buf->vb.v4l2_buf.index,
+                core->width, core->height, dev->fmt->depth, dev->fmt->name,
                 (unsigned long)buf->risc.dma);
-
-        buf->vb.state = VIDEOBUF_PREPARED;
         return 0;
+}
+
+static void buffer_finish(struct vb2_buffer *vb)
+{
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer *buf = container_of(vb, struct cx88_buffer, vb);
+        struct sg_table *sgt = vb2_dma_sg_plane_desc(vb, 0);
+        struct cx88_riscmem *risc = &buf->risc;
+
+        if (risc->cpu)
+                pci_free_consistent(dev->pci, risc->size, risc->cpu, risc->dma);
+        memset(risc, 0, sizeof(*risc));
 
- fail:
-        cx88_free_buffer(q,buf);
-        return rc;
+        dma_unmap_sg(&dev->pci->dev, sgt->sgl, sgt->nents, DMA_FROM_DEVICE);
 }
 
-static void
-buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb)
+static void buffer_queue(struct vb2_buffer *vb)
 {
-        struct cx88_buffer    *buf = container_of(vb,struct cx88_buffer,vb);
+        struct cx8800_dev *dev = vb->vb2_queue->drv_priv;
+        struct cx88_buffer    *buf = container_of(vb, struct cx88_buffer, vb);
         struct cx88_buffer    *prev;
-        struct cx8800_fh      *fh   = vq->priv_data;
-        struct cx8800_dev     *dev  = fh->dev;
         struct cx88_core      *core = dev->core;
         struct cx88_dmaqueue  *q    = &dev->vidq;
 
-        /* add jump to stopper */
-        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_IRQ1 | RISC_CNT_INC);
-        buf->risc.jmp[1] = cpu_to_le32(q->stopper.dma);
+        /* add jump to start */
+        buf->risc.cpu[1] = cpu_to_le32(buf->risc.dma + 8);
+        buf->risc.jmp[0] = cpu_to_le32(RISC_JUMP | RISC_CNT_INC);
+        buf->risc.jmp[1] = cpu_to_le32(buf->risc.dma + 8);
 
-        if (!list_empty(&q->queued)) {
-                list_add_tail(&buf->vb.queue,&q->queued);
-                buf->vb.state = VIDEOBUF_QUEUED;
-                dprintk(2,"[%p/%d] buffer_queue - append to queued\n",
-                        buf, buf->vb.i);
-
-        } else if (list_empty(&q->active)) {
-                list_add_tail(&buf->vb.queue,&q->active);
+        if (list_empty(&q->active)) {
+                list_add_tail(&buf->list, &q->active);
                 start_video_dma(dev, q, buf);
-                buf->vb.state = VIDEOBUF_ACTIVE;
                 buf->count    = q->count++;
-                mod_timer(&q->timeout, jiffies+BUFFER_TIMEOUT);
                 dprintk(2,"[%p/%d] buffer_queue - first active\n",
-                        buf, buf->vb.i);
+                        buf, buf->vb.v4l2_buf.index);
 
         } else {
-                prev = list_entry(q->active.prev, struct cx88_buffer, vb.queue);
-                if (prev->vb.width  == buf->vb.width  &&
-                    prev->vb.height == buf->vb.height &&
-                    prev->fmt       == buf->fmt) {
-                        list_add_tail(&buf->vb.queue,&q->active);
-                        buf->vb.state = VIDEOBUF_ACTIVE;
-                        buf->count    = q->count++;
-                        prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
-                        dprintk(2,"[%p/%d] buffer_queue - append to active\n",
-                                buf, buf->vb.i);
-
-                } else {
-                        list_add_tail(&buf->vb.queue,&q->queued);
-                        buf->vb.state = VIDEOBUF_QUEUED;
-                        dprintk(2,"[%p/%d] buffer_queue - first queued\n",
-                                buf, buf->vb.i);
-                }
+                buf->risc.cpu[0] |= cpu_to_le32(RISC_IRQ1);
+                prev = list_entry(q->active.prev, struct cx88_buffer, list);
+                list_add_tail(&buf->list, &q->active);
+                buf->count    = q->count++;
+                prev->risc.jmp[1] = cpu_to_le32(buf->risc.dma);
+                dprintk(2, "[%p/%d] buffer_queue - append to active\n",
+                        buf, buf->vb.v4l2_buf.index);
         }
 }
 
-static void buffer_release(struct videobuf_queue *q, struct videobuf_buffer *vb)
+static int start_streaming(struct vb2_queue *q, unsigned int count)
 {
-        struct cx88_buffer *buf = container_of(vb,struct cx88_buffer,vb);
+        struct cx8800_dev *dev = q->drv_priv;
+        struct cx88_dmaqueue *dmaq = &dev->vidq;
+        struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
 
-        cx88_free_buffer(q,buf);
+        start_video_dma(dev, dmaq, buf);
+        return 0;
 }
 
-static const struct videobuf_queue_ops cx8800_video_qops = {
-        .buf_setup    = buffer_setup,
-        .buf_prepare  = buffer_prepare,
-        .buf_queue    = buffer_queue,
-        .buf_release  = buffer_release,
-};
-
-/* ------------------------------------------------------------------ */
-
-
-/* ------------------------------------------------------------------ */
-
-static struct videobuf_queue *get_queue(struct file *file)
+static void stop_streaming(struct vb2_queue *q)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct cx8800_fh *fh = file->private_data;
+        struct cx8800_dev *dev = q->drv_priv;
+        struct cx88_core *core = dev->core;
+        struct cx88_dmaqueue *dmaq = &dev->vidq;
+        unsigned long flags;
 
-        switch (vdev->vfl_type) {
-        case VFL_TYPE_GRABBER:
-                return &fh->vidq;
-        case VFL_TYPE_VBI:
-                return &fh->vbiq;
-        default:
-                BUG();
+        cx_clear(MO_VID_DMACNTRL, 0x11);
+        cx_clear(VID_CAPTURE_CONTROL, 0x06);
+        spin_lock_irqsave(&dev->slock, flags);
+        while (!list_empty(&dmaq->active)) {
+                struct cx88_buffer *buf = list_entry(dmaq->active.next,
+                        struct cx88_buffer, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
         }
+        spin_unlock_irqrestore(&dev->slock, flags);
 }
 
-static int get_resource(struct file *file)
-{
-        struct video_device *vdev = video_devdata(file);
+static struct vb2_ops cx8800_video_qops = {
+        .queue_setup    = queue_setup,
+        .buf_prepare  = buffer_prepare,
+        .buf_finish = buffer_finish,
+        .buf_queue    = buffer_queue,
+        .wait_prepare = vb2_ops_wait_prepare,
+        .wait_finish = vb2_ops_wait_finish,
+        .start_streaming = start_streaming,
+        .stop_streaming = stop_streaming,
+};
 
-        switch (vdev->vfl_type) {
-        case VFL_TYPE_GRABBER:
-                return RESOURCE_VIDEO;
-        case VFL_TYPE_VBI:
-                return RESOURCE_VBI;
-        default:
-                BUG();
-        }
-}
+/* ------------------------------------------------------------------ */
 
-static int video_open(struct file *file)
+static int radio_open(struct file *file)
 {
-        struct video_device *vdev = video_devdata(file);
         struct cx8800_dev *dev = video_drvdata(file);
         struct cx88_core *core = dev->core;
-        struct cx8800_fh *fh;
-        enum v4l2_buf_type type = 0;
-        int radio = 0;
+        int ret = v4l2_fh_open(file);
 
-        switch (vdev->vfl_type) {
-        case VFL_TYPE_GRABBER:
-                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                break;
-        case VFL_TYPE_VBI:
-                type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                break;
-        case VFL_TYPE_RADIO:
-                radio = 1;
-                break;
-        }
-
-        dprintk(1, "open dev=%s radio=%d type=%s\n",
-                video_device_node_name(vdev), radio, v4l2_type_names[type]);
-
-        /* allocate + initialize per filehandle data */
-        fh = kzalloc(sizeof(*fh),GFP_KERNEL);
-        if (unlikely(!fh))
-                return -ENOMEM;
-
-        v4l2_fh_init(&fh->fh, vdev);
-        file->private_data = fh;
-        fh->dev      = dev;
+        if (ret)
+                return ret;
 
-        mutex_lock(&core->lock);
-
-        videobuf_queue_sg_init(&fh->vidq, &cx8800_video_qops,
-                            &dev->pci->dev, &dev->slock,
-                            V4L2_BUF_TYPE_VIDEO_CAPTURE,
-                            V4L2_FIELD_INTERLACED,
-                            sizeof(struct cx88_buffer),
-                            fh, NULL);
-        videobuf_queue_sg_init(&fh->vbiq, &cx8800_vbi_qops,
-                            &dev->pci->dev, &dev->slock,
-                            V4L2_BUF_TYPE_VBI_CAPTURE,
-                            V4L2_FIELD_SEQ_TB,
-                            sizeof(struct cx88_buffer),
-                            fh, NULL);
-
-        if (vdev->vfl_type == VFL_TYPE_RADIO) {
-                dprintk(1,"video_open: setting radio device\n");
-                cx_write(MO_GP3_IO, core->board.radio.gpio3);
-                cx_write(MO_GP0_IO, core->board.radio.gpio0);
-                cx_write(MO_GP1_IO, core->board.radio.gpio1);
-                cx_write(MO_GP2_IO, core->board.radio.gpio2);
-                if (core->board.radio.audioroute) {
-                        if (core->sd_wm8775) {
-                                call_all(core, audio, s_routing,
+        cx_write(MO_GP3_IO, core->board.radio.gpio3);
+        cx_write(MO_GP0_IO, core->board.radio.gpio0);
+        cx_write(MO_GP1_IO, core->board.radio.gpio1);
+        cx_write(MO_GP2_IO, core->board.radio.gpio2);
+        if (core->board.radio.audioroute) {
+                if (core->sd_wm8775) {
+                        call_all(core, audio, s_routing,
                                         core->board.radio.audioroute, 0, 0);
-                        }
-                        /* "I2S ADC mode" */
-                        core->tvaudio = WW_I2SADC;
-                        cx88_set_tvaudio(core);
-                } else {
-                        /* FM Mode */
-                        core->tvaudio = WW_FM;
-                        cx88_set_tvaudio(core);
-                        cx88_set_stereo(core,V4L2_TUNER_MODE_STEREO,1);
                 }
-                call_all(core, tuner, s_radio);
-        }
-
-        core->users++;
-        mutex_unlock(&core->lock);
-        v4l2_fh_add(&fh->fh);
-
-        return 0;
-}
-
-static ssize_t
-video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
-{
-        struct video_device *vdev = video_devdata(file);
-        struct cx8800_fh *fh = file->private_data;
-
-        switch (vdev->vfl_type) {
-        case VFL_TYPE_GRABBER:
-                if (res_locked(fh->dev,RESOURCE_VIDEO))
-                        return -EBUSY;
-                return videobuf_read_one(&fh->vidq, data, count, ppos,
-                                         file->f_flags & O_NONBLOCK);
-        case VFL_TYPE_VBI:
-                if (!res_get(fh->dev,fh,RESOURCE_VBI))
-                        return -EBUSY;
-                return videobuf_read_stream(&fh->vbiq, data, count, ppos, 1,
-                                            file->f_flags & O_NONBLOCK);
-        default:
-                BUG();
-        }
-}
-
-static unsigned int
-video_poll(struct file *file, struct poll_table_struct *wait)
-{
-        struct video_device *vdev = video_devdata(file);
-        struct cx8800_fh *fh = file->private_data;
-        struct cx88_buffer *buf;
-        unsigned int rc = v4l2_ctrl_poll(file, wait);
-
-        if (vdev->vfl_type == VFL_TYPE_VBI) {
-                if (!res_get(fh->dev,fh,RESOURCE_VBI))
-                        return rc | POLLERR;
-                return rc | videobuf_poll_stream(file, &fh->vbiq, wait);
-        }
-        mutex_lock(&fh->vidq.vb_lock);
-        if (res_check(fh,RESOURCE_VIDEO)) {
-                /* streaming capture */
-                if (list_empty(&fh->vidq.stream))
-                        goto done;
-                buf = list_entry(fh->vidq.stream.next,struct cx88_buffer,vb.stream);
+                /* "I2S ADC mode" */
+                core->tvaudio = WW_I2SADC;
+                cx88_set_tvaudio(core);
         } else {
-                /* read() capture */
-                buf = (struct cx88_buffer*)fh->vidq.read_buf;
-                if (NULL == buf)
-                        goto done;
-        }
-        poll_wait(file, &buf->vb.done, wait);
-        if (buf->vb.state == VIDEOBUF_DONE ||
-            buf->vb.state == VIDEOBUF_ERROR)
-                rc |= POLLIN|POLLRDNORM;
-done:
-        mutex_unlock(&fh->vidq.vb_lock);
-        return rc;
-}
-
-static int video_release(struct file *file)
-{
-        struct cx8800_fh  *fh  = file->private_data;
-        struct cx8800_dev *dev = fh->dev;
-
-        /* turn off overlay */
-        if (res_check(fh, RESOURCE_OVERLAY)) {
-                /* FIXME */
-                res_free(dev,fh,RESOURCE_OVERLAY);
-        }
-
-        /* stop video capture */
-        if (res_check(fh, RESOURCE_VIDEO)) {
-                videobuf_queue_cancel(&fh->vidq);
-                res_free(dev,fh,RESOURCE_VIDEO);
+                /* FM Mode */
+                core->tvaudio = WW_FM;
+                cx88_set_tvaudio(core);
+                cx88_set_stereo(core, V4L2_TUNER_MODE_STEREO, 1);
         }
-        if (fh->vidq.read_buf) {
-                buffer_release(&fh->vidq,fh->vidq.read_buf);
-                kfree(fh->vidq.read_buf);
-        }
-
-        /* stop vbi capture */
-        if (res_check(fh, RESOURCE_VBI)) {
-                videobuf_stop(&fh->vbiq);
-                res_free(dev,fh,RESOURCE_VBI);
-        }
-
-        videobuf_mmap_free(&fh->vidq);
-        videobuf_mmap_free(&fh->vbiq);
-
-        mutex_lock(&dev->core->lock);
-        v4l2_fh_del(&fh->fh);
-        v4l2_fh_exit(&fh->fh);
-        file->private_data = NULL;
-        kfree(fh);
-
-        dev->core->users--;
-        if (!dev->core->users)
-                call_all(dev->core, core, s_power, 0);
-        mutex_unlock(&dev->core->lock);
-
+        call_all(core, tuner, s_radio);
         return 0;
 }
 
-static int
-video_mmap(struct file *file, struct vm_area_struct * vma)
-{
-        return videobuf_mmap_mapper(get_queue(file), vma);
-}
-
 /* ------------------------------------------------------------------ */
 /* VIDEO CTRL IOCTLS                                                  */
 
@@ -999,12 +723,12 @@ static int cx8800_s_aud_ctrl(struct v4l2_ctrl *ctrl)
 static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
-        struct cx8800_fh  *fh   = priv;
-        struct cx8800_dev *dev = fh->dev;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
-        f->fmt.pix.width        = dev->width;
-        f->fmt.pix.height       = dev->height;
-        f->fmt.pix.field        = fh->vidq.field;
+        f->fmt.pix.width        = core->width;
+        f->fmt.pix.height       = core->height;
+        f->fmt.pix.field        = core->field;
         f->fmt.pix.pixelformat  = dev->fmt->fourcc;
         f->fmt.pix.bytesperline =
                 (f->fmt.pix.width * dev->fmt->depth) >> 3;
@@ -1017,7 +741,8 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                         struct v4l2_format *f)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         const struct cx8800_fmt *fmt;
         enum v4l2_field   field;
         unsigned int      maxw, maxh;
@@ -1026,30 +751,30 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
         if (NULL == fmt)
                 return -EINVAL;
 
-        field = f->fmt.pix.field;
-        maxw  = norm_maxw(core->tvnorm);
-        maxh  = norm_maxh(core->tvnorm);
+        maxw = norm_maxw(core->tvnorm);
+        maxh = norm_maxh(core->tvnorm);
 
-        if (V4L2_FIELD_ANY == field) {
-                field = (f->fmt.pix.height > maxh/2)
-                        ? V4L2_FIELD_INTERLACED
-                        : V4L2_FIELD_BOTTOM;
-        }
+        field = f->fmt.pix.field;
 
         switch (field) {
         case V4L2_FIELD_TOP:
         case V4L2_FIELD_BOTTOM:
-                maxh = maxh / 2;
-                break;
         case V4L2_FIELD_INTERLACED:
+        case V4L2_FIELD_SEQ_BT:
+        case V4L2_FIELD_SEQ_TB:
                 break;
         default:
-                return -EINVAL;
+                field = (f->fmt.pix.height > maxh / 2)
+                        ? V4L2_FIELD_INTERLACED
+                        : V4L2_FIELD_BOTTOM;
+                break;
         }
+        if (V4L2_FIELD_HAS_T_OR_B(field))
+                maxh /= 2;
 
-        f->fmt.pix.field = field;
         v4l_bound_align_image(&f->fmt.pix.width, 48, maxw, 2,
                               &f->fmt.pix.height, 32, maxh, 0, 0);
+        f->fmt.pix.field = field;
         f->fmt.pix.bytesperline =
                 (f->fmt.pix.width * fmt->depth) >> 3;
         f->fmt.pix.sizeimage =
@@ -1061,16 +786,20 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
-        struct cx8800_fh  *fh   = priv;
-        struct cx8800_dev *dev = fh->dev;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         int err = vidioc_try_fmt_vid_cap (file,priv,f);
 
         if (0 != err)
                 return err;
-        dev->fmt        = format_by_fourcc(f->fmt.pix.pixelformat);
-        dev->width      = f->fmt.pix.width;
-        dev->height     = f->fmt.pix.height;
-        fh->vidq.field = f->fmt.pix.field;
+        if (vb2_is_busy(&dev->vb2_vidq) || vb2_is_busy(&dev->vb2_vbiq))
+                return -EBUSY;
+        if (core->dvbdev && vb2_is_busy(&core->dvbdev->vb2_mpegq))
+                return -EBUSY;
+        dev->fmt = format_by_fourcc(f->fmt.pix.pixelformat);
+        core->width = f->fmt.pix.width;
+        core->height = f->fmt.pix.height;
+        core->field = f->fmt.pix.field;
         return 0;
 }
 
@@ -1104,8 +833,8 @@ EXPORT_SYMBOL(cx88_querycap);
 static int vidioc_querycap(struct file *file, void  *priv,
                                         struct v4l2_capability *cap)
 {
-        struct cx8800_dev *dev  = ((struct cx8800_fh *)priv)->dev;
-        struct cx88_core  *core = dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         strcpy(cap->driver, "cx8800");
         sprintf(cap->bus_info, "PCI:%s", pci_name(dev->pci));
@@ -1125,64 +854,10 @@ static int vidioc_enum_fmt_vid_cap (struct file *file, void  *priv,
         return 0;
 }
 
-static int vidioc_reqbufs (struct file *file, void *priv, struct v4l2_requestbuffers *p)
-{
-        return videobuf_reqbufs(get_queue(file), p);
-}
-
-static int vidioc_querybuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        return videobuf_querybuf(get_queue(file), p);
-}
-
-static int vidioc_qbuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        return videobuf_qbuf(get_queue(file), p);
-}
-
-static int vidioc_dqbuf (struct file *file, void *priv, struct v4l2_buffer *p)
-{
-        return videobuf_dqbuf(get_queue(file), p,
-                                file->f_flags & O_NONBLOCK);
-}
-
-static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
-{
-        struct video_device *vdev = video_devdata(file);
-        struct cx8800_fh  *fh   = priv;
-        struct cx8800_dev *dev  = fh->dev;
-
-        if ((vdev->vfl_type == VFL_TYPE_GRABBER && i != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
-            (vdev->vfl_type == VFL_TYPE_VBI && i != V4L2_BUF_TYPE_VBI_CAPTURE))
-                return -EINVAL;
-
-        if (unlikely(!res_get(dev, fh, get_resource(file))))
-                return -EBUSY;
-        return videobuf_streamon(get_queue(file));
-}
-
-static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type i)
-{
-        struct video_device *vdev = video_devdata(file);
-        struct cx8800_fh  *fh   = priv;
-        struct cx8800_dev *dev  = fh->dev;
-        int               err, res;
-
-        if ((vdev->vfl_type == VFL_TYPE_GRABBER && i != V4L2_BUF_TYPE_VIDEO_CAPTURE) ||
-            (vdev->vfl_type == VFL_TYPE_VBI && i != V4L2_BUF_TYPE_VBI_CAPTURE))
-                return -EINVAL;
-
-        res = get_resource(file);
-        err = videobuf_streamoff(get_queue(file));
-        if (err < 0)
-                return err;
-        res_free(dev,fh,res);
-        return 0;
-}
-
 static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm)
 {
-        struct cx88_core *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         *tvnorm = core->tvnorm;
         return 0;
@@ -1190,13 +865,10 @@ static int vidioc_g_std(struct file *file, void *priv, v4l2_std_id *tvnorm)
 
 static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id tvnorms)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
-
-        mutex_lock(&core->lock);
-        cx88_set_tvnorm(core, tvnorms);
-        mutex_unlock(&core->lock);
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
-        return 0;
+        return cx88_set_tvnorm(core, tvnorms);
 }
 
 /* only one input in this sample driver */
@@ -1233,13 +905,15 @@ EXPORT_SYMBOL(cx88_enum_input);
 static int vidioc_enum_input (struct file *file, void *priv,
                                 struct v4l2_input *i)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         return cx88_enum_input (core,i);
 }
 
 static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         *i = core->input;
         return 0;
@@ -1247,24 +921,24 @@ static int vidioc_g_input (struct file *file, void *priv, unsigned int *i)
 
 static int vidioc_s_input (struct file *file, void *priv, unsigned int i)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (i >= 4)
                 return -EINVAL;
         if (0 == INPUT(i).type)
                 return -EINVAL;
 
-        mutex_lock(&core->lock);
         cx88_newstation(core);
         cx88_video_mux(core,i);
-        mutex_unlock(&core->lock);
         return 0;
 }
 
 static int vidioc_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
         u32 reg;
 
         if (unlikely(UNSET == core->board.tuner_type))
@@ -1286,7 +960,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,
 static int vidioc_s_tuner (struct file *file, void *priv,
                                 const struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (UNSET == core->board.tuner_type)
                 return -EINVAL;
@@ -1300,8 +975,8 @@ static int vidioc_s_tuner (struct file *file, void *priv,
 static int vidioc_g_frequency (struct file *file, void *priv,
                                 struct v4l2_frequency *f)
 {
-        struct cx8800_fh  *fh   = priv;
-        struct cx88_core  *core = fh->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (unlikely(UNSET == core->board.tuner_type))
                 return -EINVAL;
@@ -1325,7 +1000,6 @@ int cx88_set_freq (struct cx88_core  *core,
         if (unlikely(f->tuner != 0))
                 return -EINVAL;
 
-        mutex_lock(&core->lock);
         cx88_newstation(core);
         call_all(core, tuner, s_frequency, f);
         call_all(core, tuner, g_frequency, &new_freq);
@@ -1335,8 +1009,6 @@ int cx88_set_freq (struct cx88_core  *core,
         msleep (10);
         cx88_set_tvaudio(core);
 
-        mutex_unlock(&core->lock);
-
         return 0;
 }
 EXPORT_SYMBOL(cx88_set_freq);
@@ -1344,8 +1016,8 @@ EXPORT_SYMBOL(cx88_set_freq);
 static int vidioc_s_frequency (struct file *file, void *priv,
                                 const struct v4l2_frequency *f)
 {
-        struct cx8800_fh  *fh   = priv;
-        struct cx88_core  *core = fh->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         return cx88_set_freq(core, f);
 }
@@ -1354,7 +1026,8 @@ static int vidioc_s_frequency (struct file *file, void *priv,
 static int vidioc_g_register (struct file *file, void *fh,
                                 struct v4l2_dbg_register *reg)
 {
-        struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         /* cx2388x has a 24-bit register space */
         reg->val = cx_read(reg->reg & 0xfffffc);
@@ -1365,7 +1038,8 @@ static int vidioc_g_register (struct file *file, void *fh,
 static int vidioc_s_register (struct file *file, void *fh,
                                 const struct v4l2_dbg_register *reg)
 {
-        struct cx88_core *core = ((struct cx8800_fh*)fh)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         cx_write(reg->reg & 0xfffffc, reg->val);
         return 0;
@@ -1379,7 +1053,8 @@ static int vidioc_s_register (struct file *file, void *fh,
 static int radio_g_tuner (struct file *file, void *priv,
                                 struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (unlikely(t->index > 0))
                 return -EINVAL;
@@ -1393,7 +1068,8 @@ static int radio_g_tuner (struct file *file, void *priv,
 static int radio_s_tuner (struct file *file, void *priv,
                                 const struct v4l2_tuner *t)
 {
-        struct cx88_core  *core = ((struct cx8800_fh *)priv)->dev->core;
+        struct cx8800_dev *dev = video_drvdata(file);
+        struct cx88_core *core = dev->core;
 
         if (0 != t->index)
                 return -EINVAL;
@@ -1404,32 +1080,6 @@ static int radio_s_tuner (struct file *file, void *priv,
 
 /* ----------------------------------------------------------- */
 
-static void cx8800_vid_timeout(unsigned long data)
-{
-        struct cx8800_dev *dev = (struct cx8800_dev*)data;
-        struct cx88_core *core = dev->core;
-        struct cx88_dmaqueue *q = &dev->vidq;
-        struct cx88_buffer *buf;
-        unsigned long flags;
-
-        cx88_sram_channel_dump(core, &cx88_sram_channels[SRAM_CH21]);
-
-        cx_clear(MO_VID_DMACNTRL, 0x11);
-        cx_clear(VID_CAPTURE_CONTROL, 0x06);
-
-        spin_lock_irqsave(&dev->slock,flags);
-        while (!list_empty(&q->active)) {
-                buf = list_entry(q->active.next, struct cx88_buffer, vb.queue);
-                list_del(&buf->vb.queue);
-                buf->vb.state = VIDEOBUF_ERROR;
-                wake_up(&buf->vb.done);
-                printk("%s/0: [%p/%d] timeout - dma=0x%08lx\n", core->name,
-                       buf, buf->vb.i, (unsigned long)buf->risc.dma);
-        }
-        restart_video_queue(dev,q);
-        spin_unlock_irqrestore(&dev->slock,flags);
-}
-
 static const char *cx88_vid_irqs[32] = {
         "y_risci1", "u_risci1", "v_risci1", "vbi_risc1",
         "y_risci2", "u_risci2", "v_risci2", "vbi_risc2",
@@ -1476,22 +1126,6 @@ static void cx8800_vid_irq(struct cx8800_dev *dev)
                 cx88_wakeup(core, &dev->vbiq, count);
                 spin_unlock(&dev->slock);
         }
-
-        /* risc2 y */
-        if (status & 0x10) {
-                dprintk(2,"stopper video\n");
-                spin_lock(&dev->slock);
-                restart_video_queue(dev,&dev->vidq);
-                spin_unlock(&dev->slock);
-        }
-
-        /* risc2 vbi */
-        if (status & 0x80) {
-                dprintk(2,"stopper vbi\n");
-                spin_lock(&dev->slock);
-                cx8800_restart_vbi_queue(dev,&dev->vbiq);
-                spin_unlock(&dev->slock);
-        }
 }
 
 static irqreturn_t cx8800_irq(int irq, void *dev_id)
@@ -1530,11 +1164,11 @@ static irqreturn_t cx8800_irq(int irq, void *dev_id)
 static const struct v4l2_file_operations video_fops =
 {
         .owner         = THIS_MODULE,
-        .open          = video_open,
-        .release       = video_release,
-        .read          = video_read,
-        .poll          = video_poll,
-        .mmap          = video_mmap,
+        .open          = v4l2_fh_open,
+        .release       = vb2_fop_release,
+        .read          = vb2_fop_read,
+        .poll          = vb2_fop_poll,
+        .mmap          = vb2_fop_mmap,
         .unlocked_ioctl = video_ioctl2,
 };
 
@@ -1544,17 +1178,17 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_g_fmt_vid_cap     = vidioc_g_fmt_vid_cap,
         .vidioc_try_fmt_vid_cap   = vidioc_try_fmt_vid_cap,
         .vidioc_s_fmt_vid_cap     = vidioc_s_fmt_vid_cap,
-        .vidioc_reqbufs       = vidioc_reqbufs,
-        .vidioc_querybuf      = vidioc_querybuf,
-        .vidioc_qbuf          = vidioc_qbuf,
-        .vidioc_dqbuf         = vidioc_dqbuf,
+        .vidioc_reqbufs       = vb2_ioctl_reqbufs,
+        .vidioc_querybuf      = vb2_ioctl_querybuf,
+        .vidioc_qbuf          = vb2_ioctl_qbuf,
+        .vidioc_dqbuf         = vb2_ioctl_dqbuf,
         .vidioc_g_std         = vidioc_g_std,
         .vidioc_s_std         = vidioc_s_std,
         .vidioc_enum_input    = vidioc_enum_input,
         .vidioc_g_input       = vidioc_g_input,
         .vidioc_s_input       = vidioc_s_input,
-        .vidioc_streamon      = vidioc_streamon,
-        .vidioc_streamoff     = vidioc_streamoff,
+        .vidioc_streamon      = vb2_ioctl_streamon,
+        .vidioc_streamoff     = vb2_ioctl_streamoff,
         .vidioc_g_tuner       = vidioc_g_tuner,
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_g_frequency   = vidioc_g_frequency,
@@ -1579,17 +1213,17 @@ static const struct v4l2_ioctl_ops vbi_ioctl_ops = {
         .vidioc_g_fmt_vbi_cap     = cx8800_vbi_fmt,
         .vidioc_try_fmt_vbi_cap   = cx8800_vbi_fmt,
         .vidioc_s_fmt_vbi_cap     = cx8800_vbi_fmt,
-        .vidioc_reqbufs       = vidioc_reqbufs,
-        .vidioc_querybuf      = vidioc_querybuf,
-        .vidioc_qbuf          = vidioc_qbuf,
-        .vidioc_dqbuf         = vidioc_dqbuf,
+        .vidioc_reqbufs       = vb2_ioctl_reqbufs,
+        .vidioc_querybuf      = vb2_ioctl_querybuf,
+        .vidioc_qbuf          = vb2_ioctl_qbuf,
+        .vidioc_dqbuf         = vb2_ioctl_dqbuf,
         .vidioc_g_std         = vidioc_g_std,
         .vidioc_s_std         = vidioc_s_std,
         .vidioc_enum_input    = vidioc_enum_input,
         .vidioc_g_input       = vidioc_g_input,
         .vidioc_s_input       = vidioc_s_input,
-        .vidioc_streamon      = vidioc_streamon,
-        .vidioc_streamoff     = vidioc_streamoff,
+        .vidioc_streamon      = vb2_ioctl_streamon,
+        .vidioc_streamoff     = vb2_ioctl_streamoff,
         .vidioc_g_tuner       = vidioc_g_tuner,
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_g_frequency   = vidioc_g_frequency,
@@ -1610,9 +1244,9 @@ static const struct video_device cx8800_vbi_template = {
 static const struct v4l2_file_operations radio_fops =
 {
         .owner         = THIS_MODULE,
-        .open          = video_open,
+        .open          = radio_open,
         .poll          = v4l2_ctrl_poll,
-        .release       = video_release,
+        .release       = v4l2_fh_release,
         .unlocked_ioctl = video_ioctl2,
 };
 
@@ -1676,6 +1310,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 {
         struct cx8800_dev *dev;
         struct cx88_core *core;
+        struct vb2_queue *q;
         int err;
         int i;
 
@@ -1713,25 +1348,12 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 
         /* initialize driver struct */
         spin_lock_init(&dev->slock);
-        core->tvnorm = V4L2_STD_NTSC_M;
 
         /* init video dma queues */
         INIT_LIST_HEAD(&dev->vidq.active);
-        INIT_LIST_HEAD(&dev->vidq.queued);
-        dev->vidq.timeout.function = cx8800_vid_timeout;
-        dev->vidq.timeout.data     = (unsigned long)dev;
-        init_timer(&dev->vidq.timeout);
-        cx88_risc_stopper(dev->pci,&dev->vidq.stopper,
-                          MO_VID_DMACNTRL,0x11,0x00);
 
         /* init vbi dma queues */
         INIT_LIST_HEAD(&dev->vbiq.active);
-        INIT_LIST_HEAD(&dev->vbiq.queued);
-        dev->vbiq.timeout.function = cx8800_vbi_timeout;
-        dev->vbiq.timeout.data     = (unsigned long)dev;
-        init_timer(&dev->vbiq.timeout);
-        cx88_risc_stopper(dev->pci,&dev->vbiq.stopper,
-                          MO_VID_DMACNTRL,0x88,0x00);
 
         /* get irq */
         err = request_irq(pci_dev->irq, cx8800_irq,
@@ -1820,9 +1442,10 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
         /* Sets device info at pci_dev */
         pci_set_drvdata(pci_dev, dev);
 
-        dev->width   = 320;
-        dev->height  = 240;
-        dev->fmt     = format_by_fourcc(V4L2_PIX_FMT_BGR24);
+        dev->fmt = format_by_fourcc(V4L2_PIX_FMT_BGR24);
+
+        /* Maintain a reference so cx88-blackbird can query the 8800 device. */
+        core->v4ldev = dev;
 
         /* initial device configuration */
         mutex_lock(&core->lock);
@@ -1831,11 +1454,44 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
         v4l2_ctrl_handler_setup(&core->audio_hdl);
         cx88_video_mux(core, 0);
 
+        q = &dev->vb2_vidq;
+        q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;
+        q->gfp_flags = GFP_DMA32;
+        q->min_buffers_needed = 2;
+        q->drv_priv = dev;
+        q->buf_struct_size = sizeof(struct cx88_buffer);
+        q->ops = &cx8800_video_qops;
+        q->mem_ops = &vb2_dma_sg_memops;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->lock = &core->lock;
+
+        err = vb2_queue_init(q);
+        if (err < 0)
+                goto fail_unreg;
+
+        q = &dev->vb2_vbiq;
+        q->type = V4L2_BUF_TYPE_VBI_CAPTURE;
+        q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF | VB2_READ;
+        q->gfp_flags = GFP_DMA32;
+        q->min_buffers_needed = 2;
+        q->drv_priv = dev;
+        q->buf_struct_size = sizeof(struct cx88_buffer);
+        q->ops = &cx8800_vbi_qops;
+        q->mem_ops = &vb2_dma_sg_memops;
+        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->lock = &core->lock;
+
+        err = vb2_queue_init(q);
+        if (err < 0)
+                goto fail_unreg;
+
         /* register v4l devices */
         dev->video_dev = cx88_vdev_init(core,dev->pci,
                                         &cx8800_video_template,"video");
         video_set_drvdata(dev->video_dev, dev);
         dev->video_dev->ctrl_handler = &core->video_hdl;
+        dev->video_dev->queue = &dev->vb2_vidq;
         err = video_register_device(dev->video_dev,VFL_TYPE_GRABBER,
                                     video_nr[core->nr]);
         if (err < 0) {
@@ -1848,6 +1504,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 
         dev->vbi_dev = cx88_vdev_init(core,dev->pci,&cx8800_vbi_template,"vbi");
         video_set_drvdata(dev->vbi_dev, dev);
+        dev->vbi_dev->queue = &dev->vb2_vbiq;
         err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
                                     vbi_nr[core->nr]);
         if (err < 0) {
@@ -1875,7 +1532,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
         }
 
         /* start tvaudio thread */
-        if (core->board.tuner_type != TUNER_ABSENT) {
+        if (core->board.tuner_type != UNSET) {
                 core->kthread = kthread_run(cx88_audio_thread, core, "cx88 tvaudio");
                 if (IS_ERR(core->kthread)) {
                         err = PTR_ERR(core->kthread);
@@ -1892,6 +1549,7 @@ fail_unreg:
         free_irq(pci_dev->irq, dev);
         mutex_unlock(&core->lock);
 fail_core:
+        core->v4ldev = NULL;
         cx88_core_put(core,dev->pci);
 fail_free:
         kfree(dev);
@@ -1913,15 +1571,16 @@ static void cx8800_finidev(struct pci_dev *pci_dev)
                 cx88_ir_stop(core);
 
         cx88_shutdown(core); /* FIXME */
-        pci_disable_device(pci_dev);
 
         /* unregister stuff */
 
         free_irq(pci_dev->irq, dev);
         cx8800_unregister_video(dev);
+        pci_disable_device(pci_dev);
+
+        core->v4ldev = NULL;
 
         /* free memory */
-        btcx_riscmem_free(dev->pci,&dev->vidq.stopper);
         cx88_core_put(core,dev->pci);
         kfree(dev);
 }
@@ -1938,12 +1597,10 @@ static int cx8800_suspend(struct pci_dev *pci_dev, pm_message_t state)
         if (!list_empty(&dev->vidq.active)) {
                 printk("%s/0: suspend video\n", core->name);
                 stop_video_dma(dev);
-                del_timer(&dev->vidq.timeout);
         }
         if (!list_empty(&dev->vbiq.active)) {
                 printk("%s/0: suspend vbi\n", core->name);
                 cx8800_stop_vbi_dma(dev);
-                del_timer(&dev->vbiq.timeout);
         }
         spin_unlock_irqrestore(&dev->slock, flags);
 
diff --git a/drivers/media/pci/cx88/cx88.h b/drivers/media/pci/cx88/cx88.h
index 28893a6b249e..3b0ae754f165 100644
--- a/drivers/media/pci/cx88/cx88.h
+++ b/drivers/media/pci/cx88/cx88.h
@@ -29,19 +29,18 @@
 #include <media/v4l2-fh.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
-#include <media/videobuf-dma-sg.h>
+#include <media/videobuf2-dma-sg.h>
 #include <media/cx2341x.h>
-#include <media/videobuf-dvb.h>
+#include <media/videobuf2-dvb.h>
 #include <media/ir-kbd-i2c.h>
 #include <media/wm8775.h>
 
-#include "btcx-risc.h"
 #include "cx88-reg.h"
 #include "tuner-xc2028.h"
 
 #include <linux/mutex.h>
 
-#define CX88_VERSION "0.0.9"
+#define CX88_VERSION "1.0.0"
 
 #define UNSET (-1U)
 
@@ -62,7 +61,8 @@
 #define FORMAT_FLAGS_PACKED       0x01
 #define FORMAT_FLAGS_PLANAR       0x02
 
-#define VBI_LINE_COUNT              17
+#define VBI_LINE_PAL_COUNT              18
+#define VBI_LINE_NTSC_COUNT             12
 #define VBI_LINE_LENGTH           2048
 
 #define AUD_RDS_LINES                4
@@ -95,13 +95,13 @@ enum cx8802_board_access {
 
 static inline unsigned int norm_maxw(v4l2_std_id norm)
 {
-        return (norm & (V4L2_STD_MN & ~V4L2_STD_PAL_Nc)) ? 720 : 768;
+        return 720;
 }
 
 
 static inline unsigned int norm_maxh(v4l2_std_id norm)
 {
-        return (norm & V4L2_STD_625_50) ? 576 : 480;
+        return (norm & V4L2_STD_525_60) ? 480 : 576;
 }
 
 /* ----------------------------------------------------------- */
@@ -311,26 +311,33 @@ enum cx88_tvaudio {
 
 #define BUFFER_TIMEOUT     msecs_to_jiffies(2000)
 
+struct cx88_riscmem {
+        unsigned int   size;
+        __le32         *cpu;
+        __le32         *jmp;
+        dma_addr_t     dma;
+};
+
 /* buffer for one video frame */
 struct cx88_buffer {
         /* common v4l buffer stuff -- must be first */
-        struct videobuf_buffer vb;
+        struct vb2_buffer vb;
+        struct list_head       list;
 
         /* cx88 specific */
         unsigned int           bpl;
-        struct btcx_riscmem    risc;
-        const struct cx8800_fmt *fmt;
+        struct cx88_riscmem    risc;
         u32                    count;
 };
 
 struct cx88_dmaqueue {
         struct list_head       active;
-        struct list_head       queued;
-        struct timer_list      timeout;
-        struct btcx_riscmem    stopper;
         u32                    count;
 };
 
+struct cx8800_dev;
+struct cx8802_dev;
+
 struct cx88_core {
         struct list_head           devlist;
         atomic_t                   refcount;
@@ -376,6 +383,8 @@ struct cx88_core {
         /* state info */
         struct task_struct         *kthread;
         v4l2_std_id                tvnorm;
+        unsigned                   width, height;
+        unsigned                   field;
         enum cx88_tvaudio          tvaudio;
         u32                        audiomode_manual;
         u32                        audiomode_current;
@@ -395,11 +404,14 @@ struct cx88_core {
         struct mutex               lock;
         /* various v4l controls */
         u32                        freq;
-        int                        users;
-        int                        mpeg_users;
 
-        /* cx88-video needs to access cx8802 for hybrid tuner pll access. */
+        /*
+         * cx88-video needs to access cx8802 for hybrid tuner pll access and
+         * for vb2_is_busy() checks.
+         */
         struct cx8802_dev          *dvbdev;
+        /* cx88-blackbird needs to access cx8800 for vb2_is_busy() checks */
+        struct cx8800_dev          *v4ldev;
         enum cx88_board_type       active_type_id;
         int                        active_ref;
         int                        active_fe_id;
@@ -453,24 +465,9 @@ static inline struct cx88_core *to_core(struct v4l2_device *v4l2_dev)
                 val;                                                            \
         })
 
-struct cx8800_dev;
-struct cx8802_dev;
-
 /* ----------------------------------------------------------- */
 /* function 0: video stuff                                     */
 
-struct cx8800_fh {
-        struct v4l2_fh             fh;
-        struct cx8800_dev          *dev;
-        unsigned int               resources;
-
-        /* video capture */
-        struct videobuf_queue      vidq;
-
-        /* vbi capture */
-        struct videobuf_queue      vbiq;
-};
-
 struct cx8800_suspend_state {
         int                        disabled;
 };
@@ -490,11 +487,12 @@ struct cx8800_dev {
         unsigned char              pci_rev,pci_lat;
 
         const struct cx8800_fmt    *fmt;
-        unsigned int               width, height;
 
         /* capture queues */
         struct cx88_dmaqueue       vidq;
+        struct vb2_queue           vb2_vidq;
         struct cx88_dmaqueue       vbiq;
+        struct vb2_queue           vb2_vbiq;
 
         /* various v4l controls */
 
@@ -510,12 +508,6 @@ struct cx8800_dev {
 /* ----------------------------------------------------------- */
 /* function 2: mpeg stuff                                      */
 
-struct cx8802_fh {
-        struct v4l2_fh             fh;
-        struct cx8802_dev          *dev;
-        struct videobuf_queue      mpegq;
-};
-
 struct cx8802_suspend_state {
         int                        disabled;
 };
@@ -559,6 +551,7 @@ struct cx8802_dev {
 
         /* dma queues */
         struct cx88_dmaqueue       mpegq;
+        struct vb2_queue           vb2_mpegq;
         u32                        ts_packet_size;
         u32                        ts_packet_count;
 
@@ -570,9 +563,6 @@ struct cx8802_dev {
 #if IS_ENABLED(CONFIG_VIDEO_CX88_BLACKBIRD)
         struct video_device        *mpeg_dev;
         u32                        mailbox;
-        int                        width;
-        int                        height;
-        unsigned char              mpeg_active; /* nonzero if mpeg encoder is active */
 
         /* mpeg params */
         struct cx2341x_handler     cxhdl;
@@ -580,7 +570,7 @@ struct cx8802_dev {
 
 #if IS_ENABLED(CONFIG_VIDEO_CX88_DVB)
         /* for dvb only */
-        struct videobuf_dvb_frontends frontends;
+        struct vb2_dvb_frontends frontends;
 #endif
 
 #if IS_ENABLED(CONFIG_VIDEO_CX88_VP3054)
@@ -634,22 +624,17 @@ extern void cx88_shutdown(struct cx88_core *core);
 extern int cx88_reset(struct cx88_core *core);
 
 extern int
-cx88_risc_buffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+cx88_risc_buffer(struct pci_dev *pci, struct cx88_riscmem *risc,
                  struct scatterlist *sglist,
                  unsigned int top_offset, unsigned int bottom_offset,
                  unsigned int bpl, unsigned int padding, unsigned int lines);
 extern int
-cx88_risc_databuffer(struct pci_dev *pci, struct btcx_riscmem *risc,
+cx88_risc_databuffer(struct pci_dev *pci, struct cx88_riscmem *risc,
                      struct scatterlist *sglist, unsigned int bpl,
                      unsigned int lines, unsigned int lpi);
-extern int
-cx88_risc_stopper(struct pci_dev *pci, struct btcx_riscmem *risc,
-                  u32 reg, u32 mask, u32 value);
-extern void
-cx88_free_buffer(struct videobuf_queue *q, struct cx88_buffer *buf);
 
 extern void cx88_risc_disasm(struct cx88_core *core,
-                             struct btcx_riscmem *risc);
+                             struct cx88_riscmem *risc);
 extern int cx88_sram_channel_setup(struct cx88_core *core,
                                    const struct sram_channel *ch,
                                    unsigned int bpl, u32 risc);
@@ -664,7 +649,7 @@ extern struct video_device *cx88_vdev_init(struct cx88_core *core,
                                            struct pci_dev *pci,
                                            const struct video_device *template_,
                                            const char *type);
-extern struct cx88_core* cx88_core_get(struct pci_dev *pci);
+extern struct cx88_core *cx88_core_get(struct pci_dev *pci);
 extern void cx88_core_put(struct cx88_core *core,
                           struct pci_dev *pci);
 
@@ -684,12 +669,10 @@ int cx8800_start_vbi_dma(struct cx8800_dev    *dev,
                          struct cx88_dmaqueue *q,
                          struct cx88_buffer   *buf);
 */
-int cx8800_stop_vbi_dma(struct cx8800_dev *dev);
-int cx8800_restart_vbi_queue(struct cx8800_dev    *dev,
-                             struct cx88_dmaqueue *q);
-void cx8800_vbi_timeout(unsigned long data);
+void cx8800_stop_vbi_dma(struct cx8800_dev *dev);
+int cx8800_restart_vbi_queue(struct cx8800_dev *dev, struct cx88_dmaqueue *q);
 
-extern const struct videobuf_queue_ops cx8800_vbi_qops;
+extern const struct vb2_ops cx8800_vbi_qops;
 
 /* ----------------------------------------------------------- */
 /* cx88-i2c.c                                                  */
@@ -739,14 +722,17 @@ extern void cx88_i2c_init_ir(struct cx88_core *core);
 /* ----------------------------------------------------------- */
 /* cx88-mpeg.c                                                 */
 
-int cx8802_buf_prepare(struct videobuf_queue *q,struct cx8802_dev *dev,
-                        struct cx88_buffer *buf, enum v4l2_field field);
+int cx8802_buf_prepare(struct vb2_queue *q, struct cx8802_dev *dev,
+                        struct cx88_buffer *buf);
 void cx8802_buf_queue(struct cx8802_dev *dev, struct cx88_buffer *buf);
 void cx8802_cancel_buffers(struct cx8802_dev *dev);
+int cx8802_start_dma(struct cx8802_dev    *dev,
+                            struct cx88_dmaqueue *q,
+                            struct cx88_buffer   *buf);
 
 /* ----------------------------------------------------------- */
 /* cx88-video.c*/
-int cx88_enum_input (struct cx88_core  *core,struct v4l2_input *i);
+int cx88_enum_input(struct cx88_core *core, struct v4l2_input *i);
 int cx88_set_freq(struct cx88_core  *core, const struct v4l2_frequency *f);
 int cx88_video_mux(struct cx88_core *core, unsigned int input);
 void cx88_querycap(struct file *file, struct cx88_core *core,
diff --git a/drivers/media/pci/ddbridge/ddbridge-core.c b/drivers/media/pci/ddbridge/ddbridge-core.c
index c82e855a0814..9e3492e20766 100644
--- a/drivers/media/pci/ddbridge/ddbridge-core.c
+++ b/drivers/media/pci/ddbridge/ddbridge-core.c
@@ -1118,8 +1118,7 @@ static void ddb_ports_detach(struct ddb *dev)
                         dvb_input_detach(port->input[1]);
                         break;
                 case DDB_PORT_CI:
-                        if (port->output->dev)
-                                dvb_unregister_device(port->output->dev);
+                        dvb_unregister_device(port->output->dev);
                         if (port->en) {
                                 ddb_input_stop(port->input[0]);
                                 ddb_output_stop(port->output);
diff --git a/drivers/media/pci/ivtv/ivtv-controls.c b/drivers/media/pci/ivtv/ivtv-controls.c
index 2b0ab26e11e8..ccf548c255f1 100644
--- a/drivers/media/pci/ivtv/ivtv-controls.c
+++ b/drivers/media/pci/ivtv/ivtv-controls.c
@@ -69,7 +69,7 @@ static int ivtv_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val)
         /* fix videodecoder resolution */
         fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);
         fmt.height = cxhdl->height;
-        fmt.code = V4L2_MBUS_FMT_FIXED;
+        fmt.code = MEDIA_BUS_FMT_FIXED;
         v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &fmt);
         return 0;
 }
diff --git a/drivers/media/pci/ivtv/ivtv-ioctl.c b/drivers/media/pci/ivtv/ivtv-ioctl.c
index 3e0cb77d5930..4d8ee18c3feb 100644
--- a/drivers/media/pci/ivtv/ivtv-ioctl.c
+++ b/drivers/media/pci/ivtv/ivtv-ioctl.c
@@ -595,7 +595,7 @@ static int ivtv_s_fmt_vid_cap(struct file *file, void *fh, struct v4l2_format *f
                 fmt->fmt.pix.width /= 2;
         mbus_fmt.width = fmt->fmt.pix.width;
         mbus_fmt.height = h;
-        mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+        mbus_fmt.code = MEDIA_BUS_FMT_FIXED;
         v4l2_subdev_call(itv->sd_video, video, s_mbus_fmt, &mbus_fmt);
         return ivtv_g_fmt_vid_cap(file, fh, fmt);
 }
diff --git a/drivers/media/pci/ivtv/ivtv-udma.c b/drivers/media/pci/ivtv/ivtv-udma.c
index 7338cb2d0a38..bee2329e0b2e 100644
--- a/drivers/media/pci/ivtv/ivtv-udma.c
+++ b/drivers/media/pci/ivtv/ivtv-udma.c
@@ -76,7 +76,7 @@ void ivtv_udma_fill_sg_array (struct ivtv_user_dma *dma, u32 buffer_offset, u32
         int i;
         struct scatterlist *sg;
 
-        for (i = 0, sg = dma->SGlist; i < dma->SG_length; i++, sg++) {
+        for (i = 0, sg = dma->SGlist; i < dma->SG_length; i++, sg = sg_next(sg)) {
                 dma->SGarray[i].size = cpu_to_le32(sg_dma_len(sg));
                 dma->SGarray[i].src = cpu_to_le32(sg_dma_address(sg));
                 dma->SGarray[i].dst = cpu_to_le32(buffer_offset);
diff --git a/drivers/media/pci/meye/meye.c b/drivers/media/pci/meye/meye.c
index aeae54708811..9d9f90cb7740 100644
--- a/drivers/media/pci/meye/meye.c
+++ b/drivers/media/pci/meye/meye.c
@@ -1031,9 +1031,6 @@ static int vidioc_querycap(struct file *file, void *fh,
         strcpy(cap->card, "meye");
         sprintf(cap->bus_info, "PCI:%s", pci_name(meye.mchip_dev));
 
-        cap->version = (MEYE_DRIVER_MAJORVERSION << 8) +
-                       MEYE_DRIVER_MINORVERSION;
-
         cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
                             V4L2_CAP_STREAMING;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
diff --git a/drivers/media/pci/pt1/pt1.c b/drivers/media/pci/pt1/pt1.c
index db887b0c37b1..acc35b42e53c 100644
--- a/drivers/media/pci/pt1/pt1.c
+++ b/drivers/media/pci/pt1/pt1.c
@@ -109,9 +109,6 @@ struct pt1_adapter {
         int sleep;
 };
 
-#define pt1_printk(level, pt1, format, arg...)  \
-        dev_printk(level, &(pt1)->pdev->dev, format, ##arg)
-
 static void pt1_write_reg(struct pt1 *pt1, int reg, u32 data)
 {
         writel(data, pt1->regs + reg * 4);
@@ -154,7 +151,7 @@ static int pt1_sync(struct pt1 *pt1)
                         return 0;
                 pt1_write_reg(pt1, 0, 0x00000008);
         }
-        pt1_printk(KERN_ERR, pt1, "could not sync\n");
+        dev_err(&pt1->pdev->dev, "could not sync\n");
         return -EIO;
 }
 
@@ -179,7 +176,7 @@ static int pt1_unlock(struct pt1 *pt1)
                         return 0;
                 schedule_timeout_uninterruptible((HZ + 999) / 1000);
         }
-        pt1_printk(KERN_ERR, pt1, "could not unlock\n");
+        dev_err(&pt1->pdev->dev, "could not unlock\n");
         return -EIO;
 }
 
@@ -193,7 +190,7 @@ static int pt1_reset_pci(struct pt1 *pt1)
                         return 0;
                 schedule_timeout_uninterruptible((HZ + 999) / 1000);
         }
-        pt1_printk(KERN_ERR, pt1, "could not reset PCI\n");
+        dev_err(&pt1->pdev->dev, "could not reset PCI\n");
         return -EIO;
 }
 
@@ -207,7 +204,7 @@ static int pt1_reset_ram(struct pt1 *pt1)
                         return 0;
                 schedule_timeout_uninterruptible((HZ + 999) / 1000);
         }
-        pt1_printk(KERN_ERR, pt1, "could not reset RAM\n");
+        dev_err(&pt1->pdev->dev, "could not reset RAM\n");
         return -EIO;
 }
 
@@ -224,7 +221,7 @@ static int pt1_do_enable_ram(struct pt1 *pt1)
                 }
                 schedule_timeout_uninterruptible((HZ + 999) / 1000);
         }
-        pt1_printk(KERN_ERR, pt1, "could not enable RAM\n");
+        dev_err(&pt1->pdev->dev, "could not enable RAM\n");
         return -EIO;
 }
 
diff --git a/drivers/media/pci/pt3/pt3.c b/drivers/media/pci/pt3/pt3.c
index 1fdeac11501a..7a37e8fe2ee2 100644
--- a/drivers/media/pci/pt3/pt3.c
+++ b/drivers/media/pci/pt3/pt3.c
@@ -255,7 +255,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
         pt3_i2c_reset(pt3);
         ret = pt3_init_all_demods(pt3);
         if (ret < 0) {
-                dev_warn(&pt3->pdev->dev, "Failed to init demod chips.");
+                dev_warn(&pt3->pdev->dev, "Failed to init demod chips\n");
                 return ret;
         }
 
@@ -271,7 +271,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
                                               init0_ter, ARRAY_SIZE(init0_ter));
                 if (ret < 0) {
                         dev_warn(&pt3->pdev->dev,
-                                 "demod[%d] faild in init sequence0.", i);
+                                 "demod[%d] failed in init sequence0\n", i);
                         return ret;
                 }
                 ret = fe->ops.init(fe);
@@ -282,7 +282,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
         usleep_range(2000, 4000);
         ret = pt3_set_tuner_power(pt3, true, false);
         if (ret < 0) {
-                dev_warn(&pt3->pdev->dev, "Failed to control tuner module.");
+                dev_warn(&pt3->pdev->dev, "Failed to control tuner module\n");
                 return ret;
         }
 
@@ -297,7 +297,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
                                                 cfg_ter, ARRAY_SIZE(cfg_ter));
                 if (ret < 0) {
                         dev_warn(&pt3->pdev->dev,
-                                 "demod[%d] faild in init sequence1.", i);
+                                 "demod[%d] failed in init sequence1\n", i);
                         return ret;
                 }
         }
@@ -311,19 +311,19 @@ static int pt3_fe_init(struct pt3_board *pt3)
                 ret = fe->ops.tuner_ops.init(fe);
                 if (ret < 0) {
                         dev_warn(&pt3->pdev->dev,
-                                 "Failed to init SAT-tuner[%d].", i);
+                                 "Failed to init SAT-tuner[%d]\n", i);
                         return ret;
                 }
         }
         ret = pt3_init_all_mxl301rf(pt3);
         if (ret < 0) {
-                dev_warn(&pt3->pdev->dev, "Failed to init TERR-tuners.");
+                dev_warn(&pt3->pdev->dev, "Failed to init TERR-tuners\n");
                 return ret;
         }
 
         ret = pt3_set_tuner_power(pt3, true, true);
         if (ret < 0) {
-                dev_warn(&pt3->pdev->dev, "Failed to control tuner module.");
+                dev_warn(&pt3->pdev->dev, "Failed to control tuner module\n");
                 return ret;
         }
 
@@ -344,7 +344,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
                 }
                 if (ret < 0) {
                         dev_warn(&pt3->pdev->dev,
-                                 "Failed in initial tuning of tuner[%d].", i);
+                                 "Failed in initial tuning of tuner[%d]\n", i);
                         return ret;
                 }
         }
@@ -366,7 +366,7 @@ static int pt3_fe_init(struct pt3_board *pt3)
                         fe->ops.set_lna = &pt3_set_lna;
         }
         if (i < PT3_NUM_FE) {
-                dev_warn(&pt3->pdev->dev, "FE[%d] failed to standby.", i);
+                dev_warn(&pt3->pdev->dev, "FE[%d] failed to standby\n", i);
                 return ret;
         }
         return 0;
@@ -453,8 +453,8 @@ static int pt3_fetch_thread(void *data)
         pt3_init_dmabuf(adap);
         adap->num_discard = PT3_INITIAL_BUF_DROPS;
 
-        dev_dbg(adap->dvb_adap.device,
-                "PT3: [%s] started.\n", adap->thread->comm);
+        dev_dbg(adap->dvb_adap.device, "PT3: [%s] started\n",
+                adap->thread->comm);
         set_freezable();
         while (!kthread_freezable_should_stop(&was_frozen)) {
                 if (was_frozen)
@@ -468,8 +468,8 @@ static int pt3_fetch_thread(void *data)
                                         PT3_FETCH_DELAY_DELTA * NSEC_PER_MSEC,
                                         HRTIMER_MODE_REL);
         }
-        dev_dbg(adap->dvb_adap.device,
-                "PT3: [%s] exited.\n", adap->thread->comm);
+        dev_dbg(adap->dvb_adap.device, "PT3: [%s] exited\n",
+                adap->thread->comm);
         adap->thread = NULL;
         return 0;
 }
@@ -485,8 +485,8 @@ static int pt3_start_streaming(struct pt3_adapter *adap)
                 int ret = PTR_ERR(thread);
 
                 dev_warn(adap->dvb_adap.device,
-                        "PT3 (adap:%d, dmx:%d): failed to start kthread.\n",
-                        adap->dvb_adap.num, adap->dmxdev.dvbdev->id);
+                         "PT3 (adap:%d, dmx:%d): failed to start kthread\n",
+                         adap->dvb_adap.num, adap->dmxdev.dvbdev->id);
                 return ret;
         }
         adap->thread = thread;
@@ -501,8 +501,8 @@ static int pt3_stop_streaming(struct pt3_adapter *adap)
         ret = pt3_stop_dma(adap);
         if (ret)
                 dev_warn(adap->dvb_adap.device,
-                        "PT3: failed to stop streaming of adap:%d/FE:%d\n",
-                        adap->dvb_adap.num, adap->fe->id);
+                         "PT3: failed to stop streaming of adap:%d/FE:%d\n",
+                         adap->dvb_adap.num, adap->fe->id);
 
         /* kill the fetching thread */
         ret = kthread_stop(adap->thread);
@@ -522,8 +522,8 @@ static int pt3_start_feed(struct dvb_demux_feed *feed)
                 return 0;
         if (adap->num_feeds != 1) {
                 dev_warn(adap->dvb_adap.device,
-                        "%s: unmatched start/stop_feed in adap:%i/dmx:%i.\n",
-                        __func__, adap->dvb_adap.num, adap->dmxdev.dvbdev->id);
+                         "%s: unmatched start/stop_feed in adap:%i/dmx:%i\n",
+                         __func__, adap->dvb_adap.num, adap->dmxdev.dvbdev->id);
                 adap->num_feeds = 1;
         }
 
@@ -553,10 +553,9 @@ static int pt3_alloc_adapter(struct pt3_board *pt3, int index)
         struct dvb_adapter *da;
 
         adap = kzalloc(sizeof(*adap), GFP_KERNEL);
-        if (!adap) {
-                dev_err(&pt3->pdev->dev, "failed to alloc mem for adapter.\n");
+        if (!adap)
                 return -ENOMEM;
-        }
+
         pt3->adaps[index] = adap;
         adap->adap_idx = index;
 
@@ -565,7 +564,7 @@ static int pt3_alloc_adapter(struct pt3_board *pt3, int index)
                                 THIS_MODULE, &pt3->pdev->dev, adapter_nr);
                 if (ret < 0) {
                         dev_err(&pt3->pdev->dev,
-                                "failed to register adapter dev.\n");
+                                "failed to register adapter dev\n");
                         goto err_mem;
                 }
                 da = &adap->dvb_adap;
@@ -581,7 +580,7 @@ static int pt3_alloc_adapter(struct pt3_board *pt3, int index)
         adap->demux.stop_feed = pt3_stop_feed;
         ret = dvb_dmx_init(&adap->demux);
         if (ret < 0) {
-                dev_err(&pt3->pdev->dev, "failed to init dmx dev.\n");
+                dev_err(&pt3->pdev->dev, "failed to init dmx dev\n");
                 goto err_adap;
         }
 
@@ -589,13 +588,13 @@ static int pt3_alloc_adapter(struct pt3_board *pt3, int index)
         adap->dmxdev.demux = &adap->demux.dmx;
         ret = dvb_dmxdev_init(&adap->dmxdev, da);
         if (ret < 0) {
-                dev_err(&pt3->pdev->dev, "failed to init dmxdev.\n");
+                dev_err(&pt3->pdev->dev, "failed to init dmxdev\n");
                 goto err_demux;
         }
 
         ret = pt3_alloc_dmabuf(adap);
         if (ret) {
-                dev_err(&pt3->pdev->dev, "failed to alloc DMA buffers.\n");
+                dev_err(&pt3->pdev->dev, "failed to alloc DMA buffers\n");
                 goto err_dmabuf;
         }
 
@@ -695,7 +694,7 @@ static int pt3_resume(struct device *dev)
                 dvb_frontend_resume(adap->fe);
                 ret = pt3_alloc_dmabuf(adap);
                 if (ret) {
-                        dev_err(&pt3->pdev->dev, "failed to alloc DMA bufs.\n");
+                        dev_err(&pt3->pdev->dev, "failed to alloc DMA bufs\n");
                         continue;
                 }
                 if (adap->num_feeds > 0)
@@ -753,15 +752,14 @@ static int pt3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 if (ret == 0)
                         dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
                 else {
-                        dev_err(&pdev->dev, "Failed to set DMA mask.\n");
+                        dev_err(&pdev->dev, "Failed to set DMA mask\n");
                         goto err_release_regions;
                 }
-                dev_info(&pdev->dev, "Use 32bit DMA.\n");
+                dev_info(&pdev->dev, "Use 32bit DMA\n");
         }
 
         pt3 = kzalloc(sizeof(*pt3), GFP_KERNEL);
         if (!pt3) {
-                dev_err(&pdev->dev, "Failed to alloc mem for this dev.\n");
                 ret = -ENOMEM;
                 goto err_release_regions;
         }
@@ -771,15 +769,15 @@ static int pt3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         pt3->regs[0] = pci_ioremap_bar(pdev, 0);
         pt3->regs[1] = pci_ioremap_bar(pdev, 2);
         if (pt3->regs[0] == NULL || pt3->regs[1] == NULL) {
-                dev_err(&pdev->dev, "Failed to ioremap.\n");
+                dev_err(&pdev->dev, "Failed to ioremap\n");
                 ret = -ENOMEM;
                 goto err_kfree;
         }
 
         ver = ioread32(pt3->regs[0] + REG_VERSION);
         if ((ver >> 16) != 0x0301) {
-                dev_warn(&pdev->dev, "PT%d, I/F-ver.:%d not supported",
-                        ver >> 24, (ver & 0x00ff0000) >> 16);
+                dev_warn(&pdev->dev, "PT%d, I/F-ver.:%d not supported\n",
+                         ver >> 24, (ver & 0x00ff0000) >> 16);
                 ret = -ENODEV;
                 goto err_iounmap;
         }
@@ -788,7 +786,6 @@ static int pt3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pt3->i2c_buf = kmalloc(sizeof(*pt3->i2c_buf), GFP_KERNEL);
         if (pt3->i2c_buf == NULL) {
-                dev_err(&pdev->dev, "Failed to alloc mem for i2c.\n");
                 ret = -ENOMEM;
                 goto err_iounmap;
         }
@@ -801,7 +798,7 @@ static int pt3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         i2c_set_adapdata(i2c, pt3);
         ret = i2c_add_adapter(i2c);
         if (ret < 0) {
-                dev_err(&pdev->dev, "Failed to add i2c adapter.\n");
+                dev_err(&pdev->dev, "Failed to add i2c adapter\n");
                 goto err_i2cbuf;
         }
 
@@ -815,20 +812,20 @@ static int pt3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         break;
         }
         if (i < PT3_NUM_FE) {
-                dev_err(&pdev->dev, "Failed to create FE%d.\n", i);
+                dev_err(&pdev->dev, "Failed to create FE%d\n", i);
                 goto err_cleanup_adapters;
         }
 
         ret = pt3_fe_init(pt3);
         if (ret < 0) {
-                dev_err(&pdev->dev, "Failed to init frontends.\n");
+                dev_err(&pdev->dev, "Failed to init frontends\n");
                 i = PT3_NUM_FE - 1;
                 goto err_cleanup_adapters;
         }
 
         dev_info(&pdev->dev,
-                "successfully init'ed PT%d (fw:0x%02x, I/F:0x%02x).\n",
-                ver >> 24, (ver >> 8) & 0xff, (ver >> 16) & 0xff);
+                 "successfully init'ed PT%d (fw:0x%02x, I/F:0x%02x)\n",
+                 ver >> 24, (ver >> 8) & 0xff, (ver >> 16) & 0xff);
         return 0;
 
 err_cleanup_adapters:
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index 236ed725f933..a349e964e0bc 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -1001,13 +1001,18 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         saa7134_board_init1(dev);
         saa7134_hwinit1(dev);
 
+        dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
+        if (IS_ERR(dev->alloc_ctx)) {
+                err = PTR_ERR(dev->alloc_ctx);
+                goto fail3;
+        }
         /* get irq */
         err = request_irq(pci_dev->irq, saa7134_irq,
                           IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 printk(KERN_ERR "%s: can't get IRQ %d\n",
                        dev->name,pci_dev->irq);
-                goto fail3;
+                goto fail4;
         }
 
         /* wait a bit, register i2c bus */
@@ -1065,7 +1070,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         if (err < 0) {
                 printk(KERN_INFO "%s: can't register video device\n",
                        dev->name);
-                goto fail4;
+                goto fail5;
         }
         printk(KERN_INFO "%s: registered device %s [v4l2]\n",
                dev->name, video_device_node_name(dev->video_dev));
@@ -1078,7 +1083,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         err = video_register_device(dev->vbi_dev,VFL_TYPE_VBI,
                                     vbi_nr[dev->nr]);
         if (err < 0)
-                goto fail4;
+                goto fail5;
         printk(KERN_INFO "%s: registered device %s\n",
                dev->name, video_device_node_name(dev->vbi_dev));
 
@@ -1089,7 +1094,7 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
                 err = video_register_device(dev->radio_dev,VFL_TYPE_RADIO,
                                             radio_nr[dev->nr]);
                 if (err < 0)
-                        goto fail4;
+                        goto fail5;
                 printk(KERN_INFO "%s: registered device %s\n",
                        dev->name, video_device_node_name(dev->radio_dev));
         }
@@ -1103,10 +1108,12 @@ static int saa7134_initdev(struct pci_dev *pci_dev,
         request_submodules(dev);
         return 0;
 
- fail4:
+ fail5:
         saa7134_unregister_video(dev);
         saa7134_i2c_unregister(dev);
         free_irq(pci_dev->irq, dev);
+ fail4:
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
  fail3:
         saa7134_hwfini(dev);
         iounmap(dev->lmmio);
@@ -1173,6 +1180,7 @@ static void saa7134_finidev(struct pci_dev *pci_dev)
 
         /* release resources */
         free_irq(pci_dev->irq, dev);
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
         iounmap(dev->lmmio);
         release_mem_region(pci_resource_start(pci_dev,0),
                            pci_resource_len(pci_dev,0));
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c
index e4ea85fd1b23..594dc3ad4750 100644
--- a/drivers/media/pci/saa7134/saa7134-empress.c
+++ b/drivers/media/pci/saa7134/saa7134-empress.c
@@ -96,7 +96,6 @@ static struct vb2_ops saa7134_empress_qops = {
         .queue_setup    = saa7134_ts_queue_setup,
         .buf_init       = saa7134_ts_buffer_init,
         .buf_prepare    = saa7134_ts_buffer_prepare,
-        .buf_finish     = saa7134_ts_buffer_finish,
         .buf_queue      = saa7134_vb2_buffer_queue,
         .wait_prepare   = vb2_ops_wait_prepare,
         .wait_finish    = vb2_ops_wait_finish,
@@ -140,7 +139,7 @@ static int empress_s_fmt_vid_cap(struct file *file, void *priv,
         struct saa7134_dev *dev = video_drvdata(file);
         struct v4l2_mbus_framefmt mbus_fmt;
 
-        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, MEDIA_BUS_FMT_FIXED);
         saa_call_all(dev, video, s_mbus_fmt, &mbus_fmt);
         v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
@@ -157,7 +156,7 @@ static int empress_try_fmt_vid_cap(struct file *file, void *priv,
         struct saa7134_dev *dev = video_drvdata(file);
         struct v4l2_mbus_framefmt mbus_fmt;
 
-        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, MEDIA_BUS_FMT_FIXED);
         saa_call_all(dev, video, try_mbus_fmt, &mbus_fmt);
         v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
diff --git a/drivers/media/pci/saa7134/saa7134-ts.c b/drivers/media/pci/saa7134/saa7134-ts.c
index bd25323bd947..2709b83d57b1 100644
--- a/drivers/media/pci/saa7134/saa7134-ts.c
+++ b/drivers/media/pci/saa7134/saa7134-ts.c
@@ -94,7 +94,6 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
         struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
         struct sg_table *dma = vb2_dma_sg_plane_desc(vb2, 0);
         unsigned int lines, llength, size;
-        int ret;
 
         dprintk("buffer_prepare [%p]\n", buf);
 
@@ -108,25 +107,11 @@ int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2)
         vb2_set_plane_payload(vb2, 0, size);
         vb2->v4l2_buf.field = dev->field;
 
-        ret = dma_map_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
         return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                     saa7134_buffer_startpage(buf));
 }
 EXPORT_SYMBOL_GPL(saa7134_ts_buffer_prepare);
 
-void saa7134_ts_buffer_finish(struct vb2_buffer *vb2)
-{
-        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
-
-        dma_unmap_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-}
-EXPORT_SYMBOL_GPL(saa7134_ts_buffer_finish);
-
 int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                            unsigned int *nbuffers, unsigned int *nplanes,
                            unsigned int sizes[], void *alloc_ctxs[])
@@ -142,6 +127,7 @@ int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                 *nbuffers = 3;
         *nplanes = 1;
         sizes[0] = size;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 EXPORT_SYMBOL_GPL(saa7134_ts_queue_setup);
@@ -187,7 +173,6 @@ struct vb2_ops saa7134_ts_qops = {
         .queue_setup    = saa7134_ts_queue_setup,
         .buf_init       = saa7134_ts_buffer_init,
         .buf_prepare    = saa7134_ts_buffer_prepare,
-        .buf_finish     = saa7134_ts_buffer_finish,
         .buf_queue      = saa7134_vb2_buffer_queue,
         .wait_prepare   = vb2_ops_wait_prepare,
         .wait_finish    = vb2_ops_wait_finish,
diff --git a/drivers/media/pci/saa7134/saa7134-vbi.c b/drivers/media/pci/saa7134/saa7134-vbi.c
index 4f0b1012e4f3..5306e549e526 100644
--- a/drivers/media/pci/saa7134/saa7134-vbi.c
+++ b/drivers/media/pci/saa7134/saa7134-vbi.c
@@ -120,7 +120,6 @@ static int buffer_prepare(struct vb2_buffer *vb2)
         struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
         struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
         unsigned int size;
-        int ret;
 
         if (dma->sgl->offset) {
                 pr_err("The buffer is not page-aligned\n");
@@ -132,9 +131,6 @@ static int buffer_prepare(struct vb2_buffer *vb2)
 
         vb2_set_plane_payload(vb2, 0, size);
 
-        ret = dma_map_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
         return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                     saa7134_buffer_startpage(buf));
 }
@@ -156,6 +152,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         *nbuffers = saa7134_buffer_count(size, *nbuffers);
         *nplanes = 1;
         sizes[0] = size;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 
@@ -169,21 +166,10 @@ static int buffer_init(struct vb2_buffer *vb2)
         return 0;
 }
 
-static void buffer_finish(struct vb2_buffer *vb2)
-{
-        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
-
-        dma_unmap_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-}
-
 struct vb2_ops saa7134_vbi_qops = {
         .queue_setup    = queue_setup,
         .buf_init       = buffer_init,
         .buf_prepare    = buffer_prepare,
-        .buf_finish     = buffer_finish,
         .buf_queue      = saa7134_vb2_buffer_queue,
         .wait_prepare   = vb2_ops_wait_prepare,
         .wait_finish    = vb2_ops_wait_finish,
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index fc4a427cb51f..701b52f34689 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -883,7 +883,6 @@ static int buffer_prepare(struct vb2_buffer *vb2)
         struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
         struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
         unsigned int size;
-        int ret;
 
         if (dma->sgl->offset) {
                 pr_err("The buffer is not page-aligned\n");
@@ -896,23 +895,10 @@ static int buffer_prepare(struct vb2_buffer *vb2)
         vb2_set_plane_payload(vb2, 0, size);
         vb2->v4l2_buf.field = dev->field;
 
-        ret = dma_map_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-        if (!ret)
-                return -EIO;
         return saa7134_pgtable_build(dev->pci, &dmaq->pt, dma->sgl, dma->nents,
                                     saa7134_buffer_startpage(buf));
 }
 
-static void buffer_finish(struct vb2_buffer *vb2)
-{
-        struct saa7134_dmaqueue *dmaq = vb2->vb2_queue->drv_priv;
-        struct saa7134_dev *dev = dmaq->dev;
-        struct saa7134_buf *buf = container_of(vb2, struct saa7134_buf, vb2);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(&buf->vb2, 0);
-
-        dma_unmap_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-}
-
 static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                            unsigned int *nbuffers, unsigned int *nplanes,
                            unsigned int sizes[], void *alloc_ctxs[])
@@ -932,6 +918,7 @@ static int queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         *nbuffers = saa7134_buffer_count(size, *nbuffers);
         *nplanes = 1;
         sizes[0] = size;
+        alloc_ctxs[0] = dev->alloc_ctx;
         return 0;
 }
 
@@ -1004,7 +991,6 @@ static struct vb2_ops vb2_qops = {
         .queue_setup    = queue_setup,
         .buf_init       = buffer_init,
         .buf_prepare    = buffer_prepare,
-        .buf_finish     = buffer_finish,
         .buf_queue      = saa7134_vb2_buffer_queue,
         .wait_prepare   = vb2_ops_wait_prepare,
         .wait_finish    = vb2_ops_wait_finish,
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 1a82dd07205b..8bf0553b8d2f 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -588,6 +588,7 @@ struct saa7134_dev {
 
 
         /* video+ts+vbi capture */
+        void                       *alloc_ctx;
         struct saa7134_dmaqueue    video_q;
         struct vb2_queue           video_vbq;
         struct saa7134_dmaqueue    vbi_q;
@@ -814,7 +815,6 @@ void saa7134_video_fini(struct saa7134_dev *dev);
 
 int saa7134_ts_buffer_init(struct vb2_buffer *vb2);
 int saa7134_ts_buffer_prepare(struct vb2_buffer *vb2);
-void saa7134_ts_buffer_finish(struct vb2_buffer *vb2);
 int saa7134_ts_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
                            unsigned int *nbuffers, unsigned int *nplanes,
                            unsigned int sizes[], void *alloc_ctxs[]);
diff --git a/drivers/media/pci/saa7164/saa7164-buffer.c b/drivers/media/pci/saa7164/saa7164-buffer.c
index 66696fa8341d..9bd1f73f82da 100644
--- a/drivers/media/pci/saa7164/saa7164-buffer.c
+++ b/drivers/media/pci/saa7164/saa7164-buffer.c
@@ -130,9 +130,9 @@ struct saa7164_buffer *saa7164_buffer_alloc(struct saa7164_port *port,
                 goto fail2;
 
         /* init the buffers to a known pattern, easier during debugging */
-        memset_io(buf->cpu, 0xff, buf->pci_size);
+        memset(buf->cpu, 0xff, buf->pci_size);
         buf->crc = crc32(0, buf->cpu, buf->actual_size);
-        memset_io(buf->pt_cpu, 0xff, buf->pt_size);
+        memset(buf->pt_cpu, 0xff, buf->pt_size);
 
         dprintk(DBGLVL_BUF, "%s()   allocated buffer @ 0x%p (%d pageptrs)\n",
                 __func__, buf, params->numpagetables);
diff --git a/drivers/media/pci/saa7164/saa7164-bus.c b/drivers/media/pci/saa7164/saa7164-bus.c
index 5f6f3094c44e..6c73f5b155f6 100644
--- a/drivers/media/pci/saa7164/saa7164-bus.c
+++ b/drivers/media/pci/saa7164/saa7164-bus.c
@@ -33,12 +33,12 @@ int saa7164_bus_setup(struct saa7164_dev *dev)
         b->Type                 = TYPE_BUS_PCIe;
         b->m_wMaxReqSize        = SAA_DEVICE_MAXREQUESTSIZE;
 
-        b->m_pdwSetRing         = (u8 *)(dev->bmmio +
+        b->m_pdwSetRing         = (u8 __iomem *)(dev->bmmio +
                 ((u32)dev->busdesc.CommandRing));
 
         b->m_dwSizeSetRing      = SAA_DEVICE_BUFFERBLOCKSIZE;
 
-        b->m_pdwGetRing         = (u8 *)(dev->bmmio +
+        b->m_pdwGetRing         = (u8 __iomem *)(dev->bmmio +
                 ((u32)dev->busdesc.ResponseRing));
 
         b->m_dwSizeGetRing      = SAA_DEVICE_BUFFERBLOCKSIZE;
@@ -138,6 +138,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
         u32 bytes_to_write, free_write_space, timeout, curr_srp, curr_swp;
         u32 new_swp, space_rem;
         int ret = SAA_ERR_BAD_PARAMETER;
+        u16 size;
 
         if (!msg) {
                 printk(KERN_ERR "%s() !msg\n", __func__);
@@ -148,10 +149,6 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
 
         saa7164_bus_verify(dev);
 
-        msg->size = cpu_to_le16(msg->size);
-        msg->command = cpu_to_le32(msg->command);
-        msg->controlselector = cpu_to_le16(msg->controlselector);
-
         if (msg->size > dev->bus.m_wMaxReqSize) {
                 printk(KERN_ERR "%s() Exceeded dev->bus.m_wMaxReqSize\n",
                         __func__);
@@ -169,8 +166,8 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
         bytes_to_write = sizeof(*msg) + msg->size;
         free_write_space = 0;
         timeout = SAA_BUS_TIMEOUT;
-        curr_srp = le32_to_cpu(saa7164_readl(bus->m_dwSetReadPos));
-        curr_swp = le32_to_cpu(saa7164_readl(bus->m_dwSetWritePos));
+        curr_srp = saa7164_readl(bus->m_dwSetReadPos);
+        curr_swp = saa7164_readl(bus->m_dwSetWritePos);
 
         /* Deal with ring wrapping issues */
         if (curr_srp > curr_swp)
@@ -203,7 +200,7 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
                 mdelay(1);
 
                 /* Check the space usage again */
-                curr_srp = le32_to_cpu(saa7164_readl(bus->m_dwSetReadPos));
+                curr_srp = saa7164_readl(bus->m_dwSetReadPos);
 
                 /* Deal with ring wrapping issues */
                 if (curr_srp > curr_swp)
@@ -223,6 +220,16 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
         dprintk(DBGLVL_BUS, "%s() bus->m_dwSizeSetRing = %x\n", __func__,
                 bus->m_dwSizeSetRing);
 
+        /*
+         * Make a copy of msg->size before it is converted to le16 since it is
+         * used in the code below.
+         */
+        size = msg->size;
+        /* Convert to le16/le32 */
+        msg->size = (__force u16)cpu_to_le16(msg->size);
+        msg->command = (__force u32)cpu_to_le32(msg->command);
+        msg->controlselector = (__force u16)cpu_to_le16(msg->controlselector);
+
         /* Mental Note: line 462 tmmhComResBusPCIe.cpp */
 
         /* Check if we're going to wrap again */
@@ -243,28 +250,28 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
                         dprintk(DBGLVL_BUS, "%s() tr4\n", __func__);
 
                         /* Split the msg into pieces as the ring wraps */
-                        memcpy(bus->m_pdwSetRing + curr_swp, msg, space_rem);
-                        memcpy(bus->m_pdwSetRing, (u8 *)msg + space_rem,
+                        memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, space_rem);
+                        memcpy_toio(bus->m_pdwSetRing, (u8 *)msg + space_rem,
                                 sizeof(*msg) - space_rem);
 
-                        memcpy(bus->m_pdwSetRing + sizeof(*msg) - space_rem,
-                                buf, msg->size);
+                        memcpy_toio(bus->m_pdwSetRing + sizeof(*msg) - space_rem,
+                                buf, size);
 
                 } else if (space_rem == sizeof(*msg)) {
                         dprintk(DBGLVL_BUS, "%s() tr5\n", __func__);
 
                         /* Additional data at the beginning of the ring */
-                        memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
-                        memcpy(bus->m_pdwSetRing, buf, msg->size);
+                        memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+                        memcpy_toio(bus->m_pdwSetRing, buf, size);
 
                 } else {
                         /* Additional data wraps around the ring */
-                        memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
-                        if (msg->size > 0) {
-                                memcpy(bus->m_pdwSetRing + curr_swp +
+                        memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+                        if (size > 0) {
+                                memcpy_toio(bus->m_pdwSetRing + curr_swp +
                                         sizeof(*msg), buf, space_rem -
                                         sizeof(*msg));
-                                memcpy(bus->m_pdwSetRing, (u8 *)buf +
+                                memcpy_toio(bus->m_pdwSetRing, (u8 *)buf +
                                         space_rem - sizeof(*msg),
                                         bytes_to_write - space_rem);
                         }
@@ -276,15 +283,20 @@ int saa7164_bus_set(struct saa7164_dev *dev, struct tmComResInfo* msg,
                 dprintk(DBGLVL_BUS, "%s() tr6\n", __func__);
 
                 /* The ring buffer doesn't wrap, two simple copies */
-                memcpy(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
-                memcpy(bus->m_pdwSetRing + curr_swp + sizeof(*msg), buf,
-                        msg->size);
+                memcpy_toio(bus->m_pdwSetRing + curr_swp, msg, sizeof(*msg));
+                memcpy_toio(bus->m_pdwSetRing + curr_swp + sizeof(*msg), buf,
+                        size);
         }
 
         dprintk(DBGLVL_BUS, "%s() new_swp = %x\n", __func__, new_swp);
 
         /* Update the bus write position */
-        saa7164_writel(bus->m_dwSetWritePos, cpu_to_le32(new_swp));
+        saa7164_writel(bus->m_dwSetWritePos, new_swp);
+
+        /* Convert back to cpu after writing the msg to the ringbuffer. */
+        msg->size = le16_to_cpu((__force __le16)msg->size);
+        msg->command = le32_to_cpu((__force __le32)msg->command);
+        msg->controlselector = le16_to_cpu((__force __le16)msg->controlselector);
         ret = SAA_OK;
 
 out:
@@ -336,8 +348,8 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
         /* Peek the bus to see if a msg exists, if it's not what we're expecting
          * then return cleanly else read the message from the bus.
          */
-        curr_gwp = le32_to_cpu(saa7164_readl(bus->m_dwGetWritePos));
-        curr_grp = le32_to_cpu(saa7164_readl(bus->m_dwGetReadPos));
+        curr_gwp = saa7164_readl(bus->m_dwGetWritePos);
+        curr_grp = saa7164_readl(bus->m_dwGetReadPos);
 
         if (curr_gwp == curr_grp) {
                 ret = SAA_ERR_EMPTY;
@@ -369,14 +381,18 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
                 new_grp -= bus->m_dwSizeGetRing;
                 space_rem = bus->m_dwSizeGetRing - curr_grp;
 
-                memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, space_rem);
-                memcpy((u8 *)&msg_tmp + space_rem, bus->m_pdwGetRing,
+                memcpy_fromio(&msg_tmp, bus->m_pdwGetRing + curr_grp, space_rem);
+                memcpy_fromio((u8 *)&msg_tmp + space_rem, bus->m_pdwGetRing,
                         bytes_to_read - space_rem);
 
         } else {
                 /* No wrapping */
-                memcpy(&msg_tmp, bus->m_pdwGetRing + curr_grp, bytes_to_read);
+                memcpy_fromio(&msg_tmp, bus->m_pdwGetRing + curr_grp, bytes_to_read);
         }
+        /* Convert from little endian to CPU */
+        msg_tmp.size = le16_to_cpu((__force __le16)msg_tmp.size);
+        msg_tmp.command = le32_to_cpu((__force __le32)msg_tmp.command);
+        msg_tmp.controlselector = le16_to_cpu((__force __le16)msg_tmp.controlselector);
 
         /* No need to update the read positions, because this was a peek */
         /* If the caller specifically want to peek, return */
@@ -427,24 +443,24 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
 
                 if (space_rem < sizeof(*msg)) {
                         /* msg wraps around the ring */
-                        memcpy(msg, bus->m_pdwGetRing + curr_grp, space_rem);
-                        memcpy((u8 *)msg + space_rem, bus->m_pdwGetRing,
+                        memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, space_rem);
+                        memcpy_fromio((u8 *)msg + space_rem, bus->m_pdwGetRing,
                                 sizeof(*msg) - space_rem);
                         if (buf)
-                                memcpy(buf, bus->m_pdwGetRing + sizeof(*msg) -
+                                memcpy_fromio(buf, bus->m_pdwGetRing + sizeof(*msg) -
                                         space_rem, buf_size);
 
                 } else if (space_rem == sizeof(*msg)) {
-                        memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+                        memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
                         if (buf)
-                                memcpy(buf, bus->m_pdwGetRing, buf_size);
+                                memcpy_fromio(buf, bus->m_pdwGetRing, buf_size);
                 } else {
                         /* Additional data wraps around the ring */
-                        memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+                        memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
                         if (buf) {
-                                memcpy(buf, bus->m_pdwGetRing + curr_grp +
+                                memcpy_fromio(buf, bus->m_pdwGetRing + curr_grp +
                                         sizeof(*msg), space_rem - sizeof(*msg));
-                                memcpy(buf + space_rem - sizeof(*msg),
+                                memcpy_fromio(buf + space_rem - sizeof(*msg),
                                         bus->m_pdwGetRing, bytes_to_read -
                                         space_rem);
                         }
@@ -453,19 +469,20 @@ int saa7164_bus_get(struct saa7164_dev *dev, struct tmComResInfo* msg,
 
         } else {
                 /* No wrapping */
-                memcpy(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
+                memcpy_fromio(msg, bus->m_pdwGetRing + curr_grp, sizeof(*msg));
                 if (buf)
-                        memcpy(buf, bus->m_pdwGetRing + curr_grp + sizeof(*msg),
+                        memcpy_fromio(buf, bus->m_pdwGetRing + curr_grp + sizeof(*msg),
                                 buf_size);
         }
+        /* Convert from little endian to CPU */
+        msg->size = le16_to_cpu((__force __le16)msg->size);
+        msg->command = le32_to_cpu((__force __le32)msg->command);
+        msg->controlselector = le16_to_cpu((__force __le16)msg->controlselector);
 
         /* Update the read positions, adjusting the ring */
-        saa7164_writel(bus->m_dwGetReadPos, cpu_to_le32(new_grp));
+        saa7164_writel(bus->m_dwGetReadPos, new_grp);
 
 peekout:
-        msg->size = le16_to_cpu(msg->size);
-        msg->command = le32_to_cpu(msg->command);
-        msg->controlselector = le16_to_cpu(msg->controlselector);
         ret = SAA_OK;
 out:
         mutex_unlock(&bus->lock);
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c
index cc1be8a7a451..4b0bec3766ed 100644
--- a/drivers/media/pci/saa7164/saa7164-core.c
+++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -119,7 +119,7 @@ static void saa7164_ts_verifier(struct saa7164_buffer *buf)
         u32 i;
         u8 cc, a;
         u16 pid;
-        u8 __iomem *bufcpu = (u8 *)buf->cpu;
+        u8 *bufcpu = (u8 *)buf->cpu;
 
         port->sync_errors = 0;
         port->v_cc_errors = 0;
@@ -260,7 +260,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
         struct saa7164_user_buffer *ubuf = NULL;
         struct list_head *c, *n;
         int i = 0;
-        u8 __iomem *p;
+        u8 *p;
 
         mutex_lock(&port->dmaqueue_lock);
         list_for_each_safe(c, n, &port->dmaqueue.list) {
@@ -318,8 +318,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
 
                                 if (buf->actual_size <= ubuf->actual_size) {
 
-                                        memcpy_fromio(ubuf->data, buf->cpu,
-                                                ubuf->actual_size);
+                                        memcpy(ubuf->data, buf->cpu, ubuf->actual_size);
 
                                         if (crc_checking) {
                                                 /* Throw a new checksum on the read buffer */
@@ -346,7 +345,7 @@ static void saa7164_work_enchandler_helper(struct saa7164_port *port, int bufnr)
                          * with known bad data. We check for this data at a later point
                          * in time. */
                         saa7164_buffer_zero_offsets(port, bufnr);
-                        memset_io(buf->cpu, 0xff, buf->pci_size);
+                        memset(buf->cpu, 0xff, buf->pci_size);
                         if (crc_checking) {
                                 /* Throw yet aanother new checksum on the dma buffer */
                                 buf->crc = crc32(0, buf->cpu, buf->actual_size);
@@ -1096,7 +1095,7 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
                         if (c == 0)
                                 seq_printf(m, " %04x:", i);
 
-                        seq_printf(m, " %02x", *(b->m_pdwSetRing + i));
+                        seq_printf(m, " %02x", readb(b->m_pdwSetRing + i));
 
                         if (++c == 16) {
                                 seq_printf(m, "\n");
@@ -1111,7 +1110,7 @@ static int saa7164_proc_show(struct seq_file *m, void *v)
                         if (c == 0)
                                 seq_printf(m, " %04x:", i);
 
-                        seq_printf(m, " %02x", *(b->m_pdwGetRing + i));
+                        seq_printf(m, " %02x", readb(b->m_pdwGetRing + i));
 
                         if (++c == 16) {
                                 seq_printf(m, "\n");
diff --git a/drivers/media/pci/saa7164/saa7164-fw.c b/drivers/media/pci/saa7164/saa7164-fw.c
index 86763203d61d..add06ab5124d 100644
--- a/drivers/media/pci/saa7164/saa7164-fw.c
+++ b/drivers/media/pci/saa7164/saa7164-fw.c
@@ -72,7 +72,7 @@ static int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg)
 /* TODO: move dlflags into dev-> and change to write/readl/b */
 /* TODO: Excessive levels of debug */
 static int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
-                                 u32 dlflags, u8 *dst, u32 dstsize)
+                                 u32 dlflags, u8 __iomem *dst, u32 dstsize)
 {
         u32 reg, timeout, offset;
         u8 *srcbuf = NULL;
@@ -136,7 +136,7 @@ static int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
                 srcsize -= dstsize, offset += dstsize) {
 
                 dprintk(DBGLVL_FW, "%s() memcpy %d\n", __func__, dstsize);
-                memcpy(dst, srcbuf + offset, dstsize);
+                memcpy_toio(dst, srcbuf + offset, dstsize);
 
                 /* Flag the data as ready */
                 saa7164_writel(drflag, 1);
@@ -154,7 +154,7 @@ static int saa7164_downloadimage(struct saa7164_dev *dev, u8 *src, u32 srcsize,
 
         dprintk(DBGLVL_FW, "%s() memcpy(l) %d\n", __func__, dstsize);
         /* Write last block to the device */
-        memcpy(dst, srcbuf+offset, srcsize);
+        memcpy_toio(dst, srcbuf+offset, srcsize);
 
         /* Flag the data as ready */
         saa7164_writel(drflag, 1);
diff --git a/drivers/media/pci/saa7164/saa7164-types.h b/drivers/media/pci/saa7164/saa7164-types.h
index 1d2140a3eb38..f48ba978f835 100644
--- a/drivers/media/pci/saa7164/saa7164-types.h
+++ b/drivers/media/pci/saa7164/saa7164-types.h
@@ -78,9 +78,9 @@ enum tmBusType {
 struct tmComResBusInfo {
         enum tmBusType Type;
         u16     m_wMaxReqSize;
-        u8      *m_pdwSetRing;
+        u8 __iomem *m_pdwSetRing;
         u32     m_dwSizeSetRing;
-        u8      *m_pdwGetRing;
+        u8 __iomem *m_pdwGetRing;
         u32     m_dwSizeGetRing;
         u32     m_dwSetWritePos;
         u32     m_dwSetReadPos;
diff --git a/drivers/media/pci/saa7164/saa7164.h b/drivers/media/pci/saa7164/saa7164.h
index 8b29e8990301..cd1a07ce27cb 100644
--- a/drivers/media/pci/saa7164/saa7164.h
+++ b/drivers/media/pci/saa7164/saa7164.h
@@ -313,13 +313,13 @@ struct saa7164_buffer {
 
         /* A block of page align PCI memory */
         u32 pci_size;   /* PCI allocation size in bytes */
-        u64 __iomem *cpu;       /* Virtual address */
+        u64 *cpu;       /* Virtual address */
         dma_addr_t dma; /* Physical address */
         u32 crc;        /* Checksum for the entire buffer data */
 
         /* A page table that splits the block into a number of entries */
         u32 pt_size;            /* PCI allocation size in bytes */
-        u64 __iomem *pt_cpu;            /* Virtual address */
+        u64 *pt_cpu;            /* Virtual address */
         dma_addr_t pt_dma;      /* Physical address */
 
         /* Encoder fops */
diff --git a/drivers/media/pci/smipcie/Kconfig b/drivers/media/pci/smipcie/Kconfig
new file mode 100644
index 000000000000..c8de53f5ea28
--- /dev/null
+++ b/drivers/media/pci/smipcie/Kconfig
@@ -0,0 +1,17 @@
+config DVB_SMIPCIE
+        tristate "SMI PCIe DVBSky cards"
+        depends on DVB_CORE && PCI && I2C
+        select I2C_ALGOBIT
+        select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_M88RS6000T if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
+        help
+          Support for cards with SMI PCIe bridge:
+          - DVBSky S950 V3
+          - DVBSky S952 V3
+          - DVBSky T9580 V3
+
+          Say Y or M if you own such a device and want to use it.
+          If unsure say N.
diff --git a/drivers/media/pci/smipcie/Makefile b/drivers/media/pci/smipcie/Makefile
new file mode 100644
index 000000000000..be55481a6e95
--- /dev/null
+++ b/drivers/media/pci/smipcie/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_DVB_SMIPCIE) += smipcie.o
+
+ccflags-y += -Idrivers/media/tuners
+ccflags-y += -Idrivers/media/dvb-core
+ccflags-y += -Idrivers/media/dvb-frontends
+
diff --git a/drivers/media/pci/smipcie/smipcie.c b/drivers/media/pci/smipcie/smipcie.c
new file mode 100644
index 000000000000..f773350e67b9
--- /dev/null
+++ b/drivers/media/pci/smipcie/smipcie.c
@@ -0,0 +1,1099 @@
+/*
+ * SMI PCIe driver for DVBSky cards.
+ *
+ * Copyright (C) 2014 Max nibble <nibble.max@gmail.com>
+ *
+ *    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 of the License, 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.
+ */
+
+#include "smipcie.h"
+#include "m88ds3103.h"
+#include "m88ts2022.h"
+#include "m88rs6000t.h"
+#include "si2168.h"
+#include "si2157.h"
+
+DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
+
+static int smi_hw_init(struct smi_dev *dev)
+{
+        u32 port_mux, port_ctrl, int_stat;
+
+        /* set port mux.*/
+        port_mux = smi_read(MUX_MODE_CTRL);
+        port_mux &= ~(rbPaMSMask);
+        port_mux |= rbPaMSDtvNoGpio;
+        port_mux &= ~(rbPbMSMask);
+        port_mux |= rbPbMSDtvNoGpio;
+        port_mux &= ~(0x0f0000);
+        port_mux |= 0x50000;
+        smi_write(MUX_MODE_CTRL, port_mux);
+
+        /* set DTV register.*/
+        /* Port A */
+        port_ctrl = smi_read(VIDEO_CTRL_STATUS_A);
+        port_ctrl &= ~0x01;
+        smi_write(VIDEO_CTRL_STATUS_A, port_ctrl);
+        port_ctrl = smi_read(MPEG2_CTRL_A);
+        port_ctrl &= ~0x40;
+        port_ctrl |= 0x80;
+        smi_write(MPEG2_CTRL_A, port_ctrl);
+        /* Port B */
+        port_ctrl = smi_read(VIDEO_CTRL_STATUS_B);
+        port_ctrl &= ~0x01;
+        smi_write(VIDEO_CTRL_STATUS_B, port_ctrl);
+        port_ctrl = smi_read(MPEG2_CTRL_B);
+        port_ctrl &= ~0x40;
+        port_ctrl |= 0x80;
+        smi_write(MPEG2_CTRL_B, port_ctrl);
+
+        /* disable and clear interrupt.*/
+        smi_write(MSI_INT_ENA_CLR, ALL_INT);
+        int_stat = smi_read(MSI_INT_STATUS);
+        smi_write(MSI_INT_STATUS_CLR, int_stat);
+
+        /* reset demod.*/
+        smi_clear(PERIPHERAL_CTRL, 0x0303);
+        msleep(50);
+        smi_set(PERIPHERAL_CTRL, 0x0101);
+        return 0;
+}
+
+/* i2c bit bus.*/
+static void smi_i2c_cfg(struct smi_dev *dev, u32 sw_ctl)
+{
+        u32 dwCtrl;
+
+        dwCtrl = smi_read(sw_ctl);
+        dwCtrl &= ~0x18; /* disable output.*/
+        dwCtrl |= 0x21; /* reset and software mode.*/
+        dwCtrl &= ~0xff00;
+        dwCtrl |= 0x6400;
+        smi_write(sw_ctl, dwCtrl);
+        msleep(20);
+        dwCtrl = smi_read(sw_ctl);
+        dwCtrl &= ~0x20;
+        smi_write(sw_ctl, dwCtrl);
+}
+
+static void smi_i2c_setsda(struct smi_dev *dev, int state, u32 sw_ctl)
+{
+        if (state) {
+                /* set as input.*/
+                smi_clear(sw_ctl, SW_I2C_MSK_DAT_EN);
+        } else {
+                smi_clear(sw_ctl, SW_I2C_MSK_DAT_OUT);
+                /* set as output.*/
+                smi_set(sw_ctl, SW_I2C_MSK_DAT_EN);
+        }
+}
+
+static void smi_i2c_setscl(void *data, int state, u32 sw_ctl)
+{
+        struct smi_dev *dev = data;
+
+        if (state) {
+                /* set as input.*/
+                smi_clear(sw_ctl, SW_I2C_MSK_CLK_EN);
+        } else {
+                smi_clear(sw_ctl, SW_I2C_MSK_CLK_OUT);
+                /* set as output.*/
+                smi_set(sw_ctl, SW_I2C_MSK_CLK_EN);
+        }
+}
+
+static int smi_i2c_getsda(void *data, u32 sw_ctl)
+{
+        struct smi_dev *dev = data;
+        /* set as input.*/
+        smi_clear(sw_ctl, SW_I2C_MSK_DAT_EN);
+        udelay(1);
+        return (smi_read(sw_ctl) & SW_I2C_MSK_DAT_IN) ? 1 : 0;
+}
+
+static int smi_i2c_getscl(void *data, u32 sw_ctl)
+{
+        struct smi_dev *dev = data;
+        /* set as input.*/
+        smi_clear(sw_ctl, SW_I2C_MSK_CLK_EN);
+        udelay(1);
+        return (smi_read(sw_ctl) & SW_I2C_MSK_CLK_IN) ? 1 : 0;
+}
+/* i2c 0.*/
+static void smi_i2c0_setsda(void *data, int state)
+{
+        struct smi_dev *dev = data;
+
+        smi_i2c_setsda(dev, state, I2C_A_SW_CTL);
+}
+
+static void smi_i2c0_setscl(void *data, int state)
+{
+        struct smi_dev *dev = data;
+
+        smi_i2c_setscl(dev, state, I2C_A_SW_CTL);
+}
+
+static int smi_i2c0_getsda(void *data)
+{
+        struct smi_dev *dev = data;
+
+        return  smi_i2c_getsda(dev, I2C_A_SW_CTL);
+}
+
+static int smi_i2c0_getscl(void *data)
+{
+        struct smi_dev *dev = data;
+
+        return  smi_i2c_getscl(dev, I2C_A_SW_CTL);
+}
+/* i2c 1.*/
+static void smi_i2c1_setsda(void *data, int state)
+{
+        struct smi_dev *dev = data;
+
+        smi_i2c_setsda(dev, state, I2C_B_SW_CTL);
+}
+
+static void smi_i2c1_setscl(void *data, int state)
+{
+        struct smi_dev *dev = data;
+
+        smi_i2c_setscl(dev, state, I2C_B_SW_CTL);
+}
+
+static int smi_i2c1_getsda(void *data)
+{
+        struct smi_dev *dev = data;
+
+        return  smi_i2c_getsda(dev, I2C_B_SW_CTL);
+}
+
+static int smi_i2c1_getscl(void *data)
+{
+        struct smi_dev *dev = data;
+
+        return  smi_i2c_getscl(dev, I2C_B_SW_CTL);
+}
+
+static int smi_i2c_init(struct smi_dev *dev)
+{
+        int ret;
+
+        /* i2c bus 0 */
+        smi_i2c_cfg(dev, I2C_A_SW_CTL);
+        i2c_set_adapdata(&dev->i2c_bus[0], dev);
+        strcpy(dev->i2c_bus[0].name, "SMI-I2C0");
+        dev->i2c_bus[0].owner = THIS_MODULE;
+        dev->i2c_bus[0].dev.parent = &dev->pci_dev->dev;
+        dev->i2c_bus[0].algo_data = &dev->i2c_bit[0];
+        dev->i2c_bit[0].data = dev;
+        dev->i2c_bit[0].setsda = smi_i2c0_setsda;
+        dev->i2c_bit[0].setscl = smi_i2c0_setscl;
+        dev->i2c_bit[0].getsda = smi_i2c0_getsda;
+        dev->i2c_bit[0].getscl = smi_i2c0_getscl;
+        dev->i2c_bit[0].udelay = 12;
+        dev->i2c_bit[0].timeout = 10;
+        /* Raise SCL and SDA */
+        smi_i2c0_setsda(dev, 1);
+        smi_i2c0_setscl(dev, 1);
+
+        ret = i2c_bit_add_bus(&dev->i2c_bus[0]);
+        if (ret < 0)
+                return ret;
+
+        /* i2c bus 1 */
+        smi_i2c_cfg(dev, I2C_B_SW_CTL);
+        i2c_set_adapdata(&dev->i2c_bus[1], dev);
+        strcpy(dev->i2c_bus[1].name, "SMI-I2C1");
+        dev->i2c_bus[1].owner = THIS_MODULE;
+        dev->i2c_bus[1].dev.parent = &dev->pci_dev->dev;
+        dev->i2c_bus[1].algo_data = &dev->i2c_bit[1];
+        dev->i2c_bit[1].data = dev;
+        dev->i2c_bit[1].setsda = smi_i2c1_setsda;
+        dev->i2c_bit[1].setscl = smi_i2c1_setscl;
+        dev->i2c_bit[1].getsda = smi_i2c1_getsda;
+        dev->i2c_bit[1].getscl = smi_i2c1_getscl;
+        dev->i2c_bit[1].udelay = 12;
+        dev->i2c_bit[1].timeout = 10;
+        /* Raise SCL and SDA */
+        smi_i2c1_setsda(dev, 1);
+        smi_i2c1_setscl(dev, 1);
+
+        ret = i2c_bit_add_bus(&dev->i2c_bus[1]);
+        if (ret < 0)
+                i2c_del_adapter(&dev->i2c_bus[0]);
+
+        return ret;
+}
+
+static void smi_i2c_exit(struct smi_dev *dev)
+{
+        i2c_del_adapter(&dev->i2c_bus[0]);
+        i2c_del_adapter(&dev->i2c_bus[1]);
+}
+
+static int smi_read_eeprom(struct i2c_adapter *i2c, u16 reg, u8 *data, u16 size)
+{
+        int ret;
+        u8 b0[2] = { (reg >> 8) & 0xff, reg & 0xff };
+
+        struct i2c_msg msg[] = {
+                { .addr = 0x50, .flags = 0,
+                        .buf = b0, .len = 2 },
+                { .addr = 0x50, .flags = I2C_M_RD,
+                        .buf = data, .len = size }
+        };
+
+        ret = i2c_transfer(i2c, msg, 2);
+
+        if (ret != 2) {
+                dev_err(&i2c->dev, "%s: reg=0x%x (error=%d)\n",
+                        __func__, reg, ret);
+                return ret;
+        }
+        return ret;
+}
+
+/* ts port interrupt operations */
+static void smi_port_disableInterrupt(struct smi_port *port)
+{
+        struct smi_dev *dev = port->dev;
+
+        smi_write(MSI_INT_ENA_CLR,
+                (port->_dmaInterruptCH0 | port->_dmaInterruptCH1));
+}
+
+static void smi_port_enableInterrupt(struct smi_port *port)
+{
+        struct smi_dev *dev = port->dev;
+
+        smi_write(MSI_INT_ENA_SET,
+                (port->_dmaInterruptCH0 | port->_dmaInterruptCH1));
+}
+
+static void smi_port_clearInterrupt(struct smi_port *port)
+{
+        struct smi_dev *dev = port->dev;
+
+        smi_write(MSI_INT_STATUS_CLR,
+                (port->_dmaInterruptCH0 | port->_dmaInterruptCH1));
+}
+
+/* tasklet handler: DMA data to dmx.*/
+static void smi_dma_xfer(unsigned long data)
+{
+        struct smi_port *port = (struct smi_port *) data;
+        struct smi_dev *dev = port->dev;
+        u32 intr_status, finishedData, dmaManagement;
+        u8 dmaChan0State, dmaChan1State;
+
+        intr_status = port->_int_status;
+        dmaManagement = smi_read(port->DMA_MANAGEMENT);
+        dmaChan0State = (u8)((dmaManagement & 0x00000030) >> 4);
+        dmaChan1State = (u8)((dmaManagement & 0x00300000) >> 20);
+
+        /* CH-0 DMA interrupt.*/
+        if ((intr_status & port->_dmaInterruptCH0) && (dmaChan0State == 0x01)) {
+                dev_dbg(&dev->pci_dev->dev,
+                        "Port[%d]-DMA CH0 engine complete successful !\n",
+                        port->idx);
+                finishedData = smi_read(port->DMA_CHAN0_TRANS_STATE);
+                finishedData &= 0x003FFFFF;
+                /* value of DMA_PORT0_CHAN0_TRANS_STATE register [21:0]
+                 * indicate dma total transfer length and
+                 * zero of [21:0] indicate dma total transfer length
+                 * equal to 0x400000 (4MB)*/
+                if (finishedData == 0)
+                        finishedData = 0x00400000;
+                if (finishedData != SMI_TS_DMA_BUF_SIZE) {
+                        dev_dbg(&dev->pci_dev->dev,
+                                "DMA CH0 engine complete length mismatched, finish data=%d !\n",
+                                finishedData);
+                }
+                dvb_dmx_swfilter_packets(&port->demux,
+                        port->cpu_addr[0], (finishedData / 188));
+                /*dvb_dmx_swfilter(&port->demux,
+                        port->cpu_addr[0], finishedData);*/
+        }
+        /* CH-1 DMA interrupt.*/
+        if ((intr_status & port->_dmaInterruptCH1) && (dmaChan1State == 0x01)) {
+                dev_dbg(&dev->pci_dev->dev,
+                        "Port[%d]-DMA CH1 engine complete successful !\n",
+                        port->idx);
+                finishedData = smi_read(port->DMA_CHAN1_TRANS_STATE);
+                finishedData &= 0x003FFFFF;
+                /* value of DMA_PORT0_CHAN0_TRANS_STATE register [21:0]
+                 * indicate dma total transfer length and
+                 * zero of [21:0] indicate dma total transfer length
+                 * equal to 0x400000 (4MB)*/
+                if (finishedData == 0)
+                        finishedData = 0x00400000;
+                if (finishedData != SMI_TS_DMA_BUF_SIZE) {
+                        dev_dbg(&dev->pci_dev->dev,
+                                "DMA CH1 engine complete length mismatched, finish data=%d !\n",
+                                finishedData);
+                }
+                dvb_dmx_swfilter_packets(&port->demux,
+                        port->cpu_addr[1], (finishedData / 188));
+                /*dvb_dmx_swfilter(&port->demux,
+                        port->cpu_addr[1], finishedData);*/
+        }
+        /* restart DMA.*/
+        if (intr_status & port->_dmaInterruptCH0)
+                dmaManagement |= 0x00000002;
+        if (intr_status & port->_dmaInterruptCH1)
+                dmaManagement |= 0x00020000;
+        smi_write(port->DMA_MANAGEMENT, dmaManagement);
+        /* Re-enable interrupts */
+        smi_port_enableInterrupt(port);
+}
+
+static void smi_port_dma_free(struct smi_port *port)
+{
+        if (port->cpu_addr[0]) {
+                pci_free_consistent(port->dev->pci_dev, SMI_TS_DMA_BUF_SIZE,
+                                    port->cpu_addr[0], port->dma_addr[0]);
+                port->cpu_addr[0] = NULL;
+        }
+        if (port->cpu_addr[1]) {
+                pci_free_consistent(port->dev->pci_dev, SMI_TS_DMA_BUF_SIZE,
+                                    port->cpu_addr[1], port->dma_addr[1]);
+                port->cpu_addr[1] = NULL;
+        }
+}
+
+static int smi_port_init(struct smi_port *port, int dmaChanUsed)
+{
+        dev_dbg(&port->dev->pci_dev->dev,
+                "%s, port %d, dmaused %d\n", __func__, port->idx, dmaChanUsed);
+        port->enable = 0;
+        if (port->idx == 0) {
+                /* Port A */
+                port->_dmaInterruptCH0 = dmaChanUsed & 0x01;
+                port->_dmaInterruptCH1 = dmaChanUsed & 0x02;
+
+                port->DMA_CHAN0_ADDR_LOW        = DMA_PORTA_CHAN0_ADDR_LOW;
+                port->DMA_CHAN0_ADDR_HI         = DMA_PORTA_CHAN0_ADDR_HI;
+                port->DMA_CHAN0_TRANS_STATE     = DMA_PORTA_CHAN0_TRANS_STATE;
+                port->DMA_CHAN0_CONTROL         = DMA_PORTA_CHAN0_CONTROL;
+                port->DMA_CHAN1_ADDR_LOW        = DMA_PORTA_CHAN1_ADDR_LOW;
+                port->DMA_CHAN1_ADDR_HI         = DMA_PORTA_CHAN1_ADDR_HI;
+                port->DMA_CHAN1_TRANS_STATE     = DMA_PORTA_CHAN1_TRANS_STATE;
+                port->DMA_CHAN1_CONTROL         = DMA_PORTA_CHAN1_CONTROL;
+                port->DMA_MANAGEMENT            = DMA_PORTA_MANAGEMENT;
+        } else {
+                /* Port B */
+                port->_dmaInterruptCH0 = (dmaChanUsed << 2) & 0x04;
+                port->_dmaInterruptCH1 = (dmaChanUsed << 2) & 0x08;
+
+                port->DMA_CHAN0_ADDR_LOW        = DMA_PORTB_CHAN0_ADDR_LOW;
+                port->DMA_CHAN0_ADDR_HI         = DMA_PORTB_CHAN0_ADDR_HI;
+                port->DMA_CHAN0_TRANS_STATE     = DMA_PORTB_CHAN0_TRANS_STATE;
+                port->DMA_CHAN0_CONTROL         = DMA_PORTB_CHAN0_CONTROL;
+                port->DMA_CHAN1_ADDR_LOW        = DMA_PORTB_CHAN1_ADDR_LOW;
+                port->DMA_CHAN1_ADDR_HI         = DMA_PORTB_CHAN1_ADDR_HI;
+                port->DMA_CHAN1_TRANS_STATE     = DMA_PORTB_CHAN1_TRANS_STATE;
+                port->DMA_CHAN1_CONTROL         = DMA_PORTB_CHAN1_CONTROL;
+                port->DMA_MANAGEMENT            = DMA_PORTB_MANAGEMENT;
+        }
+
+        if (port->_dmaInterruptCH0) {
+                port->cpu_addr[0] = pci_alloc_consistent(port->dev->pci_dev,
+                                        SMI_TS_DMA_BUF_SIZE,
+                                        &port->dma_addr[0]);
+                if (!port->cpu_addr[0]) {
+                        dev_err(&port->dev->pci_dev->dev,
+                                "Port[%d] DMA CH0 memory allocation failed!\n",
+                                port->idx);
+                        goto err;
+                }
+        }
+
+        if (port->_dmaInterruptCH1) {
+                port->cpu_addr[1] = pci_alloc_consistent(port->dev->pci_dev,
+                                        SMI_TS_DMA_BUF_SIZE,
+                                        &port->dma_addr[1]);
+                if (!port->cpu_addr[1]) {
+                        dev_err(&port->dev->pci_dev->dev,
+                                "Port[%d] DMA CH1 memory allocation failed!\n",
+                                port->idx);
+                        goto err;
+                }
+        }
+
+        smi_port_disableInterrupt(port);
+        tasklet_init(&port->tasklet, smi_dma_xfer, (unsigned long)port);
+        tasklet_disable(&port->tasklet);
+        port->enable = 1;
+        return 0;
+err:
+        smi_port_dma_free(port);
+        return -ENOMEM;
+}
+
+static void smi_port_exit(struct smi_port *port)
+{
+        smi_port_disableInterrupt(port);
+        tasklet_kill(&port->tasklet);
+        smi_port_dma_free(port);
+        port->enable = 0;
+}
+
+static void smi_port_irq(struct smi_port *port, u32 int_status)
+{
+        u32 port_req_irq = port->_dmaInterruptCH0 | port->_dmaInterruptCH1;
+
+        if (int_status & port_req_irq) {
+                smi_port_disableInterrupt(port);
+                port->_int_status = int_status;
+                smi_port_clearInterrupt(port);
+                tasklet_schedule(&port->tasklet);
+        }
+}
+
+static irqreturn_t smi_irq_handler(int irq, void *dev_id)
+{
+        struct smi_dev *dev = dev_id;
+        struct smi_port *port0 = &dev->ts_port[0];
+        struct smi_port *port1 = &dev->ts_port[1];
+
+        u32 intr_status = smi_read(MSI_INT_STATUS);
+
+        /* ts0 interrupt.*/
+        if (dev->info->ts_0)
+                smi_port_irq(port0, intr_status);
+
+        /* ts1 interrupt.*/
+        if (dev->info->ts_1)
+                smi_port_irq(port1, intr_status);
+
+        return IRQ_HANDLED;
+}
+
+static struct i2c_client *smi_add_i2c_client(struct i2c_adapter *adapter,
+                        struct i2c_board_info *info)
+{
+        struct i2c_client *client;
+
+        request_module(info->type);
+        client = i2c_new_device(adapter, info);
+        if (client == NULL || client->dev.driver == NULL)
+                goto err_add_i2c_client;
+
+        if (!try_module_get(client->dev.driver->owner)) {
+                i2c_unregister_device(client);
+                goto err_add_i2c_client;
+        }
+        return client;
+
+err_add_i2c_client:
+        client = NULL;
+        return client;
+}
+
+static void smi_del_i2c_client(struct i2c_client *client)
+{
+        module_put(client->dev.driver->owner);
+        i2c_unregister_device(client);
+}
+
+static const struct m88ds3103_config smi_dvbsky_m88ds3103_cfg = {
+        .i2c_addr = 0x68,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .clock_out = 0,
+        .ts_mode = M88DS3103_TS_PARALLEL,
+        .ts_clk = 16000,
+        .ts_clk_pol = 1,
+        .agc = 0x99,
+        .lnb_hv_pol = 0,
+        .lnb_en_pol = 1,
+};
+
+static int smi_dvbsky_m88ds3103_fe_attach(struct smi_port *port)
+{
+        int ret = 0;
+        struct smi_dev *dev = port->dev;
+        struct i2c_adapter *i2c;
+        /* tuner I2C module */
+        struct i2c_adapter *tuner_i2c_adapter;
+        struct i2c_client *tuner_client;
+        struct i2c_board_info tuner_info;
+        struct m88ts2022_config m88ts2022_config = {
+                .clock = 27000000,
+        };
+        memset(&tuner_info, 0, sizeof(struct i2c_board_info));
+        i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1];
+
+        /* attach demod */
+        port->fe = dvb_attach(m88ds3103_attach,
+                        &smi_dvbsky_m88ds3103_cfg, i2c, &tuner_i2c_adapter);
+        if (!port->fe) {
+                ret = -ENODEV;
+                return ret;
+        }
+        /* attach tuner */
+        m88ts2022_config.fe = port->fe;
+        strlcpy(tuner_info.type, "m88ts2022", I2C_NAME_SIZE);
+        tuner_info.addr = 0x60;
+        tuner_info.platform_data = &m88ts2022_config;
+        tuner_client = smi_add_i2c_client(tuner_i2c_adapter, &tuner_info);
+        if (!tuner_client) {
+                ret = -ENODEV;
+                goto err_tuner_i2c_device;
+        }
+
+        /* delegate signal strength measurement to tuner */
+        port->fe->ops.read_signal_strength =
+                        port->fe->ops.tuner_ops.get_rf_strength;
+
+        port->i2c_client_tuner = tuner_client;
+        return ret;
+
+err_tuner_i2c_device:
+        dvb_frontend_detach(port->fe);
+        return ret;
+}
+
+static const struct m88ds3103_config smi_dvbsky_m88rs6000_cfg = {
+        .i2c_addr = 0x69,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .ts_mode = M88DS3103_TS_PARALLEL,
+        .ts_clk = 16000,
+        .ts_clk_pol = 1,
+        .agc = 0x99,
+        .lnb_hv_pol = 0,
+        .lnb_en_pol = 1,
+};
+
+static int smi_dvbsky_m88rs6000_fe_attach(struct smi_port *port)
+{
+        int ret = 0;
+        struct smi_dev *dev = port->dev;
+        struct i2c_adapter *i2c;
+        /* tuner I2C module */
+        struct i2c_adapter *tuner_i2c_adapter;
+        struct i2c_client *tuner_client;
+        struct i2c_board_info tuner_info;
+        struct m88rs6000t_config m88rs6000t_config;
+
+        memset(&tuner_info, 0, sizeof(struct i2c_board_info));
+        i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1];
+
+        /* attach demod */
+        port->fe = dvb_attach(m88ds3103_attach,
+                        &smi_dvbsky_m88rs6000_cfg, i2c, &tuner_i2c_adapter);
+        if (!port->fe) {
+                ret = -ENODEV;
+                return ret;
+        }
+        /* attach tuner */
+        m88rs6000t_config.fe = port->fe;
+        strlcpy(tuner_info.type, "m88rs6000t", I2C_NAME_SIZE);
+        tuner_info.addr = 0x21;
+        tuner_info.platform_data = &m88rs6000t_config;
+        tuner_client = smi_add_i2c_client(tuner_i2c_adapter, &tuner_info);
+        if (!tuner_client) {
+                ret = -ENODEV;
+                goto err_tuner_i2c_device;
+        }
+
+        /* delegate signal strength measurement to tuner */
+        port->fe->ops.read_signal_strength =
+                        port->fe->ops.tuner_ops.get_rf_strength;
+
+        port->i2c_client_tuner = tuner_client;
+        return ret;
+
+err_tuner_i2c_device:
+        dvb_frontend_detach(port->fe);
+        return ret;
+}
+
+static int smi_dvbsky_sit2_fe_attach(struct smi_port *port)
+{
+        int ret = 0;
+        struct smi_dev *dev = port->dev;
+        struct i2c_adapter *i2c;
+        struct i2c_adapter *tuner_i2c_adapter;
+        struct i2c_client *client_tuner, *client_demod;
+        struct i2c_board_info client_info;
+        struct si2168_config si2168_config;
+        struct si2157_config si2157_config;
+
+        /* select i2c bus */
+        i2c = (port->idx == 0) ? &dev->i2c_bus[0] : &dev->i2c_bus[1];
+
+        /* attach demod */
+        memset(&si2168_config, 0, sizeof(si2168_config));
+        si2168_config.i2c_adapter = &tuner_i2c_adapter;
+        si2168_config.fe = &port->fe;
+        si2168_config.ts_mode = SI2168_TS_PARALLEL;
+
+        memset(&client_info, 0, sizeof(struct i2c_board_info));
+        strlcpy(client_info.type, "si2168", I2C_NAME_SIZE);
+        client_info.addr = 0x64;
+        client_info.platform_data = &si2168_config;
+
+        client_demod = smi_add_i2c_client(i2c, &client_info);
+        if (!client_demod) {
+                ret = -ENODEV;
+                return ret;
+        }
+        port->i2c_client_demod = client_demod;
+
+        /* attach tuner */
+        memset(&si2157_config, 0, sizeof(si2157_config));
+        si2157_config.fe = port->fe;
+
+        memset(&client_info, 0, sizeof(struct i2c_board_info));
+        strlcpy(client_info.type, "si2157", I2C_NAME_SIZE);
+        client_info.addr = 0x60;
+        client_info.platform_data = &si2157_config;
+
+        client_tuner = smi_add_i2c_client(tuner_i2c_adapter, &client_info);
+        if (!client_tuner) {
+                smi_del_i2c_client(port->i2c_client_demod);
+                port->i2c_client_demod = NULL;
+                ret = -ENODEV;
+                return ret;
+        }
+        port->i2c_client_tuner = client_tuner;
+        return ret;
+}
+
+static int smi_fe_init(struct smi_port *port)
+{
+        int ret = 0;
+        struct smi_dev *dev = port->dev;
+        struct dvb_adapter *adap = &port->dvb_adapter;
+        u8 mac_ee[16];
+
+        dev_dbg(&port->dev->pci_dev->dev,
+                "%s: port %d, fe_type = %d\n",
+                __func__, port->idx, port->fe_type);
+        switch (port->fe_type) {
+        case DVBSKY_FE_M88DS3103:
+                ret = smi_dvbsky_m88ds3103_fe_attach(port);
+                break;
+        case DVBSKY_FE_M88RS6000:
+                ret = smi_dvbsky_m88rs6000_fe_attach(port);
+                break;
+        case DVBSKY_FE_SIT2:
+                ret = smi_dvbsky_sit2_fe_attach(port);
+                break;
+        }
+        if (ret < 0)
+                return ret;
+
+        /* register dvb frontend */
+        ret = dvb_register_frontend(adap, port->fe);
+        if (ret < 0) {
+                if (port->i2c_client_tuner)
+                        smi_del_i2c_client(port->i2c_client_tuner);
+                if (port->i2c_client_demod)
+                        smi_del_i2c_client(port->i2c_client_demod);
+                dvb_frontend_detach(port->fe);
+                return ret;
+        }
+        /* init MAC.*/
+        ret = smi_read_eeprom(&dev->i2c_bus[0], 0xc0, mac_ee, 16);
+        dev_info(&port->dev->pci_dev->dev,
+                "DVBSky SMI PCIe MAC= %pM\n", mac_ee + (port->idx)*8);
+        memcpy(adap->proposed_mac, mac_ee + (port->idx)*8, 6);
+        return ret;
+}
+
+static void smi_fe_exit(struct smi_port *port)
+{
+        dvb_unregister_frontend(port->fe);
+        /* remove I2C demod and tuner */
+        if (port->i2c_client_tuner)
+                smi_del_i2c_client(port->i2c_client_tuner);
+        if (port->i2c_client_demod)
+                smi_del_i2c_client(port->i2c_client_demod);
+        dvb_frontend_detach(port->fe);
+}
+
+static int my_dvb_dmx_ts_card_init(struct dvb_demux *dvbdemux, char *id,
+                            int (*start_feed)(struct dvb_demux_feed *),
+                            int (*stop_feed)(struct dvb_demux_feed *),
+                            void *priv)
+{
+        dvbdemux->priv = priv;
+
+        dvbdemux->filternum = 256;
+        dvbdemux->feednum = 256;
+        dvbdemux->start_feed = start_feed;
+        dvbdemux->stop_feed = stop_feed;
+        dvbdemux->write_to_decoder = NULL;
+        dvbdemux->dmx.capabilities = (DMX_TS_FILTERING |
+                                      DMX_SECTION_FILTERING |
+                                      DMX_MEMORY_BASED_FILTERING);
+        return dvb_dmx_init(dvbdemux);
+}
+
+static int my_dvb_dmxdev_ts_card_init(struct dmxdev *dmxdev,
+                               struct dvb_demux *dvbdemux,
+                               struct dmx_frontend *hw_frontend,
+                               struct dmx_frontend *mem_frontend,
+                               struct dvb_adapter *dvb_adapter)
+{
+        int ret;
+
+        dmxdev->filternum = 256;
+        dmxdev->demux = &dvbdemux->dmx;
+        dmxdev->capabilities = 0;
+        ret = dvb_dmxdev_init(dmxdev, dvb_adapter);
+        if (ret < 0)
+                return ret;
+
+        hw_frontend->source = DMX_FRONTEND_0;
+        dvbdemux->dmx.add_frontend(&dvbdemux->dmx, hw_frontend);
+        mem_frontend->source = DMX_MEMORY_FE;
+        dvbdemux->dmx.add_frontend(&dvbdemux->dmx, mem_frontend);
+        return dvbdemux->dmx.connect_frontend(&dvbdemux->dmx, hw_frontend);
+}
+
+static u32 smi_config_DMA(struct smi_port *port)
+{
+        struct smi_dev *dev = port->dev;
+        u32 totalLength = 0, dmaMemPtrLow, dmaMemPtrHi, dmaCtlReg;
+        u8 chanLatencyTimer = 0, dmaChanEnable = 1, dmaTransStart = 1;
+        u32 dmaManagement = 0, tlpTransUnit = DMA_TRANS_UNIT_188;
+        u8 tlpTc = 0, tlpTd = 1, tlpEp = 0, tlpAttr = 0;
+        u64 mem;
+
+        dmaManagement = smi_read(port->DMA_MANAGEMENT);
+        /* Setup Channel-0 */
+        if (port->_dmaInterruptCH0) {
+                totalLength = SMI_TS_DMA_BUF_SIZE;
+                mem = port->dma_addr[0];
+                dmaMemPtrLow = mem & 0xffffffff;
+                dmaMemPtrHi = mem >> 32;
+                dmaCtlReg = (totalLength) | (tlpTransUnit << 22) | (tlpTc << 25)
+                        | (tlpTd << 28) | (tlpEp << 29) | (tlpAttr << 30);
+                dmaManagement |= dmaChanEnable | (dmaTransStart << 1)
+                        | (chanLatencyTimer << 8);
+                /* write DMA register, start DMA engine */
+                smi_write(port->DMA_CHAN0_ADDR_LOW, dmaMemPtrLow);
+                smi_write(port->DMA_CHAN0_ADDR_HI, dmaMemPtrHi);
+                smi_write(port->DMA_CHAN0_CONTROL, dmaCtlReg);
+        }
+        /* Setup Channel-1 */
+        if (port->_dmaInterruptCH1) {
+                totalLength = SMI_TS_DMA_BUF_SIZE;
+                mem = port->dma_addr[1];
+                dmaMemPtrLow = mem & 0xffffffff;
+                dmaMemPtrHi = mem >> 32;
+                dmaCtlReg = (totalLength) | (tlpTransUnit << 22) | (tlpTc << 25)
+                        | (tlpTd << 28) | (tlpEp << 29) | (tlpAttr << 30);
+                dmaManagement |= (dmaChanEnable << 16) | (dmaTransStart << 17)
+                        | (chanLatencyTimer << 24);
+                /* write DMA register, start DMA engine */
+                smi_write(port->DMA_CHAN1_ADDR_LOW, dmaMemPtrLow);
+                smi_write(port->DMA_CHAN1_ADDR_HI, dmaMemPtrHi);
+                smi_write(port->DMA_CHAN1_CONTROL, dmaCtlReg);
+        }
+        return dmaManagement;
+}
+
+static int smi_start_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
+        struct smi_port *port = dvbdmx->priv;
+        struct smi_dev *dev = port->dev;
+        u32 dmaManagement;
+
+        if (port->users++ == 0) {
+                dmaManagement = smi_config_DMA(port);
+                smi_port_clearInterrupt(port);
+                smi_port_enableInterrupt(port);
+                smi_write(port->DMA_MANAGEMENT, dmaManagement);
+                tasklet_enable(&port->tasklet);
+        }
+        return port->users;
+}
+
+static int smi_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
+{
+        struct dvb_demux *dvbdmx = dvbdmxfeed->demux;
+        struct smi_port *port = dvbdmx->priv;
+        struct smi_dev *dev = port->dev;
+
+        if (--port->users)
+                return port->users;
+
+        tasklet_disable(&port->tasklet);
+        smi_port_disableInterrupt(port);
+        smi_clear(port->DMA_MANAGEMENT, 0x30003);
+        return 0;
+}
+
+static int smi_dvb_init(struct smi_port *port)
+{
+        int ret;
+        struct dvb_adapter *adap = &port->dvb_adapter;
+        struct dvb_demux *dvbdemux = &port->demux;
+
+        dev_dbg(&port->dev->pci_dev->dev,
+                "%s, port %d\n", __func__, port->idx);
+
+        ret = dvb_register_adapter(adap, "SMI_DVB", THIS_MODULE,
+                                   &port->dev->pci_dev->dev,
+                                   adapter_nr);
+        if (ret < 0) {
+                dev_err(&port->dev->pci_dev->dev, "Fail to register DVB adapter.\n");
+                return ret;
+        }
+        ret = my_dvb_dmx_ts_card_init(dvbdemux, "SW demux",
+                                      smi_start_feed,
+                                      smi_stop_feed, port);
+        if (ret < 0)
+                goto err_del_dvb_register_adapter;
+
+        ret = my_dvb_dmxdev_ts_card_init(&port->dmxdev, &port->demux,
+                                         &port->hw_frontend,
+                                         &port->mem_frontend, adap);
+        if (ret < 0)
+                goto err_del_dvb_dmx;
+
+        ret = dvb_net_init(adap, &port->dvbnet, port->dmxdev.demux);
+        if (ret < 0)
+                goto err_del_dvb_dmxdev;
+        return 0;
+err_del_dvb_dmxdev:
+        dvbdemux->dmx.close(&dvbdemux->dmx);
+        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &port->hw_frontend);
+        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &port->mem_frontend);
+        dvb_dmxdev_release(&port->dmxdev);
+err_del_dvb_dmx:
+        dvb_dmx_release(&port->demux);
+err_del_dvb_register_adapter:
+        dvb_unregister_adapter(&port->dvb_adapter);
+        return ret;
+}
+
+static void smi_dvb_exit(struct smi_port *port)
+{
+        struct dvb_demux *dvbdemux = &port->demux;
+
+        dvb_net_release(&port->dvbnet);
+
+        dvbdemux->dmx.close(&dvbdemux->dmx);
+        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &port->hw_frontend);
+        dvbdemux->dmx.remove_frontend(&dvbdemux->dmx, &port->mem_frontend);
+        dvb_dmxdev_release(&port->dmxdev);
+        dvb_dmx_release(&port->demux);
+
+        dvb_unregister_adapter(&port->dvb_adapter);
+}
+
+static int smi_port_attach(struct smi_dev *dev,
+                struct smi_port *port, int index)
+{
+        int ret, dmachs;
+
+        port->dev = dev;
+        port->idx = index;
+        port->fe_type = (index == 0) ? dev->info->fe_0 : dev->info->fe_1;
+        dmachs = (index == 0) ? dev->info->ts_0 : dev->info->ts_1;
+        /* port init.*/
+        ret = smi_port_init(port, dmachs);
+        if (ret < 0)
+                return ret;
+        /* dvb init.*/
+        ret = smi_dvb_init(port);
+        if (ret < 0)
+                goto err_del_port_init;
+        /* fe init.*/
+        ret = smi_fe_init(port);
+        if (ret < 0)
+                goto err_del_dvb_init;
+        return 0;
+err_del_dvb_init:
+        smi_dvb_exit(port);
+err_del_port_init:
+        smi_port_exit(port);
+        return ret;
+}
+
+static void smi_port_detach(struct smi_port *port)
+{
+        smi_fe_exit(port);
+        smi_dvb_exit(port);
+        smi_port_exit(port);
+}
+
+static int smi_probe(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+        struct smi_dev *dev;
+        int ret = -ENOMEM;
+
+        if (pci_enable_device(pdev) < 0)
+                return -ENODEV;
+
+        dev = kzalloc(sizeof(struct smi_dev), GFP_KERNEL);
+        if (!dev) {
+                ret = -ENOMEM;
+                goto err_pci_disable_device;
+        }
+
+        dev->pci_dev = pdev;
+        pci_set_drvdata(pdev, dev);
+        dev->info = (struct smi_cfg_info *) id->driver_data;
+        dev_info(&dev->pci_dev->dev,
+                "card detected: %s\n", dev->info->name);
+
+        dev->nr = dev->info->type;
+        dev->lmmio = ioremap(pci_resource_start(dev->pci_dev, 0),
+                            pci_resource_len(dev->pci_dev, 0));
+        if (!dev->lmmio) {
+                ret = -ENOMEM;
+                goto err_kfree;
+        }
+
+        /* should we set to 32bit DMA? */
+        ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
+        if (ret < 0)
+                goto err_pci_iounmap;
+
+        pci_set_master(pdev);
+
+        ret = smi_hw_init(dev);
+        if (ret < 0)
+                goto err_pci_iounmap;
+
+        ret = smi_i2c_init(dev);
+        if (ret < 0)
+                goto err_pci_iounmap;
+
+        if (dev->info->ts_0) {
+                ret = smi_port_attach(dev, &dev->ts_port[0], 0);
+                if (ret < 0)
+                        goto err_del_i2c_adaptor;
+        }
+
+        if (dev->info->ts_1) {
+                ret = smi_port_attach(dev, &dev->ts_port[1], 1);
+                if (ret < 0)
+                        goto err_del_port0_attach;
+        }
+
+#ifdef CONFIG_PCI_MSI /* to do msi interrupt.???*/
+        if (pci_msi_enabled())
+                ret = pci_enable_msi(dev->pci_dev);
+        if (ret)
+                dev_info(&dev->pci_dev->dev, "MSI not available.\n");
+#endif
+
+        ret = request_irq(dev->pci_dev->irq, smi_irq_handler,
+                           IRQF_SHARED, "SMI_PCIE", dev);
+        if (ret < 0)
+                goto err_del_port1_attach;
+
+        return 0;
+
+err_del_port1_attach:
+        if (dev->info->ts_1)
+                smi_port_detach(&dev->ts_port[1]);
+err_del_port0_attach:
+        if (dev->info->ts_0)
+                smi_port_detach(&dev->ts_port[0]);
+err_del_i2c_adaptor:
+        smi_i2c_exit(dev);
+err_pci_iounmap:
+        iounmap(dev->lmmio);
+err_kfree:
+        pci_set_drvdata(pdev, NULL);
+        kfree(dev);
+err_pci_disable_device:
+        pci_disable_device(pdev);
+        return ret;
+}
+
+static void smi_remove(struct pci_dev *pdev)
+{
+        struct smi_dev *dev = pci_get_drvdata(pdev);
+
+        smi_write(MSI_INT_ENA_CLR, ALL_INT);
+        free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+        pci_disable_msi(dev->pci_dev);
+#endif
+        if (dev->info->ts_1)
+                smi_port_detach(&dev->ts_port[1]);
+        if (dev->info->ts_0)
+                smi_port_detach(&dev->ts_port[0]);
+
+        smi_i2c_exit(dev);
+        iounmap(dev->lmmio);
+        pci_set_drvdata(pdev, NULL);
+        pci_disable_device(pdev);
+        kfree(dev);
+}
+
+/* DVBSky cards */
+static struct smi_cfg_info dvbsky_s950_cfg = {
+        .type = SMI_DVBSKY_S950,
+        .name = "DVBSky S950 V3",
+        .ts_0 = SMI_TS_NULL,
+        .ts_1 = SMI_TS_DMA_BOTH,
+        .fe_0 = DVBSKY_FE_NULL,
+        .fe_1 = DVBSKY_FE_M88DS3103,
+};
+
+static struct smi_cfg_info dvbsky_s952_cfg = {
+        .type = SMI_DVBSKY_S952,
+        .name = "DVBSky S952 V3",
+        .ts_0 = SMI_TS_DMA_BOTH,
+        .ts_1 = SMI_TS_DMA_BOTH,
+        .fe_0 = DVBSKY_FE_M88RS6000,
+        .fe_1 = DVBSKY_FE_M88RS6000,
+};
+
+static struct smi_cfg_info dvbsky_t9580_cfg = {
+        .type = SMI_DVBSKY_T9580,
+        .name = "DVBSky T9580 V3",
+        .ts_0 = SMI_TS_DMA_BOTH,
+        .ts_1 = SMI_TS_DMA_BOTH,
+        .fe_0 = DVBSKY_FE_SIT2,
+        .fe_1 = DVBSKY_FE_M88DS3103,
+};
+
+/* PCI IDs */
+#define SMI_ID(_subvend, _subdev, _driverdata) {        \
+        .vendor      = SMI_VID,    .device    = SMI_PID, \
+        .subvendor   = _subvend, .subdevice = _subdev, \
+        .driver_data = (unsigned long)&_driverdata }
+
+static const struct pci_device_id smi_id_table[] = {
+        SMI_ID(0x4254, 0x0550, dvbsky_s950_cfg),
+        SMI_ID(0x4254, 0x0552, dvbsky_s952_cfg),
+        SMI_ID(0x4254, 0x5580, dvbsky_t9580_cfg),
+        {0}
+};
+MODULE_DEVICE_TABLE(pci, smi_id_table);
+
+static struct pci_driver smipcie_driver = {
+        .name = "SMI PCIe driver",
+        .id_table = smi_id_table,
+        .probe = smi_probe,
+        .remove = smi_remove,
+};
+
+module_pci_driver(smipcie_driver);
+
+MODULE_AUTHOR("Max nibble <nibble.max@gmail.com>");
+MODULE_DESCRIPTION("SMI PCIe driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/pci/smipcie/smipcie.h b/drivers/media/pci/smipcie/smipcie.h
new file mode 100644
index 000000000000..10cdf20f4839
--- /dev/null
+++ b/drivers/media/pci/smipcie/smipcie.h
@@ -0,0 +1,299 @@
+/*
+ * SMI PCIe driver for DVBSky cards.
+ *
+ * Copyright (C) 2014 Max nibble <nibble.max@gmail.com>
+ *
+ *    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 of the License, 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 _SMI_PCIE_H_
+#define _SMI_PCIE_H_
+
+#include <linux/i2c.h>
+#include <linux/i2c-algo-bit.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/pci.h>
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+#include <media/rc-core.h>
+
+#include "demux.h"
+#include "dmxdev.h"
+#include "dvb_demux.h"
+#include "dvb_frontend.h"
+#include "dvb_net.h"
+#include "dvbdev.h"
+
+/* -------- Register Base -------- */
+#define    MSI_CONTROL_REG_BASE                 0x0800
+#define    SYSTEM_CONTROL_REG_BASE              0x0880
+#define    PCIE_EP_DEBUG_REG_BASE               0x08C0
+#define    IR_CONTROL_REG_BASE                  0x0900
+#define    I2C_A_CONTROL_REG_BASE               0x0940
+#define    I2C_B_CONTROL_REG_BASE               0x0980
+#define    ATV_PORTA_CONTROL_REG_BASE           0x09C0
+#define    DTV_PORTA_CONTROL_REG_BASE           0x0A00
+#define    AES_PORTA_CONTROL_REG_BASE           0x0A80
+#define    DMA_PORTA_CONTROL_REG_BASE           0x0AC0
+#define    ATV_PORTB_CONTROL_REG_BASE           0x0B00
+#define    DTV_PORTB_CONTROL_REG_BASE           0x0B40
+#define    AES_PORTB_CONTROL_REG_BASE           0x0BC0
+#define    DMA_PORTB_CONTROL_REG_BASE           0x0C00
+#define    UART_A_REGISTER_BASE                 0x0C40
+#define    UART_B_REGISTER_BASE                 0x0C80
+#define    GPS_CONTROL_REG_BASE                 0x0CC0
+#define    DMA_PORTC_CONTROL_REG_BASE           0x0D00
+#define    DMA_PORTD_CONTROL_REG_BASE           0x0D00
+#define    AES_RANDOM_DATA_BASE                 0x0D80
+#define    AES_KEY_IN_BASE                      0x0D90
+#define    RANDOM_DATA_LIB_BASE                 0x0E00
+#define    IR_DATA_BUFFER_BASE                  0x0F00
+#define    PORTA_TS_BUFFER_BASE                 0x1000
+#define    PORTA_I2S_BUFFER_BASE                0x1400
+#define    PORTB_TS_BUFFER_BASE                 0x1800
+#define    PORTB_I2S_BUFFER_BASE                0x1C00
+
+/* -------- MSI control and state register -------- */
+#define MSI_DELAY_TIMER             (MSI_CONTROL_REG_BASE + 0x00)
+#define MSI_INT_STATUS              (MSI_CONTROL_REG_BASE + 0x08)
+#define MSI_INT_STATUS_CLR          (MSI_CONTROL_REG_BASE + 0x0C)
+#define MSI_INT_STATUS_SET          (MSI_CONTROL_REG_BASE + 0x10)
+#define MSI_INT_ENA                 (MSI_CONTROL_REG_BASE + 0x14)
+#define MSI_INT_ENA_CLR             (MSI_CONTROL_REG_BASE + 0x18)
+#define MSI_INT_ENA_SET             (MSI_CONTROL_REG_BASE + 0x1C)
+#define MSI_SOFT_RESET              (MSI_CONTROL_REG_BASE + 0x20)
+#define MSI_CFG_SRC0                (MSI_CONTROL_REG_BASE + 0x24)
+
+/* -------- Hybird Controller System Control register -------- */
+#define MUX_MODE_CTRL         (SYSTEM_CONTROL_REG_BASE + 0x00)
+        #define rbPaMSMask        0x07
+        #define rbPaMSDtvNoGpio   0x00 /*[2:0], DTV Simple mode */
+        #define rbPaMSDtv4bitGpio 0x01 /*[2:0], DTV TS2 Serial mode)*/
+        #define rbPaMSDtv7bitGpio 0x02 /*[2:0], DTV TS0 Serial mode*/
+        #define rbPaMS8bitGpio    0x03 /*[2:0], GPIO mode selected;(8bit GPIO)*/
+        #define rbPaMSAtv         0x04 /*[2:0], 3'b1xx: ATV mode select*/
+        #define rbPbMSMask        0x38
+        #define rbPbMSDtvNoGpio   0x00 /*[5:3], DTV Simple mode */
+        #define rbPbMSDtv4bitGpio 0x08 /*[5:3], DTV TS2 Serial mode*/
+        #define rbPbMSDtv7bitGpio 0x10 /*[5:3], DTV TS0 Serial mode*/
+        #define rbPbMS8bitGpio    0x18 /*[5:3], GPIO mode selected;(8bit GPIO)*/
+        #define rbPbMSAtv         0x20 /*[5:3], 3'b1xx: ATV mode select*/
+        #define rbPaAESEN         0x40 /*[6], port A AES enable bit*/
+        #define rbPbAESEN         0x80 /*[7], port B AES enable bit*/
+
+#define INTERNAL_RST                (SYSTEM_CONTROL_REG_BASE + 0x04)
+#define PERIPHERAL_CTRL             (SYSTEM_CONTROL_REG_BASE + 0x08)
+#define GPIO_0to7_CTRL              (SYSTEM_CONTROL_REG_BASE + 0x0C)
+#define GPIO_8to15_CTRL             (SYSTEM_CONTROL_REG_BASE + 0x10)
+#define GPIO_16to24_CTRL            (SYSTEM_CONTROL_REG_BASE + 0x14)
+#define GPIO_INT_SRC_CFG            (SYSTEM_CONTROL_REG_BASE + 0x18)
+#define SYS_BUF_STATUS              (SYSTEM_CONTROL_REG_BASE + 0x1C)
+#define PCIE_IP_REG_ACS             (SYSTEM_CONTROL_REG_BASE + 0x20)
+#define PCIE_IP_REG_ACS_ADDR        (SYSTEM_CONTROL_REG_BASE + 0x24)
+#define PCIE_IP_REG_ACS_DATA        (SYSTEM_CONTROL_REG_BASE + 0x28)
+
+/* -------- IR Control register -------- */
+#define   IR_Init_Reg         (IR_CONTROL_REG_BASE + 0x00)
+#define   IR_Idle_Cnt_Low     (IR_CONTROL_REG_BASE + 0x04)
+#define   IR_Idle_Cnt_High    (IR_CONTROL_REG_BASE + 0x05)
+#define   IR_Unit_Cnt_Low     (IR_CONTROL_REG_BASE + 0x06)
+#define   IR_Unit_Cnt_High    (IR_CONTROL_REG_BASE + 0x07)
+#define   IR_Data_Cnt         (IR_CONTROL_REG_BASE + 0x08)
+#define   rbIRen            0x80
+#define   rbIRhighidle      0x10
+#define   rbIRlowidle       0x00
+#define   rbIRVld           0x04
+
+/* -------- I2C A control and state register -------- */
+#define I2C_A_CTL_STATUS                 (I2C_A_CONTROL_REG_BASE + 0x00)
+#define I2C_A_ADDR                       (I2C_A_CONTROL_REG_BASE + 0x04)
+#define I2C_A_SW_CTL                     (I2C_A_CONTROL_REG_BASE + 0x08)
+#define I2C_A_TIME_OUT_CNT               (I2C_A_CONTROL_REG_BASE + 0x0C)
+#define I2C_A_FIFO_STATUS                (I2C_A_CONTROL_REG_BASE + 0x10)
+#define I2C_A_FS_EN                      (I2C_A_CONTROL_REG_BASE + 0x14)
+#define I2C_A_FIFO_DATA                  (I2C_A_CONTROL_REG_BASE + 0x20)
+
+/* -------- I2C B control and state register -------- */
+#define I2C_B_CTL_STATUS                 (I2C_B_CONTROL_REG_BASE + 0x00)
+#define I2C_B_ADDR                       (I2C_B_CONTROL_REG_BASE + 0x04)
+#define I2C_B_SW_CTL                     (I2C_B_CONTROL_REG_BASE + 0x08)
+#define I2C_B_TIME_OUT_CNT               (I2C_B_CONTROL_REG_BASE + 0x0C)
+#define I2C_B_FIFO_STATUS                (I2C_B_CONTROL_REG_BASE + 0x10)
+#define I2C_B_FS_EN                      (I2C_B_CONTROL_REG_BASE + 0x14)
+#define I2C_B_FIFO_DATA                  (I2C_B_CONTROL_REG_BASE + 0x20)
+
+#define VIDEO_CTRL_STATUS_A     (ATV_PORTA_CONTROL_REG_BASE + 0x04)
+
+/* -------- Digital TV control register, Port A -------- */
+#define MPEG2_CTRL_A            (DTV_PORTA_CONTROL_REG_BASE + 0x00)
+#define SERIAL_IN_ADDR_A        (DTV_PORTA_CONTROL_REG_BASE + 0x4C)
+#define VLD_CNT_ADDR_A          (DTV_PORTA_CONTROL_REG_BASE + 0x60)
+#define ERR_CNT_ADDR_A          (DTV_PORTA_CONTROL_REG_BASE + 0x64)
+#define BRD_CNT_ADDR_A          (DTV_PORTA_CONTROL_REG_BASE + 0x68)
+
+/* -------- DMA Control Register, Port A  -------- */
+#define DMA_PORTA_CHAN0_ADDR_LOW        (DMA_PORTA_CONTROL_REG_BASE + 0x00)
+#define DMA_PORTA_CHAN0_ADDR_HI         (DMA_PORTA_CONTROL_REG_BASE + 0x04)
+#define DMA_PORTA_CHAN0_TRANS_STATE     (DMA_PORTA_CONTROL_REG_BASE + 0x08)
+#define DMA_PORTA_CHAN0_CONTROL         (DMA_PORTA_CONTROL_REG_BASE + 0x0C)
+#define DMA_PORTA_CHAN1_ADDR_LOW        (DMA_PORTA_CONTROL_REG_BASE + 0x10)
+#define DMA_PORTA_CHAN1_ADDR_HI         (DMA_PORTA_CONTROL_REG_BASE + 0x14)
+#define DMA_PORTA_CHAN1_TRANS_STATE     (DMA_PORTA_CONTROL_REG_BASE + 0x18)
+#define DMA_PORTA_CHAN1_CONTROL         (DMA_PORTA_CONTROL_REG_BASE + 0x1C)
+#define DMA_PORTA_MANAGEMENT            (DMA_PORTA_CONTROL_REG_BASE + 0x20)
+#define VIDEO_CTRL_STATUS_B             (ATV_PORTB_CONTROL_REG_BASE + 0x04)
+
+/* -------- Digital TV control register, Port B -------- */
+#define MPEG2_CTRL_B            (DTV_PORTB_CONTROL_REG_BASE + 0x00)
+#define SERIAL_IN_ADDR_B        (DTV_PORTB_CONTROL_REG_BASE + 0x4C)
+#define VLD_CNT_ADDR_B          (DTV_PORTB_CONTROL_REG_BASE + 0x60)
+#define ERR_CNT_ADDR_B          (DTV_PORTB_CONTROL_REG_BASE + 0x64)
+#define BRD_CNT_ADDR_B          (DTV_PORTB_CONTROL_REG_BASE + 0x68)
+
+/* -------- AES control register, Port B -------- */
+#define AES_CTRL_B              (AES_PORTB_CONTROL_REG_BASE + 0x00)
+#define AES_KEY_BASE_B  (AES_PORTB_CONTROL_REG_BASE + 0x04)
+
+/* -------- DMA Control Register, Port B  -------- */
+#define DMA_PORTB_CHAN0_ADDR_LOW        (DMA_PORTB_CONTROL_REG_BASE + 0x00)
+#define DMA_PORTB_CHAN0_ADDR_HI         (DMA_PORTB_CONTROL_REG_BASE + 0x04)
+#define DMA_PORTB_CHAN0_TRANS_STATE     (DMA_PORTB_CONTROL_REG_BASE + 0x08)
+#define DMA_PORTB_CHAN0_CONTROL         (DMA_PORTB_CONTROL_REG_BASE + 0x0C)
+#define DMA_PORTB_CHAN1_ADDR_LOW        (DMA_PORTB_CONTROL_REG_BASE + 0x10)
+#define DMA_PORTB_CHAN1_ADDR_HI         (DMA_PORTB_CONTROL_REG_BASE + 0x14)
+#define DMA_PORTB_CHAN1_TRANS_STATE     (DMA_PORTB_CONTROL_REG_BASE + 0x18)
+#define DMA_PORTB_CHAN1_CONTROL         (DMA_PORTB_CONTROL_REG_BASE + 0x1C)
+#define DMA_PORTB_MANAGEMENT            (DMA_PORTB_CONTROL_REG_BASE + 0x20)
+
+#define DMA_TRANS_UNIT_188 (0x00000007)
+
+/* -------- Macro define of 24 interrupt resource --------*/
+#define DMA_A_CHAN0_DONE_INT   (0x00000001)
+#define DMA_A_CHAN1_DONE_INT   (0x00000002)
+#define DMA_B_CHAN0_DONE_INT   (0x00000004)
+#define DMA_B_CHAN1_DONE_INT   (0x00000008)
+#define DMA_C_CHAN0_DONE_INT   (0x00000010)
+#define DMA_C_CHAN1_DONE_INT   (0x00000020)
+#define DMA_D_CHAN0_DONE_INT   (0x00000040)
+#define DMA_D_CHAN1_DONE_INT   (0x00000080)
+#define DATA_BUF_OVERFLOW_INT  (0x00000100)
+#define UART_0_X_INT           (0x00000200)
+#define UART_1_X_INT           (0x00000400)
+#define IR_X_INT               (0x00000800)
+#define GPIO_0_INT             (0x00001000)
+#define GPIO_1_INT             (0x00002000)
+#define GPIO_2_INT             (0x00004000)
+#define GPIO_3_INT             (0x00008000)
+#define ALL_INT                (0x0000FFFF)
+
+/* software I2C bit mask */
+#define SW_I2C_MSK_MODE         0x01
+#define SW_I2C_MSK_CLK_OUT      0x02
+#define SW_I2C_MSK_DAT_OUT      0x04
+#define SW_I2C_MSK_CLK_EN       0x08
+#define SW_I2C_MSK_DAT_EN       0x10
+#define SW_I2C_MSK_DAT_IN       0x40
+#define SW_I2C_MSK_CLK_IN       0x80
+
+#define SMI_VID         0x1ADE
+#define SMI_PID         0x3038
+#define SMI_TS_DMA_BUF_SIZE     (1024 * 188)
+
+struct smi_cfg_info {
+#define SMI_DVBSKY_S952         0
+#define SMI_DVBSKY_S950         1
+#define SMI_DVBSKY_T9580        2
+#define SMI_DVBSKY_T982         3
+        int type;
+        char *name;
+#define SMI_TS_NULL             0
+#define SMI_TS_DMA_SINGLE       1
+#define SMI_TS_DMA_BOTH         3
+/* SMI_TS_NULL: not use;
+ * SMI_TS_DMA_SINGLE: use DMA 0 only;
+ * SMI_TS_DMA_BOTH:use DMA 0 and 1.*/
+        int ts_0;
+        int ts_1;
+#define DVBSKY_FE_NULL          0
+#define DVBSKY_FE_M88RS6000     1
+#define DVBSKY_FE_M88DS3103     2
+#define DVBSKY_FE_SIT2          3
+        int fe_0;
+        int fe_1;
+};
+
+struct smi_port {
+        struct smi_dev *dev;
+        int idx;
+        int enable;
+        int fe_type;
+        /* regs */
+        u32 DMA_CHAN0_ADDR_LOW;
+        u32 DMA_CHAN0_ADDR_HI;
+        u32 DMA_CHAN0_TRANS_STATE;
+        u32 DMA_CHAN0_CONTROL;
+        u32 DMA_CHAN1_ADDR_LOW;
+        u32 DMA_CHAN1_ADDR_HI;
+        u32 DMA_CHAN1_TRANS_STATE;
+        u32 DMA_CHAN1_CONTROL;
+        u32 DMA_MANAGEMENT;
+        /* dma */
+        dma_addr_t dma_addr[2];
+        u8 *cpu_addr[2];
+        u32 _dmaInterruptCH0;
+        u32 _dmaInterruptCH1;
+        u32 _int_status;
+        struct tasklet_struct tasklet;
+        /* dvb */
+        struct dmx_frontend hw_frontend;
+        struct dmx_frontend mem_frontend;
+        struct dmxdev dmxdev;
+        struct dvb_adapter dvb_adapter;
+        struct dvb_demux demux;
+        struct dvb_net dvbnet;
+        int users;
+        struct dvb_frontend *fe;
+        /* frontend i2c module */
+        struct i2c_client *i2c_client_demod;
+        struct i2c_client *i2c_client_tuner;
+};
+
+struct smi_dev {
+        int nr;
+        struct smi_cfg_info *info;
+
+        /* pcie */
+        struct pci_dev *pci_dev;
+        u32 __iomem *lmmio;
+
+        /* ts port */
+        struct smi_port ts_port[2];
+
+        /* i2c */
+        struct i2c_adapter i2c_bus[2];
+        struct i2c_algo_bit_data i2c_bit[2];
+};
+
+#define smi_read(reg)             readl(dev->lmmio + ((reg)>>2))
+#define smi_write(reg, value)     writel((value), dev->lmmio + ((reg)>>2))
+
+#define smi_andor(reg, mask, value) \
+        writel((readl(dev->lmmio+((reg)>>2)) & ~(mask)) |\
+        ((value) & (mask)), dev->lmmio+((reg)>>2))
+
+#define smi_set(reg, bit)          smi_andor((reg), (bit), (bit))
+#define smi_clear(reg, bit)        smi_andor((reg), (bit), 0)
+
+#endif /* #ifndef _SMI_PCIE_H_ */
diff --git a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
index 28023f9f1dc7..6e933d383fa2 100644
--- a/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
+++ b/drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c
@@ -463,7 +463,6 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
         struct solo_dev *solo_dev = solo_enc->solo_dev;
         struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_size;
-        int ret;
 
         vb->v4l2_buf.flags |= V4L2_BUF_FLAG_KEYFRAME;
 
@@ -473,22 +472,10 @@ static int solo_fill_jpeg(struct solo_enc_dev *solo_enc,
         frame_size = ALIGN(vop_jpeg_size(vh) + solo_enc->jpeg_len, DMA_ALIGN);
         vb2_set_plane_payload(vb, 0, vop_jpeg_size(vh) + solo_enc->jpeg_len);
 
-        /* may discard all previous data in vbuf->sgl */
-        if (!dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE))
-                return -ENOMEM;
-        ret = solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
+        return solo_send_desc(solo_enc, solo_enc->jpeg_len, vbuf,
                              vop_jpeg_offset(vh) - SOLO_JPEG_EXT_ADDR(solo_dev),
                              frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
                              SOLO_JPEG_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE);
-
-        /* add the header only after dma_unmap_sg() */
-        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
-                            solo_enc->jpeg_header, solo_enc->jpeg_len);
-
-        return ret;
 }
 
 static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
@@ -498,7 +485,6 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
         struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
         int frame_off, frame_size;
         int skip = 0;
-        int ret;
 
         if (vb2_plane_size(vb, 0) < vop_mpeg_size(vh))
                 return -EIO;
@@ -521,21 +507,9 @@ static int solo_fill_mpeg(struct solo_enc_dev *solo_enc,
                 sizeof(*vh)) % SOLO_MP4E_EXT_SIZE(solo_dev);
         frame_size = ALIGN(vop_mpeg_size(vh) + skip, DMA_ALIGN);
 
-        /* may discard all previous data in vbuf->sgl */
-        if (!dma_map_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE))
-                return -ENOMEM;
-        ret = solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
+        return solo_send_desc(solo_enc, skip, vbuf, frame_off, frame_size,
                         SOLO_MP4E_EXT_ADDR(solo_dev),
                         SOLO_MP4E_EXT_SIZE(solo_dev));
-        dma_unmap_sg(&solo_dev->pdev->dev, vbuf->sgl, vbuf->nents,
-                        DMA_FROM_DEVICE);
-
-        /* add the header only after dma_unmap_sg() */
-        if (!vop_type(vh))
-                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
-                                    solo_enc->vop, solo_enc->vop_len);
-        return ret;
 }
 
 static int solo_enc_fillbuf(struct solo_enc_dev *solo_enc,
@@ -703,9 +677,7 @@ static int solo_ring_thread(void *data)
 
                 if (timeout == -ERESTARTSYS || kthread_should_stop())
                         break;
-                solo_irq_off(solo_dev, SOLO_IRQ_ENCODER);
                 solo_handle_ring(solo_dev);
-                solo_irq_on(solo_dev, SOLO_IRQ_ENCODER);
                 try_to_freeze();
         }
 
@@ -720,7 +692,10 @@ static int solo_enc_queue_setup(struct vb2_queue *q,
                                 unsigned int *num_planes, unsigned int sizes[],
                                 void *alloc_ctxs[])
 {
+        struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
+
         sizes[0] = FRAME_BUF_SIZE;
+        alloc_ctxs[0] = solo_enc->alloc_ctx;
         *num_planes = 1;
 
         if (*num_buffers < MIN_VID_BUFFERS)
@@ -770,26 +745,51 @@ static void solo_ring_stop(struct solo_dev *solo_dev)
 static int solo_enc_start_streaming(struct vb2_queue *q, unsigned int count)
 {
         struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
-        int ret;
 
-        ret = solo_enc_on(solo_enc);
-        if (ret)
-                return ret;
-        return solo_ring_start(solo_enc->solo_dev);
+        return solo_enc_on(solo_enc);
 }
 
 static void solo_enc_stop_streaming(struct vb2_queue *q)
 {
         struct solo_enc_dev *solo_enc = vb2_get_drv_priv(q);
+        unsigned long flags;
 
+        spin_lock_irqsave(&solo_enc->av_lock, flags);
         solo_enc_off(solo_enc);
-        INIT_LIST_HEAD(&solo_enc->vidq_active);
-        solo_ring_stop(solo_enc->solo_dev);
+        while (!list_empty(&solo_enc->vidq_active)) {
+                struct solo_vb2_buf *buf = list_entry(
+                                solo_enc->vidq_active.next,
+                                struct solo_vb2_buf, list);
+
+                list_del(&buf->list);
+                vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
+        }
+        spin_unlock_irqrestore(&solo_enc->av_lock, flags);
+}
+
+static void solo_enc_buf_finish(struct vb2_buffer *vb)
+{
+        struct solo_enc_dev *solo_enc = vb2_get_drv_priv(vb->vb2_queue);
+        struct sg_table *vbuf = vb2_dma_sg_plane_desc(vb, 0);
+
+        switch (solo_enc->fmt) {
+        case V4L2_PIX_FMT_MPEG4:
+        case V4L2_PIX_FMT_H264:
+                if (vb->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME)
+                        sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                                        solo_enc->vop, solo_enc->vop_len);
+                break;
+        default: /* V4L2_PIX_FMT_MJPEG */
+                sg_copy_from_buffer(vbuf->sgl, vbuf->nents,
+                                solo_enc->jpeg_header, solo_enc->jpeg_len);
+                break;
+        }
 }
 
 static struct vb2_ops solo_enc_video_qops = {
         .queue_setup    = solo_enc_queue_setup,
         .buf_queue      = solo_enc_buf_queue,
+        .buf_finish     = solo_enc_buf_finish,
         .start_streaming = solo_enc_start_streaming,
         .stop_streaming = solo_enc_stop_streaming,
         .wait_prepare   = vb2_ops_wait_prepare,
@@ -1263,6 +1263,11 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo_dev *solo_dev,
                 return ERR_PTR(-ENOMEM);
 
         hdl = &solo_enc->hdl;
+        solo_enc->alloc_ctx = vb2_dma_sg_init_ctx(&solo_dev->pdev->dev);
+        if (IS_ERR(solo_enc->alloc_ctx)) {
+                ret = PTR_ERR(solo_enc->alloc_ctx);
+                goto hdl_free;
+        }
         v4l2_ctrl_handler_init(hdl, 10);
         v4l2_ctrl_new_std(hdl, &solo_ctrl_ops,
                         V4L2_CID_BRIGHTNESS, 0, 255, 1, 128);
@@ -1366,6 +1371,7 @@ pci_free:
                         solo_enc->desc_items, solo_enc->desc_dma);
 hdl_free:
         v4l2_ctrl_handler_free(hdl);
+        vb2_dma_sg_cleanup_ctx(solo_enc->alloc_ctx);
         kfree(solo_enc);
         return ERR_PTR(ret);
 }
@@ -1375,8 +1381,12 @@ static void solo_enc_free(struct solo_enc_dev *solo_enc)
         if (solo_enc == NULL)
                 return;
 
+        pci_free_consistent(solo_enc->solo_dev->pdev,
+                        sizeof(struct solo_p2m_desc) * solo_enc->desc_nelts,
+                        solo_enc->desc_items, solo_enc->desc_dma);
         video_unregister_device(solo_enc->vfd);
         v4l2_ctrl_handler_free(&solo_enc->hdl);
+        vb2_dma_sg_cleanup_ctx(solo_enc->alloc_ctx);
         kfree(solo_enc);
 }
 
@@ -1419,13 +1429,15 @@ int solo_enc_v4l2_init(struct solo_dev *solo_dev, unsigned nr)
                  solo_dev->v4l2_enc[0]->vfd->num,
                  solo_dev->v4l2_enc[solo_dev->nr_chans - 1]->vfd->num);
 
-        return 0;
+        return solo_ring_start(solo_dev);
 }
 
 void solo_enc_v4l2_exit(struct solo_dev *solo_dev)
 {
         int i;
 
+        solo_ring_stop(solo_dev);
+
         for (i = 0; i < solo_dev->nr_chans; i++)
                 solo_enc_free(solo_dev->v4l2_enc[i]);
 
diff --git a/drivers/media/pci/solo6x10/solo6x10.h b/drivers/media/pci/solo6x10/solo6x10.h
index 72017b7f0a75..bd8edfa319b8 100644
--- a/drivers/media/pci/solo6x10/solo6x10.h
+++ b/drivers/media/pci/solo6x10/solo6x10.h
@@ -180,6 +180,7 @@ struct solo_enc_dev {
         u32                     sequence;
         struct vb2_queue        vidq;
         struct list_head        vidq_active;
+        void                    *alloc_ctx;
         int                     desc_count;
         int                     desc_nelts;
         struct solo_p2m_desc    *desc_items;
diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
index 63f0b64057cb..c135165a8b26 100644
--- a/drivers/media/pci/tw68/tw68-core.c
+++ b/drivers/media/pci/tw68/tw68-core.c
@@ -304,13 +304,19 @@ static int tw68_initdev(struct pci_dev *pci_dev,
         /* Then do any initialisation wanted before interrupts are on */
         tw68_hw_init1(dev);
 
+        dev->alloc_ctx = vb2_dma_sg_init_ctx(&pci_dev->dev);
+        if (IS_ERR(dev->alloc_ctx)) {
+                err = PTR_ERR(dev->alloc_ctx);
+                goto fail3;
+        }
+
         /* get irq */
         err = devm_request_irq(&pci_dev->dev, pci_dev->irq, tw68_irq,
                           IRQF_SHARED, dev->name, dev);
         if (err < 0) {
                 pr_err("%s: can't get IRQ %d\n",
                        dev->name, pci_dev->irq);
-                goto fail3;
+                goto fail4;
         }
 
         /*
@@ -324,7 +330,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,
         if (err < 0) {
                 pr_err("%s: can't register video device\n",
                        dev->name);
-                goto fail4;
+                goto fail5;
         }
         tw_setl(TW68_INTMASK, dev->pci_irqmask);
 
@@ -333,8 +339,10 @@ static int tw68_initdev(struct pci_dev *pci_dev,
 
         return 0;
 
-fail4:
+fail5:
         video_unregister_device(&dev->vdev);
+fail4:
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
 fail3:
         iounmap(dev->lmmio);
 fail2:
@@ -358,6 +366,7 @@ static void tw68_finidev(struct pci_dev *pci_dev)
         /* unregister */
         video_unregister_device(&dev->vdev);
         v4l2_ctrl_handler_free(&dev->hdl);
+        vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);
 
         /* release resources */
         iounmap(dev->lmmio);
diff --git a/drivers/media/pci/tw68/tw68-video.c b/drivers/media/pci/tw68/tw68-video.c
index 5c94ac7c88d9..8355e55b4e8e 100644
--- a/drivers/media/pci/tw68/tw68-video.c
+++ b/drivers/media/pci/tw68/tw68-video.c
@@ -384,6 +384,7 @@ static int tw68_queue_setup(struct vb2_queue *q, const struct v4l2_format *fmt,
         unsigned tot_bufs = q->num_buffers + *num_buffers;
 
         sizes[0] = (dev->fmt->depth * dev->width * dev->height) >> 3;
+        alloc_ctxs[0] = dev->alloc_ctx;
         /*
          * We allow create_bufs, but only if the sizeimage is the same as the
          * current sizeimage. The tw68_buffer_count calculation becomes quite
@@ -461,17 +462,12 @@ static int tw68_buf_prepare(struct vb2_buffer *vb)
         struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb);
         struct sg_table *dma = vb2_dma_sg_plane_desc(vb, 0);
         unsigned size, bpl;
-        int rc;
 
         size = (dev->width * dev->height * dev->fmt->depth) >> 3;
         if (vb2_plane_size(vb, 0) < size)
                 return -EINVAL;
         vb2_set_plane_payload(vb, 0, size);
 
-        rc = dma_map_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-        if (!rc)
-                return -EIO;
-
         bpl = (dev->width * dev->fmt->depth) >> 3;
         switch (dev->field) {
         case V4L2_FIELD_TOP:
@@ -505,11 +501,8 @@ static void tw68_buf_finish(struct vb2_buffer *vb)
 {
         struct vb2_queue *vq = vb->vb2_queue;
         struct tw68_dev *dev = vb2_get_drv_priv(vq);
-        struct sg_table *dma = vb2_dma_sg_plane_desc(vb, 0);
         struct tw68_buf *buf = container_of(vb, struct tw68_buf, vb);
 
-        dma_unmap_sg(&dev->pci->dev, dma->sgl, dma->nents, DMA_FROM_DEVICE);
-
         pci_free_consistent(dev->pci, buf->size, buf->cpu, buf->dma);
 }
 
diff --git a/drivers/media/pci/tw68/tw68.h b/drivers/media/pci/tw68/tw68.h
index 2c8abe26b13b..7a7501bd165f 100644
--- a/drivers/media/pci/tw68/tw68.h
+++ b/drivers/media/pci/tw68/tw68.h
@@ -181,6 +181,7 @@ struct tw68_dev {
         unsigned                field;
         struct vb2_queue        vidq;
         struct list_head        active;
+        void                    *alloc_ctx;
 
         /* various v4l controls */
         const struct tw68_tvnorm *tvnorm;       /* video */
diff --git a/drivers/media/pci/zoran/zoran_driver.c b/drivers/media/pci/zoran/zoran_driver.c
index 099d5fbebb7c..2b25d31c46f6 100644
--- a/drivers/media/pci/zoran/zoran_driver.c
+++ b/drivers/media/pci/zoran/zoran_driver.c
@@ -1528,8 +1528,9 @@ static int zoran_querycap(struct file *file, void *__fh, struct v4l2_capability
         strncpy(cap->driver, "zoran", sizeof(cap->driver)-1);
         snprintf(cap->bus_info, sizeof(cap->bus_info), "PCI:%s",
                  pci_name(zr->pci_dev));
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE |
-                            V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY;
+        cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_CAPTURE |
+                           V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_VIDEO_OVERLAY;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig
index 3aac88f1d54a..0c61155699f7 100644
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@ -267,8 +267,8 @@ if V4L_TEST_DRIVERS
 
 source "drivers/media/platform/vivid/Kconfig"
 
-config VIDEO_MEM2MEM_TESTDEV
-        tristate "Virtual test device for mem2mem framework"
+config VIDEO_VIM2M
+        tristate "Virtual Memory-to-Memory Driver"
         depends on VIDEO_DEV && VIDEO_V4L2
         select VIDEOBUF2_VMALLOC
         select V4L2_MEM2MEM_DEV
diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile
index 579046bc276f..b818afb4d336 100644
--- a/drivers/media/platform/Makefile
+++ b/drivers/media/platform/Makefile
@@ -17,7 +17,7 @@ obj-$(CONFIG_VIDEO_OMAP3)	+= omap3isp/
 obj-$(CONFIG_VIDEO_VIU) += fsl-viu.o
 
 obj-$(CONFIG_VIDEO_VIVID)               += vivid/
-obj-$(CONFIG_VIDEO_MEM2MEM_TESTDEV) += mem2mem_testdev.o
+obj-$(CONFIG_VIDEO_VIM2M)               += vim2m.o
 
 obj-$(CONFIG_VIDEO_TI_VPE)              += ti-vpe/
 
diff --git a/drivers/media/platform/blackfin/bfin_capture.c b/drivers/media/platform/blackfin/bfin_capture.c
index 9b5daa65841c..3112844e4fc1 100644
--- a/drivers/media/platform/blackfin/bfin_capture.c
+++ b/drivers/media/platform/blackfin/bfin_capture.c
@@ -49,7 +49,7 @@
 struct bcap_format {
         char *desc;
         u32 pixelformat;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
         int bpp; /* bits per pixel */
         int dlen; /* data length for ppi in bits */
 };
@@ -116,35 +116,35 @@ static const struct bcap_format bcap_formats[] = {
         {
                 .desc        = "YCbCr 4:2:2 Interleaved UYVY",
                 .pixelformat = V4L2_PIX_FMT_UYVY,
-                .mbus_code   = V4L2_MBUS_FMT_UYVY8_2X8,
+                .mbus_code   = MEDIA_BUS_FMT_UYVY8_2X8,
                 .bpp         = 16,
                 .dlen        = 8,
         },
         {
                 .desc        = "YCbCr 4:2:2 Interleaved YUYV",
                 .pixelformat = V4L2_PIX_FMT_YUYV,
-                .mbus_code   = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code   = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp         = 16,
                 .dlen        = 8,
         },
         {
                 .desc        = "YCbCr 4:2:2 Interleaved UYVY",
                 .pixelformat = V4L2_PIX_FMT_UYVY,
-                .mbus_code   = V4L2_MBUS_FMT_UYVY8_1X16,
+                .mbus_code   = MEDIA_BUS_FMT_UYVY8_1X16,
                 .bpp         = 16,
                 .dlen        = 16,
         },
         {
                 .desc        = "RGB 565",
                 .pixelformat = V4L2_PIX_FMT_RGB565,
-                .mbus_code   = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .mbus_code   = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .bpp         = 16,
                 .dlen        = 8,
         },
         {
                 .desc        = "RGB 444",
                 .pixelformat = V4L2_PIX_FMT_RGB444,
-                .mbus_code   = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+                .mbus_code   = MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,
                 .bpp         = 16,
                 .dlen        = 8,
         },
@@ -161,7 +161,7 @@ static struct bcap_buffer *to_bcap_vb(struct vb2_buffer *vb)
 
 static int bcap_init_sensor_formats(struct bcap_device *bcap_dev)
 {
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         struct bcap_format *sf;
         unsigned int num_formats = 0;
         int i, j;
@@ -349,18 +349,6 @@ static void bcap_buffer_cleanup(struct vb2_buffer *vb)
         spin_unlock_irqrestore(&bcap_dev->lock, flags);
 }
 
-static void bcap_lock(struct vb2_queue *vq)
-{
-        struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
-        mutex_lock(&bcap_dev->mutex);
-}
-
-static void bcap_unlock(struct vb2_queue *vq)
-{
-        struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
-        mutex_unlock(&bcap_dev->mutex);
-}
-
 static int bcap_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
         struct bcap_device *bcap_dev = vb2_get_drv_priv(vq);
@@ -457,8 +445,8 @@ static struct vb2_ops bcap_video_qops = {
         .buf_prepare            = bcap_buffer_prepare,
         .buf_cleanup            = bcap_buffer_cleanup,
         .buf_queue              = bcap_buffer_queue,
-        .wait_prepare           = bcap_unlock,
-        .wait_finish            = bcap_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
         .start_streaming        = bcap_start_streaming,
         .stop_streaming         = bcap_stop_streaming,
 };
@@ -841,7 +829,8 @@ static int bcap_querycap(struct file *file, void  *priv,
 {
         struct bcap_device *bcap_dev = video_drvdata(file);
 
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver));
         strlcpy(cap->bus_info, "Blackfin Platform", sizeof(cap->bus_info));
         strlcpy(cap->card, bcap_dev->cfg->card_name, sizeof(cap->card));
@@ -995,6 +984,7 @@ static int bcap_probe(struct platform_device *pdev)
         q->ops = &bcap_video_qops;
         q->mem_ops = &vb2_dma_contig_memops;
         q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+        q->lock = &bcap_dev->mutex;
 
         ret = vb2_queue_init(q);
         if (ret)
diff --git a/drivers/media/platform/coda/Makefile b/drivers/media/platform/coda/Makefile
index 3543291e6273..25ce15561695 100644
--- a/drivers/media/platform/coda/Makefile
+++ b/drivers/media/platform/coda/Makefile
@@ -1,3 +1,3 @@
-coda-objs := coda-common.o coda-bit.o coda-h264.o
+coda-objs := coda-common.o coda-bit.o coda-h264.o coda-jpeg.o
 
 obj-$(CONFIG_VIDEO_CODA) += coda.o
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 9b8ea8bbeb4e..b4029ae293d3 100644
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -217,11 +217,34 @@ static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
 void coda_fill_bitstream(struct coda_ctx *ctx)
 {
         struct vb2_buffer *src_buf;
-        struct coda_timestamp *ts;
+        struct coda_buffer_meta *meta;
+        u32 start;
 
         while (v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) > 0) {
+                /*
+                 * Only queue a single JPEG into the bitstream buffer, except
+                 * to increase payload over 512 bytes or if in hold state.
+                 */
+                if (ctx->codec->src_fourcc == V4L2_PIX_FMT_JPEG &&
+                    (coda_get_bitstream_payload(ctx) >= 512) && !ctx->hold)
+                        break;
+
                 src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
 
+                /* Drop frames that do not start/end with a SOI/EOI markers */
+                if (ctx->codec->src_fourcc == V4L2_PIX_FMT_JPEG &&
+                    !coda_jpeg_check_buffer(ctx, src_buf)) {
+                        v4l2_err(&ctx->dev->v4l2_dev,
+                                 "dropping invalid JPEG frame\n");
+                        src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
+                        v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
+                        continue;
+                }
+
+                /* Buffer start position */
+                start = ctx->bitstream_fifo.kfifo.in &
+                        ctx->bitstream_fifo.kfifo.mask;
+
                 if (coda_bitstream_try_queue(ctx, src_buf)) {
                         /*
                          * Source buffer is queued in the bitstream ringbuffer;
@@ -229,12 +252,16 @@ void coda_fill_bitstream(struct coda_ctx *ctx)
                          */
                         src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
 
-                        ts = kmalloc(sizeof(*ts), GFP_KERNEL);
-                        if (ts) {
-                                ts->sequence = src_buf->v4l2_buf.sequence;
-                                ts->timecode = src_buf->v4l2_buf.timecode;
-                                ts->timestamp = src_buf->v4l2_buf.timestamp;
-                                list_add_tail(&ts->list, &ctx->timestamp_list);
+                        meta = kmalloc(sizeof(*meta), GFP_KERNEL);
+                        if (meta) {
+                                meta->sequence = src_buf->v4l2_buf.sequence;
+                                meta->timecode = src_buf->v4l2_buf.timecode;
+                                meta->timestamp = src_buf->v4l2_buf.timestamp;
+                                meta->start = start;
+                                meta->end = ctx->bitstream_fifo.kfifo.in &
+                                            ctx->bitstream_fifo.kfifo.mask;
+                                list_add_tail(&meta->list,
+                                              &ctx->buffer_meta_list);
                         }
 
                         v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
@@ -691,6 +718,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
         struct vb2_buffer *buf;
         int gamma, ret, value;
         u32 dst_fourcc;
+        u32 stride;
 
         q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
         q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
@@ -710,6 +738,14 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                 return -EFAULT;
         }
 
+        if (dst_fourcc == V4L2_PIX_FMT_JPEG) {
+                if (!ctx->params.jpeg_qmat_tab[0])
+                        ctx->params.jpeg_qmat_tab[0] = kmalloc(64, GFP_KERNEL);
+                if (!ctx->params.jpeg_qmat_tab[1])
+                        ctx->params.jpeg_qmat_tab[1] = kmalloc(64, GFP_KERNEL);
+                coda_set_jpeg_compression_quality(ctx, ctx->params.jpeg_quality);
+        }
+
         mutex_lock(&dev->coda_mutex);
 
         coda_write(dev, ctx->parabuf.paddr, CODA_REG_BIT_PARA_BUF_ADDR);
@@ -729,10 +765,10 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                 break;
         }
 
-        value = coda_read(dev, CODA_REG_BIT_FRAME_MEM_CTRL);
-        value &= ~(1 << 2 | 0x7 << 9);
-        ctx->frame_mem_ctrl = value;
-        coda_write(dev, value, CODA_REG_BIT_FRAME_MEM_CTRL);
+        ctx->frame_mem_ctrl &= ~CODA_FRAME_CHROMA_INTERLEAVE;
+        if (q_data_src->fourcc == V4L2_PIX_FMT_NV12)
+                ctx->frame_mem_ctrl |= CODA_FRAME_CHROMA_INTERLEAVE;
+        coda_write(dev, ctx->frame_mem_ctrl, CODA_REG_BIT_FRAME_MEM_CTRL);
 
         if (dev->devtype->product == CODA_DX6) {
                 /* Configure the coda */
@@ -741,6 +777,7 @@ static int coda_start_encoding(struct coda_ctx *ctx)
         }
 
         /* Could set rotation here if needed */
+        value = 0;
         switch (dev->devtype->product) {
         case CODA_DX6:
                 value = (q_data_src->width & CODADX6_PICWIDTH_MASK)
@@ -764,6 +801,8 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                          << CODA_PICHEIGHT_OFFSET;
         }
         coda_write(dev, value, CODA_CMD_ENC_SEQ_SRC_SIZE);
+        if (dst_fourcc == V4L2_PIX_FMT_JPEG)
+                ctx->params.framerate = 0;
         coda_write(dev, ctx->params.framerate,
                    CODA_CMD_ENC_SEQ_SRC_F_RATE);
 
@@ -797,6 +836,16 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                 }
                 coda_write(dev, value, CODA_CMD_ENC_SEQ_264_PARA);
                 break;
+        case V4L2_PIX_FMT_JPEG:
+                coda_write(dev, 0, CODA_CMD_ENC_SEQ_JPG_PARA);
+                coda_write(dev, ctx->params.jpeg_restart_interval,
+                                CODA_CMD_ENC_SEQ_JPG_RST_INTERVAL);
+                coda_write(dev, 0, CODA_CMD_ENC_SEQ_JPG_THUMB_EN);
+                coda_write(dev, 0, CODA_CMD_ENC_SEQ_JPG_THUMB_SIZE);
+                coda_write(dev, 0, CODA_CMD_ENC_SEQ_JPG_THUMB_OFFSET);
+
+                coda_jpeg_write_tables(ctx);
+                break;
         default:
                 v4l2_err(v4l2_dev,
                          "dst format (0x%08x) invalid.\n", dst_fourcc);
@@ -804,28 +853,36 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                 goto out;
         }
 
-        switch (ctx->params.slice_mode) {
-        case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
-                value = 0;
-                break;
-        case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:
-                value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK)
-                         << CODA_SLICING_SIZE_OFFSET;
-                value |= (1 & CODA_SLICING_UNIT_MASK)
-                         << CODA_SLICING_UNIT_OFFSET;
-                value |=  1 & CODA_SLICING_MODE_MASK;
-                break;
-        case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:
-                value  = (ctx->params.slice_max_bits & CODA_SLICING_SIZE_MASK)
-                         << CODA_SLICING_SIZE_OFFSET;
-                value |= (0 & CODA_SLICING_UNIT_MASK)
-                         << CODA_SLICING_UNIT_OFFSET;
-                value |=  1 & CODA_SLICING_MODE_MASK;
-                break;
+        /*
+         * slice mode and GOP size registers are used for thumb size/offset
+         * in JPEG mode
+         */
+        if (dst_fourcc != V4L2_PIX_FMT_JPEG) {
+                switch (ctx->params.slice_mode) {
+                case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:
+                        value = 0;
+                        break;
+                case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:
+                        value  = (ctx->params.slice_max_mb &
+                                  CODA_SLICING_SIZE_MASK)
+                                 << CODA_SLICING_SIZE_OFFSET;
+                        value |= (1 & CODA_SLICING_UNIT_MASK)
+                                 << CODA_SLICING_UNIT_OFFSET;
+                        value |=  1 & CODA_SLICING_MODE_MASK;
+                        break;
+                case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:
+                        value  = (ctx->params.slice_max_bits &
+                                  CODA_SLICING_SIZE_MASK)
+                                 << CODA_SLICING_SIZE_OFFSET;
+                        value |= (0 & CODA_SLICING_UNIT_MASK)
+                                 << CODA_SLICING_UNIT_OFFSET;
+                        value |=  1 & CODA_SLICING_MODE_MASK;
+                        break;
+                }
+                coda_write(dev, value, CODA_CMD_ENC_SEQ_SLICE_MODE);
+                value = ctx->params.gop_size & CODA_GOP_SIZE_MASK;
+                coda_write(dev, value, CODA_CMD_ENC_SEQ_GOP_SIZE);
         }
-        coda_write(dev, value, CODA_CMD_ENC_SEQ_SLICE_MODE);
-        value = ctx->params.gop_size & CODA_GOP_SIZE_MASK;
-        coda_write(dev, value, CODA_CMD_ENC_SEQ_GOP_SIZE);
 
         if (ctx->params.bitrate) {
                 /* Rate control enabled */
@@ -916,19 +973,24 @@ static int coda_start_encoding(struct coda_ctx *ctx)
                 goto out;
         }
 
-        if (dev->devtype->product == CODA_960)
-                ctx->num_internal_frames = 4;
-        else
-                ctx->num_internal_frames = 2;
-        ret = coda_alloc_framebuffers(ctx, q_data_src, dst_fourcc);
-        if (ret < 0) {
-                v4l2_err(v4l2_dev, "failed to allocate framebuffers\n");
-                goto out;
+        if (dst_fourcc != V4L2_PIX_FMT_JPEG) {
+                if (dev->devtype->product == CODA_960)
+                        ctx->num_internal_frames = 4;
+                else
+                        ctx->num_internal_frames = 2;
+                ret = coda_alloc_framebuffers(ctx, q_data_src, dst_fourcc);
+                if (ret < 0) {
+                        v4l2_err(v4l2_dev, "failed to allocate framebuffers\n");
+                        goto out;
+                }
+                stride = q_data_src->bytesperline;
+        } else {
+                ctx->num_internal_frames = 0;
+                stride = 0;
         }
-
         coda_write(dev, ctx->num_internal_frames, CODA_CMD_SET_FRAME_BUF_NUM);
-        coda_write(dev, q_data_src->bytesperline,
-                        CODA_CMD_SET_FRAME_BUF_STRIDE);
+        coda_write(dev, stride, CODA_CMD_SET_FRAME_BUF_STRIDE);
+
         if (dev->devtype->product == CODA_7541) {
                 coda_write(dev, q_data_src->bytesperline,
                                 CODA7_CMD_SET_FRAME_SOURCE_BUF_STRIDE);
@@ -1036,9 +1098,10 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
         struct coda_dev *dev = ctx->dev;
         int force_ipicture;
         int quant_param = 0;
-        u32 picture_y, picture_cb, picture_cr;
         u32 pic_stream_buffer_addr, pic_stream_buffer_size;
+        u32 rot_mode = 0;
         u32 dst_fourcc;
+        u32 reg;
 
         src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
         dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
@@ -1076,7 +1139,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
                         ctx->vpu_header_size[0] +
                         ctx->vpu_header_size[1] +
                         ctx->vpu_header_size[2];
-                pic_stream_buffer_size = CODA_MAX_FRAME_SIZE -
+                pic_stream_buffer_size = q_data_dst->sizeimage -
                         ctx->vpu_header_size[0] -
                         ctx->vpu_header_size[1] -
                         ctx->vpu_header_size[2];
@@ -1090,7 +1153,7 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
         } else {
                 pic_stream_buffer_addr =
                         vb2_dma_contig_plane_dma_addr(dst_buf, 0);
-                pic_stream_buffer_size = CODA_MAX_FRAME_SIZE;
+                pic_stream_buffer_size = q_data_dst->sizeimage;
         }
 
         if (src_buf->v4l2_buf.flags & V4L2_BUF_FLAG_KEYFRAME) {
@@ -1102,6 +1165,9 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
                 case V4L2_PIX_FMT_MPEG4:
                         quant_param = ctx->params.mpeg4_intra_qp;
                         break;
+                case V4L2_PIX_FMT_JPEG:
+                        quant_param = 30;
+                        break;
                 default:
                         v4l2_warn(&ctx->dev->v4l2_dev,
                                 "cannot set intra qp, fmt not supported\n");
@@ -1124,42 +1190,22 @@ static int coda_prepare_encode(struct coda_ctx *ctx)
         }
 
         /* submit */
-        coda_write(dev, CODA_ROT_MIR_ENABLE | ctx->params.rot_mode,
-                   CODA_CMD_ENC_PIC_ROT_MODE);
+        if (ctx->params.rot_mode)
+                rot_mode = CODA_ROT_MIR_ENABLE | ctx->params.rot_mode;
+        coda_write(dev, rot_mode, CODA_CMD_ENC_PIC_ROT_MODE);
         coda_write(dev, quant_param, CODA_CMD_ENC_PIC_QS);
 
-
-        picture_y = vb2_dma_contig_plane_dma_addr(src_buf, 0);
-        switch (q_data_src->fourcc) {
-        case V4L2_PIX_FMT_YVU420:
-                /* Switch Cb and Cr for YVU420 format */
-                picture_cr = picture_y + q_data_src->bytesperline *
-                                q_data_src->height;
-                picture_cb = picture_cr + q_data_src->bytesperline / 2 *
-                                q_data_src->height / 2;
-                break;
-        case V4L2_PIX_FMT_YUV420:
-        default:
-                picture_cb = picture_y + q_data_src->bytesperline *
-                                q_data_src->height;
-                picture_cr = picture_cb + q_data_src->bytesperline / 2 *
-                                q_data_src->height / 2;
-                break;
-        }
-
         if (dev->devtype->product == CODA_960) {
                 coda_write(dev, 4/*FIXME: 0*/, CODA9_CMD_ENC_PIC_SRC_INDEX);
                 coda_write(dev, q_data_src->width, CODA9_CMD_ENC_PIC_SRC_STRIDE);
                 coda_write(dev, 0, CODA9_CMD_ENC_PIC_SUB_FRAME_SYNC);
 
-                coda_write(dev, picture_y, CODA9_CMD_ENC_PIC_SRC_ADDR_Y);
-                coda_write(dev, picture_cb, CODA9_CMD_ENC_PIC_SRC_ADDR_CB);
-                coda_write(dev, picture_cr, CODA9_CMD_ENC_PIC_SRC_ADDR_CR);
+                reg = CODA9_CMD_ENC_PIC_SRC_ADDR_Y;
         } else {
-                coda_write(dev, picture_y, CODA_CMD_ENC_PIC_SRC_ADDR_Y);
-                coda_write(dev, picture_cb, CODA_CMD_ENC_PIC_SRC_ADDR_CB);
-                coda_write(dev, picture_cr, CODA_CMD_ENC_PIC_SRC_ADDR_CR);
+                reg = CODA_CMD_ENC_PIC_SRC_ADDR_Y;
         }
+        coda_write_base(ctx, q_data_src, src_buf, reg);
+
         coda_write(dev, force_ipicture << 1 & 0x2,
                    CODA_CMD_ENC_PIC_OPTION);
 
@@ -1293,7 +1339,7 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
         u32 bitstream_buf, bitstream_size;
         struct coda_dev *dev = ctx->dev;
         int width, height;
-        u32 src_fourcc;
+        u32 src_fourcc, dst_fourcc;
         u32 val;
         int ret;
 
@@ -1303,6 +1349,7 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
         bitstream_buf = ctx->bitstream.paddr;
         bitstream_size = ctx->bitstream.size;
         src_fourcc = q_data_src->fourcc;
+        dst_fourcc = q_data_dst->fourcc;
 
         /* Allocate per-instance buffers */
         ret = coda_alloc_context_buffers(ctx, q_data_src);
@@ -1314,6 +1361,11 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
         /* Update coda bitstream read and write pointers from kfifo */
         coda_kfifo_sync_to_device_full(ctx);
 
+        ctx->frame_mem_ctrl &= ~CODA_FRAME_CHROMA_INTERLEAVE;
+        if (dst_fourcc == V4L2_PIX_FMT_NV12)
+                ctx->frame_mem_ctrl |= CODA_FRAME_CHROMA_INTERLEAVE;
+        coda_write(dev, ctx->frame_mem_ctrl, CODA_REG_BIT_FRAME_MEM_CTRL);
+
         ctx->display_idx = -1;
         ctx->frm_dis_flg = 0;
         coda_write(dev, 0, CODA_REG_BIT_FRM_DIS_FLG(ctx->reg_idx));
@@ -1327,6 +1379,8 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
         if ((dev->devtype->product == CODA_7541) ||
             (dev->devtype->product == CODA_960))
                 val |= CODA_REORDER_ENABLE;
+        if (ctx->codec->src_fourcc == V4L2_PIX_FMT_JPEG)
+                val |= CODA_NO_INT_ENABLE;
         coda_write(dev, val, CODA_CMD_DEC_SEQ_OPTION);
 
         ctx->params.codec_mode = ctx->codec->mode;
@@ -1442,13 +1496,23 @@ static int __coda_start_decoding(struct coda_ctx *ctx)
         }
 
         if (dev->devtype->product == CODA_960) {
-                coda_write(dev, -1, CODA9_CMD_SET_FRAME_DELAY);
+                int cbb_size, crb_size;
 
+                coda_write(dev, -1, CODA9_CMD_SET_FRAME_DELAY);
+                /* Luma 2x0 page, 2x6 cache, chroma 2x0 page, 2x4 cache size */
                 coda_write(dev, 0x20262024, CODA9_CMD_SET_FRAME_CACHE_SIZE);
+
+                if (dst_fourcc == V4L2_PIX_FMT_NV12) {
+                        cbb_size = 0;
+                        crb_size = 16;
+                } else {
+                        cbb_size = 8;
+                        crb_size = 8;
+                }
                 coda_write(dev, 2 << CODA9_CACHE_PAGEMERGE_OFFSET |
                                 32 << CODA9_CACHE_LUMA_BUFFER_SIZE_OFFSET |
-                                8 << CODA9_CACHE_CB_BUFFER_SIZE_OFFSET |
-                                8 << CODA9_CACHE_CR_BUFFER_SIZE_OFFSET,
+                                cbb_size << CODA9_CACHE_CB_BUFFER_SIZE_OFFSET |
+                                crb_size << CODA9_CACHE_CR_BUFFER_SIZE_OFFSET,
                                 CODA9_CMD_SET_FRAME_CACHE_CONFIG);
         }
 
@@ -1501,20 +1565,11 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
         struct vb2_buffer *dst_buf;
         struct coda_dev *dev = ctx->dev;
         struct coda_q_data *q_data_dst;
-        u32 stridey, height;
-        u32 picture_y, picture_cb, picture_cr;
+        u32 reg_addr, reg_stride;
 
         dst_buf = v4l2_m2m_next_dst_buf(ctx->fh.m2m_ctx);
         q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
 
-        if (ctx->params.rot_mode & CODA_ROT_90) {
-                stridey = q_data_dst->height;
-                height = q_data_dst->width;
-        } else {
-                stridey = q_data_dst->width;
-                height = q_data_dst->height;
-        }
-
         /* Try to copy source buffer contents into the bitstream ringbuffer */
         mutex_lock(&ctx->bitstream_mutex);
         coda_fill_bitstream(ctx);
@@ -1545,17 +1600,6 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
         if (dev->devtype->product == CODA_960)
                 coda_set_gdi_regs(ctx);
 
-        /* Set rotator output */
-        picture_y = vb2_dma_contig_plane_dma_addr(dst_buf, 0);
-        if (q_data_dst->fourcc == V4L2_PIX_FMT_YVU420) {
-                /* Switch Cr and Cb for YVU420 format */
-                picture_cr = picture_y + stridey * height;
-                picture_cb = picture_cr + stridey / 2 * height / 2;
-        } else {
-                picture_cb = picture_y + stridey * height;
-                picture_cr = picture_cb + stridey / 2 * height / 2;
-        }
-
         if (dev->devtype->product == CODA_960) {
                 /*
                  * The CODA960 seems to have an internal list of buffers with
@@ -1565,16 +1609,16 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
                  */
                 coda_write(dev, CODA_MAX_FRAMEBUFFERS + dst_buf->v4l2_buf.index,
                                 CODA9_CMD_DEC_PIC_ROT_INDEX);
-                coda_write(dev, picture_y, CODA9_CMD_DEC_PIC_ROT_ADDR_Y);
-                coda_write(dev, picture_cb, CODA9_CMD_DEC_PIC_ROT_ADDR_CB);
-                coda_write(dev, picture_cr, CODA9_CMD_DEC_PIC_ROT_ADDR_CR);
-                coda_write(dev, stridey, CODA9_CMD_DEC_PIC_ROT_STRIDE);
+
+                reg_addr = CODA9_CMD_DEC_PIC_ROT_ADDR_Y;
+                reg_stride = CODA9_CMD_DEC_PIC_ROT_STRIDE;
         } else {
-                coda_write(dev, picture_y, CODA_CMD_DEC_PIC_ROT_ADDR_Y);
-                coda_write(dev, picture_cb, CODA_CMD_DEC_PIC_ROT_ADDR_CB);
-                coda_write(dev, picture_cr, CODA_CMD_DEC_PIC_ROT_ADDR_CR);
-                coda_write(dev, stridey, CODA_CMD_DEC_PIC_ROT_STRIDE);
+                reg_addr = CODA_CMD_DEC_PIC_ROT_ADDR_Y;
+                reg_stride = CODA_CMD_DEC_PIC_ROT_STRIDE;
         }
+        coda_write_base(ctx, q_data_dst, dst_buf, reg_addr);
+        coda_write(dev, q_data_dst->bytesperline, reg_stride);
+
         coda_write(dev, CODA_ROT_MIR_ENABLE | ctx->params.rot_mode,
                         CODA_CMD_DEC_PIC_ROT_MODE);
 
@@ -1599,6 +1643,26 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
                 coda_write(dev, ctx->iram_info.axi_sram_use,
                                 CODA7_REG_BIT_AXI_SRAM_USE);
 
+        if (ctx->codec->src_fourcc == V4L2_PIX_FMT_JPEG) {
+                struct coda_buffer_meta *meta;
+
+                /* If this is the last buffer in the bitstream, add padding */
+                meta = list_first_entry(&ctx->buffer_meta_list,
+                                      struct coda_buffer_meta, list);
+                if (meta->end == (ctx->bitstream_fifo.kfifo.in &
+                                  ctx->bitstream_fifo.kfifo.mask)) {
+                        static unsigned char buf[512];
+                        unsigned int pad;
+
+                        /* Pad to multiple of 256 and then add 256 more */
+                        pad = ((0 - meta->end) & 0xff) + 256;
+
+                        memset(buf, 0xff, sizeof(buf));
+
+                        kfifo_in(&ctx->bitstream_fifo, buf, pad);
+                }
+        }
+
         coda_kfifo_sync_to_device_full(ctx);
 
         coda_command_async(ctx, CODA_COMMAND_PIC_RUN);
@@ -1612,7 +1676,8 @@ static void coda_finish_decode(struct coda_ctx *ctx)
         struct coda_q_data *q_data_src;
         struct coda_q_data *q_data_dst;
         struct vb2_buffer *dst_buf;
-        struct coda_timestamp *ts;
+        struct coda_buffer_meta *meta;
+        unsigned long payload;
         int width, height;
         int decoded_idx;
         int display_idx;
@@ -1739,23 +1804,23 @@ static void coda_finish_decode(struct coda_ctx *ctx)
                 val = coda_read(dev, CODA_RET_DEC_PIC_FRAME_NUM) - 1;
                 val -= ctx->sequence_offset;
                 mutex_lock(&ctx->bitstream_mutex);
-                if (!list_empty(&ctx->timestamp_list)) {
-                        ts = list_first_entry(&ctx->timestamp_list,
-                                              struct coda_timestamp, list);
-                        list_del(&ts->list);
-                        if (val != (ts->sequence & 0xffff)) {
+                if (!list_empty(&ctx->buffer_meta_list)) {
+                        meta = list_first_entry(&ctx->buffer_meta_list,
+                                              struct coda_buffer_meta, list);
+                        list_del(&meta->list);
+                        if (val != (meta->sequence & 0xffff)) {
                                 v4l2_err(&dev->v4l2_dev,
                                          "sequence number mismatch (%d(%d) != %d)\n",
                                          val, ctx->sequence_offset,
-                                         ts->sequence);
+                                         meta->sequence);
                         }
-                        ctx->frame_timestamps[decoded_idx] = *ts;
-                        kfree(ts);
+                        ctx->frame_metas[decoded_idx] = *meta;
+                        kfree(meta);
                 } else {
                         v4l2_err(&dev->v4l2_dev, "empty timestamp list!\n");
-                        memset(&ctx->frame_timestamps[decoded_idx], 0,
-                               sizeof(struct coda_timestamp));
-                        ctx->frame_timestamps[decoded_idx].sequence = val;
+                        memset(&ctx->frame_metas[decoded_idx], 0,
+                               sizeof(struct coda_buffer_meta));
+                        ctx->frame_metas[decoded_idx].sequence = val;
                 }
                 mutex_unlock(&ctx->bitstream_mutex);
 
@@ -1794,11 +1859,22 @@ static void coda_finish_decode(struct coda_ctx *ctx)
                                              V4L2_BUF_FLAG_PFRAME |
                                              V4L2_BUF_FLAG_BFRAME);
                 dst_buf->v4l2_buf.flags |= ctx->frame_types[ctx->display_idx];
-                ts = &ctx->frame_timestamps[ctx->display_idx];
-                dst_buf->v4l2_buf.timecode = ts->timecode;
-                dst_buf->v4l2_buf.timestamp = ts->timestamp;
-
-                vb2_set_plane_payload(dst_buf, 0, width * height * 3 / 2);
+                meta = &ctx->frame_metas[ctx->display_idx];
+                dst_buf->v4l2_buf.timecode = meta->timecode;
+                dst_buf->v4l2_buf.timestamp = meta->timestamp;
+
+                switch (q_data_dst->fourcc) {
+                case V4L2_PIX_FMT_YUV420:
+                case V4L2_PIX_FMT_YVU420:
+                case V4L2_PIX_FMT_NV12:
+                default:
+                        payload = width * height * 3 / 2;
+                        break;
+                case V4L2_PIX_FMT_YUV422P:
+                        payload = width * height * 2;
+                        break;
+                }
+                vb2_set_plane_payload(dst_buf, 0, payload);
 
                 v4l2_m2m_buf_done(dst_buf, ctx->frame_errors[display_idx] ?
                                   VB2_BUF_STATE_ERROR : VB2_BUF_STATE_DONE);
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 5f0cd5cafea2..90b7791d36e1 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -43,6 +43,7 @@
 #define CODA_NAME               "coda"
 
 #define CODADX6_MAX_INSTANCES   4
+#define CODA_MAX_FORMATS        4
 
 #define CODA_PARA_BUF_SIZE      (10 * 1024)
 #define CODA_ISRAM_SIZE (2048 * 2)
@@ -82,6 +83,34 @@ unsigned int coda_read(struct coda_dev *dev, u32 reg)
         return data;
 }
 
+void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
+                     struct vb2_buffer *buf, unsigned int reg_y)
+{
+        u32 base_y = vb2_dma_contig_plane_dma_addr(buf, 0);
+        u32 base_cb, base_cr;
+
+        switch (q_data->fourcc) {
+        case V4L2_PIX_FMT_YVU420:
+                /* Switch Cb and Cr for YVU420 format */
+                base_cr = base_y + q_data->bytesperline * q_data->height;
+                base_cb = base_cr + q_data->bytesperline * q_data->height / 4;
+                break;
+        case V4L2_PIX_FMT_YUV420:
+        case V4L2_PIX_FMT_NV12:
+        default:
+                base_cb = base_y + q_data->bytesperline * q_data->height;
+                base_cr = base_cb + q_data->bytesperline * q_data->height / 4;
+                break;
+        case V4L2_PIX_FMT_YUV422P:
+                base_cb = base_y + q_data->bytesperline * q_data->height;
+                base_cr = base_cb + q_data->bytesperline * q_data->height / 2;
+        }
+
+        coda_write(ctx->dev, base_y, reg_y);
+        coda_write(ctx->dev, base_cb, reg_y + 4);
+        coda_write(ctx->dev, base_cr, reg_y + 8);
+}
+
 /*
  * Array of all formats supported by any version of Coda:
  */
@@ -95,6 +124,14 @@ static const struct coda_fmt coda_formats[] = {
                 .fourcc = V4L2_PIX_FMT_YVU420,
         },
         {
+                .name = "YUV 4:2:0 Partial interleaved Y/CbCr",
+                .fourcc = V4L2_PIX_FMT_NV12,
+        },
+        {
+                .name = "YUV 4:2:2 Planar, YCbCr",
+                .fourcc = V4L2_PIX_FMT_YUV422P,
+        },
+        {
                 .name = "H264 Encoded Stream",
                 .fourcc = V4L2_PIX_FMT_H264,
         },
@@ -102,6 +139,10 @@ static const struct coda_fmt coda_formats[] = {
                 .name = "MPEG4 Encoded Stream",
                 .fourcc = V4L2_PIX_FMT_MPEG4,
         },
+        {
+                .name = "JPEG Encoded Images",
+                .fourcc = V4L2_PIX_FMT_JPEG,
+        },
 };
 
 #define CODA_CODEC(mode, src_fourcc, dst_fourcc, max_w, max_h) \
@@ -122,8 +163,10 @@ static const struct coda_codec codadx6_codecs[] = {
 static const struct coda_codec coda7_codecs[] = {
         CODA_CODEC(CODA7_MODE_ENCODE_H264, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_H264,   1280, 720),
         CODA_CODEC(CODA7_MODE_ENCODE_MP4,  V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_MPEG4,  1280, 720),
+        CODA_CODEC(CODA7_MODE_ENCODE_MJPG, V4L2_PIX_FMT_YUV420, V4L2_PIX_FMT_JPEG,   8192, 8192),
         CODA_CODEC(CODA7_MODE_DECODE_H264, V4L2_PIX_FMT_H264,   V4L2_PIX_FMT_YUV420, 1920, 1088),
         CODA_CODEC(CODA7_MODE_DECODE_MP4,  V4L2_PIX_FMT_MPEG4,  V4L2_PIX_FMT_YUV420, 1920, 1088),
+        CODA_CODEC(CODA7_MODE_DECODE_MJPG, V4L2_PIX_FMT_JPEG,   V4L2_PIX_FMT_YUV420, 8192, 8192),
 };
 
 static const struct coda_codec coda9_codecs[] = {
@@ -133,17 +176,115 @@ static const struct coda_codec coda9_codecs[] = {
         CODA_CODEC(CODA9_MODE_DECODE_MP4,  V4L2_PIX_FMT_MPEG4,  V4L2_PIX_FMT_YUV420, 1920, 1088),
 };
 
+struct coda_video_device {
+        const char *name;
+        enum coda_inst_type type;
+        const struct coda_context_ops *ops;
+        u32 src_formats[CODA_MAX_FORMATS];
+        u32 dst_formats[CODA_MAX_FORMATS];
+};
+
+static const struct coda_video_device coda_bit_encoder = {
+        .name = "coda-encoder",
+        .type = CODA_INST_ENCODER,
+        .ops = &coda_bit_encode_ops,
+        .src_formats = {
+                V4L2_PIX_FMT_YUV420,
+                V4L2_PIX_FMT_YVU420,
+                V4L2_PIX_FMT_NV12,
+        },
+        .dst_formats = {
+                V4L2_PIX_FMT_H264,
+                V4L2_PIX_FMT_MPEG4,
+        },
+};
+
+static const struct coda_video_device coda_bit_jpeg_encoder = {
+        .name = "coda-jpeg-encoder",
+        .type = CODA_INST_ENCODER,
+        .ops = &coda_bit_encode_ops,
+        .src_formats = {
+                V4L2_PIX_FMT_YUV420,
+                V4L2_PIX_FMT_YVU420,
+                V4L2_PIX_FMT_NV12,
+                V4L2_PIX_FMT_YUV422P,
+        },
+        .dst_formats = {
+                V4L2_PIX_FMT_JPEG,
+        },
+};
+
+static const struct coda_video_device coda_bit_decoder = {
+        .name = "coda-decoder",
+        .type = CODA_INST_DECODER,
+        .ops = &coda_bit_decode_ops,
+        .src_formats = {
+                V4L2_PIX_FMT_H264,
+                V4L2_PIX_FMT_MPEG4,
+        },
+        .dst_formats = {
+                V4L2_PIX_FMT_YUV420,
+                V4L2_PIX_FMT_YVU420,
+                V4L2_PIX_FMT_NV12,
+        },
+};
+
+static const struct coda_video_device coda_bit_jpeg_decoder = {
+        .name = "coda-jpeg-decoder",
+        .type = CODA_INST_DECODER,
+        .ops = &coda_bit_decode_ops,
+        .src_formats = {
+                V4L2_PIX_FMT_JPEG,
+        },
+        .dst_formats = {
+                V4L2_PIX_FMT_YUV420,
+                V4L2_PIX_FMT_YVU420,
+                V4L2_PIX_FMT_NV12,
+                V4L2_PIX_FMT_YUV422P,
+        },
+};
+
+static const struct coda_video_device *codadx6_video_devices[] = {
+        &coda_bit_encoder,
+};
+
+static const struct coda_video_device *coda7_video_devices[] = {
+        &coda_bit_jpeg_encoder,
+        &coda_bit_jpeg_decoder,
+        &coda_bit_encoder,
+        &coda_bit_decoder,
+};
+
+static const struct coda_video_device *coda9_video_devices[] = {
+        &coda_bit_encoder,
+        &coda_bit_decoder,
+};
+
 static bool coda_format_is_yuv(u32 fourcc)
 {
         switch (fourcc) {
         case V4L2_PIX_FMT_YUV420:
         case V4L2_PIX_FMT_YVU420:
+        case V4L2_PIX_FMT_NV12:
+        case V4L2_PIX_FMT_YUV422P:
                 return true;
         default:
                 return false;
         }
 }
 
+static const char *coda_format_name(u32 fourcc)
+{
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(coda_formats); i++) {
+                if (coda_formats[i].fourcc == fourcc)
+                        return coda_formats[i].name;
+        }
+
+        return NULL;
+}
+
 /*
  * Normalize all supported YUV 4:2:0 formats to the value used in the codec
  * tables.
@@ -202,6 +343,17 @@ static void coda_get_max_dimensions(struct coda_dev *dev,
                 *max_h = h;
 }
 
+const struct coda_video_device *to_coda_video_device(struct video_device *vdev)
+{
+        struct coda_dev *dev = video_get_drvdata(vdev);
+        unsigned int i = vdev - dev->vfd;
+
+        if (i >= dev->devtype->num_vdevs)
+                return NULL;
+
+        return dev->devtype->vdevs[i];
+}
+
 const char *coda_product_name(int product)
 {
         static char buf[9];
@@ -240,58 +392,28 @@ static int coda_querycap(struct file *file, void *priv,
 static int coda_enum_fmt(struct file *file, void *priv,
                          struct v4l2_fmtdesc *f)
 {
-        struct coda_ctx *ctx = fh_to_ctx(priv);
-        const struct coda_codec *codecs = ctx->dev->devtype->codecs;
-        const struct coda_fmt *formats = coda_formats;
-        const struct coda_fmt *fmt;
-        int num_codecs = ctx->dev->devtype->num_codecs;
-        int num_formats = ARRAY_SIZE(coda_formats);
-        int i, k, num = 0;
-        bool yuv;
-
-        if (ctx->inst_type == CODA_INST_ENCODER)
-                yuv = (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        struct video_device *vdev = video_devdata(file);
+        const struct coda_video_device *cvd = to_coda_video_device(vdev);
+        const u32 *formats;
+        const char *name;
+
+        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+                formats = cvd->src_formats;
+        else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                formats = cvd->dst_formats;
         else
-                yuv = (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE);
-
-        for (i = 0; i < num_formats; i++) {
-                /* Skip either raw or compressed formats */
-                if (yuv != coda_format_is_yuv(formats[i].fourcc))
-                        continue;
-                /* All uncompressed formats are always supported */
-                if (yuv) {
-                        if (num == f->index)
-                                break;
-                        ++num;
-                        continue;
-                }
-                /* Compressed formats may be supported, check the codec list */
-                for (k = 0; k < num_codecs; k++) {
-                        if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE &&
-                            formats[i].fourcc == codecs[k].dst_fourcc)
-                                break;
-                        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT &&
-                            formats[i].fourcc == codecs[k].src_fourcc)
-                                break;
-                }
-                if (k < num_codecs) {
-                        if (num == f->index)
-                                break;
-                        ++num;
-                }
-        }
+                return -EINVAL;
 
-        if (i < num_formats) {
-                fmt = &formats[i];
-                strlcpy(f->description, fmt->name, sizeof(f->description));
-                f->pixelformat = fmt->fourcc;
-                if (!yuv)
-                        f->flags |= V4L2_FMT_FLAG_COMPRESSED;
-                return 0;
-        }
+        if (f->index >= CODA_MAX_FORMATS || formats[f->index] == 0)
+                return -EINVAL;
+
+        name = coda_format_name(formats[f->index]);
+        strlcpy(f->description, name, sizeof(f->description));
+        f->pixelformat = formats[f->index];
+        if (!coda_format_is_yuv(formats[f->index]))
+                f->flags |= V4L2_FMT_FLAG_COMPRESSED;
 
-        /* Format not found */
-        return -EINVAL;
+        return 0;
 }
 
 static int coda_g_fmt(struct file *file, void *priv,
@@ -311,7 +433,37 @@ static int coda_g_fmt(struct file *file, void *priv,
         f->fmt.pix.bytesperline = q_data->bytesperline;
 
         f->fmt.pix.sizeimage    = q_data->sizeimage;
-        f->fmt.pix.colorspace   = ctx->colorspace;
+        if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_JPEG)
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
+        else
+                f->fmt.pix.colorspace = ctx->colorspace;
+
+        return 0;
+}
+
+static int coda_try_pixelformat(struct coda_ctx *ctx, struct v4l2_format *f)
+{
+        struct coda_q_data *q_data;
+        const u32 *formats;
+        int i;
+
+        if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
+                formats = ctx->cvd->src_formats;
+        else if (f->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                formats = ctx->cvd->dst_formats;
+        else
+                return -EINVAL;
+
+        for (i = 0; i < CODA_MAX_FORMATS; i++) {
+                if (formats[i] == f->fmt.pix.pixelformat) {
+                        f->fmt.pix.pixelformat = formats[i];
+                        return 0;
+                }
+        }
+
+        /* Fall back to currently set pixelformat */
+        q_data = get_q_data(ctx, f->type);
+        f->fmt.pix.pixelformat = q_data->fourcc;
 
         return 0;
 }
@@ -320,7 +472,6 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
                         struct v4l2_format *f)
 {
         struct coda_dev *dev = ctx->dev;
-        struct coda_q_data *q_data;
         unsigned int max_w, max_h;
         enum v4l2_field field;
 
@@ -342,30 +493,35 @@ static int coda_try_fmt(struct coda_ctx *ctx, const struct coda_codec *codec,
         switch (f->fmt.pix.pixelformat) {
         case V4L2_PIX_FMT_YUV420:
         case V4L2_PIX_FMT_YVU420:
-        case V4L2_PIX_FMT_H264:
-        case V4L2_PIX_FMT_MPEG4:
-        case V4L2_PIX_FMT_JPEG:
-                break;
-        default:
-                q_data = get_q_data(ctx, f->type);
-                if (!q_data)
-                        return -EINVAL;
-                f->fmt.pix.pixelformat = q_data->fourcc;
-        }
-
-        switch (f->fmt.pix.pixelformat) {
-        case V4L2_PIX_FMT_YUV420:
-        case V4L2_PIX_FMT_YVU420:
-                /* Frame stride must be multiple of 8, but 16 for h.264 */
+        case V4L2_PIX_FMT_NV12:
+                /*
+                 * Frame stride must be at least multiple of 8,
+                 * but multiple of 16 for h.264 or JPEG 4:2:x
+                 */
                 f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 16);
                 f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
                                         f->fmt.pix.height * 3 / 2;
                 break;
+        case V4L2_PIX_FMT_YUV422P:
+                f->fmt.pix.bytesperline = round_up(f->fmt.pix.width, 16);
+                f->fmt.pix.sizeimage = f->fmt.pix.bytesperline *
+                                        f->fmt.pix.height * 2;
+                break;
+        case V4L2_PIX_FMT_JPEG:
+                f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
+                /* fallthrough */
         case V4L2_PIX_FMT_H264:
         case V4L2_PIX_FMT_MPEG4:
-        case V4L2_PIX_FMT_JPEG:
                 f->fmt.pix.bytesperline = 0;
-                f->fmt.pix.sizeimage = CODA_MAX_FRAME_SIZE;
+                /*
+                 * This is a rough estimate for sensible compressed buffer
+                 * sizes (between 1 and 16 bits per pixel). This could be
+                 * improved by better format specific worst case estimates.
+                 */
+                f->fmt.pix.sizeimage = round_up(clamp(f->fmt.pix.sizeimage,
+                                f->fmt.pix.width * f->fmt.pix.height / 8,
+                                f->fmt.pix.width * f->fmt.pix.height * 2),
+                                PAGE_SIZE);
                 break;
         default:
                 BUG();
@@ -378,34 +534,35 @@ static int coda_try_fmt_vid_cap(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
-        const struct coda_codec *codec = NULL;
+        const struct coda_q_data *q_data_src;
+        const struct coda_codec *codec;
         struct vb2_queue *src_vq;
         int ret;
 
+        ret = coda_try_pixelformat(ctx, f);
+        if (ret < 0)
+                return ret;
+
+        q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+
         /*
-         * If the source format is already fixed, try to find a codec that
-         * converts to the given destination format
+         * If the source format is already fixed, only allow the same output
+         * resolution
          */
         src_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
         if (vb2_is_streaming(src_vq)) {
-                struct coda_q_data *q_data_src;
-
-                q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
-                codec = coda_find_codec(ctx->dev, q_data_src->fourcc,
-                                        f->fmt.pix.pixelformat);
-                if (!codec)
-                        return -EINVAL;
-
                 f->fmt.pix.width = q_data_src->width;
                 f->fmt.pix.height = q_data_src->height;
-        } else {
-                /* Otherwise determine codec by encoded format, if possible */
-                codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_YUV420,
-                                        f->fmt.pix.pixelformat);
         }
 
         f->fmt.pix.colorspace = ctx->colorspace;
 
+        q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
+        codec = coda_find_codec(ctx->dev, q_data_src->fourcc,
+                                f->fmt.pix.pixelformat);
+        if (!codec)
+                return -EINVAL;
+
         ret = coda_try_fmt(ctx, codec, f);
         if (ret < 0)
                 return ret;
@@ -426,21 +583,24 @@ static int coda_try_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
         struct coda_ctx *ctx = fh_to_ctx(priv);
-        const struct coda_codec *codec = NULL;
+        struct coda_dev *dev = ctx->dev;
+        const struct coda_q_data *q_data_dst;
+        const struct coda_codec *codec;
+        int ret;
 
-        /* Determine codec by encoded format, returns NULL if raw or invalid */
-        if (ctx->inst_type == CODA_INST_DECODER) {
-                codec = coda_find_codec(ctx->dev, f->fmt.pix.pixelformat,
-                                        V4L2_PIX_FMT_YUV420);
-                if (!codec)
-                        codec = coda_find_codec(ctx->dev, V4L2_PIX_FMT_H264,
-                                                V4L2_PIX_FMT_YUV420);
-                if (!codec)
-                        return -EINVAL;
+        ret = coda_try_pixelformat(ctx, f);
+        if (ret < 0)
+                return ret;
+
+        if (!f->fmt.pix.colorspace) {
+                if (f->fmt.pix.pixelformat == V4L2_PIX_FMT_JPEG)
+                        f->fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
+                else
+                        f->fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
         }
 
-        if (!f->fmt.pix.colorspace)
-                f->fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
+        q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
+        codec = coda_find_codec(dev, f->fmt.pix.pixelformat, q_data_dst->fourcc);
 
         return coda_try_fmt(ctx, codec, f);
 }
@@ -781,6 +941,7 @@ static int coda_job_ready(void *m2m_priv)
 
         if (ctx->hold ||
             ((ctx->inst_type == CODA_INST_DECODER) &&
+             !v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) &&
              (coda_get_bitstream_payload(ctx) < 512) &&
              !(ctx->bit_stream_param & CODA_BIT_STREAM_END_FLAG))) {
                 v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,
@@ -862,25 +1023,17 @@ static void coda_set_tiled_map_type(struct coda_ctx *ctx, int tiled_map_type)
 
 static void set_default_params(struct coda_ctx *ctx)
 {
-        u32 src_fourcc, dst_fourcc;
-        int max_w;
-        int max_h;
+        unsigned int max_w, max_h, size;
 
-        if (ctx->inst_type == CODA_INST_ENCODER) {
-                src_fourcc = V4L2_PIX_FMT_YUV420;
-                dst_fourcc = V4L2_PIX_FMT_H264;
-        } else {
-                src_fourcc = V4L2_PIX_FMT_H264;
-                dst_fourcc = V4L2_PIX_FMT_YUV420;
-        }
-        ctx->codec = coda_find_codec(ctx->dev, src_fourcc, dst_fourcc);
-        max_w = ctx->codec->max_w;
-        max_h = ctx->codec->max_h;
+        ctx->codec = coda_find_codec(ctx->dev, ctx->cvd->src_formats[0],
+                                     ctx->cvd->dst_formats[0]);
+        max_w = min(ctx->codec->max_w, 1920U);
+        max_h = min(ctx->codec->max_h, 1088U);
+        size = max_w * max_h * 3 / 2;
 
         ctx->params.codec_mode = ctx->codec->mode;
         ctx->colorspace = V4L2_COLORSPACE_REC709;
         ctx->params.framerate = 30;
-        ctx->aborting = 0;
 
         /* Default formats for output and input queues */
         ctx->q_data[V4L2_M2M_SRC].fourcc = ctx->codec->src_fourcc;
@@ -891,14 +1044,14 @@ static void set_default_params(struct coda_ctx *ctx)
         ctx->q_data[V4L2_M2M_DST].height = max_h;
         if (ctx->codec->src_fourcc == V4L2_PIX_FMT_YUV420) {
                 ctx->q_data[V4L2_M2M_SRC].bytesperline = max_w;
-                ctx->q_data[V4L2_M2M_SRC].sizeimage = (max_w * max_h * 3) / 2;
+                ctx->q_data[V4L2_M2M_SRC].sizeimage = size;
                 ctx->q_data[V4L2_M2M_DST].bytesperline = 0;
-                ctx->q_data[V4L2_M2M_DST].sizeimage = CODA_MAX_FRAME_SIZE;
+                ctx->q_data[V4L2_M2M_DST].sizeimage = round_up(size, PAGE_SIZE);
         } else {
                 ctx->q_data[V4L2_M2M_SRC].bytesperline = 0;
-                ctx->q_data[V4L2_M2M_SRC].sizeimage = CODA_MAX_FRAME_SIZE;
+                ctx->q_data[V4L2_M2M_SRC].sizeimage = round_up(size, PAGE_SIZE);
                 ctx->q_data[V4L2_M2M_DST].bytesperline = max_w;
-                ctx->q_data[V4L2_M2M_DST].sizeimage = (max_w * max_h * 3) / 2;
+                ctx->q_data[V4L2_M2M_DST].sizeimage = size;
         }
         ctx->q_data[V4L2_M2M_SRC].rect.width = max_w;
         ctx->q_data[V4L2_M2M_SRC].rect.height = max_h;
@@ -964,7 +1117,7 @@ static void coda_buf_queue(struct vb2_buffer *vb)
          * In the decoder case, immediately try to copy the buffer into the
          * bitstream ringbuffer and mark it as ready to be dequeued.
          */
-        if (q_data->fourcc == V4L2_PIX_FMT_H264 &&
+        if (ctx->inst_type == CODA_INST_DECODER &&
             vb->vb2_queue->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 /*
                  * For backwards compatibility, queuing an empty buffer marks
@@ -1027,12 +1180,13 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
         struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev;
         struct coda_q_data *q_data_src, *q_data_dst;
         struct vb2_buffer *buf;
-        u32 dst_fourcc;
         int ret = 0;
 
         q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
         if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
-                if (q_data_src->fourcc == V4L2_PIX_FMT_H264) {
+                if (q_data_src->fourcc == V4L2_PIX_FMT_H264 ||
+                    (q_data_src->fourcc == V4L2_PIX_FMT_JPEG &&
+                     ctx->dev->devtype->product == CODA_7541)) {
                         /* copy the buffers that where queued before streamon */
                         mutex_lock(&ctx->bitstream_mutex);
                         coda_fill_bitstream(ctx);
@@ -1063,13 +1217,12 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
         if (!(ctx->streamon_out & ctx->streamon_cap))
                 return 0;
 
-        /* Allow decoder device_run with no new buffers queued */
+        /* Allow BIT decoder device_run with no new buffers queued */
         if (ctx->inst_type == CODA_INST_DECODER)
                 v4l2_m2m_set_src_buffered(ctx->fh.m2m_ctx, true);
 
         ctx->gopcounter = ctx->params.gop_size - 1;
         q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
-        dst_fourcc = q_data_dst->fourcc;
 
         ctx->codec = coda_find_codec(ctx->dev, q_data_src->fourcc,
                                      q_data_dst->fourcc);
@@ -1079,6 +1232,10 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
                 goto err;
         }
 
+        if (q_data_dst->fourcc == V4L2_PIX_FMT_JPEG)
+                ctx->params.gop_size = 1;
+        ctx->gopcounter = ctx->params.gop_size - 1;
+
         ret = ctx->ops->start_streaming(ctx);
         if (ctx->inst_type == CODA_INST_DECODER) {
                 if (ret == -EAGAIN)
@@ -1093,10 +1250,10 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 err:
         if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                 while ((buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx)))
-                        v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);
+                        v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);
         } else {
                 while ((buf = v4l2_m2m_dst_buf_remove(ctx->fh.m2m_ctx)))
-                        v4l2_m2m_buf_done(buf, VB2_BUF_STATE_DEQUEUED);
+                        v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);
         }
         return ret;
 }
@@ -1131,19 +1288,20 @@ static void coda_stop_streaming(struct vb2_queue *q)
         }
 
         if (!ctx->streamon_out && !ctx->streamon_cap) {
-                struct coda_timestamp *ts;
+                struct coda_buffer_meta *meta;
 
                 mutex_lock(&ctx->bitstream_mutex);
-                while (!list_empty(&ctx->timestamp_list)) {
-                        ts = list_first_entry(&ctx->timestamp_list,
-                                              struct coda_timestamp, list);
-                        list_del(&ts->list);
-                        kfree(ts);
+                while (!list_empty(&ctx->buffer_meta_list)) {
+                        meta = list_first_entry(&ctx->buffer_meta_list,
+                                                struct coda_buffer_meta, list);
+                        list_del(&meta->list);
+                        kfree(meta);
                 }
                 mutex_unlock(&ctx->bitstream_mutex);
                 kfifo_init(&ctx->bitstream_fifo,
                         ctx->bitstream.vaddr, ctx->bitstream.size);
                 ctx->runcounter = 0;
+                ctx->aborting = 0;
         }
 }
 
@@ -1226,6 +1384,12 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl)
         case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:
                 ctx->params.intra_refresh = ctrl->val;
                 break;
+        case V4L2_CID_JPEG_COMPRESSION_QUALITY:
+                coda_set_jpeg_compression_quality(ctx, ctrl->val);
+                break;
+        case V4L2_CID_JPEG_RESTART_INTERVAL:
+                ctx->params.jpeg_restart_interval = ctrl->val;
+                break;
         default:
                 v4l2_dbg(1, coda_debug, &ctx->dev->v4l2_dev,
                         "Invalid control, id=%d, val=%d\n",
@@ -1240,14 +1404,8 @@ static const struct v4l2_ctrl_ops coda_ctrl_ops = {
         .s_ctrl = coda_s_ctrl,
 };
 
-static int coda_ctrls_setup(struct coda_ctx *ctx)
+static void coda_encode_ctrls(struct coda_ctx *ctx)
 {
-        v4l2_ctrl_handler_init(&ctx->ctrls, 9);
-
-        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
-                V4L2_CID_HFLIP, 0, 1, 1, 0);
-        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
-                V4L2_CID_VFLIP, 0, 1, 1, 0);
         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
                 V4L2_CID_MPEG_VIDEO_BITRATE, 0, 32767000, 1, 0);
         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
@@ -1291,6 +1449,30 @@ static int coda_ctrls_setup(struct coda_ctx *ctx)
         v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
                 V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB, 0,
                 1920 * 1088 / 256, 1, 0);
+}
+
+static void coda_jpeg_encode_ctrls(struct coda_ctx *ctx)
+{
+        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+                V4L2_CID_JPEG_COMPRESSION_QUALITY, 5, 100, 1, 50);
+        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+                V4L2_CID_JPEG_RESTART_INTERVAL, 0, 100, 1, 0);
+}
+
+static int coda_ctrls_setup(struct coda_ctx *ctx)
+{
+        v4l2_ctrl_handler_init(&ctx->ctrls, 2);
+
+        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+                V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
+                V4L2_CID_VFLIP, 0, 1, 1, 0);
+        if (ctx->inst_type == CODA_INST_ENCODER) {
+                if (ctx->cvd->dst_formats[0] == V4L2_PIX_FMT_JPEG)
+                        coda_jpeg_encode_ctrls(ctx);
+                else
+                        coda_encode_ctrls(ctx);
+        }
 
         if (ctx->ctrls.error) {
                 v4l2_err(&ctx->dev->v4l2_dev,
@@ -1364,10 +1546,14 @@ static int coda_next_free_instance(struct coda_dev *dev)
         return idx;
 }
 
-static int coda_open(struct file *file, enum coda_inst_type inst_type,
-                     const struct coda_context_ops *ctx_ops)
+/*
+ * File operations
+ */
+
+static int coda_open(struct file *file)
 {
-        struct coda_dev *dev = video_drvdata(file);
+        struct video_device *vdev = video_devdata(file);
+        struct coda_dev *dev = video_get_drvdata(vdev);
         struct coda_ctx *ctx = NULL;
         char *name;
         int ret;
@@ -1388,8 +1574,9 @@ static int coda_open(struct file *file, enum coda_inst_type inst_type,
         ctx->debugfs_entry = debugfs_create_dir(name, dev->debugfs_root);
         kfree(name);
 
-        ctx->inst_type = inst_type;
-        ctx->ops = ctx_ops;
+        ctx->cvd = to_coda_video_device(vdev);
+        ctx->inst_type = ctx->cvd->type;
+        ctx->ops = ctx->cvd->ops;
         init_completion(&ctx->completion);
         INIT_WORK(&ctx->pic_run_work, coda_pic_run_work);
         INIT_WORK(&ctx->seq_end_work, ctx->ops->seq_end_work);
@@ -1399,8 +1586,10 @@ static int coda_open(struct file *file, enum coda_inst_type inst_type,
         ctx->dev = dev;
         ctx->idx = idx;
         switch (dev->devtype->product) {
-        case CODA_7541:
         case CODA_960:
+                ctx->frame_mem_ctrl = 1 << 12;
+                /* fallthrough */
+        case CODA_7541:
                 ctx->reg_idx = 0;
                 break;
         default:
@@ -1441,16 +1630,17 @@ static int coda_open(struct file *file, enum coda_inst_type inst_type,
 
         ctx->fh.ctrl_handler = &ctx->ctrls;
 
-        ret = coda_alloc_context_buf(ctx, &ctx->parabuf, CODA_PARA_BUF_SIZE,
-                                     "parabuf");
+        ret = coda_alloc_context_buf(ctx, &ctx->parabuf,
+                                     CODA_PARA_BUF_SIZE, "parabuf");
         if (ret < 0) {
                 v4l2_err(&dev->v4l2_dev, "failed to allocate parabuf");
                 goto err_dma_alloc;
         }
 
         ctx->bitstream.size = CODA_MAX_FRAME_SIZE;
-        ctx->bitstream.vaddr = dma_alloc_writecombine(&dev->plat_dev->dev,
-                        ctx->bitstream.size, &ctx->bitstream.paddr, GFP_KERNEL);
+        ctx->bitstream.vaddr = dma_alloc_writecombine(
+                        &dev->plat_dev->dev, ctx->bitstream.size,
+                        &ctx->bitstream.paddr, GFP_KERNEL);
         if (!ctx->bitstream.vaddr) {
                 v4l2_err(&dev->v4l2_dev,
                          "failed to allocate bitstream ringbuffer");
@@ -1461,7 +1651,7 @@ static int coda_open(struct file *file, enum coda_inst_type inst_type,
                 ctx->bitstream.vaddr, ctx->bitstream.size);
         mutex_init(&ctx->bitstream_mutex);
         mutex_init(&ctx->buffer_mutex);
-        INIT_LIST_HEAD(&ctx->timestamp_list);
+        INIT_LIST_HEAD(&ctx->buffer_meta_list);
 
         coda_lock(ctx);
         list_add(&ctx->list, &dev->instances);
@@ -1495,16 +1685,6 @@ err_coda_max:
         return ret;
 }
 
-static int coda_encoder_open(struct file *file)
-{
-        return coda_open(file, CODA_INST_ENCODER, &coda_bit_encode_ops);
-}
-
-static int coda_decoder_open(struct file *file)
-{
-        return coda_open(file, CODA_INST_DECODER, &coda_bit_decode_ops);
-}
-
 static int coda_release(struct file *file)
 {
         struct coda_dev *dev = video_drvdata(file);
@@ -1515,6 +1695,9 @@ static int coda_release(struct file *file)
 
         debugfs_remove_recursive(ctx->debugfs_entry);
 
+        if (ctx->inst_type == CODA_INST_DECODER)
+                coda_bit_stream_end_flag(ctx);
+
         /* If this instance is running, call .job_abort and wait for it to end */
         v4l2_m2m_ctx_release(ctx->fh.m2m_ctx);
 
@@ -1528,8 +1711,10 @@ static int coda_release(struct file *file)
         list_del(&ctx->list);
         coda_unlock(ctx);
 
-        dma_free_writecombine(&dev->plat_dev->dev, ctx->bitstream.size,
-                ctx->bitstream.vaddr, ctx->bitstream.paddr);
+        if (ctx->bitstream.vaddr) {
+                dma_free_writecombine(&dev->plat_dev->dev, ctx->bitstream.size,
+                        ctx->bitstream.vaddr, ctx->bitstream.paddr);
+        }
         if (ctx->dev->devtype->product == CODA_DX6)
                 coda_free_aux_buf(dev, &ctx->workbuf);
 
@@ -1548,18 +1733,9 @@ static int coda_release(struct file *file)
         return 0;
 }
 
-static const struct v4l2_file_operations coda_encoder_fops = {
-        .owner          = THIS_MODULE,
-        .open           = coda_encoder_open,
-        .release        = coda_release,
-        .poll           = v4l2_m2m_fop_poll,
-        .unlocked_ioctl = video_ioctl2,
-        .mmap           = v4l2_m2m_fop_mmap,
-};
-
-static const struct v4l2_file_operations coda_decoder_fops = {
+static const struct v4l2_file_operations coda_fops = {
         .owner          = THIS_MODULE,
-        .open           = coda_decoder_open,
+        .open           = coda_open,
         .release        = coda_release,
         .poll           = v4l2_m2m_fop_poll,
         .unlocked_ioctl = video_ioctl2,
@@ -1664,8 +1840,16 @@ err_clk_per:
         return ret;
 }
 
-static int coda_register_device(struct coda_dev *dev, struct video_device *vfd)
+static int coda_register_device(struct coda_dev *dev, int i)
 {
+        struct video_device *vfd = &dev->vfd[i];
+
+        if (i > ARRAY_SIZE(dev->vfd))
+                return -EINVAL;
+
+        snprintf(vfd->name, sizeof(vfd->name), dev->devtype->vdevs[i]->name);
+        vfd->fops       = &coda_fops;
+        vfd->ioctl_ops  = &coda_ioctl_ops;
         vfd->release    = video_device_release_empty,
         vfd->lock       = &dev->dev_mutex;
         vfd->v4l2_dev   = &dev->v4l2_dev;
@@ -1684,7 +1868,7 @@ static void coda_fw_callback(const struct firmware *fw, void *context)
 {
         struct coda_dev *dev = context;
         struct platform_device *pdev = dev->plat_dev;
-        int ret;
+        int i, ret;
 
         if (!fw) {
                 v4l2_err(&dev->v4l2_dev, "firmware request failed\n");
@@ -1725,33 +1909,25 @@ static void coda_fw_callback(const struct firmware *fw, void *context)
                 goto rel_ctx;
         }
 
-        dev->vfd[0].fops      = &coda_encoder_fops,
-        dev->vfd[0].ioctl_ops = &coda_ioctl_ops;
-        snprintf(dev->vfd[0].name, sizeof(dev->vfd[0].name), "coda-encoder");
-        ret = coda_register_device(dev, &dev->vfd[0]);
-        if (ret) {
-                v4l2_err(&dev->v4l2_dev,
-                         "Failed to register encoder video device\n");
-                goto rel_m2m;
-        }
-
-        dev->vfd[1].fops      = &coda_decoder_fops,
-        dev->vfd[1].ioctl_ops = &coda_ioctl_ops;
-        snprintf(dev->vfd[1].name, sizeof(dev->vfd[1].name), "coda-decoder");
-        ret = coda_register_device(dev, &dev->vfd[1]);
-        if (ret) {
-                v4l2_err(&dev->v4l2_dev,
-                         "Failed to register decoder video device\n");
-                goto rel_m2m;
+        for (i = 0; i < dev->devtype->num_vdevs; i++) {
+                ret = coda_register_device(dev, i);
+                if (ret) {
+                        v4l2_err(&dev->v4l2_dev,
+                                 "Failed to register %s video device: %d\n",
+                                 dev->devtype->vdevs[i]->name, ret);
+                        goto rel_vfd;
+                }
         }
 
         v4l2_info(&dev->v4l2_dev, "codec registered as /dev/video[%d-%d]\n",
-                  dev->vfd[0].num, dev->vfd[1].num);
+                  dev->vfd[0].num, dev->vfd[i - 1].num);
 
         pm_runtime_put_sync(&pdev->dev);
         return;
 
-rel_m2m:
+rel_vfd:
+        while (--i >= 0)
+                video_unregister_device(&dev->vfd[i]);
         v4l2_m2m_release(dev->m2m_dev);
 rel_ctx:
         vb2_dma_contig_cleanup_ctx(dev->alloc_ctx);
@@ -1783,6 +1959,8 @@ static const struct coda_devtype coda_devdata[] = {
                 .product      = CODA_DX6,
                 .codecs       = codadx6_codecs,
                 .num_codecs   = ARRAY_SIZE(codadx6_codecs),
+                .vdevs        = codadx6_video_devices,
+                .num_vdevs    = ARRAY_SIZE(codadx6_video_devices),
                 .workbuf_size = 288 * 1024 + FMO_SLICE_SAVE_BUF_SIZE * 8 * 1024,
                 .iram_size    = 0xb000,
         },
@@ -1791,6 +1969,8 @@ static const struct coda_devtype coda_devdata[] = {
                 .product      = CODA_7541,
                 .codecs       = coda7_codecs,
                 .num_codecs   = ARRAY_SIZE(coda7_codecs),
+                .vdevs        = coda7_video_devices,
+                .num_vdevs    = ARRAY_SIZE(coda7_video_devices),
                 .workbuf_size = 128 * 1024,
                 .tempbuf_size = 304 * 1024,
                 .iram_size    = 0x14000,
@@ -1800,6 +1980,8 @@ static const struct coda_devtype coda_devdata[] = {
                 .product      = CODA_960,
                 .codecs       = coda9_codecs,
                 .num_codecs   = ARRAY_SIZE(coda9_codecs),
+                .vdevs        = coda9_video_devices,
+                .num_vdevs    = ARRAY_SIZE(coda9_video_devices),
                 .workbuf_size = 80 * 1024,
                 .tempbuf_size = 204 * 1024,
                 .iram_size    = 0x21000,
@@ -1809,6 +1991,8 @@ static const struct coda_devtype coda_devdata[] = {
                 .product      = CODA_960,
                 .codecs       = coda9_codecs,
                 .num_codecs   = ARRAY_SIZE(coda9_codecs),
+                .vdevs        = coda9_video_devices,
+                .num_vdevs    = ARRAY_SIZE(coda9_video_devices),
                 .workbuf_size = 80 * 1024,
                 .tempbuf_size = 204 * 1024,
                 .iram_size    = 0x20000,
@@ -1846,10 +2030,18 @@ static int coda_probe(struct platform_device *pdev)
         int ret, irq;
 
         dev = devm_kzalloc(&pdev->dev, sizeof(*dev), GFP_KERNEL);
-        if (!dev) {
-                dev_err(&pdev->dev, "Not enough memory for %s\n",
-                        CODA_NAME);
+        if (!dev)
                 return -ENOMEM;
+
+        pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
+
+        if (of_id) {
+                dev->devtype = of_id->data;
+        } else if (pdev_id) {
+                dev->devtype = &coda_devdata[pdev_id->driver_data];
+        } else {
+                ret = -EINVAL;
+                goto err_v4l2_register;
         }
 
         spin_lock_init(&dev->irqlock);
@@ -1919,17 +2111,6 @@ static int coda_probe(struct platform_device *pdev)
         mutex_init(&dev->dev_mutex);
         mutex_init(&dev->coda_mutex);
 
-        pdev_id = of_id ? of_id->data : platform_get_device_id(pdev);
-
-        if (of_id) {
-                dev->devtype = of_id->data;
-        } else if (pdev_id) {
-                dev->devtype = &coda_devdata[pdev_id->driver_data];
-        } else {
-                v4l2_device_unregister(&dev->v4l2_dev);
-                return -EINVAL;
-        }
-
         dev->debugfs_root = debugfs_create_dir("coda", NULL);
         if (!dev->debugfs_root)
                 dev_warn(&pdev->dev, "failed to create debugfs root\n");
@@ -1941,8 +2122,7 @@ static int coda_probe(struct platform_device *pdev)
                                          dev->debugfs_root);
                 if (ret < 0) {
                         dev_err(&pdev->dev, "failed to allocate work buffer\n");
-                        v4l2_device_unregister(&dev->v4l2_dev);
-                        return ret;
+                        goto err_v4l2_register;
                 }
         }
 
@@ -1952,8 +2132,7 @@ static int coda_probe(struct platform_device *pdev)
                                          dev->debugfs_root);
                 if (ret < 0) {
                         dev_err(&pdev->dev, "failed to allocate temp buffer\n");
-                        v4l2_device_unregister(&dev->v4l2_dev);
-                        return ret;
+                        goto err_v4l2_register;
                 }
         }
 
@@ -1973,7 +2152,8 @@ static int coda_probe(struct platform_device *pdev)
         dev->workqueue = alloc_workqueue("coda", WQ_UNBOUND | WQ_MEM_RECLAIM, 1);
         if (!dev->workqueue) {
                 dev_err(&pdev->dev, "unable to alloc workqueue\n");
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto err_v4l2_register;
         }
 
         platform_set_drvdata(pdev, dev);
@@ -1988,14 +2168,21 @@ static int coda_probe(struct platform_device *pdev)
         pm_runtime_enable(&pdev->dev);
 
         return coda_firmware_request(dev);
+
+err_v4l2_register:
+        v4l2_device_unregister(&dev->v4l2_dev);
+        return ret;
 }
 
 static int coda_remove(struct platform_device *pdev)
 {
         struct coda_dev *dev = platform_get_drvdata(pdev);
+        int i;
 
-        video_unregister_device(&dev->vfd[0]);
-        video_unregister_device(&dev->vfd[1]);
+        for (i = 0; i < ARRAY_SIZE(dev->vfd); i++) {
+                if (video_get_drvdata(&dev->vfd[i]))
+                        video_unregister_device(&dev->vfd[i]);
+        }
         if (dev->m2m_dev)
                 v4l2_m2m_release(dev->m2m_dev);
         pm_runtime_disable(&pdev->dev);
diff --git a/drivers/media/platform/coda/coda-jpeg.c b/drivers/media/platform/coda/coda-jpeg.c
new file mode 100644
index 000000000000..8fa3e353f9e2
--- /dev/null
+++ b/drivers/media/platform/coda/coda-jpeg.c
@@ -0,0 +1,238 @@
+/*
+ * Coda multi-standard codec IP - JPEG support functions
+ *
+ * Copyright (C) 2014 Philipp Zabel, Pengutronix
+ *
+ * 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 of the License, or
+ * (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/swab.h>
+
+#include "coda.h"
+
+#define SOI_MARKER      0xffd8
+#define EOI_MARKER      0xffd9
+
+/*
+ * Typical Huffman tables for 8-bit precision luminance and
+ * chrominance from JPEG ITU-T.81 (ISO/IEC 10918-1) Annex K.3
+ */
+
+static const unsigned char luma_dc_bits[16] = {
+        0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const unsigned char luma_dc_value[12] = {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0a, 0x0b,
+};
+
+static const unsigned char chroma_dc_bits[16] = {
+        0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+        0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
+};
+
+static const unsigned char chroma_dc_value[12] = {
+        0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+        0x08, 0x09, 0x0a, 0x0b,
+};
+
+static const unsigned char luma_ac_bits[16] = {
+        0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
+        0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7d,
+};
+
+static const unsigned char luma_ac_value[162 + 2] = {
+        0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+        0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+        0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+        0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+        0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+        0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+        0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+        0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+        0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+        0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+        0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+        0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+        0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+        0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+        0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+        0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+        0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+        0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+        0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+        0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+        0xf9, 0xfa, /* padded to 32-bit */
+};
+
+static const unsigned char chroma_ac_bits[16] = {
+        0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
+        0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77,
+};
+
+static const unsigned char chroma_ac_value[162 + 2] = {
+        0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+        0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+        0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+        0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+        0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+        0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+        0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+        0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+        0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+        0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+        0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+        0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+        0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+        0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+        0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+        0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+        0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+        0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+        0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+        0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+        0xf9, 0xfa, /* padded to 32-bit */
+};
+
+/*
+ * Quantization tables for luminance and chrominance components in
+ * zig-zag scan order from the Freescale i.MX VPU libaries
+ */
+
+static unsigned char luma_q[64] = {
+        0x06, 0x04, 0x04, 0x04, 0x05, 0x04, 0x06, 0x05,
+        0x05, 0x06, 0x09, 0x06, 0x05, 0x06, 0x09, 0x0b,
+        0x08, 0x06, 0x06, 0x08, 0x0b, 0x0c, 0x0a, 0x0a,
+        0x0b, 0x0a, 0x0a, 0x0c, 0x10, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x10, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+};
+
+static unsigned char chroma_q[64] = {
+        0x07, 0x07, 0x07, 0x0d, 0x0c, 0x0d, 0x18, 0x10,
+        0x10, 0x18, 0x14, 0x0e, 0x0e, 0x0e, 0x14, 0x14,
+        0x0e, 0x0e, 0x0e, 0x0e, 0x14, 0x11, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x11, 0x11, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x11, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+        0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
+};
+
+struct coda_memcpy_desc {
+        int offset;
+        const void *src;
+        size_t len;
+};
+
+static void coda_memcpy_parabuf(void *parabuf,
+                                const struct coda_memcpy_desc *desc)
+{
+        u32 *dst = parabuf + desc->offset;
+        const u32 *src = desc->src;
+        int len = desc->len / 4;
+        int i;
+
+        for (i = 0; i < len; i += 2) {
+                dst[i + 1] = swab32(src[i]);
+                dst[i] = swab32(src[i + 1]);
+        }
+}
+
+int coda_jpeg_write_tables(struct coda_ctx *ctx)
+{
+        int i;
+        static const struct coda_memcpy_desc huff[8] = {
+                { 0,   luma_dc_bits,    sizeof(luma_dc_bits)    },
+                { 16,  luma_dc_value,   sizeof(luma_dc_value)   },
+                { 32,  luma_ac_bits,    sizeof(luma_ac_bits)    },
+                { 48,  luma_ac_value,   sizeof(luma_ac_value)   },
+                { 216, chroma_dc_bits,  sizeof(chroma_dc_bits)  },
+                { 232, chroma_dc_value, sizeof(chroma_dc_value) },
+                { 248, chroma_ac_bits,  sizeof(chroma_ac_bits)  },
+                { 264, chroma_ac_value, sizeof(chroma_ac_value) },
+        };
+        struct coda_memcpy_desc qmat[3] = {
+                { 512, ctx->params.jpeg_qmat_tab[0], 64 },
+                { 576, ctx->params.jpeg_qmat_tab[1], 64 },
+                { 640, ctx->params.jpeg_qmat_tab[1], 64 },
+        };
+
+        /* Write huffman tables to parameter memory */
+        for (i = 0; i < ARRAY_SIZE(huff); i++)
+                coda_memcpy_parabuf(ctx->parabuf.vaddr, huff + i);
+
+        /* Write Q-matrix to parameter memory */
+        for (i = 0; i < ARRAY_SIZE(qmat); i++)
+                coda_memcpy_parabuf(ctx->parabuf.vaddr, qmat + i);
+
+        return 0;
+}
+
+bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb)
+{
+        void *vaddr = vb2_plane_vaddr(vb, 0);
+        u16 soi = be16_to_cpup((__be16 *)vaddr);
+        u16 eoi = be16_to_cpup((__be16 *)(vaddr +
+                                          vb2_get_plane_payload(vb, 0) - 2));
+
+        return soi == SOI_MARKER && eoi == EOI_MARKER;
+}
+
+/*
+ * Scale quantization table using nonlinear scaling factor
+ * u8 qtab[64], scale [50,190]
+ */
+static void coda_scale_quant_table(u8 *q_tab, int scale)
+{
+        unsigned int temp;
+        int i;
+
+        for (i = 0; i < 64; i++) {
+                temp = DIV_ROUND_CLOSEST((unsigned int)q_tab[i] * scale, 100);
+                if (temp <= 0)
+                        temp = 1;
+                if (temp > 255)
+                        temp = 255;
+                q_tab[i] = (unsigned char)temp;
+        }
+}
+
+void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality)
+{
+        unsigned int scale;
+
+        ctx->params.jpeg_quality = quality;
+
+        /* Clip quality setting to [5,100] interval */
+        if (quality > 100)
+                quality = 100;
+        if (quality < 5)
+                quality = 5;
+
+        /*
+         * Non-linear scaling factor:
+         * [5,50] -> [1000..100], [51,100] -> [98..0]
+         */
+        if (quality < 50)
+                scale = 5000 / quality;
+        else
+                scale = 200 - 2 * quality;
+
+        if (ctx->params.jpeg_qmat_tab[0]) {
+                memcpy(ctx->params.jpeg_qmat_tab[0], luma_q, 64);
+                coda_scale_quant_table(ctx->params.jpeg_qmat_tab[0], scale);
+        }
+        if (ctx->params.jpeg_qmat_tab[1]) {
+                memcpy(ctx->params.jpeg_qmat_tab[1], chroma_q, 64);
+                coda_scale_quant_table(ctx->params.jpeg_qmat_tab[1], scale);
+        }
+}
diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
index bbc18c0dacd9..5dd47e5f97c1 100644
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -45,11 +45,15 @@ enum coda_product {
         CODA_960 = 0xf020,
 };
 
+struct coda_video_device;
+
 struct coda_devtype {
         char                    *firmware;
         enum coda_product       product;
         const struct coda_codec *codecs;
         unsigned int            num_codecs;
+        const struct coda_video_device **vdevs;
+        unsigned int            num_vdevs;
         size_t                  workbuf_size;
         size_t                  tempbuf_size;
         size_t                  iram_size;
@@ -65,7 +69,7 @@ struct coda_aux_buf {
 
 struct coda_dev {
         struct v4l2_device      v4l2_dev;
-        struct video_device     vfd[2];
+        struct video_device     vfd[5];
         struct platform_device  *plat_dev;
         const struct coda_devtype *devtype;
 
@@ -114,6 +118,9 @@ struct coda_params {
         u8                      mpeg4_inter_qp;
         u8                      gop_size;
         int                     intra_refresh;
+        u8                      jpeg_quality;
+        u8                      jpeg_restart_interval;
+        u8                      *jpeg_qmat_tab[3];
         int                     codec_mode;
         int                     codec_mode_aux;
         enum v4l2_mpeg_video_multi_slice_mode slice_mode;
@@ -123,11 +130,13 @@ struct coda_params {
         u32                     slice_max_mb;
 };
 
-struct coda_timestamp {
+struct coda_buffer_meta {
         struct list_head        list;
         u32                     sequence;
         struct v4l2_timecode    timecode;
         struct timeval          timestamp;
+        u32                     start;
+        u32                     end;
 };
 
 /* Per-queue, driver-specific private data */
@@ -183,6 +192,7 @@ struct coda_ctx {
         struct work_struct              pic_run_work;
         struct work_struct              seq_end_work;
         struct completion               completion;
+        const struct coda_video_device  *cvd;
         const struct coda_context_ops   *ops;
         int                             aborting;
         int                             initialized;
@@ -212,9 +222,9 @@ struct coda_ctx {
         struct coda_aux_buf             slicebuf;
         struct coda_aux_buf             internal_frames[CODA_MAX_FRAMEBUFFERS];
         u32                             frame_types[CODA_MAX_FRAMEBUFFERS];
-        struct coda_timestamp           frame_timestamps[CODA_MAX_FRAMEBUFFERS];
+        struct coda_buffer_meta         frame_metas[CODA_MAX_FRAMEBUFFERS];
         u32                             frame_errors[CODA_MAX_FRAMEBUFFERS];
-        struct list_head                timestamp_list;
+        struct list_head                buffer_meta_list;
         struct coda_aux_buf             workbuf;
         int                             num_internal_frames;
         int                             idx;
@@ -232,6 +242,8 @@ extern int coda_debug;
 
 void coda_write(struct coda_dev *dev, u32 data, u32 reg);
 unsigned int coda_read(struct coda_dev *dev, u32 reg);
+void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data,
+                     struct vb2_buffer *buf, unsigned int reg_y);
 
 int coda_alloc_aux_buf(struct coda_dev *dev, struct coda_aux_buf *buf,
                        size_t size, const char *name, struct dentry *parent);
@@ -281,6 +293,10 @@ void coda_bit_stream_end_flag(struct coda_ctx *ctx);
 
 int coda_h264_padding(int size, char *p);
 
+bool coda_jpeg_check_buffer(struct coda_ctx *ctx, struct vb2_buffer *vb);
+int coda_jpeg_write_tables(struct coda_ctx *ctx);
+void coda_set_jpeg_compression_quality(struct coda_ctx *ctx, int quality);
+
 extern const struct coda_context_ops coda_bit_encode_ops;
 extern const struct coda_context_ops coda_bit_decode_ops;
 
diff --git a/drivers/media/platform/coda/coda_regs.h b/drivers/media/platform/coda/coda_regs.h
index c791275e307b..8e015b8aa8fa 100644
--- a/drivers/media/platform/coda/coda_regs.h
+++ b/drivers/media/platform/coda/coda_regs.h
@@ -147,6 +147,7 @@
 #define CODA_CMD_DEC_SEQ_BB_START               0x180
 #define CODA_CMD_DEC_SEQ_BB_SIZE                0x184
 #define CODA_CMD_DEC_SEQ_OPTION                 0x188
+#define         CODA_NO_INT_ENABLE                      (1 << 10)
 #define         CODA_REORDER_ENABLE                     (1 << 1)
 #define         CODADX6_QP_REPORT                       (1 << 0)
 #define         CODA7_MP4_DEBLK_ENABLE                  (1 << 0)
@@ -332,6 +333,12 @@
 #define CODA9_CMD_ENC_SEQ_ME_OPTION                             0x1d8
 #define CODA_RET_ENC_SEQ_SUCCESS                                0x1c0
 
+#define CODA_CMD_ENC_SEQ_JPG_PARA                               0x198
+#define CODA_CMD_ENC_SEQ_JPG_RST_INTERVAL                       0x19C
+#define CODA_CMD_ENC_SEQ_JPG_THUMB_EN                           0x1a0
+#define CODA_CMD_ENC_SEQ_JPG_THUMB_SIZE                         0x1a4
+#define CODA_CMD_ENC_SEQ_JPG_THUMB_OFFSET                       0x1a8
+
 /* Encoder Picture Run */
 #define CODA9_CMD_ENC_PIC_SRC_INDEX             0x180
 #define CODA9_CMD_ENC_PIC_SRC_STRIDE            0x184
diff --git a/drivers/media/platform/davinci/vpbe.c b/drivers/media/platform/davinci/vpbe.c
index 33b9660b7f77..244d3d6c244c 100644
--- a/drivers/media/platform/davinci/vpbe.c
+++ b/drivers/media/platform/davinci/vpbe.c
@@ -227,7 +227,7 @@ static int vpbe_set_output(struct vpbe_device *vpbe_dev, int index)
                         vpbe_current_encoder_info(vpbe_dev);
         struct vpbe_config *cfg = vpbe_dev->cfg;
         struct venc_platform_data *venc_device = vpbe_dev->venc_device;
-        enum v4l2_mbus_pixelcode if_params;
+        u32 if_params;
         int enc_out_index;
         int sd_index;
         int ret = 0;
@@ -341,7 +341,7 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
 
         if (!(cfg->outputs[out_index].output.capabilities &
             V4L2_OUT_CAP_DV_TIMINGS))
-                return -EINVAL;
+                return -ENODATA;
 
         for (i = 0; i < output->num_modes; i++) {
                 if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS &&
@@ -384,6 +384,13 @@ static int vpbe_s_dv_timings(struct vpbe_device *vpbe_dev,
 static int vpbe_g_dv_timings(struct vpbe_device *vpbe_dev,
                      struct v4l2_dv_timings *dv_timings)
 {
+        struct vpbe_config *cfg = vpbe_dev->cfg;
+        int out_index = vpbe_dev->current_out_index;
+
+        if (!(cfg->outputs[out_index].output.capabilities &
+                V4L2_OUT_CAP_DV_TIMINGS))
+                return -ENODATA;
+
         if (vpbe_dev->current_timings.timings_type &
           VPBE_ENC_DV_TIMINGS) {
                 *dv_timings = vpbe_dev->current_timings.dv_timings;
@@ -409,7 +416,7 @@ static int vpbe_enum_dv_timings(struct vpbe_device *vpbe_dev,
         int i;
 
         if (!(output->output.capabilities & V4L2_OUT_CAP_DV_TIMINGS))
-                return -EINVAL;
+                return -ENODATA;
 
         for (i = 0; i < output->num_modes; i++) {
                 if (output->modes[i].timings_type == VPBE_ENC_DV_TIMINGS) {
@@ -440,7 +447,7 @@ static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id std_id)
 
         if (!(cfg->outputs[out_index].output.capabilities &
                 V4L2_OUT_CAP_STD))
-                return -EINVAL;
+                return -ENODATA;
 
         ret = vpbe_get_std_info(vpbe_dev, std_id);
         if (ret)
@@ -473,6 +480,11 @@ static int vpbe_s_std(struct vpbe_device *vpbe_dev, v4l2_std_id std_id)
 static int vpbe_g_std(struct vpbe_device *vpbe_dev, v4l2_std_id *std_id)
 {
         struct vpbe_enc_mode_info *cur_timings = &vpbe_dev->current_timings;
+        struct vpbe_config *cfg = vpbe_dev->cfg;
+        int out_index = vpbe_dev->current_out_index;
+
+        if (!(cfg->outputs[out_index].output.capabilities & V4L2_OUT_CAP_STD))
+                return -ENODATA;
 
         if (cur_timings->timings_type & VPBE_ENC_STD) {
                 *std_id = cur_timings->std_id;
@@ -613,6 +625,7 @@ static int vpbe_initialize(struct device *dev, struct vpbe_device *vpbe_dev)
                 }
                 if (clk_prepare_enable(vpbe_dev->dac_clk)) {
                         ret =  -ENODEV;
+                        clk_put(vpbe_dev->dac_clk);
                         goto fail_mutex_unlock;
                 }
         }
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 73496d953ba0..21a5a56eb5ea 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -152,8 +152,8 @@ static irqreturn_t venc_isr(int irq, void *arg)
 
         for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {
                 layer = disp_dev->dev[i];
-                /* If streaming is started in this layer */
-                if (!layer->started)
+
+                if (!vb2_start_streaming_called(&layer->buffer_queue))
                         continue;
 
                 if (layer->layer_first_int) {
@@ -207,31 +207,23 @@ static irqreturn_t venc_isr(int irq, void *arg)
  */
 static int vpbe_buffer_prepare(struct vb2_buffer *vb)
 {
-        struct vpbe_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
         struct vb2_queue *q = vb->vb2_queue;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = vb2_get_drv_priv(q);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         unsigned long addr;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
                                 "vpbe_buffer_prepare\n");
 
-        if (vb->state != VB2_BUF_STATE_ACTIVE &&
-                vb->state != VB2_BUF_STATE_PREPARED) {
-                vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
-                if (vb2_plane_vaddr(vb, 0) &&
-                vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
-                        return -EINVAL;
+        vb2_set_plane_payload(vb, 0, layer->pix_fmt.sizeimage);
+        if (vb2_get_plane_payload(vb, 0) > vb2_plane_size(vb, 0))
+                return -EINVAL;
 
-                addr = vb2_dma_contig_plane_dma_addr(vb, 0);
-                if (q->streaming) {
-                        if (!IS_ALIGNED(addr, 8)) {
-                                v4l2_err(&vpbe_dev->v4l2_dev,
-                                        "buffer_prepare:offset is \
-                                        not aligned to 32 bytes\n");
-                                return -EINVAL;
-                        }
-                }
+        addr = vb2_dma_contig_plane_dma_addr(vb, 0);
+        if (!IS_ALIGNED(addr, 8)) {
+                v4l2_err(&vpbe_dev->v4l2_dev,
+                         "buffer_prepare:offset is not aligned to 32 bytes\n");
+                return -EINVAL;
         }
         return 0;
 }
@@ -247,18 +239,20 @@ vpbe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 
 {
         /* Get the file handle object and layer object */
-        struct vpbe_fh *fh = vb2_get_drv_priv(vq);
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = vb2_get_drv_priv(vq);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_buffer_setup\n");
 
+        if (fmt && fmt->fmt.pix.sizeimage < layer->pix_fmt.sizeimage)
+                return -EINVAL;
+
         /* Store number of buffers allocated in numbuffer member */
-        if (*nbuffers < VPBE_DEFAULT_NUM_BUFS)
-                *nbuffers = layer->numbuffers = VPBE_DEFAULT_NUM_BUFS;
+        if (vq->num_buffers + *nbuffers < VPBE_DEFAULT_NUM_BUFS)
+                *nbuffers = VPBE_DEFAULT_NUM_BUFS - vq->num_buffers;
 
         *nplanes = 1;
-        sizes[0] = layer->pix_fmt.sizeimage;
+        sizes[0] = fmt ? fmt->fmt.pix.sizeimage : layer->pix_fmt.sizeimage;
         alloc_ctxs[0] = layer->alloc_ctx;
 
         return 0;
@@ -271,12 +265,11 @@ vpbe_buffer_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
 static void vpbe_buffer_queue(struct vb2_buffer *vb)
 {
         /* Get the file handle object and layer object */
-        struct vpbe_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
         struct vpbe_disp_buffer *buf = container_of(vb,
                                 struct vpbe_disp_buffer, vb);
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_display *disp = fh->disp_dev;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = vb2_get_drv_priv(vb->vb2_queue);
+        struct vpbe_display *disp = layer->disp_dev;
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         unsigned long flags;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
@@ -288,61 +281,14 @@ static void vpbe_buffer_queue(struct vb2_buffer *vb)
         spin_unlock_irqrestore(&disp->dma_queue_lock, flags);
 }
 
-/*
- * vpbe_buf_cleanup()
- * This function is called from the vb2 layer to free memory allocated to
- * the buffers
- */
-static void vpbe_buf_cleanup(struct vb2_buffer *vb)
-{
-        /* Get the file handle object and layer object */
-        struct vpbe_fh *fh = vb2_get_drv_priv(vb->vb2_queue);
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        struct vpbe_disp_buffer *buf = container_of(vb,
-                                        struct vpbe_disp_buffer, vb);
-        unsigned long flags;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                        "vpbe_buf_cleanup\n");
-
-        spin_lock_irqsave(&layer->irqlock, flags);
-        if (vb->state == VB2_BUF_STATE_ACTIVE)
-                list_del_init(&buf->list);
-        spin_unlock_irqrestore(&layer->irqlock, flags);
-}
-
-static void vpbe_wait_prepare(struct vb2_queue *vq)
-{
-        struct vpbe_fh *fh = vb2_get_drv_priv(vq);
-        struct vpbe_layer *layer = fh->layer;
-
-        mutex_unlock(&layer->opslock);
-}
-
-static void vpbe_wait_finish(struct vb2_queue *vq)
-{
-        struct vpbe_fh *fh = vb2_get_drv_priv(vq);
-        struct vpbe_layer *layer = fh->layer;
-
-        mutex_lock(&layer->opslock);
-}
-
-static int vpbe_buffer_init(struct vb2_buffer *vb)
-{
-        struct vpbe_disp_buffer *buf = container_of(vb,
-                                        struct vpbe_disp_buffer, vb);
-
-        INIT_LIST_HEAD(&buf->list);
-        return 0;
-}
-
 static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
 {
-        struct vpbe_fh *fh = vb2_get_drv_priv(vq);
-        struct vpbe_layer *layer = fh->layer;
+        struct vpbe_layer *layer = vb2_get_drv_priv(vq);
+        struct osd_state *osd_device = layer->disp_dev->osd_device;
         int ret;
 
+         osd_device->ops.disable_layer(osd_device, layer->layer_info.id);
+
         /* Get the next frame from the buffer queue */
         layer->next_frm = layer->cur_frm = list_entry(layer->dma_queue.next,
                                 struct vpbe_disp_buffer, list);
@@ -354,7 +300,7 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
         layer->field_id = 0;
 
         /* Set parameters in OSD and VENC */
-        ret = vpbe_set_osd_display_params(fh->disp_dev, layer);
+        ret = vpbe_set_osd_display_params(layer->disp_dev, layer);
         if (ret < 0) {
                 struct vpbe_disp_buffer *buf, *tmp;
 
@@ -371,7 +317,6 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
          * if request format is yuv420 semiplanar, need to
          * enable both video windows
          */
-        layer->started = 1;
         layer->layer_first_int = 1;
 
         return ret;
@@ -379,14 +324,16 @@ static int vpbe_start_streaming(struct vb2_queue *vq, unsigned int count)
 
 static void vpbe_stop_streaming(struct vb2_queue *vq)
 {
-        struct vpbe_fh *fh = vb2_get_drv_priv(vq);
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_display *disp = fh->disp_dev;
+        struct vpbe_layer *layer = vb2_get_drv_priv(vq);
+        struct osd_state *osd_device = layer->disp_dev->osd_device;
+        struct vpbe_display *disp = layer->disp_dev;
         unsigned long flags;
 
         if (!vb2_is_streaming(vq))
                 return;
 
+        osd_device->ops.disable_layer(osd_device, layer->layer_info.id);
+
         /* release all active buffers */
         spin_lock_irqsave(&disp->dma_queue_lock, flags);
         if (layer->cur_frm == layer->next_frm) {
@@ -411,13 +358,11 @@ static void vpbe_stop_streaming(struct vb2_queue *vq)
 
 static struct vb2_ops video_qops = {
         .queue_setup = vpbe_buffer_queue_setup,
-        .wait_prepare = vpbe_wait_prepare,
-        .wait_finish = vpbe_wait_finish,
-        .buf_init = vpbe_buffer_init,
+        .wait_prepare = vb2_ops_wait_prepare,
+        .wait_finish = vb2_ops_wait_finish,
         .buf_prepare = vpbe_buffer_prepare,
         .start_streaming = vpbe_start_streaming,
         .stop_streaming = vpbe_stop_streaming,
-        .buf_cleanup = vpbe_buf_cleanup,
         .buf_queue = vpbe_buffer_queue,
 };
 
@@ -691,10 +636,9 @@ static int vpbe_try_format(struct vpbe_display *disp_dev,
 static int vpbe_display_querycap(struct file *file, void  *priv,
                                struct v4l2_capability *cap)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
-        cap->version = VPBE_DISPLAY_VERSION_CODE;
         cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
         cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         snprintf(cap->driver, sizeof(cap->driver), "%s",
@@ -709,9 +653,8 @@ static int vpbe_display_querycap(struct file *file, void  *priv,
 static int vpbe_display_s_crop(struct file *file, void *priv,
                              const struct v4l2_crop *crop)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_display *disp_dev = fh->disp_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_display *disp_dev = layer->disp_dev;
         struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
         struct osd_layer_config *cfg = &layer->layer_info.config;
         struct osd_state *osd_device = disp_dev->osd_device;
@@ -778,11 +721,10 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
 static int vpbe_display_g_crop(struct file *file, void *priv,
                              struct v4l2_crop *crop)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
+        struct vpbe_layer *layer = video_drvdata(file);
         struct osd_layer_config *cfg = &layer->layer_info.config;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        struct osd_state *osd_device = fh->disp_dev->osd_device;
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
+        struct osd_state *osd_device = layer->disp_dev->osd_device;
         struct v4l2_rect *rect = &crop->c;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
@@ -806,8 +748,8 @@ static int vpbe_display_g_crop(struct file *file, void *priv,
 static int vpbe_display_cropcap(struct file *file, void *priv,
                               struct v4l2_cropcap *cropcap)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_CROPCAP ioctl\n");
 
@@ -824,9 +766,8 @@ static int vpbe_display_cropcap(struct file *file, void *priv,
 static int vpbe_display_g_fmt(struct file *file, void *priv,
                                 struct v4l2_format *fmt)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
                         "VIDIOC_G_FMT, layer id = %d\n",
@@ -846,9 +787,8 @@ static int vpbe_display_g_fmt(struct file *file, void *priv,
 static int vpbe_display_enum_fmt(struct file *file, void  *priv,
                                    struct v4l2_fmtdesc *fmt)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         unsigned int index = 0;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
@@ -878,9 +818,8 @@ static int vpbe_display_enum_fmt(struct file *file, void  *priv,
 static int vpbe_display_s_fmt(struct file *file, void *priv,
                                 struct v4l2_format *fmt)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_display *disp_dev = fh->disp_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_display *disp_dev = layer->disp_dev;
         struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
         struct osd_layer_config *cfg  = &layer->layer_info.config;
         struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
@@ -891,11 +830,9 @@ static int vpbe_display_s_fmt(struct file *file, void *priv,
                         "VIDIOC_S_FMT, layer id = %d\n",
                         layer->device_id);
 
-        /* If streaming is started, return error */
-        if (layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Streaming is started\n");
+        if (vb2_is_busy(&layer->buffer_queue))
                 return -EBUSY;
-        }
+
         if (V4L2_BUF_TYPE_VIDEO_OUTPUT != fmt->type) {
                 v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "invalid type\n");
                 return -EINVAL;
@@ -967,9 +904,9 @@ static int vpbe_display_s_fmt(struct file *file, void *priv,
 static int vpbe_display_try_fmt(struct file *file, void *priv,
                                   struct v4l2_format *fmt)
 {
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_display *disp_dev = fh->disp_dev;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_display *disp_dev = layer->disp_dev;
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         struct v4l2_pix_format *pixfmt = &fmt->fmt.pix;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_TRY_FMT\n");
@@ -993,18 +930,15 @@ static int vpbe_display_try_fmt(struct file *file, void *priv,
 static int vpbe_display_s_std(struct file *file, void *priv,
                                 v4l2_std_id std_id)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_S_STD\n");
 
-        /* If streaming is started, return error */
-        if (layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Streaming is started\n");
+        if (vb2_is_busy(&layer->buffer_queue))
                 return -EBUSY;
-        }
+
         if (NULL != vpbe_dev->ops.s_std) {
                 ret = vpbe_dev->ops.s_std(vpbe_dev, std_id);
                 if (ret) {
@@ -1028,8 +962,8 @@ static int vpbe_display_s_std(struct file *file, void *priv,
 static int vpbe_display_g_std(struct file *file, void *priv,
                                 v4l2_std_id *std_id)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_G_STD\n");
 
@@ -1051,8 +985,8 @@ static int vpbe_display_g_std(struct file *file, void *priv,
 static int vpbe_display_enum_output(struct file *file, void *priv,
                                     struct v4l2_output *output)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_ENUM_OUTPUT\n");
@@ -1079,17 +1013,15 @@ static int vpbe_display_enum_output(struct file *file, void *priv,
 static int vpbe_display_s_output(struct file *file, void *priv,
                                 unsigned int i)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_S_OUTPUT\n");
-        /* If streaming is started, return error */
-        if (layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Streaming is started\n");
+
+        if (vb2_is_busy(&layer->buffer_queue))
                 return -EBUSY;
-        }
+
         if (NULL == vpbe_dev->ops.set_output)
                 return -EINVAL;
 
@@ -1110,8 +1042,8 @@ static int vpbe_display_s_output(struct file *file, void *priv,
 static int vpbe_display_g_output(struct file *file, void *priv,
                                 unsigned int *i)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_G_OUTPUT\n");
         /* Get the standard from the current encoder */
@@ -1130,8 +1062,8 @@ static int
 vpbe_display_enum_dv_timings(struct file *file, void *priv,
                         struct v4l2_enum_dv_timings *timings)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_ENUM_DV_TIMINGS\n");
@@ -1160,19 +1092,14 @@ static int
 vpbe_display_s_dv_timings(struct file *file, void *priv,
                                 struct v4l2_dv_timings *timings)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
         int ret;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_S_DV_TIMINGS\n");
 
-
-        /* If streaming is started, return error */
-        if (layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Streaming is started\n");
+        if (vb2_is_busy(&layer->buffer_queue))
                 return -EBUSY;
-        }
 
         /* Set the given standard in the encoder */
         if (!vpbe_dev->ops.s_dv_timings)
@@ -1198,8 +1125,8 @@ static int
 vpbe_display_g_dv_timings(struct file *file, void *priv,
                                 struct v4l2_dv_timings *dv_timings)
 {
-        struct vpbe_fh *fh = priv;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
+        struct vpbe_layer *layer = video_drvdata(file);
+        struct vpbe_device *vpbe_dev = layer->disp_dev->vpbe_dev;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_G_DV_TIMINGS\n");
 
@@ -1215,259 +1142,6 @@ vpbe_display_g_dv_timings(struct file *file, void *priv,
         return 0;
 }
 
-static int vpbe_display_streamoff(struct file *file, void *priv,
-                                enum v4l2_buf_type buf_type)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        struct osd_state *osd_device = fh->disp_dev->osd_device;
-        int ret;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                        "VIDIOC_STREAMOFF,layer id = %d\n",
-                        layer->device_id);
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != buf_type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-
-        /* If io is allowed for this file handle, return error */
-        if (!fh->io_allowed) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "No io_allowed\n");
-                return -EACCES;
-        }
-
-        /* If streaming is not started, return error */
-        if (!layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "streaming not started in layer"
-                        " id = %d\n", layer->device_id);
-                return -EINVAL;
-        }
-
-        osd_device->ops.disable_layer(osd_device,
-                        layer->layer_info.id);
-        layer->started = 0;
-        ret = vb2_streamoff(&layer->buffer_queue, buf_type);
-
-        return ret;
-}
-
-static int vpbe_display_streamon(struct file *file, void *priv,
-                         enum v4l2_buf_type buf_type)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_display *disp_dev = fh->disp_dev;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        struct osd_state *osd_device = disp_dev->osd_device;
-        int ret;
-
-        osd_device->ops.disable_layer(osd_device,
-                        layer->layer_info.id);
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "VIDIOC_STREAMON, layerid=%d\n",
-                                                layer->device_id);
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != buf_type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-
-        /* If file handle is not allowed IO, return error */
-        if (!fh->io_allowed) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "No io_allowed\n");
-                return -EACCES;
-        }
-        /* If Streaming is already started, return error */
-        if (layer->started) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "layer is already streaming\n");
-                return -EBUSY;
-        }
-
-        /*
-         * Call vb2_streamon to start streaming
-         * in videobuf
-         */
-        ret = vb2_streamon(&layer->buffer_queue, buf_type);
-        if (ret) {
-                v4l2_err(&vpbe_dev->v4l2_dev,
-                "error in vb2_streamon\n");
-                return ret;
-        }
-        return ret;
-}
-
-static int vpbe_display_dqbuf(struct file *file, void *priv,
-                      struct v4l2_buffer *buf)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        int ret;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                "VIDIOC_DQBUF, layer id = %d\n",
-                layer->device_id);
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-        /* If this file handle is not allowed to do IO, return error */
-        if (!fh->io_allowed) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "No io_allowed\n");
-                return -EACCES;
-        }
-        if (file->f_flags & O_NONBLOCK)
-                /* Call videobuf_dqbuf for non blocking mode */
-                ret = vb2_dqbuf(&layer->buffer_queue, buf, 1);
-        else
-                /* Call videobuf_dqbuf for blocking mode */
-                ret = vb2_dqbuf(&layer->buffer_queue, buf, 0);
-
-        return ret;
-}
-
-static int vpbe_display_qbuf(struct file *file, void *priv,
-                     struct v4l2_buffer *p)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                "VIDIOC_QBUF, layer id = %d\n",
-                layer->device_id);
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != p->type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-
-        /* If this file handle is not allowed to do IO, return error */
-        if (!fh->io_allowed) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "No io_allowed\n");
-                return -EACCES;
-        }
-
-        return vb2_qbuf(&layer->buffer_queue, p);
-}
-
-static int vpbe_display_querybuf(struct file *file, void *priv,
-                         struct v4l2_buffer *buf)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                "VIDIOC_QUERYBUF, layer id = %d\n",
-                layer->device_id);
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != buf->type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-        /* Call vb2_querybuf to get information */
-        return vb2_querybuf(&layer->buffer_queue, buf);
-}
-
-static int vpbe_display_reqbufs(struct file *file, void *priv,
-                        struct v4l2_requestbuffers *req_buf)
-{
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        struct vb2_queue *q;
-        int ret;
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_reqbufs\n");
-
-        if (V4L2_BUF_TYPE_VIDEO_OUTPUT != req_buf->type) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Invalid buffer type\n");
-                return -EINVAL;
-        }
-
-        /* If io users of the layer is not zero, return error */
-        if (0 != layer->io_usrs) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "not IO user\n");
-                return -EBUSY;
-        }
-        /* Initialize videobuf queue as per the buffer type */
-        layer->alloc_ctx = vb2_dma_contig_init_ctx(vpbe_dev->pdev);
-        if (IS_ERR(layer->alloc_ctx)) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "Failed to get the context\n");
-                return PTR_ERR(layer->alloc_ctx);
-        }
-        q = &layer->buffer_queue;
-        memset(q, 0, sizeof(*q));
-        q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
-        q->io_modes = VB2_MMAP | VB2_USERPTR;
-        q->drv_priv = fh;
-        q->ops = &video_qops;
-        q->mem_ops = &vb2_dma_contig_memops;
-        q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
-        q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
-        q->min_buffers_needed = 1;
-
-        ret = vb2_queue_init(q);
-        if (ret) {
-                v4l2_err(&vpbe_dev->v4l2_dev, "vb2_queue_init() failed\n");
-                vb2_dma_contig_cleanup_ctx(layer->alloc_ctx);
-                return ret;
-        }
-        /* Set io allowed member of file handle to TRUE */
-        fh->io_allowed = 1;
-        /* Increment io usrs member of layer object to 1 */
-        layer->io_usrs = 1;
-        /* Store type of memory requested in layer object */
-        layer->memory = req_buf->memory;
-        /* Initialize buffer queue */
-        INIT_LIST_HEAD(&layer->dma_queue);
-        /* Allocate buffers */
-        return vb2_reqbufs(q, req_buf);
-}
-
-/*
- * vpbe_display_mmap()
- * It is used to map kernel space buffers into user spaces
- */
-static int vpbe_display_mmap(struct file *filep, struct vm_area_struct *vma)
-{
-        /* Get the layer object and file handle object */
-        struct vpbe_fh *fh = filep->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        int ret;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_mmap\n");
-
-        if (mutex_lock_interruptible(&layer->opslock))
-                return -ERESTARTSYS;
-        ret = vb2_mmap(&layer->buffer_queue, vma);
-        mutex_unlock(&layer->opslock);
-        return ret;
-}
-
-/* vpbe_display_poll(): It is used for select/poll system call
- */
-static unsigned int vpbe_display_poll(struct file *filep, poll_table *wait)
-{
-        struct vpbe_fh *fh = filep->private_data;
-        struct vpbe_layer *layer = fh->layer;
-        struct vpbe_device *vpbe_dev = fh->disp_dev->vpbe_dev;
-        unsigned int err = 0;
-
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_poll\n");
-        if (layer->started) {
-                mutex_lock(&layer->opslock);
-                err = vb2_poll(&layer->buffer_queue, filep, wait);
-                mutex_unlock(&layer->opslock);
-        }
-        return err;
-}
-
 /*
  * vpbe_display_open()
  * It creates object of file handle structure and stores it in private_data
@@ -1475,30 +1149,22 @@ static unsigned int vpbe_display_poll(struct file *filep, poll_table *wait)
  */
 static int vpbe_display_open(struct file *file)
 {
-        struct vpbe_fh *fh = NULL;
         struct vpbe_layer *layer = video_drvdata(file);
-        struct video_device *vdev = video_devdata(file);
         struct vpbe_display *disp_dev = layer->disp_dev;
         struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
         struct osd_state *osd_device = disp_dev->osd_device;
         int err;
 
-        /* Allocate memory for the file handle object */
-        fh = kmalloc(sizeof(struct vpbe_fh), GFP_KERNEL);
-        if (fh == NULL) {
-                v4l2_err(&vpbe_dev->v4l2_dev,
-                        "unable to allocate memory for file handle object\n");
-                return -ENOMEM;
+        /* creating context for file descriptor */
+        err = v4l2_fh_open(file);
+        if (err) {
+                v4l2_err(&vpbe_dev->v4l2_dev, "v4l2_fh_open failed\n");
+                return err;
         }
-        v4l2_fh_init(&fh->fh, vdev);
-        v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
-                        "vpbe display open plane = %d\n",
-                        layer->device_id);
 
-        /* store pointer to fh in private_data member of filep */
-        file->private_data = fh;
-        fh->layer = layer;
-        fh->disp_dev = disp_dev;
+        /* leaving if layer is already initialized */
+        if (!v4l2_fh_is_singular_file(file))
+                return err;
 
         if (!layer->usrs) {
                 if (mutex_lock_interruptible(&layer->opslock))
@@ -1511,15 +1177,12 @@ static int vpbe_display_open(struct file *file)
                         /* Couldn't get layer */
                         v4l2_err(&vpbe_dev->v4l2_dev,
                                 "Display Manager failed to allocate layer\n");
-                        kfree(fh);
+                        v4l2_fh_release(file);
                         return -EINVAL;
                 }
         }
         /* Increment layer usrs counter */
         layer->usrs++;
-        /* Set io_allowed member to false */
-        fh->io_allowed = 0;
-        v4l2_fh_add(&fh->fh);
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
                         "vpbe display device opened successfully\n");
         return 0;
@@ -1532,30 +1195,18 @@ static int vpbe_display_open(struct file *file)
  */
 static int vpbe_display_release(struct file *file)
 {
-        /* Get the layer object and file handle object */
-        struct vpbe_fh *fh = file->private_data;
-        struct vpbe_layer *layer = fh->layer;
+        struct vpbe_layer *layer = video_drvdata(file);
         struct osd_layer_config *cfg  = &layer->layer_info.config;
-        struct vpbe_display *disp_dev = fh->disp_dev;
+        struct vpbe_display *disp_dev = layer->disp_dev;
         struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
         struct osd_state *osd_device = disp_dev->osd_device;
 
         v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, "vpbe_display_release\n");
 
         mutex_lock(&layer->opslock);
-        /* if this instance is doing IO */
-        if (fh->io_allowed) {
-                /* Reset io_usrs member of layer object */
-                layer->io_usrs = 0;
-
-                osd_device->ops.disable_layer(osd_device,
-                                layer->layer_info.id);
-                layer->started = 0;
-                /* Free buffers allocated */
-                vb2_queue_release(&layer->buffer_queue);
-                vb2_dma_contig_cleanup_ctx(&layer->buffer_queue);
-        }
 
+        osd_device->ops.disable_layer(osd_device,
+                        layer->layer_info.id);
         /* Decrement layer usrs counter */
         layer->usrs--;
         /* If this file handle has initialize encoder device, reset it */
@@ -1575,14 +1226,9 @@ static int vpbe_display_release(struct file *file)
                                 layer->layer_info.id);
         }
 
-        v4l2_fh_del(&fh->fh);
-        v4l2_fh_exit(&fh->fh);
-        file->private_data = NULL;
+        _vb2_fop_release(file, NULL);
         mutex_unlock(&layer->opslock);
 
-        /* Free memory allocated to file handle object */
-        kfree(fh);
-
         disp_dev->cbcr_ofst = 0;
 
         return 0;
@@ -1595,20 +1241,27 @@ static const struct v4l2_ioctl_ops vpbe_ioctl_ops = {
         .vidioc_enum_fmt_vid_out = vpbe_display_enum_fmt,
         .vidioc_s_fmt_vid_out    = vpbe_display_s_fmt,
         .vidioc_try_fmt_vid_out  = vpbe_display_try_fmt,
-        .vidioc_reqbufs          = vpbe_display_reqbufs,
-        .vidioc_querybuf         = vpbe_display_querybuf,
-        .vidioc_qbuf             = vpbe_display_qbuf,
-        .vidioc_dqbuf            = vpbe_display_dqbuf,
-        .vidioc_streamon         = vpbe_display_streamon,
-        .vidioc_streamoff        = vpbe_display_streamoff,
+
+        .vidioc_reqbufs          = vb2_ioctl_reqbufs,
+        .vidioc_create_bufs      = vb2_ioctl_create_bufs,
+        .vidioc_querybuf         = vb2_ioctl_querybuf,
+        .vidioc_qbuf             = vb2_ioctl_qbuf,
+        .vidioc_dqbuf            = vb2_ioctl_dqbuf,
+        .vidioc_streamon         = vb2_ioctl_streamon,
+        .vidioc_streamoff        = vb2_ioctl_streamoff,
+        .vidioc_expbuf           = vb2_ioctl_expbuf,
+
         .vidioc_cropcap          = vpbe_display_cropcap,
         .vidioc_g_crop           = vpbe_display_g_crop,
         .vidioc_s_crop           = vpbe_display_s_crop,
+
         .vidioc_s_std            = vpbe_display_s_std,
         .vidioc_g_std            = vpbe_display_g_std,
+
         .vidioc_enum_output      = vpbe_display_enum_output,
         .vidioc_s_output         = vpbe_display_s_output,
         .vidioc_g_output         = vpbe_display_g_output,
+
         .vidioc_s_dv_timings     = vpbe_display_s_dv_timings,
         .vidioc_g_dv_timings     = vpbe_display_g_dv_timings,
         .vidioc_enum_dv_timings  = vpbe_display_enum_dv_timings,
@@ -1619,8 +1272,8 @@ static struct v4l2_file_operations vpbe_fops = {
         .open = vpbe_display_open,
         .release = vpbe_display_release,
         .unlocked_ioctl = video_ioctl2,
-        .mmap = vpbe_display_mmap,
-        .poll = vpbe_display_poll
+        .mmap = vb2_fop_mmap,
+        .poll =  vb2_fop_poll,
 };
 
 static int vpbe_device_get(struct device *dev, void *data)
@@ -1700,6 +1353,7 @@ static int register_device(struct vpbe_layer *vpbe_display_layer,
                   (int)vpbe_display_layer,
                   (int)&vpbe_display_layer->video_dev);
 
+        vpbe_display_layer->video_dev.queue = &vpbe_display_layer->buffer_queue;
         err = video_register_device(&vpbe_display_layer->video_dev,
                                     VFL_TYPE_GRABBER,
                                     -1);
@@ -1724,9 +1378,10 @@ static int register_device(struct vpbe_layer *vpbe_display_layer,
  */
 static int vpbe_display_probe(struct platform_device *pdev)
 {
-        struct vpbe_layer *vpbe_display_layer;
         struct vpbe_display *disp_dev;
+        struct v4l2_device *v4l2_dev;
         struct resource *res = NULL;
+        struct vb2_queue *q;
         int k;
         int i;
         int err;
@@ -1748,13 +1403,14 @@ static int vpbe_display_probe(struct platform_device *pdev)
                         vpbe_device_get);
         if (err < 0)
                 return err;
+
+        v4l2_dev = &disp_dev->vpbe_dev->v4l2_dev;
         /* Initialize the vpbe display controller */
         if (NULL != disp_dev->vpbe_dev->ops.initialize) {
                 err = disp_dev->vpbe_dev->ops.initialize(&pdev->dev,
                                                          disp_dev->vpbe_dev);
                 if (err) {
-                        v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,
-                                        "Error initing vpbe\n");
+                        v4l2_err(v4l2_dev, "Error initing vpbe\n");
                         err = -ENOMEM;
                         goto probe_out;
                 }
@@ -1769,8 +1425,7 @@ static int vpbe_display_probe(struct platform_device *pdev)
 
         res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
         if (!res) {
-                v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,
-                         "Unable to get VENC interrupt resource\n");
+                v4l2_err(v4l2_dev, "Unable to get VENC interrupt resource\n");
                 err = -ENODEV;
                 goto probe_out;
         }
@@ -1779,30 +1434,57 @@ static int vpbe_display_probe(struct platform_device *pdev)
         err = devm_request_irq(&pdev->dev, irq, venc_isr, 0,
                                VPBE_DISPLAY_DRIVER, disp_dev);
         if (err) {
-                v4l2_err(&disp_dev->vpbe_dev->v4l2_dev,
-                                "Unable to request interrupt\n");
+                v4l2_err(v4l2_dev, "VPBE IRQ request failed\n");
                 goto probe_out;
         }
 
         for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {
+                /* initialize vb2 queue */
+                q = &disp_dev->dev[i]->buffer_queue;
+                memset(q, 0, sizeof(*q));
+                q->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
+                q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
+                q->drv_priv = disp_dev->dev[i];
+                q->ops = &video_qops;
+                q->mem_ops = &vb2_dma_contig_memops;
+                q->buf_struct_size = sizeof(struct vpbe_disp_buffer);
+                q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
+                q->min_buffers_needed = 1;
+                q->lock = &disp_dev->dev[i]->opslock;
+                err = vb2_queue_init(q);
+                if (err) {
+                        v4l2_err(v4l2_dev, "vb2_queue_init() failed\n");
+                        goto probe_out;
+                }
+
+                disp_dev->dev[i]->alloc_ctx =
+                        vb2_dma_contig_init_ctx(disp_dev->vpbe_dev->pdev);
+                if (IS_ERR(disp_dev->dev[i]->alloc_ctx)) {
+                        v4l2_err(v4l2_dev, "Failed to get the context\n");
+                        err = PTR_ERR(disp_dev->dev[i]->alloc_ctx);
+                        goto probe_out;
+                }
+
+                INIT_LIST_HEAD(&disp_dev->dev[i]->dma_queue);
+
                 if (register_device(disp_dev->dev[i], disp_dev, pdev)) {
                         err = -ENODEV;
                         goto probe_out;
                 }
         }
 
-        printk(KERN_DEBUG "Successfully completed the probing of vpbe v4l2 device\n");
+        v4l2_dbg(1, debug, v4l2_dev,
+                 "Successfully completed the probing of vpbe v4l2 device\n");
+
         return 0;
 
 probe_out:
         for (k = 0; k < VPBE_DISPLAY_MAX_DEVICES; k++) {
-                /* Get the pointer to the layer object */
-                vpbe_display_layer = disp_dev->dev[k];
                 /* Unregister video device */
-                if (vpbe_display_layer) {
-                        video_unregister_device(
-                                &vpbe_display_layer->video_dev);
-                                kfree(disp_dev->dev[k]);
+                if (disp_dev->dev[k] != NULL) {
+                        vb2_dma_contig_cleanup_ctx(disp_dev->dev[k]->alloc_ctx);
+                        video_unregister_device(&disp_dev->dev[k]->video_dev);
+                        kfree(disp_dev->dev[k]);
                 }
         }
         return err;
@@ -1828,6 +1510,7 @@ static int vpbe_display_remove(struct platform_device *pdev)
         for (i = 0; i < VPBE_DISPLAY_MAX_DEVICES; i++) {
                 /* Get the pointer to the layer object */
                 vpbe_display_layer = disp_dev->dev[i];
+                vb2_dma_contig_cleanup_ctx(vpbe_display_layer->alloc_ctx);
                 /* Unregister video device */
                 video_unregister_device(&vpbe_display_layer->video_dev);
 
diff --git a/drivers/media/platform/davinci/vpfe_capture.c b/drivers/media/platform/davinci/vpfe_capture.c
index de55f47a77db..271c4600432d 100644
--- a/drivers/media/platform/davinci/vpfe_capture.c
+++ b/drivers/media/platform/davinci/vpfe_capture.c
@@ -414,13 +414,13 @@ static int vpfe_config_image_format(struct vpfe_device *vpfe_dev,
                 /* assume V4L2_PIX_FMT_UYVY as default */
                 pix->pixelformat = V4L2_PIX_FMT_UYVY;
                 v4l2_fill_mbus_format(&mbus_fmt, pix,
-                                V4L2_MBUS_FMT_YUYV10_2X10);
+                                MEDIA_BUS_FMT_YUYV10_2X10);
         } else {
                 pix->field = V4L2_FIELD_NONE;
                 /* assume V4L2_PIX_FMT_SBGGR8 */
                 pix->pixelformat = V4L2_PIX_FMT_SBGGR8;
                 v4l2_fill_mbus_format(&mbus_fmt, pix,
-                                V4L2_MBUS_FMT_SBGGR8_1X8);
+                                MEDIA_BUS_FMT_SBGGR8_1X8);
         }
 
         /* if sub device supports g_mbus_fmt, override the defaults */
@@ -930,8 +930,8 @@ static int vpfe_querycap(struct file *file, void  *priv,
 
         v4l2_dbg(1, debug, &vpfe_dev->v4l2_dev, "vpfe_querycap\n");
 
-        cap->version = VPFE_CAPTURE_VERSION_CODE;
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         strlcpy(cap->driver, CAPTURE_DRV_NAME, sizeof(cap->driver));
         strlcpy(cap->bus_info, "VPFE", sizeof(cap->bus_info));
         strlcpy(cap->card, vpfe_dev->cfg->card_name, sizeof(cap->card));
diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index 3ccb26ff43c8..d8e1b98b7784 100644
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -311,6 +311,8 @@ static struct vb2_ops video_qops = {
         .start_streaming        = vpif_start_streaming,
         .stop_streaming         = vpif_stop_streaming,
         .buf_queue              = vpif_buffer_queue,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 /**
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.c b/drivers/media/platform/exynos-gsc/gsc-core.c
index b4c9f1d08968..3062e9fac6da 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.c
+++ b/drivers/media/platform/exynos-gsc/gsc-core.c
@@ -54,7 +54,7 @@ static const struct gsc_fmt gsc_formats[] = {
                 .corder         = GSC_CBCR,
                 .num_planes     = 1,
                 .num_comp       = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
         }, {
                 .name           = "YUV 4:2:2 packed, CbYCrY",
                 .pixelformat    = V4L2_PIX_FMT_UYVY,
@@ -64,7 +64,7 @@ static const struct gsc_fmt gsc_formats[] = {
                 .corder         = GSC_CBCR,
                 .num_planes     = 1,
                 .num_comp       = 1,
-                .mbus_code      = V4L2_MBUS_FMT_UYVY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_UYVY8_2X8,
         }, {
                 .name           = "YUV 4:2:2 packed, CrYCbY",
                 .pixelformat    = V4L2_PIX_FMT_VYUY,
@@ -74,7 +74,7 @@ static const struct gsc_fmt gsc_formats[] = {
                 .corder         = GSC_CRCB,
                 .num_planes     = 1,
                 .num_comp       = 1,
-                .mbus_code      = V4L2_MBUS_FMT_VYUY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_VYUY8_2X8,
         }, {
                 .name           = "YUV 4:2:2 packed, YCrYCb",
                 .pixelformat    = V4L2_PIX_FMT_YVYU,
@@ -84,7 +84,7 @@ static const struct gsc_fmt gsc_formats[] = {
                 .corder         = GSC_CRCB,
                 .num_planes     = 1,
                 .num_comp       = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YVYU8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YVYU8_2X8,
         }, {
                 .name           = "YUV 4:4:4 planar, YCbYCr",
                 .pixelformat    = V4L2_PIX_FMT_YUV32,
@@ -319,21 +319,22 @@ int gsc_enum_fmt_mplane(struct v4l2_fmtdesc *f)
         return 0;
 }
 
-static u32 get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index)
+static int get_plane_info(struct gsc_frame *frm, u32 addr, u32 *index, u32 *ret_addr)
 {
         if (frm->addr.y == addr) {
                 *index = 0;
-                return frm->addr.y;
+                *ret_addr = frm->addr.y;
         } else if (frm->addr.cb == addr) {
                 *index = 1;
-                return frm->addr.cb;
+                *ret_addr = frm->addr.cb;
         } else if (frm->addr.cr == addr) {
                 *index = 2;
-                return frm->addr.cr;
+                *ret_addr = frm->addr.cr;
         } else {
                 pr_err("Plane address is wrong");
                 return -EINVAL;
         }
+        return 0;
 }
 
 void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm)
@@ -352,9 +353,11 @@ void gsc_set_prefbuf(struct gsc_dev *gsc, struct gsc_frame *frm)
                 u32 t_min, t_max;
 
                 t_min = min3(frm->addr.y, frm->addr.cb, frm->addr.cr);
-                low_addr = get_plane_info(frm, t_min, &low_plane);
+                if (get_plane_info(frm, t_min, &low_plane, &low_addr))
+                        return;
                 t_max = max3(frm->addr.y, frm->addr.cb, frm->addr.cr);
-                high_addr = get_plane_info(frm, t_max, &high_plane);
+                if (get_plane_info(frm, t_max, &high_plane, &high_addr))
+                        return;
 
                 mid_plane = 3 - (low_plane + high_plane);
                 if (mid_plane == 0)
diff --git a/drivers/media/platform/exynos-gsc/gsc-core.h b/drivers/media/platform/exynos-gsc/gsc-core.h
index ef0a6564cef9..0abdb17fb19c 100644
--- a/drivers/media/platform/exynos-gsc/gsc-core.h
+++ b/drivers/media/platform/exynos-gsc/gsc-core.h
@@ -117,7 +117,7 @@ enum gsc_yuv_fmt {
  * @flags: flags indicating which operation mode format applies to
  */
 struct gsc_fmt {
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
         char    *name;
         u32     pixelformat;
         u32     color;
diff --git a/drivers/media/platform/exynos4-is/fimc-capture.c b/drivers/media/platform/exynos4-is/fimc-capture.c
index 3d2babd5067a..8a2fd8c33d42 100644
--- a/drivers/media/platform/exynos4-is/fimc-capture.c
+++ b/drivers/media/platform/exynos4-is/fimc-capture.c
@@ -749,7 +749,7 @@ static int fimc_cap_enum_fmt_mplane(struct file *file, void *priv,
                 return -EINVAL;
         strncpy(f->description, fmt->name, sizeof(f->description) - 1);
         f->pixelformat = fmt->fourcc;
-        if (fmt->fourcc == V4L2_MBUS_FMT_JPEG_1X8)
+        if (fmt->fourcc == MEDIA_BUS_FMT_JPEG_1X8)
                 f->flags |= V4L2_FMT_FLAG_COMPRESSED;
         return 0;
 }
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c
index f5d85520caf3..2acc19573b6b 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.c
+++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -81,7 +81,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .flags          = FMT_FLAGS_M2M_OUT | FMT_HAS_ALPHA,
         }, {
                 .name           = "YUV 4:4:4",
-                .mbus_code      = V4L2_MBUS_FMT_YUV10_1X30,
+                .mbus_code      = MEDIA_BUS_FMT_YUV10_1X30,
                 .flags          = FMT_FLAGS_WRITEBACK,
         }, {
                 .name           = "YUV 4:2:2 packed, YCbYCr",
@@ -90,7 +90,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .color          = FIMC_FMT_YCBYCR422,
                 .memplanes      = 1,
                 .colplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
         }, {
                 .name           = "YUV 4:2:2 packed, CbYCrY",
@@ -99,7 +99,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .color          = FIMC_FMT_CBYCRY422,
                 .memplanes      = 1,
                 .colplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_UYVY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_UYVY8_2X8,
                 .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
         }, {
                 .name           = "YUV 4:2:2 packed, CrYCbY",
@@ -108,7 +108,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .color          = FIMC_FMT_CRYCBY422,
                 .memplanes      = 1,
                 .colplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_VYUY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_VYUY8_2X8,
                 .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
         }, {
                 .name           = "YUV 4:2:2 packed, YCrYCb",
@@ -117,7 +117,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .color          = FIMC_FMT_YCRYCB422,
                 .memplanes      = 1,
                 .colplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YVYU8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YVYU8_2X8,
                 .flags          = FMT_FLAGS_M2M | FMT_FLAGS_CAM,
         }, {
                 .name           = "YUV 4:2:2 planar, Y/Cb/Cr",
@@ -190,7 +190,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .depth          = { 8 },
                 .memplanes      = 1,
                 .colplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_JPEG_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_JPEG_1X8,
                 .flags          = FMT_FLAGS_CAM | FMT_FLAGS_COMPRESSED,
         }, {
                 .name           = "S5C73MX interleaved UYVY/JPEG",
@@ -200,7 +200,7 @@ static struct fimc_fmt fimc_formats[] = {
                 .memplanes      = 2,
                 .colplanes      = 1,
                 .mdataplanes    = 0x2, /* plane 1 holds frame meta data */
-                .mbus_code      = V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,
                 .flags          = FMT_FLAGS_CAM | FMT_FLAGS_COMPRESSED,
         },
 };
diff --git a/drivers/media/platform/exynos4-is/fimc-core.h b/drivers/media/platform/exynos4-is/fimc-core.h
index 6c75c6ced1f7..7328f0845065 100644
--- a/drivers/media/platform/exynos4-is/fimc-core.h
+++ b/drivers/media/platform/exynos4-is/fimc-core.h
@@ -579,8 +579,8 @@ static inline bool fimc_jpeg_fourcc(u32 pixelformat)
 
 static inline bool fimc_user_defined_mbus_fmt(u32 code)
 {
-        return (code == V4L2_MBUS_FMT_JPEG_1X8 ||
-                code == V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8);
+        return (code == MEDIA_BUS_FMT_JPEG_1X8 ||
+                code == MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8);
 }
 
 /* Return the alpha component bit mask */
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c
index 22162b2567da..2a0cbeff0324 100644
--- a/drivers/media/platform/exynos4-is/fimc-is.c
+++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -428,8 +428,7 @@ static void fimc_is_load_firmware(const struct firmware *fw, void *context)
          * needed around for copying to the IS working memory every
          * time before the Cortex-A5 is restarted.
          */
-        if (is->fw.f_w)
-                release_firmware(is->fw.f_w);
+        release_firmware(is->fw.f_w);
         is->fw.f_w = fw;
 done:
         mutex_unlock(&is->lock);
@@ -814,9 +813,9 @@ static int fimc_is_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         is->irq = irq_of_parse_and_map(dev->of_node, 0);
-        if (is->irq < 0) {
+        if (!is->irq) {
                 dev_err(dev, "no irq found\n");
-                return is->irq;
+                return -EINVAL;
         }
 
         ret = fimc_is_get_clocks(is);
@@ -937,8 +936,7 @@ static int fimc_is_remove(struct platform_device *pdev)
         vb2_dma_contig_cleanup_ctx(is->alloc_ctx);
         fimc_is_put_clocks(is);
         fimc_is_debugfs_remove(is);
-        if (is->fw.f_w)
-                release_firmware(is->fw.f_w);
+        release_firmware(is->fw.f_w);
         fimc_is_free_cpu_memory(is);
 
         return 0;
diff --git a/drivers/media/platform/exynos4-is/fimc-isp.c b/drivers/media/platform/exynos4-is/fimc-isp.c
index be62d6b9ac48..60c744915549 100644
--- a/drivers/media/platform/exynos4-is/fimc-isp.c
+++ b/drivers/media/platform/exynos4-is/fimc-isp.c
@@ -41,21 +41,21 @@ static const struct fimc_fmt fimc_isp_formats[FIMC_ISP_NUM_FORMATS] = {
                 .depth          = { 8 },
                 .color          = FIMC_FMT_RAW8,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG8_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG8_1X8,
         }, {
                 .name           = "RAW10 (GRBG)",
                 .fourcc         = V4L2_PIX_FMT_SGRBG10,
                 .depth          = { 10 },
                 .color          = FIMC_FMT_RAW10,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG10_1X10,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG10_1X10,
         }, {
                 .name           = "RAW12 (GRBG)",
                 .fourcc         = V4L2_PIX_FMT_SGRBG12,
                 .depth          = { 12 },
                 .color          = FIMC_FMT_RAW12,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG12_1X12,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG12_1X12,
         },
 };
 
@@ -149,7 +149,7 @@ static int fimc_isp_subdev_get_fmt(struct v4l2_subdev *sd,
 
                 if (fmt->pad == FIMC_ISP_SD_PAD_SRC_FIFO) {
                         mf->colorspace = V4L2_COLORSPACE_JPEG;
-                        mf->code = V4L2_MBUS_FMT_YUV10_1X30;
+                        mf->code = MEDIA_BUS_FMT_YUV10_1X30;
                 }
         }
 
@@ -175,7 +175,7 @@ static void __isp_subdev_try_format(struct fimc_isp *isp,
                                 FIMC_ISP_SINK_WIDTH_MAX, 0,
                                 &mf->height, FIMC_ISP_SINK_HEIGHT_MIN,
                                 FIMC_ISP_SINK_HEIGHT_MAX, 0, 0);
-                mf->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                mf->code = MEDIA_BUS_FMT_SGRBG10_1X10;
         } else {
                 if (fmt->which == V4L2_SUBDEV_FORMAT_TRY)
                         format = v4l2_subdev_get_try_format(fh,
@@ -188,7 +188,7 @@ static void __isp_subdev_try_format(struct fimc_isp *isp,
                 mf->height = format->height - FIMC_ISP_CAC_MARGIN_HEIGHT;
 
                 if (fmt->pad == FIMC_ISP_SD_PAD_SRC_FIFO) {
-                        mf->code = V4L2_MBUS_FMT_YUV10_1X30;
+                        mf->code = MEDIA_BUS_FMT_YUV10_1X30;
                         mf->colorspace = V4L2_COLORSPACE_JPEG;
                 } else {
                         mf->code = format->code;
@@ -680,11 +680,11 @@ static void __isp_subdev_set_default_format(struct fimc_isp *isp)
                                 FIMC_ISP_CAC_MARGIN_WIDTH;
         isp->sink_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT +
                                 FIMC_ISP_CAC_MARGIN_HEIGHT;
-        isp->sink_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        isp->sink_fmt.code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
         isp->src_fmt.width = DEFAULT_PREVIEW_STILL_WIDTH;
         isp->src_fmt.height = DEFAULT_PREVIEW_STILL_HEIGHT;
-        isp->src_fmt.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        isp->src_fmt.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         __is_set_frame_size(is, &isp->src_fmt);
 }
 
diff --git a/drivers/media/platform/exynos4-is/fimc-lite-reg.c b/drivers/media/platform/exynos4-is/fimc-lite-reg.c
index bc3ec7d25a32..0477716a20db 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite-reg.c
@@ -112,24 +112,24 @@ void flite_hw_set_test_pattern(struct fimc_lite *dev, bool on)
 }
 
 static const u32 src_pixfmt_map[8][3] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_YCBYCR,
+        { MEDIA_BUS_FMT_YUYV8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_YCBYCR,
           FLITE_REG_CIGCTRL_YUV422_1P },
-        { V4L2_MBUS_FMT_YVYU8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_YCRYCB,
+        { MEDIA_BUS_FMT_YVYU8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_YCRYCB,
           FLITE_REG_CIGCTRL_YUV422_1P },
-        { V4L2_MBUS_FMT_UYVY8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_CBYCRY,
+        { MEDIA_BUS_FMT_UYVY8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_CBYCRY,
           FLITE_REG_CIGCTRL_YUV422_1P },
-        { V4L2_MBUS_FMT_VYUY8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_CRYCBY,
+        { MEDIA_BUS_FMT_VYUY8_2X8, FLITE_REG_CISRCSIZE_ORDER422_IN_CRYCBY,
           FLITE_REG_CIGCTRL_YUV422_1P },
-        { V4L2_MBUS_FMT_SGRBG8_1X8, 0, FLITE_REG_CIGCTRL_RAW8 },
-        { V4L2_MBUS_FMT_SGRBG10_1X10, 0, FLITE_REG_CIGCTRL_RAW10 },
-        { V4L2_MBUS_FMT_SGRBG12_1X12, 0, FLITE_REG_CIGCTRL_RAW12 },
-        { V4L2_MBUS_FMT_JPEG_1X8, 0, FLITE_REG_CIGCTRL_USER(1) },
+        { MEDIA_BUS_FMT_SGRBG8_1X8, 0, FLITE_REG_CIGCTRL_RAW8 },
+        { MEDIA_BUS_FMT_SGRBG10_1X10, 0, FLITE_REG_CIGCTRL_RAW10 },
+        { MEDIA_BUS_FMT_SGRBG12_1X12, 0, FLITE_REG_CIGCTRL_RAW12 },
+        { MEDIA_BUS_FMT_JPEG_1X8, 0, FLITE_REG_CIGCTRL_USER(1) },
 };
 
 /* Set camera input pixel format and resolution */
 void flite_hw_set_source_format(struct fimc_lite *dev, struct flite_frame *f)
 {
-        enum v4l2_mbus_pixelcode pixelcode = f->fmt->mbus_code;
+        u32 pixelcode = f->fmt->mbus_code;
         int i = ARRAY_SIZE(src_pixfmt_map);
         u32 cfg;
 
@@ -232,10 +232,10 @@ static void flite_hw_set_pack12(struct fimc_lite *dev, int on)
 static void flite_hw_set_out_order(struct fimc_lite *dev, struct flite_frame *f)
 {
         static const u32 pixcode[4][2] = {
-                { V4L2_MBUS_FMT_YUYV8_2X8, FLITE_REG_CIODMAFMT_YCBYCR },
-                { V4L2_MBUS_FMT_YVYU8_2X8, FLITE_REG_CIODMAFMT_YCRYCB },
-                { V4L2_MBUS_FMT_UYVY8_2X8, FLITE_REG_CIODMAFMT_CBYCRY },
-                { V4L2_MBUS_FMT_VYUY8_2X8, FLITE_REG_CIODMAFMT_CRYCBY },
+                { MEDIA_BUS_FMT_YUYV8_2X8, FLITE_REG_CIODMAFMT_YCBYCR },
+                { MEDIA_BUS_FMT_YVYU8_2X8, FLITE_REG_CIODMAFMT_YCRYCB },
+                { MEDIA_BUS_FMT_UYVY8_2X8, FLITE_REG_CIODMAFMT_CBYCRY },
+                { MEDIA_BUS_FMT_VYUY8_2X8, FLITE_REG_CIODMAFMT_CRYCBY },
         };
         u32 cfg = readl(dev->regs + FLITE_REG_CIODMAFMT);
         int i = ARRAY_SIZE(pixcode);
diff --git a/drivers/media/platform/exynos4-is/fimc-lite.c b/drivers/media/platform/exynos4-is/fimc-lite.c
index 6c1eb308f7b5..7e8687338155 100644
--- a/drivers/media/platform/exynos4-is/fimc-lite.c
+++ b/drivers/media/platform/exynos4-is/fimc-lite.c
@@ -48,7 +48,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_YCBYCR422,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .flags          = FMT_FLAGS_YUV,
         }, {
                 .name           = "YUV 4:2:2 packed, CbYCrY",
@@ -57,7 +57,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_CBYCRY422,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_UYVY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_UYVY8_2X8,
                 .flags          = FMT_FLAGS_YUV,
         }, {
                 .name           = "YUV 4:2:2 packed, CrYCbY",
@@ -66,7 +66,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_CRYCBY422,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_VYUY8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_VYUY8_2X8,
                 .flags          = FMT_FLAGS_YUV,
         }, {
                 .name           = "YUV 4:2:2 packed, YCrYCb",
@@ -75,7 +75,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_YCRYCB422,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_YVYU8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YVYU8_2X8,
                 .flags          = FMT_FLAGS_YUV,
         }, {
                 .name           = "RAW8 (GRBG)",
@@ -84,7 +84,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 8 },
                 .color          = FIMC_FMT_RAW8,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG8_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG8_1X8,
                 .flags          = FMT_FLAGS_RAW_BAYER,
         }, {
                 .name           = "RAW10 (GRBG)",
@@ -93,7 +93,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_RAW10,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG10_1X10,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG10_1X10,
                 .flags          = FMT_FLAGS_RAW_BAYER,
         }, {
                 .name           = "RAW12 (GRBG)",
@@ -102,7 +102,7 @@ static const struct fimc_fmt fimc_lite_formats[] = {
                 .depth          = { 16 },
                 .color          = FIMC_FMT_RAW12,
                 .memplanes      = 1,
-                .mbus_code      = V4L2_MBUS_FMT_SGRBG12_1X12,
+                .mbus_code      = MEDIA_BUS_FMT_SGRBG12_1X12,
                 .flags          = FMT_FLAGS_RAW_BAYER,
         },
 };
diff --git a/drivers/media/platform/exynos4-is/fimc-reg.c b/drivers/media/platform/exynos4-is/fimc-reg.c
index 2d77fd8f440a..df0cbcb69b6b 100644
--- a/drivers/media/platform/exynos4-is/fimc-reg.c
+++ b/drivers/media/platform/exynos4-is/fimc-reg.c
@@ -592,10 +592,10 @@ struct mbus_pixfmt_desc {
 };
 
 static const struct mbus_pixfmt_desc pix_desc[] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8, FIMC_REG_CISRCFMT_ORDER422_YCBYCR, 8 },
-        { V4L2_MBUS_FMT_YVYU8_2X8, FIMC_REG_CISRCFMT_ORDER422_YCRYCB, 8 },
-        { V4L2_MBUS_FMT_VYUY8_2X8, FIMC_REG_CISRCFMT_ORDER422_CRYCBY, 8 },
-        { V4L2_MBUS_FMT_UYVY8_2X8, FIMC_REG_CISRCFMT_ORDER422_CBYCRY, 8 },
+        { MEDIA_BUS_FMT_YUYV8_2X8, FIMC_REG_CISRCFMT_ORDER422_YCBYCR, 8 },
+        { MEDIA_BUS_FMT_YVYU8_2X8, FIMC_REG_CISRCFMT_ORDER422_YCRYCB, 8 },
+        { MEDIA_BUS_FMT_VYUY8_2X8, FIMC_REG_CISRCFMT_ORDER422_CRYCBY, 8 },
+        { MEDIA_BUS_FMT_UYVY8_2X8, FIMC_REG_CISRCFMT_ORDER422_CBYCRY, 8 },
 };
 
 int fimc_hw_set_camera_source(struct fimc_dev *fimc,
@@ -689,11 +689,11 @@ int fimc_hw_set_camera_type(struct fimc_dev *fimc,
 
                 /* TODO: add remaining supported formats. */
                 switch (vid_cap->ci_fmt.code) {
-                case V4L2_MBUS_FMT_VYUY8_2X8:
+                case MEDIA_BUS_FMT_VYUY8_2X8:
                         tmp = FIMC_REG_CSIIMGFMT_YCBCR422_8BIT;
                         break;
-                case V4L2_MBUS_FMT_JPEG_1X8:
-                case V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8:
+                case MEDIA_BUS_FMT_JPEG_1X8:
+                case MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8:
                         tmp = FIMC_REG_CSIIMGFMT_USER(1);
                         cfg |= FIMC_REG_CIGCTRL_CAM_JPEG;
                         break;
diff --git a/drivers/media/platform/exynos4-is/mipi-csis.c b/drivers/media/platform/exynos4-is/mipi-csis.c
index be5d6fc895cb..9e1056d60c7e 100644
--- a/drivers/media/platform/exynos4-is/mipi-csis.c
+++ b/drivers/media/platform/exynos4-is/mipi-csis.c
@@ -238,34 +238,34 @@ struct csis_state {
  */
 struct csis_pix_format {
         unsigned int pix_width_alignment;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         u32 fmt_reg;
         u8 data_alignment;
 };
 
 static const struct csis_pix_format s5pcsis_formats[] = {
         {
-                .code = V4L2_MBUS_FMT_VYUY8_2X8,
+                .code = MEDIA_BUS_FMT_VYUY8_2X8,
                 .fmt_reg = S5PCSIS_CFG_FMT_YCBCR422_8BIT,
                 .data_alignment = 32,
         }, {
-                .code = V4L2_MBUS_FMT_JPEG_1X8,
+                .code = MEDIA_BUS_FMT_JPEG_1X8,
                 .fmt_reg = S5PCSIS_CFG_FMT_USER(1),
                 .data_alignment = 32,
         }, {
-                .code = V4L2_MBUS_FMT_S5C_UYVY_JPEG_1X8,
+                .code = MEDIA_BUS_FMT_S5C_UYVY_JPEG_1X8,
                 .fmt_reg = S5PCSIS_CFG_FMT_USER(1),
                 .data_alignment = 32,
         }, {
-                .code = V4L2_MBUS_FMT_SGRBG8_1X8,
+                .code = MEDIA_BUS_FMT_SGRBG8_1X8,
                 .fmt_reg = S5PCSIS_CFG_FMT_RAW8,
                 .data_alignment = 24,
         }, {
-                .code = V4L2_MBUS_FMT_SGRBG10_1X10,
+                .code = MEDIA_BUS_FMT_SGRBG10_1X10,
                 .fmt_reg = S5PCSIS_CFG_FMT_RAW10,
                 .data_alignment = 24,
         }, {
-                .code = V4L2_MBUS_FMT_SGRBG12_1X12,
+                .code = MEDIA_BUS_FMT_SGRBG12_1X12,
                 .fmt_reg = S5PCSIS_CFG_FMT_RAW12,
                 .data_alignment = 24,
         }
diff --git a/drivers/media/platform/fsl-viu.c b/drivers/media/platform/fsl-viu.c
index d5dc198502ef..8afee3c17c1c 100644
--- a/drivers/media/platform/fsl-viu.c
+++ b/drivers/media/platform/fsl-viu.c
@@ -604,10 +604,11 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
         strcpy(cap->driver, "viu");
         strcpy(cap->card, "viu");
-        cap->capabilities =     V4L2_CAP_VIDEO_CAPTURE |
+        cap->device_caps =      V4L2_CAP_VIDEO_CAPTURE |
                                 V4L2_CAP_STREAMING     |
                                 V4L2_CAP_VIDEO_OVERLAY |
                                 V4L2_CAP_READWRITE;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.c b/drivers/media/platform/marvell-ccic/mcam-core.c
index 7a86c77bffa0..193373ff268d 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.c
+++ b/drivers/media/platform/marvell-ccic/mcam-core.c
@@ -106,61 +106,61 @@ static struct mcam_format_struct {
         __u32 pixelformat;
         int bpp;   /* Bytes per pixel */
         bool planar;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 } mcam_formats[] = {
         {
                 .desc           = "YUYV 4:2:2",
                 .pixelformat    = V4L2_PIX_FMT_YUYV,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "UYVY 4:2:2",
                 .pixelformat    = V4L2_PIX_FMT_UYVY,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "YUV 4:2:2 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YUV422P,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "YUV 4:2:0 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YUV420,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "YVU 4:2:0 PLANAR",
                 .pixelformat    = V4L2_PIX_FMT_YVU420,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
                 .planar         = true,
         },
         {
                 .desc           = "RGB 444",
                 .pixelformat    = V4L2_PIX_FMT_RGB444,
-                .mbus_code      = V4L2_MBUS_FMT_RGB444_2X8_PADHI_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB444_2X8_PADHI_LE,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "RGB 565",
                 .pixelformat    = V4L2_PIX_FMT_RGB565,
-                .mbus_code      = V4L2_MBUS_FMT_RGB565_2X8_LE,
+                .mbus_code      = MEDIA_BUS_FMT_RGB565_2X8_LE,
                 .bpp            = 2,
                 .planar         = false,
         },
         {
                 .desc           = "Raw RGB Bayer",
                 .pixelformat    = V4L2_PIX_FMT_SBGGR8,
-                .mbus_code      = V4L2_MBUS_FMT_SBGGR8_1X8,
+                .mbus_code      = MEDIA_BUS_FMT_SBGGR8_1X8,
                 .bpp            = 1,
                 .planar         = false,
         },
@@ -190,8 +190,7 @@ static const struct v4l2_pix_format mcam_def_pix_format = {
         .sizeimage      = VGA_WIDTH*VGA_HEIGHT*2,
 };
 
-static const enum v4l2_mbus_pixelcode mcam_def_mbus_code =
-                                        V4L2_MBUS_FMT_YUYV8_2X8;
+static const u32 mcam_def_mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
 
 
 /*
@@ -1080,6 +1079,8 @@ static int mcam_vb_queue_setup(struct vb2_queue *vq,
                 *nbufs = minbufs;
         if (cam->buffer_mode == B_DMA_contig)
                 alloc_ctxs[0] = cam->vb_alloc_ctx;
+        else if (cam->buffer_mode == B_DMA_sg)
+                alloc_ctxs[0] = cam->vb_alloc_ctx_sg;
         return 0;
 }
 
@@ -1101,26 +1102,6 @@ static void mcam_vb_buf_queue(struct vb2_buffer *vb)
                 mcam_read_setup(cam);
 }
 
-
-/*
- * vb2 uses these to release the mutex when waiting in dqbuf.  I'm
- * not actually sure we need to do this (I'm not sure that vb2_dqbuf() needs
- * to be called with the mutex held), but better safe than sorry.
- */
-static void mcam_vb_wait_prepare(struct vb2_queue *vq)
-{
-        struct mcam_camera *cam = vb2_get_drv_priv(vq);
-
-        mutex_unlock(&cam->s_mutex);
-}
-
-static void mcam_vb_wait_finish(struct vb2_queue *vq)
-{
-        struct mcam_camera *cam = vb2_get_drv_priv(vq);
-
-        mutex_lock(&cam->s_mutex);
-}
-
 /*
  * These need to be called with the mutex held from vb2
  */
@@ -1190,8 +1171,8 @@ static const struct vb2_ops mcam_vb2_ops = {
         .buf_queue              = mcam_vb_buf_queue,
         .start_streaming        = mcam_vb_start_streaming,
         .stop_streaming         = mcam_vb_stop_streaming,
-        .wait_prepare           = mcam_vb_wait_prepare,
-        .wait_finish            = mcam_vb_wait_finish,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 
@@ -1219,17 +1200,12 @@ static int mcam_vb_sg_buf_init(struct vb2_buffer *vb)
 static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
 {
         struct mcam_vb_buffer *mvb = vb_to_mvb(vb);
-        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
         struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
         struct mcam_dma_desc *desc = mvb->dma_desc;
         struct scatterlist *sg;
         int i;
 
-        mvb->dma_desc_nent = dma_map_sg(cam->dev, sg_table->sgl,
-                        sg_table->nents, DMA_FROM_DEVICE);
-        if (mvb->dma_desc_nent <= 0)
-                return -EIO;  /* Not sure what's right here */
-        for_each_sg(sg_table->sgl, sg, mvb->dma_desc_nent, i) {
+        for_each_sg(sg_table->sgl, sg, sg_table->nents, i) {
                 desc->dma_addr = sg_dma_address(sg);
                 desc->segment_len = sg_dma_len(sg);
                 desc++;
@@ -1237,16 +1213,6 @@ static int mcam_vb_sg_buf_prepare(struct vb2_buffer *vb)
         return 0;
 }
 
-static void mcam_vb_sg_buf_finish(struct vb2_buffer *vb)
-{
-        struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
-        struct sg_table *sg_table = vb2_dma_sg_plane_desc(vb, 0);
-
-        if (sg_table)
-                dma_unmap_sg(cam->dev, sg_table->sgl,
-                                sg_table->nents, DMA_FROM_DEVICE);
-}
-
 static void mcam_vb_sg_buf_cleanup(struct vb2_buffer *vb)
 {
         struct mcam_camera *cam = vb2_get_drv_priv(vb->vb2_queue);
@@ -1263,12 +1229,11 @@ static const struct vb2_ops mcam_vb2_sg_ops = {
         .buf_init               = mcam_vb_sg_buf_init,
         .buf_prepare            = mcam_vb_sg_buf_prepare,
         .buf_queue              = mcam_vb_buf_queue,
-        .buf_finish             = mcam_vb_sg_buf_finish,
         .buf_cleanup            = mcam_vb_sg_buf_cleanup,
         .start_streaming        = mcam_vb_start_streaming,
         .stop_streaming         = mcam_vb_stop_streaming,
-        .wait_prepare           = mcam_vb_wait_prepare,
-        .wait_finish            = mcam_vb_wait_finish,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 #endif /* MCAM_MODE_DMA_SG */
@@ -1280,6 +1245,7 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
         memset(vq, 0, sizeof(*vq));
         vq->type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
         vq->drv_priv = cam;
+        vq->lock = &cam->s_mutex;
         INIT_LIST_HEAD(&cam->buffers);
         switch (cam->buffer_mode) {
         case B_DMA_contig:
@@ -1287,10 +1253,12 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
                 vq->ops = &mcam_vb2_ops;
                 vq->mem_ops = &vb2_dma_contig_memops;
                 vq->buf_struct_size = sizeof(struct mcam_vb_buffer);
-                cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
                 vq->io_modes = VB2_MMAP | VB2_USERPTR;
                 cam->dma_setup = mcam_ctlr_dma_contig;
                 cam->frame_complete = mcam_dma_contig_done;
+                cam->vb_alloc_ctx = vb2_dma_contig_init_ctx(cam->dev);
+                if (IS_ERR(cam->vb_alloc_ctx))
+                        return PTR_ERR(cam->vb_alloc_ctx);
 #endif
                 break;
         case B_DMA_sg:
@@ -1301,6 +1269,9 @@ static int mcam_setup_vb2(struct mcam_camera *cam)
                 vq->io_modes = VB2_MMAP | VB2_USERPTR;
                 cam->dma_setup = mcam_ctlr_dma_sg;
                 cam->frame_complete = mcam_dma_sg_done;
+                cam->vb_alloc_ctx_sg = vb2_dma_sg_init_ctx(cam->dev);
+                if (IS_ERR(cam->vb_alloc_ctx_sg))
+                        return PTR_ERR(cam->vb_alloc_ctx_sg);
 #endif
                 break;
         case B_vmalloc:
@@ -1326,6 +1297,10 @@ static void mcam_cleanup_vb2(struct mcam_camera *cam)
         if (cam->buffer_mode == B_DMA_contig)
                 vb2_dma_contig_cleanup_ctx(cam->vb_alloc_ctx);
 #endif
+#ifdef MCAM_MODE_DMA_SG
+        if (cam->buffer_mode == B_DMA_sg)
+                vb2_dma_sg_cleanup_ctx(cam->vb_alloc_ctx_sg);
+#endif
 }
 
 
@@ -1414,9 +1389,9 @@ static int mcam_vidioc_querycap(struct file *file, void *priv,
 {
         strcpy(cap->driver, "marvell_ccic");
         strcpy(cap->card, "marvell_ccic");
-        cap->version = 1;
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/marvell-ccic/mcam-core.h b/drivers/media/platform/marvell-ccic/mcam-core.h
index e0e628cb98f9..aa0c6eac254a 100644
--- a/drivers/media/platform/marvell-ccic/mcam-core.h
+++ b/drivers/media/platform/marvell-ccic/mcam-core.h
@@ -176,6 +176,7 @@ struct mcam_camera {
         /* DMA buffers - DMA modes */
         struct mcam_vb_buffer *vb_bufs[MAX_DMA_BUFS];
         struct vb2_alloc_ctx *vb_alloc_ctx;
+        struct vb2_alloc_ctx *vb_alloc_ctx_sg;
 
         /* Mode-specific ops, set at open time */
         void (*dma_setup)(struct mcam_camera *cam);
@@ -183,7 +184,7 @@ struct mcam_camera {
 
         /* Current operating parameters */
         struct v4l2_pix_format pix_format;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 
         /* Locks */
         struct mutex s_mutex; /* Access to this structure */
diff --git a/drivers/media/platform/mx2_emmaprp.c b/drivers/media/platform/mx2_emmaprp.c
index 4971ff21f82b..f923d1bc43a0 100644
--- a/drivers/media/platform/mx2_emmaprp.c
+++ b/drivers/media/platform/mx2_emmaprp.c
@@ -402,13 +402,8 @@ static int vidioc_querycap(struct file *file, void *priv,
 {
         strncpy(cap->driver, MEM2MEM_NAME, sizeof(cap->driver) - 1);
         strncpy(cap->card, MEM2MEM_NAME, sizeof(cap->card) - 1);
-        /*
-         * This is only a mem-to-mem video device. The capture and output
-         * device capability flags are left only for backward compatibility
-         * and are scheduled for removal.
-         */
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
-                            V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/omap/Kconfig b/drivers/media/platform/omap/Kconfig
index 05de442d24e4..dc2aaab54aef 100644
--- a/drivers/media/platform/omap/Kconfig
+++ b/drivers/media/platform/omap/Kconfig
@@ -3,7 +3,8 @@ config VIDEO_OMAP2_VOUT_VRFB
 
 config VIDEO_OMAP2_VOUT
         tristate "OMAP2/OMAP3 V4L2-Display driver"
-        depends on ARCH_OMAP2 || ARCH_OMAP3 || (COMPILE_TEST && HAS_MMU)
+        depends on MMU
+        depends on ARCH_OMAP2 || ARCH_OMAP3
         select VIDEOBUF_GEN
         select VIDEOBUF_DMA_CONTIG
         select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
diff --git a/drivers/media/platform/omap/omap_vout.c b/drivers/media/platform/omap/omap_vout.c
index 64ab6fb06b9c..ba2d8f973d58 100644
--- a/drivers/media/platform/omap/omap_vout.c
+++ b/drivers/media/platform/omap/omap_vout.c
@@ -198,7 +198,7 @@ static int omap_vout_try_format(struct v4l2_pix_format *pix)
  * omap_vout_uservirt_to_phys: This inline function is used to convert user
  * space virtual address to physical address.
  */
-static u32 omap_vout_uservirt_to_phys(u32 virtp)
+static unsigned long omap_vout_uservirt_to_phys(unsigned long virtp)
 {
         unsigned long physp = 0;
         struct vm_area_struct *vma;
@@ -418,10 +418,10 @@ static int omapvid_setup_overlay(struct omap_vout_device *vout,
         }
 
         v4l2_dbg(1, debug, &vout->vid_dev->v4l2_dev,
-                "%s enable=%d addr=%x width=%d\n height=%d color_mode=%d\n"
+                "%s enable=%d addr=%pad width=%d\n height=%d color_mode=%d\n"
                 "rotation=%d mirror=%d posx=%d posy=%d out_width = %d \n"
                 "out_height=%d rotation_type=%d screen_width=%d\n",
-                __func__, ovl->is_enabled(ovl), info.paddr, info.width, info.height,
+                __func__, ovl->is_enabled(ovl), &info.paddr, info.width, info.height,
                 info.color_mode, info.rotation, info.mirror, info.pos_x,
                 info.pos_y, info.out_width, info.out_height, info.rotation_type,
                 info.screen_width);
@@ -794,7 +794,7 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q,
                 vout->queued_buf_addr[vb->i] = (u8 *)
                         omap_vout_uservirt_to_phys(vb->baddr);
         } else {
-                u32 addr, dma_addr;
+                unsigned long addr, dma_addr;
                 unsigned long size;
 
                 addr = (unsigned long) vout->buf_virt_addr[vb->i];
@@ -1054,8 +1054,9 @@ static int vidioc_querycap(struct file *file, void *fh,
         strlcpy(cap->driver, VOUT_NAME, sizeof(cap->driver));
         strlcpy(cap->card, vout->vfd->name, sizeof(cap->card));
         cap->bus_info[0] = '\0';
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
+        cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_OUTPUT |
                 V4L2_CAP_VIDEO_OUTPUT_OVERLAY;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
 
         return 0;
 }
diff --git a/drivers/media/platform/omap3isp/ispccdc.c b/drivers/media/platform/omap3isp/ispccdc.c
index 81a9dc053d58..587489a072d5 100644
--- a/drivers/media/platform/omap3isp/ispccdc.c
+++ b/drivers/media/platform/omap3isp/ispccdc.c
@@ -36,23 +36,23 @@ __ccdc_get_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                   unsigned int pad, enum v4l2_subdev_format_whence which);
 
 static const unsigned int ccdc_fmts[] = {
-        V4L2_MBUS_FMT_Y8_1X8,
-        V4L2_MBUS_FMT_Y10_1X10,
-        V4L2_MBUS_FMT_Y12_1X12,
-        V4L2_MBUS_FMT_SGRBG8_1X8,
-        V4L2_MBUS_FMT_SRGGB8_1X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_SGBRG8_1X8,
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
-        V4L2_MBUS_FMT_SGRBG12_1X12,
-        V4L2_MBUS_FMT_SRGGB12_1X12,
-        V4L2_MBUS_FMT_SBGGR12_1X12,
-        V4L2_MBUS_FMT_SGBRG12_1X12,
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_Y8_1X8,
+        MEDIA_BUS_FMT_Y10_1X10,
+        MEDIA_BUS_FMT_Y12_1X12,
+        MEDIA_BUS_FMT_SGRBG8_1X8,
+        MEDIA_BUS_FMT_SRGGB8_1X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_SGBRG8_1X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_SGRBG12_1X12,
+        MEDIA_BUS_FMT_SRGGB12_1X12,
+        MEDIA_BUS_FMT_SBGGR12_1X12,
+        MEDIA_BUS_FMT_SGBRG12_1X12,
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
 };
 
 /*
@@ -266,10 +266,10 @@ static int __ccdc_lsc_enable(struct isp_ccdc_device *ccdc, int enable)
                 __ccdc_get_format(ccdc, NULL, CCDC_PAD_SINK,
                                   V4L2_SUBDEV_FORMAT_ACTIVE);
 
-        if ((format->code != V4L2_MBUS_FMT_SGRBG10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SRGGB10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SBGGR10_1X10) &&
-            (format->code != V4L2_MBUS_FMT_SGBRG10_1X10))
+        if ((format->code != MEDIA_BUS_FMT_SGRBG10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SRGGB10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SBGGR10_1X10) &&
+            (format->code != MEDIA_BUS_FMT_SGBRG10_1X10))
                 return -EINVAL;
 
         if (enable)
@@ -971,8 +971,8 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,
 
         format = &ccdc->formats[CCDC_PAD_SINK];
 
-        if (format->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-            format->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+            format->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 /* According to the OMAP3 TRM the input mode only affects SYNC
                  * mode, enabling BT.656 mode should take precedence. However,
                  * in practice setting the input mode to YCbCr data on 8 bits
@@ -1020,7 +1020,7 @@ static void ccdc_config_sync_if(struct isp_ccdc_device *ccdc,
         /* The CCDC_CFG.Y8POS bit is used in YCbCr8 input mode only. The
          * hardware seems to ignore it in all other input modes.
          */
-        if (format->code == V4L2_MBUS_FMT_UYVY8_2X8)
+        if (format->code == MEDIA_BUS_FMT_UYVY8_2X8)
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_CFG,
                             ISPCCDC_CFG_Y8POS);
         else
@@ -1168,9 +1168,9 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
 
         if (ccdc->bt656)
                 bridge = ISPCTRL_PAR_BRIDGE_DISABLE;
-        else if (fmt_info->code == V4L2_MBUS_FMT_YUYV8_2X8)
+        else if (fmt_info->code == MEDIA_BUS_FMT_YUYV8_2X8)
                 bridge = ISPCTRL_PAR_BRIDGE_LENDIAN;
-        else if (fmt_info->code == V4L2_MBUS_FMT_UYVY8_2X8)
+        else if (fmt_info->code == MEDIA_BUS_FMT_UYVY8_2X8)
                 bridge = ISPCTRL_PAR_BRIDGE_BENDIAN;
         else
                 bridge = ISPCTRL_PAR_BRIDGE_DISABLE;
@@ -1199,16 +1199,16 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
 
         /* Mosaic filter */
         switch (format->code) {
-        case V4L2_MBUS_FMT_SRGGB10_1X10:
-        case V4L2_MBUS_FMT_SRGGB12_1X12:
+        case MEDIA_BUS_FMT_SRGGB10_1X10:
+        case MEDIA_BUS_FMT_SRGGB12_1X12:
                 ccdc_pattern = ccdc_srggb_pattern;
                 break;
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
-        case V4L2_MBUS_FMT_SBGGR12_1X12:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR12_1X12:
                 ccdc_pattern = ccdc_sbggr_pattern;
                 break;
-        case V4L2_MBUS_FMT_SGBRG10_1X10:
-        case V4L2_MBUS_FMT_SGBRG12_1X12:
+        case MEDIA_BUS_FMT_SGBRG10_1X10:
+        case MEDIA_BUS_FMT_SGBRG12_1X12:
                 ccdc_pattern = ccdc_sgbrg_pattern;
                 break;
         default:
@@ -1267,7 +1267,7 @@ static void ccdc_configure(struct isp_ccdc_device *ccdc)
         /* The CCDC outputs data in UYVY order by default. Swap bytes to get
          * YUYV.
          */
-        if (format->code == V4L2_MBUS_FMT_YUYV8_1X16)
+        if (format->code == MEDIA_BUS_FMT_YUYV8_1X16)
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_CCDC, ISPCCDC_CFG,
                             ISPCCDC_CFG_BSWD);
         else
@@ -1967,7 +1967,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                 enum v4l2_subdev_format_whence which)
 {
         const struct isp_format_info *info;
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         unsigned int width = fmt->width;
         unsigned int height = fmt->height;
         struct v4l2_rect *crop;
@@ -1983,7 +1983,7 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(ccdc_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 /* Clamp the input size. */
                 fmt->width = clamp_t(u32, width, 32, 4096);
@@ -2007,19 +2007,19 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                  * configured to pack bytes in BT.656, hiding the inaccuracy.
                  * In all cases bytes can be swapped.
                  */
-                if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    fmt->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+                if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    fmt->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                         /* Use the user requested format if YUV. */
-                        if (pixelcode == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                            pixelcode == V4L2_MBUS_FMT_UYVY8_2X8 ||
-                            pixelcode == V4L2_MBUS_FMT_YUYV8_1X16 ||
-                            pixelcode == V4L2_MBUS_FMT_UYVY8_1X16)
+                        if (pixelcode == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                            pixelcode == MEDIA_BUS_FMT_UYVY8_2X8 ||
+                            pixelcode == MEDIA_BUS_FMT_YUYV8_1X16 ||
+                            pixelcode == MEDIA_BUS_FMT_UYVY8_1X16)
                                 fmt->code = pixelcode;
 
-                        if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8)
-                                fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
-                        else if (fmt->code == V4L2_MBUS_FMT_UYVY8_2X8)
-                                fmt->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                        if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8)
+                                fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
+                        else if (fmt->code == MEDIA_BUS_FMT_UYVY8_2X8)
+                                fmt->code = MEDIA_BUS_FMT_UYVY8_1X16;
                 }
 
                 /* Hardcode the output size to the crop rectangle size. */
@@ -2047,8 +2047,8 @@ ccdc_try_format(struct isp_ccdc_device *ccdc, struct v4l2_subdev_fh *fh,
                 fmt->code = info->truncated;
 
                 /* YUV formats are not supported by the video port. */
-                if (fmt->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    fmt->code == V4L2_MBUS_FMT_UYVY8_2X8)
+                if (fmt->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    fmt->code == MEDIA_BUS_FMT_UYVY8_2X8)
                         fmt->code = 0;
 
                 /* The number of lines that can be clocked out from the video
@@ -2083,7 +2083,7 @@ static void ccdc_try_crop(struct isp_ccdc_device *ccdc,
          * to keep the Bayer pattern.
          */
         info = omap3isp_video_format_info(sink->code);
-        if (info->flavor != V4L2_MBUS_FMT_Y8_1X8) {
+        if (info->flavor != MEDIA_BUS_FMT_Y8_1X8) {
                 crop->left &= ~1;
                 crop->top &= ~1;
         }
@@ -2103,7 +2103,7 @@ static void ccdc_try_crop(struct isp_ccdc_device *ccdc,
                                sink->height - crop->top);
 
         /* Odd width/height values don't make sense for Bayer formats. */
-        if (info->flavor != V4L2_MBUS_FMT_Y8_1X8) {
+        if (info->flavor != MEDIA_BUS_FMT_Y8_1X8) {
                 crop->width &= ~1;
                 crop->height &= ~1;
         }
@@ -2135,13 +2135,13 @@ static int ccdc_enum_mbus_code(struct v4l2_subdev *sd,
                 format = __ccdc_get_format(ccdc, fh, code->pad,
                                            V4L2_SUBDEV_FORMAT_TRY);
 
-                if (format->code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-                    format->code == V4L2_MBUS_FMT_UYVY8_2X8) {
+                if (format->code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+                    format->code == MEDIA_BUS_FMT_UYVY8_2X8) {
                         /* In YUV mode the CCDC can swap bytes. */
                         if (code->index == 0)
-                                code->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                                code->code = MEDIA_BUS_FMT_YUYV8_1X16;
                         else if (code->index == 1)
-                                code->code = V4L2_MBUS_FMT_UYVY8_1X16;
+                                code->code = MEDIA_BUS_FMT_UYVY8_1X16;
                         else
                                 return -EINVAL;
                 } else {
@@ -2383,9 +2383,7 @@ static int ccdc_set_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
  * return true if the combination is possible
  * return false otherwise
  */
-static bool ccdc_is_shiftable(enum v4l2_mbus_pixelcode in,
-                              enum v4l2_mbus_pixelcode out,
-                              unsigned int additional_shift)
+static bool ccdc_is_shiftable(u32 in, u32 out, unsigned int additional_shift)
 {
         const struct isp_format_info *in_info, *out_info;
 
@@ -2452,7 +2450,7 @@ static int ccdc_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CCDC_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         ccdc_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispccp2.c b/drivers/media/platform/omap3isp/ispccp2.c
index 9cb49b3c04bd..f4aedb37e41e 100644
--- a/drivers/media/platform/omap3isp/ispccp2.c
+++ b/drivers/media/platform/omap3isp/ispccp2.c
@@ -289,10 +289,10 @@ static void ccp2_lcx_config(struct isp_ccp2_device *ccp2,
         u32 val, format;
 
         switch (config->format) {
-        case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:
                 format = ISPCCP2_LCx_CTRL_FORMAT_RAW8_DPCM10_VP;
                 break;
-        case V4L2_MBUS_FMT_SGRBG10_1X10:
+        case MEDIA_BUS_FMT_SGRBG10_1X10:
         default:
                 format = ISPCCP2_LCx_CTRL_FORMAT_RAW10_VP;      /* RAW10+VP */
                 break;
@@ -438,7 +438,7 @@ static void ccp2_mem_configure(struct isp_ccp2_device *ccp2,
         u32 val, hwords;
 
         if (sink_pixcode != source_pixcode &&
-            sink_pixcode == V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8)
+            sink_pixcode == MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8)
                 dpcm_decompress = 1;
 
         ccp2_pwr_cfg(ccp2);
@@ -604,8 +604,8 @@ void omap3isp_ccp2_isr(struct isp_ccp2_device *ccp2)
  */
 
 static const unsigned int ccp2_fmts[] = {
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
 };
 
 /*
@@ -643,8 +643,8 @@ static void ccp2_try_format(struct isp_ccp2_device *ccp2,
 
         switch (pad) {
         case CCP2_PAD_SINK:
-                if (fmt->code != V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8)
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                if (fmt->code != MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8)
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 if (ccp2->input == CCP2_INPUT_SENSOR) {
                         fmt->width = clamp_t(u32, fmt->width,
@@ -671,7 +671,7 @@ static void ccp2_try_format(struct isp_ccp2_device *ccp2,
                  */
                 format = __ccp2_get_format(ccp2, fh, CCP2_PAD_SINK, which);
                 memcpy(fmt, format, sizeof(*fmt));
-                fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
                 break;
         }
 
@@ -808,7 +808,7 @@ static int ccp2_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CCP2_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         ccp2_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispcsi2.c b/drivers/media/platform/omap3isp/ispcsi2.c
index 6530b255f103..09c686d96ae8 100644
--- a/drivers/media/platform/omap3isp/ispcsi2.c
+++ b/drivers/media/platform/omap3isp/ispcsi2.c
@@ -78,15 +78,15 @@ static void csi2_recv_config(struct isp_device *isp,
 }
 
 static const unsigned int csi2_input_fmts[] = {
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,
-        V4L2_MBUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
+        MEDIA_BUS_FMT_YUYV8_2X8,
 };
 
 /* To set the format on the CSI2 requires a mapping function that takes
@@ -171,19 +171,19 @@ static u16 csi2_ctx_map_format(struct isp_csi2_device *csi2)
         int fmtidx, destidx, is_3630;
 
         switch (fmt->code) {
-        case V4L2_MBUS_FMT_SGRBG10_1X10:
-        case V4L2_MBUS_FMT_SRGGB10_1X10:
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
-        case V4L2_MBUS_FMT_SGBRG10_1X10:
+        case MEDIA_BUS_FMT_SGRBG10_1X10:
+        case MEDIA_BUS_FMT_SRGGB10_1X10:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SGBRG10_1X10:
                 fmtidx = 0;
                 break;
-        case V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8:
-        case V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8:
+        case MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8:
                 fmtidx = 1;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 fmtidx = 2;
                 break;
         default:
@@ -843,7 +843,7 @@ csi2_try_format(struct isp_csi2_device *csi2, struct v4l2_subdev_fh *fh,
                 unsigned int pad, struct v4l2_mbus_framefmt *fmt,
                 enum v4l2_subdev_format_whence which)
 {
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         struct v4l2_mbus_framefmt *format;
         const struct isp_format_info *info;
         unsigned int i;
@@ -858,7 +858,7 @@ csi2_try_format(struct isp_csi2_device *csi2, struct v4l2_subdev_fh *fh,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(csi2_input_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
 
                 fmt->width = clamp_t(u32, fmt->width, 1, 8191);
                 fmt->height = clamp_t(u32, fmt->height, 1, 8191);
@@ -1029,7 +1029,7 @@ static int csi2_init_formats(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh)
         memset(&format, 0, sizeof(format));
         format.pad = CSI2_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         csi2_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/isppreview.c b/drivers/media/platform/omap3isp/isppreview.c
index 605f57ef0a49..dd9eed45d853 100644
--- a/drivers/media/platform/omap3isp/isppreview.c
+++ b/drivers/media/platform/omap3isp/isppreview.c
@@ -964,18 +964,16 @@ static void preview_setup_hw(struct isp_prev_device *prev, u32 update,
  * @prev: pointer to previewer private structure
  * @pixelcode: pixel code
  */
-static void
-preview_config_ycpos(struct isp_prev_device *prev,
-                     enum v4l2_mbus_pixelcode pixelcode)
+static void preview_config_ycpos(struct isp_prev_device *prev, u32 pixelcode)
 {
         struct isp_device *isp = to_isp_device(prev);
         enum preview_ycpos_mode mode;
 
         switch (pixelcode) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
                 mode = YCPOS_CrYCbY;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 mode = YCPOS_YCrYCb;
                 break;
         default:
@@ -1028,16 +1026,16 @@ static void preview_config_input_format(struct isp_prev_device *prev,
                             ISPPRV_PCR_WIDTH);
 
         switch (info->flavor) {
-        case V4L2_MBUS_FMT_SGRBG8_1X8:
+        case MEDIA_BUS_FMT_SGRBG8_1X8:
                 prev->params.cfa_order = 0;
                 break;
-        case V4L2_MBUS_FMT_SRGGB8_1X8:
+        case MEDIA_BUS_FMT_SRGGB8_1X8:
                 prev->params.cfa_order = 1;
                 break;
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
                 prev->params.cfa_order = 2;
                 break;
-        case V4L2_MBUS_FMT_SGBRG8_1X8:
+        case MEDIA_BUS_FMT_SGBRG8_1X8:
                 prev->params.cfa_order = 3;
                 break;
         default:
@@ -1078,8 +1076,8 @@ static void preview_config_input_size(struct isp_prev_device *prev, u32 active)
         unsigned int elv = prev->crop.top + prev->crop.height - 1;
         u32 features;
 
-        if (format->code != V4L2_MBUS_FMT_Y8_1X8 &&
-            format->code != V4L2_MBUS_FMT_Y10_1X10) {
+        if (format->code != MEDIA_BUS_FMT_Y8_1X8 &&
+            format->code != MEDIA_BUS_FMT_Y10_1X10) {
                 sph -= 2;
                 eph += 2;
                 slv -= 2;
@@ -1709,21 +1707,21 @@ __preview_get_crop(struct isp_prev_device *prev, struct v4l2_subdev_fh *fh,
 
 /* previewer format descriptions */
 static const unsigned int preview_input_fmts[] = {
-        V4L2_MBUS_FMT_Y8_1X8,
-        V4L2_MBUS_FMT_SGRBG8_1X8,
-        V4L2_MBUS_FMT_SRGGB8_1X8,
-        V4L2_MBUS_FMT_SBGGR8_1X8,
-        V4L2_MBUS_FMT_SGBRG8_1X8,
-        V4L2_MBUS_FMT_Y10_1X10,
-        V4L2_MBUS_FMT_SGRBG10_1X10,
-        V4L2_MBUS_FMT_SRGGB10_1X10,
-        V4L2_MBUS_FMT_SBGGR10_1X10,
-        V4L2_MBUS_FMT_SGBRG10_1X10,
+        MEDIA_BUS_FMT_Y8_1X8,
+        MEDIA_BUS_FMT_SGRBG8_1X8,
+        MEDIA_BUS_FMT_SRGGB8_1X8,
+        MEDIA_BUS_FMT_SBGGR8_1X8,
+        MEDIA_BUS_FMT_SGBRG8_1X8,
+        MEDIA_BUS_FMT_Y10_1X10,
+        MEDIA_BUS_FMT_SGRBG10_1X10,
+        MEDIA_BUS_FMT_SRGGB10_1X10,
+        MEDIA_BUS_FMT_SBGGR10_1X10,
+        MEDIA_BUS_FMT_SGBRG10_1X10,
 };
 
 static const unsigned int preview_output_fmts[] = {
-        V4L2_MBUS_FMT_UYVY8_1X16,
-        V4L2_MBUS_FMT_YUYV8_1X16,
+        MEDIA_BUS_FMT_UYVY8_1X16,
+        MEDIA_BUS_FMT_YUYV8_1X16,
 };
 
 /*
@@ -1742,7 +1740,7 @@ static void preview_try_format(struct isp_prev_device *prev,
                                struct v4l2_mbus_framefmt *fmt,
                                enum v4l2_subdev_format_whence which)
 {
-        enum v4l2_mbus_pixelcode pixelcode;
+        u32 pixelcode;
         struct v4l2_rect *crop;
         unsigned int i;
 
@@ -1774,7 +1772,7 @@ static void preview_try_format(struct isp_prev_device *prev,
 
                 /* If not found, use SGRBG10 as default */
                 if (i >= ARRAY_SIZE(preview_input_fmts))
-                        fmt->code = V4L2_MBUS_FMT_SGRBG10_1X10;
+                        fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
                 break;
 
         case PREV_PAD_SOURCE:
@@ -1782,13 +1780,13 @@ static void preview_try_format(struct isp_prev_device *prev,
                 *fmt = *__preview_get_format(prev, fh, PREV_PAD_SINK, which);
 
                 switch (pixelcode) {
-                case V4L2_MBUS_FMT_YUYV8_1X16:
-                case V4L2_MBUS_FMT_UYVY8_1X16:
+                case MEDIA_BUS_FMT_YUYV8_1X16:
+                case MEDIA_BUS_FMT_UYVY8_1X16:
                         fmt->code = pixelcode;
                         break;
 
                 default:
-                        fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                        fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
                         break;
                 }
 
@@ -1843,8 +1841,8 @@ static void preview_try_crop(struct isp_prev_device *prev,
          * and no columns in other modes. Increase the margins based on the sink
          * format.
          */
-        if (sink->code != V4L2_MBUS_FMT_Y8_1X8 &&
-            sink->code != V4L2_MBUS_FMT_Y10_1X10) {
+        if (sink->code != MEDIA_BUS_FMT_Y8_1X8 &&
+            sink->code != MEDIA_BUS_FMT_Y10_1X10) {
                 left += 2;
                 right -= 2;
                 top += 2;
@@ -2092,7 +2090,7 @@ static int preview_init_formats(struct v4l2_subdev *sd,
         memset(&format, 0, sizeof(format));
         format.pad = PREV_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_SGRBG10_1X10;
+        format.format.code = MEDIA_BUS_FMT_SGRBG10_1X10;
         format.format.width = 4096;
         format.format.height = 4096;
         preview_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispresizer.c b/drivers/media/platform/omap3isp/ispresizer.c
index 05d1ace57451..2b9bc4839876 100644
--- a/drivers/media/platform/omap3isp/ispresizer.c
+++ b/drivers/media/platform/omap3isp/ispresizer.c
@@ -198,17 +198,16 @@ static void resizer_set_bilinear(struct isp_res_device *res,
  * @res: Device context.
  * @pixelcode: pixel code.
  */
-static void resizer_set_ycpos(struct isp_res_device *res,
-                              enum v4l2_mbus_pixelcode pixelcode)
+static void resizer_set_ycpos(struct isp_res_device *res, u32 pixelcode)
 {
         struct isp_device *isp = to_isp_device(res);
 
         switch (pixelcode) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
                 isp_reg_set(isp, OMAP3_ISP_IOMEM_RESZ, ISPRSZ_CNT,
                             ISPRSZ_CNT_YCPOS);
                 break;
-        case V4L2_MBUS_FMT_UYVY8_1X16:
+        case MEDIA_BUS_FMT_UYVY8_1X16:
                 isp_reg_clr(isp, OMAP3_ISP_IOMEM_RESZ, ISPRSZ_CNT,
                             ISPRSZ_CNT_YCPOS);
                 break;
@@ -1348,8 +1347,8 @@ static int resizer_set_selection(struct v4l2_subdev *sd,
 
 /* resizer pixel formats */
 static const unsigned int resizer_formats[] = {
-        V4L2_MBUS_FMT_UYVY8_1X16,
-        V4L2_MBUS_FMT_YUYV8_1X16,
+        MEDIA_BUS_FMT_UYVY8_1X16,
+        MEDIA_BUS_FMT_YUYV8_1X16,
 };
 
 static unsigned int resizer_max_in_width(struct isp_res_device *res)
@@ -1385,9 +1384,9 @@ static void resizer_try_format(struct isp_res_device *res,
 
         switch (pad) {
         case RESZ_PAD_SINK:
-                if (fmt->code != V4L2_MBUS_FMT_YUYV8_1X16 &&
-                    fmt->code != V4L2_MBUS_FMT_UYVY8_1X16)
-                        fmt->code = V4L2_MBUS_FMT_YUYV8_1X16;
+                if (fmt->code != MEDIA_BUS_FMT_YUYV8_1X16 &&
+                    fmt->code != MEDIA_BUS_FMT_UYVY8_1X16)
+                        fmt->code = MEDIA_BUS_FMT_YUYV8_1X16;
 
                 fmt->width = clamp_t(u32, fmt->width, MIN_IN_WIDTH,
                                      resizer_max_in_width(res));
@@ -1571,7 +1570,7 @@ static int resizer_init_formats(struct v4l2_subdev *sd,
         memset(&format, 0, sizeof(format));
         format.pad = RESZ_PAD_SINK;
         format.which = fh ? V4L2_SUBDEV_FORMAT_TRY : V4L2_SUBDEV_FORMAT_ACTIVE;
-        format.format.code = V4L2_MBUS_FMT_YUYV8_1X16;
+        format.format.code = MEDIA_BUS_FMT_YUYV8_1X16;
         format.format.width = 4096;
         format.format.height = 4096;
         resizer_set_format(sd, fh, &format);
diff --git a/drivers/media/platform/omap3isp/ispvideo.c b/drivers/media/platform/omap3isp/ispvideo.c
index bc38c88c7bd9..b463fe172d16 100644
--- a/drivers/media/platform/omap3isp/ispvideo.c
+++ b/drivers/media/platform/omap3isp/ispvideo.c
@@ -39,74 +39,74 @@
  * corresponding in-memory formats to the table below!!!
  */
 static struct isp_format_info formats[] = {
-        { V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
-          V4L2_MBUS_FMT_Y8_1X8, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y8_1X8, MEDIA_BUS_FMT_Y8_1X8,
+          MEDIA_BUS_FMT_Y8_1X8, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_GREY, 8, 1, },
-        { V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y10_1X10,
-          V4L2_MBUS_FMT_Y10_1X10, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y10_1X10, MEDIA_BUS_FMT_Y10_1X10,
+          MEDIA_BUS_FMT_Y10_1X10, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_Y10, 10, 2, },
-        { V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y10_1X10,
-          V4L2_MBUS_FMT_Y12_1X12, V4L2_MBUS_FMT_Y8_1X8,
+        { MEDIA_BUS_FMT_Y12_1X12, MEDIA_BUS_FMT_Y10_1X10,
+          MEDIA_BUS_FMT_Y12_1X12, MEDIA_BUS_FMT_Y8_1X8,
           V4L2_PIX_FMT_Y12, 12, 2, },
-        { V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
-          V4L2_MBUS_FMT_SBGGR8_1X8, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_SBGGR8_1X8,
+          MEDIA_BUS_FMT_SBGGR8_1X8, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR8, 8, 1, },
-        { V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
-          V4L2_MBUS_FMT_SGBRG8_1X8, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_SGBRG8_1X8,
+          MEDIA_BUS_FMT_SGBRG8_1X8, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG8, 8, 1, },
-        { V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
-          V4L2_MBUS_FMT_SGRBG8_1X8, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SGRBG8_1X8,
+          MEDIA_BUS_FMT_SGRBG8_1X8, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG8, 8, 1, },
-        { V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
-          V4L2_MBUS_FMT_SRGGB8_1X8, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8,
+          MEDIA_BUS_FMT_SRGGB8_1X8, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB8, 8, 1, },
-        { V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8, V4L2_MBUS_FMT_SBGGR10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SBGGR10_1X10, 0,
+        { MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8, MEDIA_BUS_FMT_SBGGR10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SBGGR10_1X10, 0,
           V4L2_PIX_FMT_SBGGR10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8, V4L2_MBUS_FMT_SGBRG10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SGBRG10_1X10, 0,
+        { MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8, MEDIA_BUS_FMT_SGBRG10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SGBRG10_1X10, 0,
           V4L2_PIX_FMT_SGBRG10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8, V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SGRBG10_1X10, 0,
+        { MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8, MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SGRBG10_1X10, 0,
           V4L2_PIX_FMT_SGRBG10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8, V4L2_MBUS_FMT_SRGGB10_DPCM8_1X8,
-          V4L2_MBUS_FMT_SRGGB10_1X10, 0,
+        { MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8, MEDIA_BUS_FMT_SRGGB10_DPCM8_1X8,
+          MEDIA_BUS_FMT_SRGGB10_1X10, 0,
           V4L2_PIX_FMT_SRGGB10DPCM8, 8, 1, },
-        { V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR10_1X10,
-          V4L2_MBUS_FMT_SBGGR10_1X10, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_SBGGR10_1X10,
+          MEDIA_BUS_FMT_SBGGR10_1X10, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR10, 10, 2, },
-        { V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG10_1X10,
-          V4L2_MBUS_FMT_SGBRG10_1X10, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SGBRG10_1X10,
+          MEDIA_BUS_FMT_SGBRG10_1X10, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG10, 10, 2, },
-        { V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG10_1X10,
-          V4L2_MBUS_FMT_SGRBG10_1X10, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGRBG10_1X10,
+          MEDIA_BUS_FMT_SGRBG10_1X10, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG10, 10, 2, },
-        { V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB10_1X10,
-          V4L2_MBUS_FMT_SRGGB10_1X10, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SRGGB10_1X10,
+          MEDIA_BUS_FMT_SRGGB10_1X10, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB10, 10, 2, },
-        { V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR10_1X10,
-          V4L2_MBUS_FMT_SBGGR12_1X12, V4L2_MBUS_FMT_SBGGR8_1X8,
+        { MEDIA_BUS_FMT_SBGGR12_1X12, MEDIA_BUS_FMT_SBGGR10_1X10,
+          MEDIA_BUS_FMT_SBGGR12_1X12, MEDIA_BUS_FMT_SBGGR8_1X8,
           V4L2_PIX_FMT_SBGGR12, 12, 2, },
-        { V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG10_1X10,
-          V4L2_MBUS_FMT_SGBRG12_1X12, V4L2_MBUS_FMT_SGBRG8_1X8,
+        { MEDIA_BUS_FMT_SGBRG12_1X12, MEDIA_BUS_FMT_SGBRG10_1X10,
+          MEDIA_BUS_FMT_SGBRG12_1X12, MEDIA_BUS_FMT_SGBRG8_1X8,
           V4L2_PIX_FMT_SGBRG12, 12, 2, },
-        { V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG10_1X10,
-          V4L2_MBUS_FMT_SGRBG12_1X12, V4L2_MBUS_FMT_SGRBG8_1X8,
+        { MEDIA_BUS_FMT_SGRBG12_1X12, MEDIA_BUS_FMT_SGRBG10_1X10,
+          MEDIA_BUS_FMT_SGRBG12_1X12, MEDIA_BUS_FMT_SGRBG8_1X8,
           V4L2_PIX_FMT_SGRBG12, 12, 2, },
-        { V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB10_1X10,
-          V4L2_MBUS_FMT_SRGGB12_1X12, V4L2_MBUS_FMT_SRGGB8_1X8,
+        { MEDIA_BUS_FMT_SRGGB12_1X12, MEDIA_BUS_FMT_SRGGB10_1X10,
+          MEDIA_BUS_FMT_SRGGB12_1X12, MEDIA_BUS_FMT_SRGGB8_1X8,
           V4L2_PIX_FMT_SRGGB12, 12, 2, },
-        { V4L2_MBUS_FMT_UYVY8_1X16, V4L2_MBUS_FMT_UYVY8_1X16,
-          V4L2_MBUS_FMT_UYVY8_1X16, 0,
+        { MEDIA_BUS_FMT_UYVY8_1X16, MEDIA_BUS_FMT_UYVY8_1X16,
+          MEDIA_BUS_FMT_UYVY8_1X16, 0,
           V4L2_PIX_FMT_UYVY, 16, 2, },
-        { V4L2_MBUS_FMT_YUYV8_1X16, V4L2_MBUS_FMT_YUYV8_1X16,
-          V4L2_MBUS_FMT_YUYV8_1X16, 0,
+        { MEDIA_BUS_FMT_YUYV8_1X16, MEDIA_BUS_FMT_YUYV8_1X16,
+          MEDIA_BUS_FMT_YUYV8_1X16, 0,
           V4L2_PIX_FMT_YUYV, 16, 2, },
-        { V4L2_MBUS_FMT_UYVY8_2X8, V4L2_MBUS_FMT_UYVY8_2X8,
-          V4L2_MBUS_FMT_UYVY8_2X8, 0,
+        { MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_UYVY8_2X8,
+          MEDIA_BUS_FMT_UYVY8_2X8, 0,
           V4L2_PIX_FMT_UYVY, 8, 2, },
-        { V4L2_MBUS_FMT_YUYV8_2X8, V4L2_MBUS_FMT_YUYV8_2X8,
-          V4L2_MBUS_FMT_YUYV8_2X8, 0,
+        { MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_YUYV8_2X8,
+          MEDIA_BUS_FMT_YUYV8_2X8, 0,
           V4L2_PIX_FMT_YUYV, 8, 2, },
         /* Empty entry to catch the unsupported pixel code (0) used by the CCDC
          * module and avoid NULL pointer dereferences.
@@ -114,8 +114,7 @@ static struct isp_format_info formats[] = {
         { 0, }
 };
 
-const struct isp_format_info *
-omap3isp_video_format_info(enum v4l2_mbus_pixelcode code)
+const struct isp_format_info *omap3isp_video_format_info(u32 code)
 {
         unsigned int i;
 
diff --git a/drivers/media/platform/omap3isp/ispvideo.h b/drivers/media/platform/omap3isp/ispvideo.h
index 0b7efedc3da9..4071dd7060ea 100644
--- a/drivers/media/platform/omap3isp/ispvideo.h
+++ b/drivers/media/platform/omap3isp/ispvideo.h
@@ -44,10 +44,10 @@ struct v4l2_pix_format;
  * @bpp: Bytes per pixel (when stored in memory)
  */
 struct isp_format_info {
-        enum v4l2_mbus_pixelcode code;
-        enum v4l2_mbus_pixelcode truncated;
-        enum v4l2_mbus_pixelcode uncompressed;
-        enum v4l2_mbus_pixelcode flavor;
+        u32 code;
+        u32 truncated;
+        u32 uncompressed;
+        u32 flavor;
         u32 pixelformat;
         unsigned int width;
         unsigned int bpp;
@@ -206,6 +206,6 @@ void omap3isp_video_resume(struct isp_video *video, int continuous);
 struct media_pad *omap3isp_video_remote_pad(struct isp_video *video);
 
 const struct isp_format_info *
-omap3isp_video_format_info(enum v4l2_mbus_pixelcode code);
+omap3isp_video_format_info(u32 code);
 
 #endif /* OMAP3_ISP_VIDEO_H */
diff --git a/drivers/media/platform/s3c-camif/camif-capture.c b/drivers/media/platform/s3c-camif/camif-capture.c
index 4f81b4c9d113..aa40c8269ab8 100644
--- a/drivers/media/platform/s3c-camif/camif-capture.c
+++ b/drivers/media/platform/s3c-camif/camif-capture.c
@@ -1218,11 +1218,11 @@ void s3c_camif_unregister_video_node(struct camif_dev *camif, int idx)
 }
 
 /* Media bus pixel formats supported at the camif input */
-static const enum v4l2_mbus_pixelcode camif_mbus_formats[] = {
-        V4L2_MBUS_FMT_YUYV8_2X8,
-        V4L2_MBUS_FMT_YVYU8_2X8,
-        V4L2_MBUS_FMT_UYVY8_2X8,
-        V4L2_MBUS_FMT_VYUY8_2X8,
+static const u32 camif_mbus_formats[] = {
+        MEDIA_BUS_FMT_YUYV8_2X8,
+        MEDIA_BUS_FMT_YVYU8_2X8,
+        MEDIA_BUS_FMT_UYVY8_2X8,
+        MEDIA_BUS_FMT_VYUY8_2X8,
 };
 
 /*
diff --git a/drivers/media/platform/s3c-camif/camif-core.c b/drivers/media/platform/s3c-camif/camif-core.c
index b38574702fe9..3b09b5b6ad51 100644
--- a/drivers/media/platform/s3c-camif/camif-core.c
+++ b/drivers/media/platform/s3c-camif/camif-core.c
@@ -256,8 +256,7 @@ static void camif_unregister_sensor(struct camif_dev *camif)
         v4l2_device_unregister_subdev(sd);
         camif->sensor.sd = NULL;
         i2c_unregister_device(client);
-        if (adapter)
-                i2c_put_adapter(adapter);
+        i2c_put_adapter(adapter);
 }
 
 static int camif_create_media_links(struct camif_dev *camif)
diff --git a/drivers/media/platform/s3c-camif/camif-regs.c b/drivers/media/platform/s3c-camif/camif-regs.c
index 6e0c9988a191..812fb3a7c4e3 100644
--- a/drivers/media/platform/s3c-camif/camif-regs.c
+++ b/drivers/media/platform/s3c-camif/camif-regs.c
@@ -96,10 +96,10 @@ void camif_hw_set_effect(struct camif_dev *camif, unsigned int effect,
 }
 
 static const u32 src_pixfmt_map[8][2] = {
-        { V4L2_MBUS_FMT_YUYV8_2X8, CISRCFMT_ORDER422_YCBYCR },
-        { V4L2_MBUS_FMT_YVYU8_2X8, CISRCFMT_ORDER422_YCRYCB },
-        { V4L2_MBUS_FMT_UYVY8_2X8, CISRCFMT_ORDER422_CBYCRY },
-        { V4L2_MBUS_FMT_VYUY8_2X8, CISRCFMT_ORDER422_CRYCBY },
+        { MEDIA_BUS_FMT_YUYV8_2X8, CISRCFMT_ORDER422_YCBYCR },
+        { MEDIA_BUS_FMT_YVYU8_2X8, CISRCFMT_ORDER422_YCRYCB },
+        { MEDIA_BUS_FMT_UYVY8_2X8, CISRCFMT_ORDER422_CBYCRY },
+        { MEDIA_BUS_FMT_VYUY8_2X8, CISRCFMT_ORDER422_CRYCBY },
 };
 
 /* Set camera input pixel format and resolution */
diff --git a/drivers/media/platform/s5p-g2d/g2d.c b/drivers/media/platform/s5p-g2d/g2d.c
index d79e214ce8ce..51e4edc92d28 100644
--- a/drivers/media/platform/s5p-g2d/g2d.c
+++ b/drivers/media/platform/s5p-g2d/g2d.c
@@ -297,14 +297,8 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->driver, G2D_NAME, sizeof(cap->driver) - 1);
         strncpy(cap->card, G2D_NAME, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
-        cap->version = KERNEL_VERSION(1, 0, 0);
-        /*
-         * This is only a mem-to-mem video device. The capture and output
-         * device capability flags are left only for backward compatibility
-         * and are scheduled for removal.
-         */
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT |
-                            V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_M2M | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/s5p-jpeg/jpeg-core.c b/drivers/media/platform/s5p-jpeg/jpeg-core.c
index fe2727413f3a..3ecf0e06a4dd 100644
--- a/drivers/media/platform/s5p-jpeg/jpeg-core.c
+++ b/drivers/media/platform/s5p-jpeg/jpeg-core.c
@@ -1001,13 +1001,8 @@ static int s5p_jpeg_querycap(struct file *file, void *priv,
                         sizeof(cap->card));
         }
         cap->bus_info[0] = 0;
-        /*
-         * This is only a mem-to-mem video device. The capture and output
-         * device capability flags are left only for backward compatibility
-         * and are scheduled for removal.
-         */
-        cap->capabilities = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M |
-                            V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT;
+        cap->device_caps = V4L2_CAP_STREAMING | V4L2_CAP_VIDEO_M2M;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
index 51cb2dd0e13a..83e01f3466e9 100644
--- a/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
+++ b/drivers/media/platform/s5p-mfc/regs-mfc-v6.h
@@ -71,6 +71,7 @@
 #define S5P_FIMV_R2H_CMD_ENC_BUFFER_FUL_RET_V6  16
 #define S5P_FIMV_R2H_CMD_ERR_RET_V6             32
 
+#define S5P_FIMV_MFC_BUS_RESET_CTRL            0x7110
 #define S5P_FIMV_FW_VERSION_V6                  0xf000
 
 #define S5P_FIMV_INSTANCE_ID_V6                 0xf008
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index 363fd8c0a699..b80a576164f1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -159,6 +159,10 @@ static void s5p_mfc_watchdog_worker(struct work_struct *work)
         }
         clear_bit(0, &dev->hw_lock);
         spin_unlock_irqrestore(&dev->irqlock, flags);
+
+        /* De-init MFC */
+        s5p_mfc_deinit_hw(dev);
+
         /* Double check if there is at least one instance running.
          * If no instance is in memory than no firmware should be present */
         if (dev->num_inst > 0) {
@@ -220,11 +224,14 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
         size_t dec_y_addr;
         unsigned int frame_type;
 
-        dec_y_addr = s5p_mfc_hw_call(dev->mfc_ops, get_dec_y_adr, dev);
+        /* Make sure we actually have a new frame before continuing. */
         frame_type = s5p_mfc_hw_call(dev->mfc_ops, get_dec_frame_type, dev);
+        if (frame_type == S5P_FIMV_DECODE_FRAME_SKIPPED)
+                return;
+        dec_y_addr = s5p_mfc_hw_call(dev->mfc_ops, get_dec_y_adr, dev);
 
         /* Copy timestamp / timecode from decoded src to dst and set
-           appropriate flags */
+           appropriate flags. */
         src_buf = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
         list_for_each_entry(dst_buf, &ctx->dst_queue, list) {
                 if (vb2_dma_contig_plane_dma_addr(dst_buf->b, 0) == dec_y_addr) {
@@ -250,6 +257,11 @@ static void s5p_mfc_handle_frame_copy_time(struct s5p_mfc_ctx *ctx)
                                 dst_buf->b->v4l2_buf.flags |=
                                                 V4L2_BUF_FLAG_BFRAME;
                                 break;
+                        default:
+                                /* Don't know how to handle
+                                   S5P_FIMV_DECODE_FRAME_OTHER_FRAME. */
+                                mfc_debug(2, "Unexpected frame type: %d\n",
+                                                frame_type);
                         }
                         break;
                 }
@@ -334,8 +346,7 @@ static void s5p_mfc_handle_frame(struct s5p_mfc_ctx *ctx,
                 ctx->state = MFCINST_RES_CHANGE_INIT;
                 s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);
                 wake_up_ctx(ctx, reason, err);
-                if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                        BUG();
+                WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
                 s5p_mfc_clock_off();
                 s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
                 return;
@@ -407,8 +418,7 @@ leave_handle_frame:
                 clear_work_bit(ctx);
         s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);
         wake_up_ctx(ctx, reason, err);
-        if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                BUG();
+        WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
         s5p_mfc_clock_off();
         /* if suspending, wake up device and do not try_run again*/
         if (test_bit(0, &dev->enter_suspend))
@@ -455,8 +465,7 @@ static void s5p_mfc_handle_error(struct s5p_mfc_dev *dev,
                         break;
                 }
         }
-        if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                BUG();
+        WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
         s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);
         s5p_mfc_clock_off();
         wake_up_dev(dev, reason, err);
@@ -510,8 +519,7 @@ static void s5p_mfc_handle_seq_done(struct s5p_mfc_ctx *ctx,
         }
         s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);
         clear_work_bit(ctx);
-        if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                BUG();
+        WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
         s5p_mfc_clock_off();
         s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
         wake_up_ctx(ctx, reason, err);
@@ -549,16 +557,14 @@ static void s5p_mfc_handle_init_buffers(struct s5p_mfc_ctx *ctx,
                 } else {
                         ctx->dpb_flush_flag = 0;
                 }
-                if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                        BUG();
+                WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
 
                 s5p_mfc_clock_off();
 
                 wake_up(&ctx->queue);
                 s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
         } else {
-                if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                        BUG();
+                WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
 
                 s5p_mfc_clock_off();
 
@@ -635,8 +641,7 @@ static irqreturn_t s5p_mfc_irq(int irq, void *priv)
                                 mfc_err("post_frame_start() failed\n");
                         s5p_mfc_hw_call_void(dev->mfc_ops, clear_int_flags, dev);
                         wake_up_ctx(ctx, reason, err);
-                        if (test_and_clear_bit(0, &dev->hw_lock) == 0)
-                                BUG();
+                        WARN_ON(test_and_clear_bit(0, &dev->hw_lock) == 0);
                         s5p_mfc_clock_off();
                         s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
                 } else {
@@ -815,7 +820,7 @@ static int s5p_mfc_open(struct file *file)
                 ret = -ENOENT;
                 goto err_queue_init;
         }
-        q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
+        q->mem_ops = &vb2_dma_contig_memops;
         q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         ret = vb2_queue_init(q);
         if (ret) {
@@ -837,7 +842,7 @@ static int s5p_mfc_open(struct file *file)
                 ret = -ENOENT;
                 goto err_queue_init;
         }
-        q->mem_ops = (struct vb2_mem_ops *)&vb2_dma_contig_memops;
+        q->mem_ops = &vb2_dma_contig_memops;
         q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         ret = vb2_queue_init(q);
         if (ret) {
@@ -1284,11 +1289,17 @@ static int s5p_mfc_suspend(struct device *dev)
                         m_dev->int_cond, msecs_to_jiffies(MFC_INT_TIMEOUT));
                 if (ret == 0) {
                         mfc_err("Waiting for hardware to finish timed out\n");
+                        clear_bit(0, &m_dev->enter_suspend);
                         return -EIO;
                 }
         }
 
-        return s5p_mfc_sleep(m_dev);
+        ret = s5p_mfc_sleep(m_dev);
+        if (ret) {
+                clear_bit(0, &m_dev->enter_suspend);
+                clear_bit(0, &m_dev->hw_lock);
+        }
+        return ret;
 }
 
 static int s5p_mfc_resume(struct device *dev)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 3e41ca1293ed..15f7663dd9f5 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -237,8 +237,6 @@ struct s5p_mfc_variant {
 
 /**
  * struct s5p_mfc_priv_buf - represents internal used buffer
- * @alloc:              allocation-specific context for each buffer
- *                      (videobuf2 allocator)
  * @ofs:                offset of each buffer, will be used for MFC
  * @virt:               kernel virtual address, only valid when the
  *                      buffer accessed by driver
@@ -246,7 +244,6 @@ struct s5p_mfc_variant {
  * @size:               size of the buffer
  */
 struct s5p_mfc_priv_buf {
-        void            *alloc;
         unsigned long   ofs;
         void            *virt;
         dma_addr_t      dma;
@@ -340,6 +337,7 @@ struct s5p_mfc_dev {
         struct s5p_mfc_hw_cmds *mfc_cmds;
         const struct s5p_mfc_regs *mfc_regs;
         enum s5p_mfc_fw_ver fw_ver;
+        bool risc_on; /* indicates if RISC is on or off */
 };
 
 /**
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
index 0c885a8a0e9f..40d8a03a141d 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
@@ -129,6 +129,25 @@ int s5p_mfc_release_firmware(struct s5p_mfc_dev *dev)
         return 0;
 }
 
+static int s5p_mfc_bus_reset(struct s5p_mfc_dev *dev)
+{
+        unsigned int status;
+        unsigned long timeout;
+
+        /* Reset */
+        mfc_write(dev, 0x1, S5P_FIMV_MFC_BUS_RESET_CTRL);
+        timeout = jiffies + msecs_to_jiffies(MFC_BW_TIMEOUT);
+        /* Check bus status */
+        do {
+                if (time_after(jiffies, timeout)) {
+                        mfc_err("Timeout while resetting MFC.\n");
+                        return -EIO;
+                }
+                status = mfc_read(dev, S5P_FIMV_MFC_BUS_RESET_CTRL);
+        } while ((status & 0x2) == 0);
+        return 0;
+}
+
 /* Reset the device */
 int s5p_mfc_reset(struct s5p_mfc_dev *dev)
 {
@@ -139,12 +158,6 @@ int s5p_mfc_reset(struct s5p_mfc_dev *dev)
         mfc_debug_enter();
 
         if (IS_MFCV6_PLUS(dev)) {
-                /* Reset IP */
-                /*  except RISC, reset */
-                mfc_write(dev, 0xFEE, S5P_FIMV_MFC_RESET_V6);
-                /*  reset release */
-                mfc_write(dev, 0x0, S5P_FIMV_MFC_RESET_V6);
-
                 /* Zero Initialization of MFC registers */
                 mfc_write(dev, 0, S5P_FIMV_RISC2HOST_CMD_V6);
                 mfc_write(dev, 0, S5P_FIMV_HOST2RISC_CMD_V6);
@@ -153,8 +166,17 @@ int s5p_mfc_reset(struct s5p_mfc_dev *dev)
                 for (i = 0; i < S5P_FIMV_REG_CLEAR_COUNT_V6; i++)
                         mfc_write(dev, 0, S5P_FIMV_REG_CLEAR_BEGIN_V6 + (i*4));
 
-                /* Reset */
-                mfc_write(dev, 0, S5P_FIMV_RISC_ON_V6);
+                /* check bus reset control before reset */
+                if (dev->risc_on)
+                        if (s5p_mfc_bus_reset(dev))
+                                return -EIO;
+                /* Reset
+                 * set RISC_ON to 0 during power_on & wake_up.
+                 * V6 needs RISC_ON set to 0 during reset also.
+                 */
+                if ((!dev->risc_on) || (!IS_MFCV7_PLUS(dev)))
+                        mfc_write(dev, 0, S5P_FIMV_RISC_ON_V6);
+
                 mfc_write(dev, 0x1FFF, S5P_FIMV_MFC_RESET_V6);
                 mfc_write(dev, 0, S5P_FIMV_MFC_RESET_V6);
         } else {
@@ -226,6 +248,7 @@ int s5p_mfc_init_hw(struct s5p_mfc_dev *dev)
         /* 0. MFC reset */
         mfc_debug(2, "MFC reset..\n");
         s5p_mfc_clock_on();
+        dev->risc_on = 0;
         ret = s5p_mfc_reset(dev);
         if (ret) {
                 mfc_err("Failed to reset MFC - timeout\n");
@@ -238,8 +261,10 @@ int s5p_mfc_init_hw(struct s5p_mfc_dev *dev)
         s5p_mfc_clear_cmds(dev);
         /* 3. Release reset signal to the RISC */
         s5p_mfc_clean_dev_int_flags(dev);
-        if (IS_MFCV6_PLUS(dev))
+        if (IS_MFCV6_PLUS(dev)) {
+                dev->risc_on = 1;
                 mfc_write(dev, 0x1, S5P_FIMV_RISC_ON_V6);
+        }
         else
                 mfc_write(dev, 0x3ff, S5P_FIMV_SW_RESET);
         mfc_debug(2, "Will now wait for completion of firmware transfer\n");
@@ -328,6 +353,58 @@ int s5p_mfc_sleep(struct s5p_mfc_dev *dev)
         return ret;
 }
 
+static int s5p_mfc_v8_wait_wakeup(struct s5p_mfc_dev *dev)
+{
+        int ret;
+
+        /* Release reset signal to the RISC */
+        dev->risc_on = 1;
+        mfc_write(dev, 0x1, S5P_FIMV_RISC_ON_V6);
+
+        if (s5p_mfc_wait_for_done_dev(dev, S5P_MFC_R2H_CMD_FW_STATUS_RET)) {
+                mfc_err("Failed to reset MFCV8\n");
+                return -EIO;
+        }
+        mfc_debug(2, "Write command to wakeup MFCV8\n");
+        ret = s5p_mfc_hw_call(dev->mfc_cmds, wakeup_cmd, dev);
+        if (ret) {
+                mfc_err("Failed to send command to MFCV8 - timeout\n");
+                return ret;
+        }
+
+        if (s5p_mfc_wait_for_done_dev(dev, S5P_MFC_R2H_CMD_WAKEUP_RET)) {
+                mfc_err("Failed to wakeup MFC\n");
+                return -EIO;
+        }
+        return ret;
+}
+
+static int s5p_mfc_wait_wakeup(struct s5p_mfc_dev *dev)
+{
+        int ret;
+
+        /* Send MFC wakeup command */
+        ret = s5p_mfc_hw_call(dev->mfc_cmds, wakeup_cmd, dev);
+        if (ret) {
+                mfc_err("Failed to send command to MFC - timeout\n");
+                return ret;
+        }
+
+        /* Release reset signal to the RISC */
+        if (IS_MFCV6_PLUS(dev)) {
+                dev->risc_on = 1;
+                mfc_write(dev, 0x1, S5P_FIMV_RISC_ON_V6);
+        } else {
+                mfc_write(dev, 0x3ff, S5P_FIMV_SW_RESET);
+        }
+
+        if (s5p_mfc_wait_for_done_dev(dev, S5P_MFC_R2H_CMD_WAKEUP_RET)) {
+                mfc_err("Failed to wakeup MFC\n");
+                return -EIO;
+        }
+        return ret;
+}
+
 int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
 {
         int ret;
@@ -336,9 +413,11 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
         /* 0. MFC reset */
         mfc_debug(2, "MFC reset..\n");
         s5p_mfc_clock_on();
+        dev->risc_on = 0;
         ret = s5p_mfc_reset(dev);
         if (ret) {
                 mfc_err("Failed to reset MFC - timeout\n");
+                s5p_mfc_clock_off();
                 return ret;
         }
         mfc_debug(2, "Done MFC reset..\n");
@@ -347,23 +426,16 @@ int s5p_mfc_wakeup(struct s5p_mfc_dev *dev)
         /* 2. Initialize registers of channel I/F */
         s5p_mfc_clear_cmds(dev);
         s5p_mfc_clean_dev_int_flags(dev);
-        /* 3. Initialize firmware */
-        ret = s5p_mfc_hw_call(dev->mfc_cmds, wakeup_cmd, dev);
-        if (ret) {
-                mfc_err("Failed to send command to MFC - timeout\n");
-                return ret;
-        }
-        /* 4. Release reset signal to the RISC */
-        if (IS_MFCV6_PLUS(dev))
-                mfc_write(dev, 0x1, S5P_FIMV_RISC_ON_V6);
+        /* 3. Send MFC wakeup command and wait for completion*/
+        if (IS_MFCV8(dev))
+                ret = s5p_mfc_v8_wait_wakeup(dev);
         else
-                mfc_write(dev, 0x3ff, S5P_FIMV_SW_RESET);
-        mfc_debug(2, "Ok, now will write a command to wakeup the system\n");
-        if (s5p_mfc_wait_for_done_dev(dev, S5P_MFC_R2H_CMD_WAKEUP_RET)) {
-                mfc_err("Failed to load firmware\n");
-                return -EIO;
-        }
+                ret = s5p_mfc_wait_wakeup(dev);
+
         s5p_mfc_clock_off();
+        if (ret)
+                return ret;
+
         dev->int_cond = 0;
         if (dev->int_err != 0 || dev->int_type !=
                                                 S5P_MFC_R2H_CMD_WAKEUP_RET) {
@@ -396,7 +468,6 @@ int s5p_mfc_open_mfc_inst(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx)
         }
 
         set_work_bit_irqsave(ctx);
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
         if (s5p_mfc_wait_for_done_ctx(ctx,
                 S5P_MFC_R2H_CMD_OPEN_INSTANCE_RET, 0)) {
@@ -422,7 +493,6 @@ void s5p_mfc_close_mfc_inst(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx)
 {
         ctx->state = MFCINST_RETURN_INST;
         set_work_bit_irqsave(ctx);
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
         /* Wait until instance is returned or timeout occurred */
         if (s5p_mfc_wait_for_done_ctx(ctx,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index a98fe023deaf..c6c3452ccca1 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -269,15 +269,13 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->driver, dev->plat_dev->name, sizeof(cap->driver) - 1);
         strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
-        cap->version = KERNEL_VERSION(1, 0, 0);
         /*
          * This is only a mem-to-mem video device. The capture and output
          * device capability flags are left only for backward compatibility
          * and are scheduled for removal.
          */
-        cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
-                            V4L2_CAP_VIDEO_CAPTURE_MPLANE |
-                            V4L2_CAP_VIDEO_OUTPUT_MPLANE;
+        cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -334,7 +332,6 @@ static int vidioc_g_fmt(struct file *file, void *priv, struct v4l2_format *f)
                                                 MFCINST_RES_CHANGE_END)) {
                 /* If the MFC is parsing the header,
                  * so wait until it is finished */
-                s5p_mfc_clean_ctx_int_flags(ctx);
                 s5p_mfc_wait_for_done_ctx(ctx, S5P_MFC_R2H_CMD_SEQ_DONE_RET,
                                                                         0);
         }
@@ -740,12 +737,12 @@ static int s5p_mfc_dec_g_v_ctrl(struct v4l2_ctrl *ctrl)
                     ctx->state < MFCINST_ABORT) {
                         ctrl->val = ctx->pb_count;
                         break;
-                } else if (ctx->state != MFCINST_INIT) {
+                } else if (ctx->state != MFCINST_INIT &&
+                                ctx->state != MFCINST_RES_CHANGE_END) {
                         v4l2_err(&dev->v4l2_dev, "Decoding not initialised\n");
                         return -EINVAL;
                 }
                 /* Should wait for the header to be parsed */
-                s5p_mfc_clean_ctx_int_flags(ctx);
                 s5p_mfc_wait_for_done_ctx(ctx,
                                 S5P_MFC_R2H_CMD_SEQ_DONE_RET, 0);
                 if (ctx->state >= MFCINST_HEAD_PARSED &&
@@ -1057,7 +1054,6 @@ static void s5p_mfc_stop_streaming(struct vb2_queue *q)
                 if (IS_MFCV6_PLUS(dev) && (ctx->state == MFCINST_RUNNING)) {
                         ctx->state = MFCINST_FLUSH;
                         set_work_bit_irqsave(ctx);
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         s5p_mfc_hw_call_void(dev->mfc_ops, try_run, dev);
                         if (s5p_mfc_wait_for_done_ctx(ctx,
                                 S5P_MFC_R2H_CMD_DPB_FLUSH_RET, 0))
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
index a904a1c7bb21..bd64f1dcbdb5 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -32,7 +32,7 @@
 #include "s5p_mfc_intr.h"
 #include "s5p_mfc_opr.h"
 
-#define DEF_SRC_FMT_ENC V4L2_PIX_FMT_NV12MT
+#define DEF_SRC_FMT_ENC V4L2_PIX_FMT_NV12M
 #define DEF_DST_FMT_ENC V4L2_PIX_FMT_H264
 
 static struct s5p_mfc_fmt formats[] = {
@@ -67,8 +67,7 @@ static struct s5p_mfc_fmt formats[] = {
                 .codec_mode     = S5P_MFC_CODEC_NONE,
                 .type           = MFC_FMT_RAW,
                 .num_planes     = 2,
-                .versions       = MFC_V5_BIT | MFC_V6_BIT | MFC_V7_BIT |
-                                                                MFC_V8_BIT,
+                .versions       = MFC_V6_BIT | MFC_V7_BIT | MFC_V8_BIT,
         },
         {
                 .name           = "H264 Encoded Stream",
@@ -690,6 +689,16 @@ static struct mfc_control controls[] = {
                 .step = 1,
                 .default_value = 0,
         },
+        {
+                .id = V4L2_CID_MIN_BUFFERS_FOR_OUTPUT,
+                .type = V4L2_CTRL_TYPE_INTEGER,
+                .name = "Minimum number of output bufs",
+                .minimum = 1,
+                .maximum = 32,
+                .step = 1,
+                .default_value = 1,
+                .is_volatile = 1,
+        },
 };
 
 #define NUM_CTRLS ARRAY_SIZE(controls)
@@ -938,15 +947,13 @@ static int vidioc_querycap(struct file *file, void *priv,
         strncpy(cap->driver, dev->plat_dev->name, sizeof(cap->driver) - 1);
         strncpy(cap->card, dev->plat_dev->name, sizeof(cap->card) - 1);
         cap->bus_info[0] = 0;
-        cap->version = KERNEL_VERSION(1, 0, 0);
         /*
          * This is only a mem-to-mem video device. The capture and output
          * device capability flags are left only for backward compatibility
          * and are scheduled for removal.
          */
-        cap->capabilities = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING |
-                            V4L2_CAP_VIDEO_CAPTURE_MPLANE |
-                            V4L2_CAP_VIDEO_OUTPUT_MPLANE;
+        cap->device_caps = V4L2_CAP_VIDEO_M2M_MPLANE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -1137,6 +1144,11 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                 (reqbufs->memory != V4L2_MEMORY_USERPTR))
                 return -EINVAL;
         if (reqbufs->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) {
+                if (reqbufs->count == 0) {
+                        ret = vb2_reqbufs(&ctx->vq_dst, reqbufs);
+                        ctx->capture_state = QUEUE_FREE;
+                        return ret;
+                }
                 if (ctx->capture_state != QUEUE_FREE) {
                         mfc_err("invalid capture state: %d\n",
                                                         ctx->capture_state);
@@ -1158,6 +1170,14 @@ static int vidioc_reqbufs(struct file *file, void *priv,
                         return -ENOMEM;
                 }
         } else if (reqbufs->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+                if (reqbufs->count == 0) {
+                        mfc_debug(2, "Freeing buffers\n");
+                        ret = vb2_reqbufs(&ctx->vq_src, reqbufs);
+                        s5p_mfc_hw_call_void(dev->mfc_ops, release_codec_buffers,
+                                        ctx);
+                        ctx->output_state = QUEUE_FREE;
+                        return ret;
+                }
                 if (ctx->output_state != QUEUE_FREE) {
                         mfc_err("invalid output state: %d\n",
                                                         ctx->output_state);
@@ -1624,8 +1644,39 @@ static int s5p_mfc_enc_s_ctrl(struct v4l2_ctrl *ctrl)
         return ret;
 }
 
+static int s5p_mfc_enc_g_v_ctrl(struct v4l2_ctrl *ctrl)
+{
+        struct s5p_mfc_ctx *ctx = ctrl_to_ctx(ctrl);
+        struct s5p_mfc_dev *dev = ctx->dev;
+
+        switch (ctrl->id) {
+        case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:
+                if (ctx->state >= MFCINST_HEAD_PARSED &&
+                    ctx->state < MFCINST_ABORT) {
+                        ctrl->val = ctx->pb_count;
+                        break;
+                } else if (ctx->state != MFCINST_INIT) {
+                        v4l2_err(&dev->v4l2_dev, "Encoding not initialised\n");
+                        return -EINVAL;
+                }
+                /* Should wait for the header to be produced */
+                s5p_mfc_wait_for_done_ctx(ctx,
+                                S5P_MFC_R2H_CMD_SEQ_DONE_RET, 0);
+                if (ctx->state >= MFCINST_HEAD_PARSED &&
+                    ctx->state < MFCINST_ABORT) {
+                        ctrl->val = ctx->pb_count;
+                } else {
+                        v4l2_err(&dev->v4l2_dev, "Encoding not initialised\n");
+                        return -EINVAL;
+                }
+                break;
+        }
+        return 0;
+}
+
 static const struct v4l2_ctrl_ops s5p_mfc_enc_ctrl_ops = {
         .s_ctrl = s5p_mfc_enc_s_ctrl,
+        .g_volatile_ctrl = s5p_mfc_enc_g_v_ctrl,
 };
 
 static int vidioc_s_parm(struct file *file, void *priv,
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
index 7cf07963187d..0c4fcf2dfd09 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c
@@ -1178,7 +1178,6 @@ static void s5p_mfc_run_res_change(struct s5p_mfc_ctx *ctx)
 
         s5p_mfc_set_dec_stream_buffer_v5(ctx, 0, 0, 0);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_decode_one_frame_v5(ctx, MFC_DEC_RES_CHANGE);
 }
 
@@ -1192,7 +1191,6 @@ static int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx, int last_frame)
                 last_frame = MFC_DEC_LAST_FRAME;
                 s5p_mfc_set_dec_stream_buffer_v5(ctx, 0, 0, 0);
                 dev->curr_ctx = ctx->num;
-                s5p_mfc_clean_ctx_int_flags(ctx);
                 s5p_mfc_decode_one_frame_v5(ctx, last_frame);
                 return 0;
         }
@@ -1212,7 +1210,6 @@ static int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx, int last_frame)
                 ctx->consumed_stream, temp_vb->b->v4l2_planes[0].bytesused);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         if (temp_vb->b->v4l2_planes[0].bytesused == 0) {
                 last_frame = MFC_DEC_LAST_FRAME;
                 mfc_debug(2, "Setting ctx->state to FINISHING\n");
@@ -1273,7 +1270,6 @@ static int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
         s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         mfc_debug(2, "encoding buffer with index=%d state=%d\n",
                   src_mb ? src_mb->b->v4l2_buf.index : -1, ctx->state);
         s5p_mfc_encode_one_frame_v5(ctx);
@@ -1297,7 +1293,6 @@ static void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
                                 0, temp_vb->b->v4l2_planes[0].bytesused);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_init_decode_v5(ctx);
 }
 
@@ -1317,7 +1312,6 @@ static void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
         s5p_mfc_set_enc_stream_buffer_v5(ctx, dst_addr, dst_size);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_init_encode_v5(ctx);
 }
 
@@ -1352,7 +1346,6 @@ static int s5p_mfc_run_init_dec_buffers(struct s5p_mfc_ctx *ctx)
                                 0, temp_vb->b->v4l2_planes[0].bytesused);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         ret = s5p_mfc_set_dec_frame_buffer_v5(ctx);
         if (ret) {
                 mfc_err("Failed to alloc frame mem\n");
@@ -1396,6 +1389,8 @@ static void s5p_mfc_try_run_v5(struct s5p_mfc_dev *dev)
          * Now obtaining frames from MFC buffer
          */
         s5p_mfc_clock_on();
+        s5p_mfc_clean_ctx_int_flags(ctx);
+
         if (ctx->type == MFCINST_DECODER) {
                 s5p_mfc_set_dec_desc_buffer(ctx);
                 switch (ctx->state) {
@@ -1406,12 +1401,10 @@ static void s5p_mfc_try_run_v5(struct s5p_mfc_dev *dev)
                         ret = s5p_mfc_run_dec_frame(ctx, MFC_DEC_FRAME);
                         break;
                 case MFCINST_INIT:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, open_inst_cmd,
                                         ctx);
                         break;
                 case MFCINST_RETURN_INST:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, close_inst_cmd,
                                         ctx);
                         break;
@@ -1444,12 +1437,10 @@ static void s5p_mfc_try_run_v5(struct s5p_mfc_dev *dev)
                         ret = s5p_mfc_run_enc_frame(ctx);
                         break;
                 case MFCINST_INIT:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, open_inst_cmd,
                                         ctx);
                         break;
                 case MFCINST_RETURN_INST:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, close_inst_cmd,
                                         ctx);
                         break;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
index 8798b14bacce..9aea179943ce 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1394,7 +1394,6 @@ static inline void s5p_mfc_set_flush(struct s5p_mfc_ctx *ctx, int flush)
 
         if (flush) {
                 dev->curr_ctx = ctx->num;
-                s5p_mfc_clean_ctx_int_flags(ctx);
                 writel(ctx->inst_no, mfc_regs->instance_id);
                 s5p_mfc_hw_call_void(dev->mfc_cmds, cmd_host2risc, dev,
                                 S5P_FIMV_H2R_CMD_FLUSH_V6, NULL);
@@ -1532,27 +1531,10 @@ static inline int s5p_mfc_get_new_ctx(struct s5p_mfc_dev *dev)
 static inline void s5p_mfc_run_dec_last_frames(struct s5p_mfc_ctx *ctx)
 {
         struct s5p_mfc_dev *dev = ctx->dev;
-        struct s5p_mfc_buf *temp_vb;
-        unsigned long flags;
-
-        spin_lock_irqsave(&dev->irqlock, flags);
-
-        /* Frames are being decoded */
-        if (list_empty(&ctx->src_queue)) {
-                mfc_debug(2, "No src buffers.\n");
-                spin_unlock_irqrestore(&dev->irqlock, flags);
-                return;
-        }
-        /* Get the next source buffer */
-        temp_vb = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list);
-        temp_vb->flags |= MFC_BUF_FLAG_USED;
-        s5p_mfc_set_dec_stream_buffer_v6(ctx,
-                        vb2_dma_contig_plane_dma_addr(temp_vb->b, 0), 0, 0);
-        spin_unlock_irqrestore(&dev->irqlock, flags);
 
+        s5p_mfc_set_dec_stream_buffer_v6(ctx, 0, 0, 0);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
-        s5p_mfc_decode_one_frame_v6(ctx, 1);
+        s5p_mfc_decode_one_frame_v6(ctx, MFC_DEC_LAST_FRAME);
 }
 
 static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
@@ -1588,7 +1570,6 @@ static inline int s5p_mfc_run_dec_frame(struct s5p_mfc_ctx *ctx)
         spin_unlock_irqrestore(&dev->irqlock, flags);
 
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         if (temp_vb->b->v4l2_planes[0].bytesused == 0) {
                 last_frame = 1;
                 mfc_debug(2, "Setting ctx->state to FINISHING\n");
@@ -1645,7 +1626,6 @@ static inline int s5p_mfc_run_enc_frame(struct s5p_mfc_ctx *ctx)
         spin_unlock_irqrestore(&dev->irqlock, flags);
 
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_encode_one_frame_v6(ctx);
 
         return 0;
@@ -1667,7 +1647,6 @@ static inline void s5p_mfc_run_init_dec(struct s5p_mfc_ctx *ctx)
                         temp_vb->b->v4l2_planes[0].bytesused);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_init_decode_v6(ctx);
 }
 
@@ -1687,7 +1666,6 @@ static inline void s5p_mfc_run_init_enc(struct s5p_mfc_ctx *ctx)
         s5p_mfc_set_enc_stream_buffer_v6(ctx, dst_addr, dst_size);
         spin_unlock_irqrestore(&dev->irqlock, flags);
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         s5p_mfc_init_encode_v6(ctx);
 }
 
@@ -1707,7 +1685,6 @@ static inline int s5p_mfc_run_init_dec_buffers(struct s5p_mfc_ctx *ctx)
         }
 
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         ret = s5p_mfc_set_dec_frame_buffer_v6(ctx);
         if (ret) {
                 mfc_err("Failed to alloc frame mem.\n");
@@ -1722,7 +1699,6 @@ static inline int s5p_mfc_run_init_enc_buffers(struct s5p_mfc_ctx *ctx)
         int ret;
 
         dev->curr_ctx = ctx->num;
-        s5p_mfc_clean_ctx_int_flags(ctx);
         ret = s5p_mfc_set_enc_ref_buffer_v6(ctx);
         if (ret) {
                 mfc_err("Failed to alloc frame mem.\n");
@@ -1771,6 +1747,8 @@ static void s5p_mfc_try_run_v6(struct s5p_mfc_dev *dev)
          * Now obtaining frames from MFC buffer */
 
         s5p_mfc_clock_on();
+        s5p_mfc_clean_ctx_int_flags(ctx);
+
         if (ctx->type == MFCINST_DECODER) {
                 switch (ctx->state) {
                 case MFCINST_FINISHING:
@@ -1780,12 +1758,10 @@ static void s5p_mfc_try_run_v6(struct s5p_mfc_dev *dev)
                         ret = s5p_mfc_run_dec_frame(ctx);
                         break;
                 case MFCINST_INIT:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, open_inst_cmd,
                                         ctx);
                         break;
                 case MFCINST_RETURN_INST:
-                        s5p_mfc_clean_ctx_int_flags(ctx);
                         ret = s5p_mfc_hw_call(dev->mfc_cmds, close_inst_cmd,
                                         ctx);
                         break;
diff --git a/drivers/media/platform/s5p-tv/hdmi_drv.c b/drivers/media/platform/s5p-tv/hdmi_drv.c
index 37c8bd694c5f..1d1ef211e113 100644
--- a/drivers/media/platform/s5p-tv/hdmi_drv.c
+++ b/drivers/media/platform/s5p-tv/hdmi_drv.c
@@ -660,7 +660,7 @@ static int hdmi_g_mbus_fmt(struct v4l2_subdev *sd,
         memset(fmt, 0, sizeof(*fmt));
         fmt->width = t->hact.end - t->hact.beg;
         fmt->height = t->vact[0].end - t->vact[0].beg;
-        fmt->code = V4L2_MBUS_FMT_FIXED; /* means RGB888 */
+        fmt->code = MEDIA_BUS_FMT_FIXED; /* means RGB888 */
         fmt->colorspace = V4L2_COLORSPACE_SRGB;
         if (t->interlaced) {
                 fmt->field = V4L2_FIELD_INTERLACED;
diff --git a/drivers/media/platform/s5p-tv/sdo_drv.c b/drivers/media/platform/s5p-tv/sdo_drv.c
index 72cf892dd008..46f4d56aaa1b 100644
--- a/drivers/media/platform/s5p-tv/sdo_drv.c
+++ b/drivers/media/platform/s5p-tv/sdo_drv.c
@@ -170,7 +170,7 @@ static int sdo_g_mbus_fmt(struct v4l2_subdev *sd,
         /* all modes are 720 pixels wide */
         fmt->width = 720;
         fmt->height = sdev->fmt->height;
-        fmt->code = V4L2_MBUS_FMT_FIXED;
+        fmt->code = MEDIA_BUS_FMT_FIXED;
         fmt->field = V4L2_FIELD_INTERLACED;
         fmt->colorspace = V4L2_COLORSPACE_JPEG;
         return 0;
diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index e5f1d4c14f2c..154ef0b6b8ab 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -396,7 +396,8 @@ static int sh_vou_querycap(struct file *file, void  *priv,
         dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);
 
         strlcpy(cap->card, "SuperH VOU", sizeof(cap->card));
-        cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+        cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
@@ -680,7 +681,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,
         struct sh_vou_geometry geo;
         struct v4l2_mbus_framefmt mbfmt = {
                 /* Revisit: is this the correct code? */
-                .code = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code = MEDIA_BUS_FMT_YUYV8_2X8,
                 .field = V4L2_FIELD_INTERLACED,
                 .colorspace = V4L2_COLORSPACE_SMPTE170M,
         };
@@ -733,7 +734,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,
         /* Sanity checks */
         if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH ||
             (unsigned)mbfmt.height > img_height_max ||
-            mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8)
+            mbfmt.code != MEDIA_BUS_FMT_YUYV8_2X8)
                 return -EIO;
 
         if (mbfmt.width != geo.output.width ||
@@ -943,7 +944,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, const struct v4l2_crop *a)
         struct sh_vou_geometry geo;
         struct v4l2_mbus_framefmt mbfmt = {
                 /* Revisit: is this the correct code? */
-                .code = V4L2_MBUS_FMT_YUYV8_2X8,
+                .code = MEDIA_BUS_FMT_YUYV8_2X8,
                 .field = V4L2_FIELD_INTERLACED,
                 .colorspace = V4L2_COLORSPACE_SMPTE170M,
         };
@@ -994,7 +995,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, const struct v4l2_crop *a)
         /* Sanity checks */
         if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH ||
             (unsigned)mbfmt.height > img_height_max ||
-            mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8)
+            mbfmt.code != MEDIA_BUS_FMT_YUYV8_2X8)
                 return -EIO;
 
         geo.output.width = mbfmt.width;
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index c5291b001057..ee5650f4ea2d 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -105,25 +105,25 @@ static u32 isi_readl(struct atmel_isi *isi, u32 reg)
 }
 
 static int configure_geometry(struct atmel_isi *isi, u32 width,
-                        u32 height, enum v4l2_mbus_pixelcode code)
+                        u32 height, u32 code)
 {
         u32 cfg2, cr;
 
         switch (code) {
         /* YUV, including grey */
-        case V4L2_MBUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_Y8_1X8:
                 cr = ISI_CFG2_GRAYSCALE;
                 break;
-        case V4L2_MBUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
                 cr = ISI_CFG2_YCC_SWAP_MODE_3;
                 break;
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 cr = ISI_CFG2_YCC_SWAP_MODE_2;
                 break;
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 cr = ISI_CFG2_YCC_SWAP_MODE_1;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 cr = ISI_CFG2_YCC_SWAP_DEFAULT;
                 break;
         /* RGB, TODO */
@@ -645,7 +645,7 @@ static int isi_camera_get_formats(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         int formats = 0, ret;
         /* sensor format */
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         /* soc camera host format */
         const struct soc_mbus_pixelfmt *fmt;
 
@@ -670,10 +670,10 @@ static int isi_camera_get_formats(struct soc_camera_device *icd,
         }
 
         switch (code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 formats++;
                 if (xlate) {
                         xlate->host_fmt = &isi_camera_formats[0];
diff --git a/drivers/media/platform/soc_camera/mx2_camera.c b/drivers/media/platform/soc_camera/mx2_camera.c
index 2347612a4cc1..ce72bd26a6ac 100644
--- a/drivers/media/platform/soc_camera/mx2_camera.c
+++ b/drivers/media/platform/soc_camera/mx2_camera.c
@@ -211,7 +211,7 @@ struct emma_prp_resize {
 
 /* prp configuration for a client-host fmt pair */
 struct mx2_fmt_cfg {
-        enum v4l2_mbus_pixelcode        in_fmt;
+        u32     in_fmt;
         u32                             out_fmt;
         struct mx2_prp_cfg              cfg;
 };
@@ -309,7 +309,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                 }
         },
         {
-                .in_fmt         = V4L2_MBUS_FMT_UYVY8_2X8,
+                .in_fmt         = MEDIA_BUS_FMT_UYVY8_2X8,
                 .out_fmt        = V4L2_PIX_FMT_YUYV,
                 .cfg            = {
                         .channel        = 1,
@@ -323,7 +323,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                 }
         },
         {
-                .in_fmt         = V4L2_MBUS_FMT_YUYV8_2X8,
+                .in_fmt         = MEDIA_BUS_FMT_YUYV8_2X8,
                 .out_fmt        = V4L2_PIX_FMT_YUYV,
                 .cfg            = {
                         .channel        = 1,
@@ -337,7 +337,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                 }
         },
         {
-                .in_fmt         = V4L2_MBUS_FMT_YUYV8_2X8,
+                .in_fmt         = MEDIA_BUS_FMT_YUYV8_2X8,
                 .out_fmt        = V4L2_PIX_FMT_YUV420,
                 .cfg            = {
                         .channel        = 2,
@@ -351,7 +351,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
                 }
         },
         {
-                .in_fmt         = V4L2_MBUS_FMT_UYVY8_2X8,
+                .in_fmt         = MEDIA_BUS_FMT_UYVY8_2X8,
                 .out_fmt        = V4L2_PIX_FMT_YUV420,
                 .cfg            = {
                         .channel        = 2,
@@ -366,9 +366,7 @@ static struct mx2_fmt_cfg mx27_emma_prp_table[] = {
         },
 };
 
-static struct mx2_fmt_cfg *mx27_emma_prp_get_format(
-                                        enum v4l2_mbus_pixelcode in_fmt,
-                                        u32 out_fmt)
+static struct mx2_fmt_cfg *mx27_emma_prp_get_format(u32 in_fmt, u32 out_fmt)
 {
         int i;
 
@@ -945,7 +943,7 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         const struct soc_mbus_pixelfmt *fmt;
         struct device *dev = icd->parent;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         int ret, formats = 0;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -959,8 +957,8 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 return 0;
         }
 
-        if (code == V4L2_MBUS_FMT_YUYV8_2X8 ||
-            code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == MEDIA_BUS_FMT_YUYV8_2X8 ||
+            code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 formats++;
                 if (xlate) {
                         /*
@@ -968,7 +966,7 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                          * soc_mediabus.c
                          */
                         xlate->host_fmt =
-                                soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_1_5X8);
+                                soc_mbus_get_fmtdesc(MEDIA_BUS_FMT_YUYV8_1_5X8);
                         xlate->code     = code;
                         dev_dbg(dev, "Providing host format %s for sensor code %d\n",
                                xlate->host_fmt->name, code);
@@ -976,11 +974,11 @@ static int mx2_camera_get_formats(struct soc_camera_device *icd,
                 }
         }
 
-        if (code == V4L2_MBUS_FMT_UYVY8_2X8) {
+        if (code == MEDIA_BUS_FMT_UYVY8_2X8) {
                 formats++;
                 if (xlate) {
                         xlate->host_fmt =
-                                soc_mbus_get_fmtdesc(V4L2_MBUS_FMT_YUYV8_2X8);
+                                soc_mbus_get_fmtdesc(MEDIA_BUS_FMT_YUYV8_2X8);
                         xlate->code     = code;
                         dev_dbg(dev, "Providing host format %s for sensor code %d\n",
                                 xlate->host_fmt->name, code);
diff --git a/drivers/media/platform/soc_camera/mx3_camera.c b/drivers/media/platform/soc_camera/mx3_camera.c
index 7696a873510d..8e52ccce66de 100644
--- a/drivers/media/platform/soc_camera/mx3_camera.c
+++ b/drivers/media/platform/soc_camera/mx3_camera.c
@@ -656,7 +656,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->parent;
         int formats = 0, ret;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         const struct soc_mbus_pixelfmt *fmt;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -677,7 +677,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
                 return 0;
 
         switch (code) {
-        case V4L2_MBUS_FMT_SBGGR10_1X10:
+        case MEDIA_BUS_FMT_SBGGR10_1X10:
                 formats++;
                 if (xlate) {
                         xlate->host_fmt = &mx3_camera_formats[0];
@@ -687,7 +687,7 @@ static int mx3_camera_get_formats(struct soc_camera_device *icd, unsigned int id
                                 mx3_camera_formats[0].name, code);
                 }
                 break;
-        case V4L2_MBUS_FMT_Y10_1X10:
+        case MEDIA_BUS_FMT_Y10_1X10:
                 formats++;
                 if (xlate) {
                         xlate->host_fmt = &mx3_camera_formats[1];
diff --git a/drivers/media/platform/soc_camera/omap1_camera.c b/drivers/media/platform/soc_camera/omap1_camera.c
index 74ce8b6b79fa..e6b93281f246 100644
--- a/drivers/media/platform/soc_camera/omap1_camera.c
+++ b/drivers/media/platform/soc_camera/omap1_camera.c
@@ -140,7 +140,7 @@
 /* buffer for one video frame */
 struct omap1_cam_buf {
         struct videobuf_buffer          vb;
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         int                             inwork;
         struct scatterlist              *sgbuf;
         int                             sgcount;
@@ -980,7 +980,7 @@ static void omap1_cam_clock_stop(struct soc_camera_host *ici)
 /* Duplicate standard formats based on host capability of byte swapping */
 static const struct soc_mbus_lookup omap1_cam_formats[] = {
 {
-        .code = V4L2_MBUS_FMT_UYVY8_2X8,
+        .code = MEDIA_BUS_FMT_UYVY8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YUYV,
                 .name                   = "YUYV",
@@ -990,7 +990,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_VYUY8_2X8,
+        .code = MEDIA_BUS_FMT_VYUY8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YVYU,
                 .name                   = "YVYU",
@@ -1000,7 +1000,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YUYV8_2X8,
+        .code = MEDIA_BUS_FMT_YUYV8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_UYVY,
                 .name                   = "UYVY",
@@ -1010,7 +1010,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YVYU8_2X8,
+        .code = MEDIA_BUS_FMT_YVYU8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_VYUY,
                 .name                   = "VYUY",
@@ -1020,7 +1020,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+        .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB555,
                 .name                   = "RGB555",
@@ -1030,7 +1030,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+        .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB555X,
                 .name                   = "RGB555X",
@@ -1040,7 +1040,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB565_2X8_BE,
+        .code = MEDIA_BUS_FMT_RGB565_2X8_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB565,
                 .name                   = "RGB565",
@@ -1050,7 +1050,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB565_2X8_LE,
+        .code = MEDIA_BUS_FMT_RGB565_2X8_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB565X,
                 .name                   = "RGB565X",
@@ -1068,7 +1068,7 @@ static int omap1_cam_get_formats(struct soc_camera_device *icd,
         struct v4l2_subdev *sd = soc_camera_to_subdev(icd);
         struct device *dev = icd->parent;
         int formats = 0, ret;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         const struct soc_mbus_pixelfmt *fmt;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -1088,14 +1088,14 @@ static int omap1_cam_get_formats(struct soc_camera_device *icd,
                 return 0;
 
         switch (code) {
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
-        case V4L2_MBUS_FMT_UYVY8_2X8:
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE:
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
                 formats++;
                 if (xlate) {
                         xlate->host_fmt = soc_mbus_find_fmtdesc(code,
diff --git a/drivers/media/platform/soc_camera/pxa_camera.c b/drivers/media/platform/soc_camera/pxa_camera.c
index 66178fc9f9eb..951226af0eba 100644
--- a/drivers/media/platform/soc_camera/pxa_camera.c
+++ b/drivers/media/platform/soc_camera/pxa_camera.c
@@ -187,7 +187,7 @@ struct pxa_cam_dma {
 struct pxa_buffer {
         /* common v4l buffer stuff -- must be first */
         struct videobuf_buffer          vb;
-        enum v4l2_mbus_pixelcode        code;
+        u32     code;
         /* our descriptor lists for Y, U and V channels */
         struct pxa_cam_dma              dmas[3];
         int                             inwork;
@@ -1253,7 +1253,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, unsigned int id
         struct device *dev = icd->parent;
         int formats = 0, ret;
         struct pxa_cam *cam;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         const struct soc_mbus_pixelfmt *fmt;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -1283,7 +1283,7 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, unsigned int id
         }
 
         switch (code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 formats++;
                 if (xlate) {
                         xlate->host_fmt = &pxa_camera_formats[0];
@@ -1292,11 +1292,11 @@ static int pxa_camera_get_formats(struct soc_camera_device *icd, unsigned int id
                         dev_dbg(dev, "Providing format %s using code %d\n",
                                 pxa_camera_formats[0].name, code);
                 }
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
-        case V4L2_MBUS_FMT_RGB565_2X8_LE:
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_RGB565_2X8_LE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE:
                 if (xlate)
                         dev_dbg(dev, "Providing format %s packed\n",
                                 fmt->name);
diff --git a/drivers/media/platform/soc_camera/rcar_vin.c b/drivers/media/platform/soc_camera/rcar_vin.c
index 20defcb8b31b..8d8438b10b87 100644
--- a/drivers/media/platform/soc_camera/rcar_vin.c
+++ b/drivers/media/platform/soc_camera/rcar_vin.c
@@ -272,16 +272,16 @@ static int rcar_vin_setup(struct rcar_vin_priv *priv)
 
         /* input interface */
         switch (icd->current_fmt->code) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
                 /* BT.601/BT.1358 16bit YCbCr422 */
                 vnmc |= VNMC_INF_YUV16;
                 break;
-        case V4L2_MBUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
                 /* BT.656 8bit YCbCr422 or BT.601 8bit YCbCr422 */
                 vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
                         VNMC_INF_YUV8_BT656 : VNMC_INF_YUV8_BT601;
                 break;
-        case V4L2_MBUS_FMT_YUYV10_2X10:
+        case MEDIA_BUS_FMT_YUYV10_2X10:
                 /* BT.656 10bit YCbCr422 or BT.601 10bit YCbCr422 */
                 vnmc |= priv->pdata_flags & RCAR_VIN_BT656 ?
                         VNMC_INF_YUV10_BT656 : VNMC_INF_YUV10_BT601;
@@ -921,7 +921,7 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
         int ret, k, n;
         int formats = 0;
         struct rcar_vin_cam *cam;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         const struct soc_mbus_pixelfmt *fmt;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -1010,9 +1010,9 @@ static int rcar_vin_get_formats(struct soc_camera_device *icd, unsigned int idx,
                 cam->extra_fmt = NULL;
 
         switch (code) {
-        case V4L2_MBUS_FMT_YUYV8_1X16:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_YUYV10_2X10:
+        case MEDIA_BUS_FMT_YUYV8_1X16:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YUYV10_2X10:
                 if (cam->extra_fmt)
                         break;
 
diff --git a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
index 20ad4a571d37..5f58ed995320 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c
@@ -149,7 +149,7 @@ struct sh_mobile_ceu_cam {
         /* Camera cropping rectangle */
         struct v4l2_rect rect;
         const struct soc_mbus_pixelfmt *extra_fmt;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
 };
 
 static struct sh_mobile_ceu_buffer *to_ceu_vb(struct vb2_buffer *vb)
@@ -861,16 +861,16 @@ static int sh_mobile_ceu_set_bus_param(struct soc_camera_device *icd)
         case V4L2_PIX_FMT_NV16:
         case V4L2_PIX_FMT_NV61:
                 switch (cam->code) {
-                case V4L2_MBUS_FMT_UYVY8_2X8:
+                case MEDIA_BUS_FMT_UYVY8_2X8:
                         value = 0x00000000; /* Cb0, Y0, Cr0, Y1 */
                         break;
-                case V4L2_MBUS_FMT_VYUY8_2X8:
+                case MEDIA_BUS_FMT_VYUY8_2X8:
                         value = 0x00000100; /* Cr0, Y0, Cb0, Y1 */
                         break;
-                case V4L2_MBUS_FMT_YUYV8_2X8:
+                case MEDIA_BUS_FMT_YUYV8_2X8:
                         value = 0x00000200; /* Y0, Cb0, Y1, Cr0 */
                         break;
-                case V4L2_MBUS_FMT_YVYU8_2X8:
+                case MEDIA_BUS_FMT_YVYU8_2X8:
                         value = 0x00000300; /* Y0, Cr0, Y1, Cb0 */
                         break;
                 default:
@@ -1048,7 +1048,7 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int
         int ret, k, n;
         int formats = 0;
         struct sh_mobile_ceu_cam *cam;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
         const struct soc_mbus_pixelfmt *fmt;
 
         ret = v4l2_subdev_call(sd, video, enum_mbus_fmt, idx, &code);
@@ -1141,10 +1141,10 @@ static int sh_mobile_ceu_get_formats(struct soc_camera_device *icd, unsigned int
                 cam->extra_fmt = NULL;
 
         switch (code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
-        case V4L2_MBUS_FMT_VYUY8_2X8:
-        case V4L2_MBUS_FMT_YUYV8_2X8:
-        case V4L2_MBUS_FMT_YVYU8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_VYUY8_2X8:
+        case MEDIA_BUS_FMT_YUYV8_2X8:
+        case MEDIA_BUS_FMT_YVYU8_2X8:
                 if (cam->extra_fmt)
                         break;
 
diff --git a/drivers/media/platform/soc_camera/sh_mobile_csi2.c b/drivers/media/platform/soc_camera/sh_mobile_csi2.c
index 05dd21a35d63..c738e27a75d7 100644
--- a/drivers/media/platform/soc_camera/sh_mobile_csi2.c
+++ b/drivers/media/platform/soc_camera/sh_mobile_csi2.c
@@ -59,28 +59,28 @@ static int sh_csi2_try_fmt(struct v4l2_subdev *sd,
         switch (pdata->type) {
         case SH_CSI2C:
                 switch (mf->code) {
-                case V4L2_MBUS_FMT_UYVY8_2X8:           /* YUV422 */
-                case V4L2_MBUS_FMT_YUYV8_1_5X8:         /* YUV420 */
-                case V4L2_MBUS_FMT_Y8_1X8:              /* RAW8 */
-                case V4L2_MBUS_FMT_SBGGR8_1X8:
-                case V4L2_MBUS_FMT_SGRBG8_1X8:
+                case MEDIA_BUS_FMT_UYVY8_2X8:           /* YUV422 */
+                case MEDIA_BUS_FMT_YUYV8_1_5X8:         /* YUV420 */
+                case MEDIA_BUS_FMT_Y8_1X8:              /* RAW8 */
+                case MEDIA_BUS_FMT_SBGGR8_1X8:
+                case MEDIA_BUS_FMT_SGRBG8_1X8:
                         break;
                 default:
                         /* All MIPI CSI-2 devices must support one of primary formats */
-                        mf->code = V4L2_MBUS_FMT_YUYV8_2X8;
+                        mf->code = MEDIA_BUS_FMT_YUYV8_2X8;
                 }
                 break;
         case SH_CSI2I:
                 switch (mf->code) {
-                case V4L2_MBUS_FMT_Y8_1X8:              /* RAW8 */
-                case V4L2_MBUS_FMT_SBGGR8_1X8:
-                case V4L2_MBUS_FMT_SGRBG8_1X8:
-                case V4L2_MBUS_FMT_SBGGR10_1X10:        /* RAW10 */
-                case V4L2_MBUS_FMT_SBGGR12_1X12:        /* RAW12 */
+                case MEDIA_BUS_FMT_Y8_1X8:              /* RAW8 */
+                case MEDIA_BUS_FMT_SBGGR8_1X8:
+                case MEDIA_BUS_FMT_SGRBG8_1X8:
+                case MEDIA_BUS_FMT_SBGGR10_1X10:        /* RAW10 */
+                case MEDIA_BUS_FMT_SBGGR12_1X12:        /* RAW12 */
                         break;
                 default:
                         /* All MIPI CSI-2 devices must support one of primary formats */
-                        mf->code = V4L2_MBUS_FMT_SBGGR8_1X8;
+                        mf->code = MEDIA_BUS_FMT_SBGGR8_1X8;
                 }
                 break;
         }
@@ -104,21 +104,21 @@ static int sh_csi2_s_fmt(struct v4l2_subdev *sd,
                 return -EINVAL;
 
         switch (mf->code) {
-        case V4L2_MBUS_FMT_UYVY8_2X8:
+        case MEDIA_BUS_FMT_UYVY8_2X8:
                 tmp |= 0x1e;    /* YUV422 8 bit */
                 break;
-        case V4L2_MBUS_FMT_YUYV8_1_5X8:
+        case MEDIA_BUS_FMT_YUYV8_1_5X8:
                 tmp |= 0x18;    /* YUV420 8 bit */
                 break;
-        case V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE:
+        case MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE:
                 tmp |= 0x21;    /* RGB555 */
                 break;
-        case V4L2_MBUS_FMT_RGB565_2X8_BE:
+        case MEDIA_BUS_FMT_RGB565_2X8_BE:
                 tmp |= 0x22;    /* RGB565 */
                 break;
-        case V4L2_MBUS_FMT_Y8_1X8:
-        case V4L2_MBUS_FMT_SBGGR8_1X8:
-        case V4L2_MBUS_FMT_SGRBG8_1X8:
+        case MEDIA_BUS_FMT_Y8_1X8:
+        case MEDIA_BUS_FMT_SBGGR8_1X8:
+        case MEDIA_BUS_FMT_SGRBG8_1X8:
                 tmp |= 0x2a;    /* RAW8 */
                 break;
         default:
diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 8e61b976da19..f4be2a1c659a 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -460,7 +460,7 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         unsigned int i, fmts = 0, raw_fmts = 0;
         int ret;
-        enum v4l2_mbus_pixelcode code;
+        u32 code;
 
         while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, raw_fmts, &code))
                 raw_fmts++;
diff --git a/drivers/media/platform/soc_camera/soc_camera_platform.c b/drivers/media/platform/soc_camera/soc_camera_platform.c
index ceaddfb85e49..f2ce1ab06d53 100644
--- a/drivers/media/platform/soc_camera/soc_camera_platform.c
+++ b/drivers/media/platform/soc_camera/soc_camera_platform.c
@@ -62,7 +62,7 @@ static struct v4l2_subdev_core_ops platform_subdev_core_ops = {
 };
 
 static int soc_camera_platform_enum_fmt(struct v4l2_subdev *sd, unsigned int index,
-                                        enum v4l2_mbus_pixelcode *code)
+                                        u32 *code)
 {
         struct soc_camera_platform_info *p = v4l2_get_subdevdata(sd);
 
diff --git a/drivers/media/platform/soc_camera/soc_mediabus.c b/drivers/media/platform/soc_camera/soc_mediabus.c
index dc02deca7563..1dbcd426683c 100644
--- a/drivers/media/platform/soc_camera/soc_mediabus.c
+++ b/drivers/media/platform/soc_camera/soc_mediabus.c
@@ -17,7 +17,7 @@
 
 static const struct soc_mbus_lookup mbus_fmt[] = {
 {
-        .code = V4L2_MBUS_FMT_YUYV8_2X8,
+        .code = MEDIA_BUS_FMT_YUYV8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YUYV,
                 .name                   = "YUYV",
@@ -27,7 +27,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YVYU8_2X8,
+        .code = MEDIA_BUS_FMT_YVYU8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YVYU,
                 .name                   = "YVYU",
@@ -37,7 +37,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_UYVY8_2X8,
+        .code = MEDIA_BUS_FMT_UYVY8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_UYVY,
                 .name                   = "UYVY",
@@ -47,7 +47,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_VYUY8_2X8,
+        .code = MEDIA_BUS_FMT_VYUY8_2X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_VYUY,
                 .name                   = "VYUY",
@@ -57,7 +57,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
+        .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB555,
                 .name                   = "RGB555",
@@ -67,7 +67,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
+        .code = MEDIA_BUS_FMT_RGB555_2X8_PADHI_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB555X,
                 .name                   = "RGB555X",
@@ -77,7 +77,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB565_2X8_LE,
+        .code = MEDIA_BUS_FMT_RGB565_2X8_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB565,
                 .name                   = "RGB565",
@@ -87,7 +87,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB565_2X8_BE,
+        .code = MEDIA_BUS_FMT_RGB565_2X8_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB565X,
                 .name                   = "RGB565X",
@@ -97,7 +97,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB666_1X18,
+        .code = MEDIA_BUS_FMT_RGB666_1X18,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB32,
                 .name                   = "RGB666/32bpp",
@@ -106,7 +106,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .order                  = SOC_MBUS_ORDER_LE,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB888_1X24,
+        .code = MEDIA_BUS_FMT_RGB888_1X24,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB32,
                 .name                   = "RGB888/32bpp",
@@ -115,7 +115,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .order                  = SOC_MBUS_ORDER_LE,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB888_2X12_BE,
+        .code = MEDIA_BUS_FMT_RGB888_2X12_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB32,
                 .name                   = "RGB888/32bpp",
@@ -124,7 +124,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .order                  = SOC_MBUS_ORDER_BE,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB888_2X12_LE,
+        .code = MEDIA_BUS_FMT_RGB888_2X12_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB32,
                 .name                   = "RGB888/32bpp",
@@ -133,7 +133,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .order                  = SOC_MBUS_ORDER_LE,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR8_1X8,
+        .code = MEDIA_BUS_FMT_SBGGR8_1X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR8,
                 .name                   = "Bayer 8 BGGR",
@@ -143,7 +143,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR10_1X10,
+        .code = MEDIA_BUS_FMT_SBGGR10_1X10,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR10,
                 .name                   = "Bayer 10 BGGR",
@@ -153,7 +153,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_Y8_1X8,
+        .code = MEDIA_BUS_FMT_Y8_1X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_GREY,
                 .name                   = "Grey",
@@ -163,7 +163,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_Y10_1X10,
+        .code = MEDIA_BUS_FMT_Y10_1X10,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_Y10,
                 .name                   = "Grey 10bit",
@@ -173,7 +173,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_LE,
+        .code = MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR10,
                 .name                   = "Bayer 10 BGGR",
@@ -183,7 +183,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_LE,
+        .code = MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_LE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR10,
                 .name                   = "Bayer 10 BGGR",
@@ -193,7 +193,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR10_2X8_PADHI_BE,
+        .code = MEDIA_BUS_FMT_SBGGR10_2X8_PADHI_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR10,
                 .name                   = "Bayer 10 BGGR",
@@ -203,7 +203,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR10_2X8_PADLO_BE,
+        .code = MEDIA_BUS_FMT_SBGGR10_2X8_PADLO_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR10,
                 .name                   = "Bayer 10 BGGR",
@@ -213,7 +213,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_JPEG_1X8,
+        .code = MEDIA_BUS_FMT_JPEG_1X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_JPEG,
                 .name                   = "JPEG",
@@ -223,7 +223,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_RGB444_2X8_PADHI_BE,
+        .code = MEDIA_BUS_FMT_RGB444_2X8_PADHI_BE,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_RGB444,
                 .name                   = "RGB444",
@@ -233,7 +233,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YUYV8_1_5X8,
+        .code = MEDIA_BUS_FMT_YUYV8_1_5X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YUV420,
                 .name                   = "YUYV 4:2:0",
@@ -243,7 +243,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YVYU8_1_5X8,
+        .code = MEDIA_BUS_FMT_YVYU8_1_5X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YVU420,
                 .name                   = "YVYU 4:2:0",
@@ -253,7 +253,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_UYVY8_1X16,
+        .code = MEDIA_BUS_FMT_UYVY8_1X16,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_UYVY,
                 .name                   = "UYVY 16bit",
@@ -263,7 +263,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_VYUY8_1X16,
+        .code = MEDIA_BUS_FMT_VYUY8_1X16,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_VYUY,
                 .name                   = "VYUY 16bit",
@@ -273,7 +273,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YUYV8_1X16,
+        .code = MEDIA_BUS_FMT_YUYV8_1X16,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YUYV,
                 .name                   = "YUYV 16bit",
@@ -283,7 +283,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_YVYU8_1X16,
+        .code = MEDIA_BUS_FMT_YVYU8_1X16,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_YVYU,
                 .name                   = "YVYU 16bit",
@@ -293,7 +293,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGRBG8_1X8,
+        .code = MEDIA_BUS_FMT_SGRBG8_1X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGRBG8,
                 .name                   = "Bayer 8 GRBG",
@@ -303,7 +303,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGRBG10_DPCM8_1X8,
+        .code = MEDIA_BUS_FMT_SGRBG10_DPCM8_1X8,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGRBG10DPCM8,
                 .name                   = "Bayer 10 BGGR DPCM 8",
@@ -313,7 +313,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGBRG10_1X10,
+        .code = MEDIA_BUS_FMT_SGBRG10_1X10,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGBRG10,
                 .name                   = "Bayer 10 GBRG",
@@ -323,7 +323,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGRBG10_1X10,
+        .code = MEDIA_BUS_FMT_SGRBG10_1X10,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGRBG10,
                 .name                   = "Bayer 10 GRBG",
@@ -333,7 +333,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SRGGB10_1X10,
+        .code = MEDIA_BUS_FMT_SRGGB10_1X10,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SRGGB10,
                 .name                   = "Bayer 10 RGGB",
@@ -343,7 +343,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SBGGR12_1X12,
+        .code = MEDIA_BUS_FMT_SBGGR12_1X12,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SBGGR12,
                 .name                   = "Bayer 12 BGGR",
@@ -353,7 +353,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGBRG12_1X12,
+        .code = MEDIA_BUS_FMT_SGBRG12_1X12,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGBRG12,
                 .name                   = "Bayer 12 GBRG",
@@ -363,7 +363,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SGRBG12_1X12,
+        .code = MEDIA_BUS_FMT_SGRBG12_1X12,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SGRBG12,
                 .name                   = "Bayer 12 GRBG",
@@ -373,7 +373,7 @@ static const struct soc_mbus_lookup mbus_fmt[] = {
                 .layout                 = SOC_MBUS_LAYOUT_PACKED,
         },
 }, {
-        .code = V4L2_MBUS_FMT_SRGGB12_1X12,
+        .code = MEDIA_BUS_FMT_SRGGB12_1X12,
         .fmt = {
                 .fourcc                 = V4L2_PIX_FMT_SRGGB12,
                 .name                   = "Bayer 12 RGGB",
@@ -458,7 +458,7 @@ s32 soc_mbus_image_size(const struct soc_mbus_pixelfmt *mf,
 EXPORT_SYMBOL(soc_mbus_image_size);
 
 const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc(
-        enum v4l2_mbus_pixelcode code,
+        u32 code,
         const struct soc_mbus_lookup *lookup,
         int n)
 {
@@ -473,7 +473,7 @@ const struct soc_mbus_pixelfmt *soc_mbus_find_fmtdesc(
 EXPORT_SYMBOL(soc_mbus_find_fmtdesc);
 
 const struct soc_mbus_pixelfmt *soc_mbus_get_fmtdesc(
-        enum v4l2_mbus_pixelcode code)
+        u32 code)
 {
         return soc_mbus_find_fmtdesc(code, mbus_fmt, ARRAY_SIZE(mbus_fmt));
 }
diff --git a/drivers/media/platform/ti-vpe/csc.c b/drivers/media/platform/ti-vpe/csc.c
index 940df4000c42..bec674994752 100644
--- a/drivers/media/platform/ti-vpe/csc.c
+++ b/drivers/media/platform/ti-vpe/csc.c
@@ -93,12 +93,8 @@ void csc_dump_regs(struct csc_data *csc)
 {
         struct device *dev = &csc->pdev->dev;
 
-        u32 read_reg(struct csc_data *csc, int offset)
-        {
-                return ioread32(csc->base + offset);
-        }
-
-#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, read_reg(csc, CSC_##r))
+#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, \
+        ioread32(csc->base + CSC_##r))
 
         DUMPREG(CSC00);
         DUMPREG(CSC01);
@@ -189,7 +185,7 @@ struct csc_data *csc_create(struct platform_device *pdev)
         csc->base = devm_ioremap_resource(&pdev->dev, csc->res);
         if (IS_ERR(csc->base)) {
                 dev_err(&pdev->dev, "failed to ioremap\n");
-                return csc->base;
+                return ERR_CAST(csc->base);
         }
 
         return csc;
diff --git a/drivers/media/platform/ti-vpe/sc.c b/drivers/media/platform/ti-vpe/sc.c
index 6314171ffe9b..f82d1c7f667f 100644
--- a/drivers/media/platform/ti-vpe/sc.c
+++ b/drivers/media/platform/ti-vpe/sc.c
@@ -24,12 +24,8 @@ void sc_dump_regs(struct sc_data *sc)
 {
         struct device *dev = &sc->pdev->dev;
 
-        u32 read_reg(struct sc_data *sc, int offset)
-        {
-                return ioread32(sc->base + offset);
-        }
-
-#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, read_reg(sc, CFG_##r))
+#define DUMPREG(r) dev_dbg(dev, "%-35s %08x\n", #r, \
+        ioread32(sc->base + CFG_##r))
 
         DUMPREG(SC0);
         DUMPREG(SC1);
@@ -304,7 +300,7 @@ struct sc_data *sc_create(struct platform_device *pdev)
         sc->base = devm_ioremap_resource(&pdev->dev, sc->res);
         if (IS_ERR(sc->base)) {
                 dev_err(&pdev->dev, "failed to ioremap\n");
-                return sc->base;
+                return ERR_CAST(sc->base);
         }
 
         return sc;
diff --git a/drivers/media/platform/via-camera.c b/drivers/media/platform/via-camera.c
index ae6870cb8339..86989d86abfa 100644
--- a/drivers/media/platform/via-camera.c
+++ b/drivers/media/platform/via-camera.c
@@ -101,7 +101,7 @@ struct via_camera {
          */
         struct v4l2_pix_format sensor_format;
         struct v4l2_pix_format user_format;
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 };
 
 /*
@@ -143,12 +143,12 @@ static struct via_format {
         __u8 *desc;
         __u32 pixelformat;
         int bpp;   /* Bytes per pixel */
-        enum v4l2_mbus_pixelcode mbus_code;
+        u32 mbus_code;
 } via_formats[] = {
         {
                 .desc           = "YUYV 4:2:2",
                 .pixelformat    = V4L2_PIX_FMT_YUYV,
-                .mbus_code      = V4L2_MBUS_FMT_YUYV8_2X8,
+                .mbus_code      = MEDIA_BUS_FMT_YUYV8_2X8,
                 .bpp            = 2,
         },
         /* RGB444 and Bayer should be doable, but have never been
@@ -849,7 +849,7 @@ static const struct v4l2_pix_format viacam_def_pix_format = {
         .sizeimage      = VGA_WIDTH * VGA_HEIGHT * 2,
 };
 
-static const enum v4l2_mbus_pixelcode via_def_mbus_code = V4L2_MBUS_FMT_YUYV8_2X8;
+static const u32 via_def_mbus_code = MEDIA_BUS_FMT_YUYV8_2X8;
 
 static int viacam_enum_fmt_vid_cap(struct file *filp, void *priv,
                 struct v4l2_fmtdesc *fmt)
@@ -985,9 +985,9 @@ static int viacam_querycap(struct file *filp, void *priv,
 {
         strcpy(cap->driver, "via-camera");
         strcpy(cap->card, "via-camera");
-        cap->version = 1;
-        cap->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_READWRITE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/mem2mem_testdev.c b/drivers/media/platform/vim2m.c
index c1b03cfd6ded..1105c111cc10 100644
--- a/drivers/media/platform/mem2mem_testdev.c
+++ b/drivers/media/platform/vim2m.c
@@ -31,12 +31,11 @@
 #include <media/v4l2-event.h>
 #include <media/videobuf2-vmalloc.h>
 
-#define MEM2MEM_TEST_MODULE_NAME "mem2mem-testdev"
-
 MODULE_DESCRIPTION("Virtual device for mem2mem framework testing");
 MODULE_AUTHOR("Pawel Osciak, <pawel@osciak.com>");
 MODULE_LICENSE("GPL");
 MODULE_VERSION("0.1.1");
+MODULE_ALIAS("mem2mem_testdev");
 
 static unsigned debug;
 module_param(debug, uint, 0644);
@@ -52,7 +51,7 @@ MODULE_PARM_DESC(debug, "activates debug info");
 #define MEM2MEM_CAPTURE (1 << 0)
 #define MEM2MEM_OUTPUT  (1 << 1)
 
-#define MEM2MEM_NAME            "m2m-testdev"
+#define MEM2MEM_NAME            "vim2m"
 
 /* Per queue */
 #define MEM2MEM_DEF_NUM_BUFS    VIDEO_MAX_FRAME
@@ -72,15 +71,15 @@ MODULE_PARM_DESC(debug, "activates debug info");
         v4l2_dbg(1, debug, &dev->v4l2_dev, "%s: " fmt, __func__, ## arg)
 
 
-static void m2mtest_dev_release(struct device *dev)
+static void vim2m_dev_release(struct device *dev)
 {}
 
-static struct platform_device m2mtest_pdev = {
+static struct platform_device vim2m_pdev = {
         .name           = MEM2MEM_NAME,
-        .dev.release    = m2mtest_dev_release,
+        .dev.release    = vim2m_dev_release,
 };
 
-struct m2mtest_fmt {
+struct vim2m_fmt {
         char    *name;
         u32     fourcc;
         int     depth;
@@ -88,7 +87,7 @@ struct m2mtest_fmt {
         u32     types;
 };
 
-static struct m2mtest_fmt formats[] = {
+static struct vim2m_fmt formats[] = {
         {
                 .name   = "RGB565 (BE)",
                 .fourcc = V4L2_PIX_FMT_RGB565X, /* rrrrrggg gggbbbbb */
@@ -108,12 +107,12 @@ static struct m2mtest_fmt formats[] = {
 #define NUM_FORMATS ARRAY_SIZE(formats)
 
 /* Per-queue, driver-specific private data */
-struct m2mtest_q_data {
+struct vim2m_q_data {
         unsigned int            width;
         unsigned int            height;
         unsigned int            sizeimage;
         unsigned int            sequence;
-        struct m2mtest_fmt      *fmt;
+        struct vim2m_fmt        *fmt;
 };
 
 enum {
@@ -124,9 +123,9 @@ enum {
 #define V4L2_CID_TRANS_TIME_MSEC        (V4L2_CID_USER_BASE + 0x1000)
 #define V4L2_CID_TRANS_NUM_BUFS         (V4L2_CID_USER_BASE + 0x1001)
 
-static struct m2mtest_fmt *find_format(struct v4l2_format *f)
+static struct vim2m_fmt *find_format(struct v4l2_format *f)
 {
-        struct m2mtest_fmt *fmt;
+        struct vim2m_fmt *fmt;
         unsigned int k;
 
         for (k = 0; k < NUM_FORMATS; k++) {
@@ -141,7 +140,7 @@ static struct m2mtest_fmt *find_format(struct v4l2_format *f)
         return &formats[k];
 }
 
-struct m2mtest_dev {
+struct vim2m_dev {
         struct v4l2_device      v4l2_dev;
         struct video_device     *vfd;
 
@@ -154,9 +153,9 @@ struct m2mtest_dev {
         struct v4l2_m2m_dev     *m2m_dev;
 };
 
-struct m2mtest_ctx {
+struct vim2m_ctx {
         struct v4l2_fh          fh;
-        struct m2mtest_dev      *dev;
+        struct vim2m_dev        *dev;
 
         struct v4l2_ctrl_handler hdl;
 
@@ -177,15 +176,15 @@ struct m2mtest_ctx {
         enum v4l2_colorspace    colorspace;
 
         /* Source and destination queue data */
-        struct m2mtest_q_data   q_data[2];
+        struct vim2m_q_data   q_data[2];
 };
 
-static inline struct m2mtest_ctx *file2ctx(struct file *file)
+static inline struct vim2m_ctx *file2ctx(struct file *file)
 {
-        return container_of(file->private_data, struct m2mtest_ctx, fh);
+        return container_of(file->private_data, struct vim2m_ctx, fh);
 }
 
-static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
+static struct vim2m_q_data *get_q_data(struct vim2m_ctx *ctx,
                                          enum v4l2_buf_type type)
 {
         switch (type) {
@@ -200,12 +199,12 @@ static struct m2mtest_q_data *get_q_data(struct m2mtest_ctx *ctx,
 }
 
 
-static int device_process(struct m2mtest_ctx *ctx,
+static int device_process(struct vim2m_ctx *ctx,
                           struct vb2_buffer *in_vb,
                           struct vb2_buffer *out_vb)
 {
-        struct m2mtest_dev *dev = ctx->dev;
-        struct m2mtest_q_data *q_data;
+        struct vim2m_dev *dev = ctx->dev;
+        struct vim2m_q_data *q_data;
         u8 *p_in, *p_out;
         int x, y, t, w;
         int tile_w, bytes_left;
@@ -334,7 +333,7 @@ static int device_process(struct m2mtest_ctx *ctx,
         return 0;
 }
 
-static void schedule_irq(struct m2mtest_dev *dev, int msec_timeout)
+static void schedule_irq(struct vim2m_dev *dev, int msec_timeout)
 {
         dprintk(dev, "Scheduling a simulated irq\n");
         mod_timer(&dev->timer, jiffies + msecs_to_jiffies(msec_timeout));
@@ -349,7 +348,7 @@ static void schedule_irq(struct m2mtest_dev *dev, int msec_timeout)
  */
 static int job_ready(void *priv)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct vim2m_ctx *ctx = priv;
 
         if (v4l2_m2m_num_src_bufs_ready(ctx->fh.m2m_ctx) < ctx->translen
             || v4l2_m2m_num_dst_bufs_ready(ctx->fh.m2m_ctx) < ctx->translen) {
@@ -362,7 +361,7 @@ static int job_ready(void *priv)
 
 static void job_abort(void *priv)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct vim2m_ctx *ctx = priv;
 
         /* Will cancel the transaction in the next interrupt handler */
         ctx->aborting = 1;
@@ -376,8 +375,8 @@ static void job_abort(void *priv)
  */
 static void device_run(void *priv)
 {
-        struct m2mtest_ctx *ctx = priv;
-        struct m2mtest_dev *dev = ctx->dev;
+        struct vim2m_ctx *ctx = priv;
+        struct vim2m_dev *dev = ctx->dev;
         struct vb2_buffer *src_buf, *dst_buf;
 
         src_buf = v4l2_m2m_next_src_buf(ctx->fh.m2m_ctx);
@@ -391,12 +390,12 @@ static void device_run(void *priv)
 
 static void device_isr(unsigned long priv)
 {
-        struct m2mtest_dev *m2mtest_dev = (struct m2mtest_dev *)priv;
-        struct m2mtest_ctx *curr_ctx;
+        struct vim2m_dev *vim2m_dev = (struct vim2m_dev *)priv;
+        struct vim2m_ctx *curr_ctx;
         struct vb2_buffer *src_vb, *dst_vb;
         unsigned long flags;
 
-        curr_ctx = v4l2_m2m_get_curr_priv(m2mtest_dev->m2m_dev);
+        curr_ctx = v4l2_m2m_get_curr_priv(vim2m_dev->m2m_dev);
 
         if (NULL == curr_ctx) {
                 pr_err("Instance released before the end of transaction\n");
@@ -408,16 +407,16 @@ static void device_isr(unsigned long priv)
 
         curr_ctx->num_processed++;
 
-        spin_lock_irqsave(&m2mtest_dev->irqlock, flags);
+        spin_lock_irqsave(&vim2m_dev->irqlock, flags);
         v4l2_m2m_buf_done(src_vb, VB2_BUF_STATE_DONE);
         v4l2_m2m_buf_done(dst_vb, VB2_BUF_STATE_DONE);
-        spin_unlock_irqrestore(&m2mtest_dev->irqlock, flags);
+        spin_unlock_irqrestore(&vim2m_dev->irqlock, flags);
 
         if (curr_ctx->num_processed == curr_ctx->translen
             || curr_ctx->aborting) {
                 dprintk(curr_ctx->dev, "Finishing transaction\n");
                 curr_ctx->num_processed = 0;
-                v4l2_m2m_job_finish(m2mtest_dev->m2m_dev, curr_ctx->fh.m2m_ctx);
+                v4l2_m2m_job_finish(vim2m_dev->m2m_dev, curr_ctx->fh.m2m_ctx);
         } else {
                 device_run(curr_ctx);
         }
@@ -441,7 +440,7 @@ static int vidioc_querycap(struct file *file, void *priv,
 static int enum_fmt(struct v4l2_fmtdesc *f, u32 type)
 {
         int i, num;
-        struct m2mtest_fmt *fmt;
+        struct vim2m_fmt *fmt;
 
         num = 0;
 
@@ -480,10 +479,10 @@ static int vidioc_enum_fmt_vid_out(struct file *file, void *priv,
         return enum_fmt(f, MEM2MEM_OUTPUT);
 }
 
-static int vidioc_g_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
+static int vidioc_g_fmt(struct vim2m_ctx *ctx, struct v4l2_format *f)
 {
         struct vb2_queue *vq;
-        struct m2mtest_q_data *q_data;
+        struct vim2m_q_data *q_data;
 
         vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
         if (!vq)
@@ -514,7 +513,7 @@ static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
         return vidioc_g_fmt(file2ctx(file), f);
 }
 
-static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)
+static int vidioc_try_fmt(struct v4l2_format *f, struct vim2m_fmt *fmt)
 {
         /* V4L2 specification suggests the driver corrects the format struct
          * if any of the dimensions is unsupported */
@@ -539,8 +538,8 @@ static int vidioc_try_fmt(struct v4l2_format *f, struct m2mtest_fmt *fmt)
 static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
                                   struct v4l2_format *f)
 {
-        struct m2mtest_fmt *fmt;
-        struct m2mtest_ctx *ctx = file2ctx(file);
+        struct vim2m_fmt *fmt;
+        struct vim2m_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
         if (!fmt) {
@@ -561,8 +560,8 @@ static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
                                   struct v4l2_format *f)
 {
-        struct m2mtest_fmt *fmt;
-        struct m2mtest_ctx *ctx = file2ctx(file);
+        struct vim2m_fmt *fmt;
+        struct vim2m_ctx *ctx = file2ctx(file);
 
         fmt = find_format(f);
         if (!fmt) {
@@ -581,9 +580,9 @@ static int vidioc_try_fmt_vid_out(struct file *file, void *priv,
         return vidioc_try_fmt(f, fmt);
 }
 
-static int vidioc_s_fmt(struct m2mtest_ctx *ctx, struct v4l2_format *f)
+static int vidioc_s_fmt(struct vim2m_ctx *ctx, struct v4l2_format *f)
 {
-        struct m2mtest_q_data *q_data;
+        struct vim2m_q_data *q_data;
         struct vb2_queue *vq;
 
         vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type);
@@ -627,7 +626,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
 static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *f)
 {
-        struct m2mtest_ctx *ctx = file2ctx(file);
+        struct vim2m_ctx *ctx = file2ctx(file);
         int ret;
 
         ret = vidioc_try_fmt_vid_out(file, priv, f);
@@ -640,10 +639,10 @@ static int vidioc_s_fmt_vid_out(struct file *file, void *priv,
         return ret;
 }
 
-static int m2mtest_s_ctrl(struct v4l2_ctrl *ctrl)
+static int vim2m_s_ctrl(struct v4l2_ctrl *ctrl)
 {
-        struct m2mtest_ctx *ctx =
-                container_of(ctrl->handler, struct m2mtest_ctx, hdl);
+        struct vim2m_ctx *ctx =
+                container_of(ctrl->handler, struct vim2m_ctx, hdl);
 
         switch (ctrl->id) {
         case V4L2_CID_HFLIP:
@@ -676,12 +675,12 @@ static int m2mtest_s_ctrl(struct v4l2_ctrl *ctrl)
         return 0;
 }
 
-static const struct v4l2_ctrl_ops m2mtest_ctrl_ops = {
-        .s_ctrl = m2mtest_s_ctrl,
+static const struct v4l2_ctrl_ops vim2m_ctrl_ops = {
+        .s_ctrl = vim2m_s_ctrl,
 };
 
 
-static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
+static const struct v4l2_ioctl_ops vim2m_ioctl_ops = {
         .vidioc_querycap        = vidioc_querycap,
 
         .vidioc_enum_fmt_vid_cap = vidioc_enum_fmt_vid_cap,
@@ -698,6 +697,7 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
         .vidioc_querybuf        = v4l2_m2m_ioctl_querybuf,
         .vidioc_qbuf            = v4l2_m2m_ioctl_qbuf,
         .vidioc_dqbuf           = v4l2_m2m_ioctl_dqbuf,
+        .vidioc_expbuf          = v4l2_m2m_ioctl_expbuf,
 
         .vidioc_streamon        = v4l2_m2m_ioctl_streamon,
         .vidioc_streamoff       = v4l2_m2m_ioctl_streamoff,
@@ -711,13 +711,13 @@ static const struct v4l2_ioctl_ops m2mtest_ioctl_ops = {
  * Queue operations
  */
 
-static int m2mtest_queue_setup(struct vb2_queue *vq,
+static int vim2m_queue_setup(struct vb2_queue *vq,
                                 const struct v4l2_format *fmt,
                                 unsigned int *nbuffers, unsigned int *nplanes,
                                 unsigned int sizes[], void *alloc_ctxs[])
 {
-        struct m2mtest_ctx *ctx = vb2_get_drv_priv(vq);
-        struct m2mtest_q_data *q_data;
+        struct vim2m_ctx *ctx = vb2_get_drv_priv(vq);
+        struct vim2m_q_data *q_data;
         unsigned int size, count = *nbuffers;
 
         q_data = get_q_data(ctx, vq->type);
@@ -741,10 +741,10 @@ static int m2mtest_queue_setup(struct vb2_queue *vq,
         return 0;
 }
 
-static int m2mtest_buf_prepare(struct vb2_buffer *vb)
+static int vim2m_buf_prepare(struct vb2_buffer *vb)
 {
-        struct m2mtest_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
-        struct m2mtest_q_data *q_data;
+        struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        struct vim2m_q_data *q_data;
 
         dprintk(ctx->dev, "type: %d\n", vb->vb2_queue->type);
 
@@ -770,25 +770,25 @@ static int m2mtest_buf_prepare(struct vb2_buffer *vb)
         return 0;
 }
 
-static void m2mtest_buf_queue(struct vb2_buffer *vb)
+static void vim2m_buf_queue(struct vb2_buffer *vb)
 {
-        struct m2mtest_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
+        struct vim2m_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
 
         v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vb);
 }
 
-static int m2mtest_start_streaming(struct vb2_queue *q, unsigned count)
+static int vim2m_start_streaming(struct vb2_queue *q, unsigned count)
 {
-        struct m2mtest_ctx *ctx = vb2_get_drv_priv(q);
-        struct m2mtest_q_data *q_data = get_q_data(ctx, q->type);
+        struct vim2m_ctx *ctx = vb2_get_drv_priv(q);
+        struct vim2m_q_data *q_data = get_q_data(ctx, q->type);
 
         q_data->sequence = 0;
         return 0;
 }
 
-static void m2mtest_stop_streaming(struct vb2_queue *q)
+static void vim2m_stop_streaming(struct vb2_queue *q)
 {
-        struct m2mtest_ctx *ctx = vb2_get_drv_priv(q);
+        struct vim2m_ctx *ctx = vb2_get_drv_priv(q);
         struct vb2_buffer *vb;
         unsigned long flags;
 
@@ -805,26 +805,26 @@ static void m2mtest_stop_streaming(struct vb2_queue *q)
         }
 }
 
-static struct vb2_ops m2mtest_qops = {
-        .queue_setup     = m2mtest_queue_setup,
-        .buf_prepare     = m2mtest_buf_prepare,
-        .buf_queue       = m2mtest_buf_queue,
-        .start_streaming = m2mtest_start_streaming,
-        .stop_streaming  = m2mtest_stop_streaming,
+static struct vb2_ops vim2m_qops = {
+        .queue_setup     = vim2m_queue_setup,
+        .buf_prepare     = vim2m_buf_prepare,
+        .buf_queue       = vim2m_buf_queue,
+        .start_streaming = vim2m_start_streaming,
+        .stop_streaming  = vim2m_stop_streaming,
         .wait_prepare    = vb2_ops_wait_prepare,
         .wait_finish     = vb2_ops_wait_finish,
 };
 
 static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)
 {
-        struct m2mtest_ctx *ctx = priv;
+        struct vim2m_ctx *ctx = priv;
         int ret;
 
         src_vq->type = V4L2_BUF_TYPE_VIDEO_OUTPUT;
         src_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         src_vq->drv_priv = ctx;
         src_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        src_vq->ops = &m2mtest_qops;
+        src_vq->ops = &vim2m_qops;
         src_vq->mem_ops = &vb2_vmalloc_memops;
         src_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         src_vq->lock = &ctx->dev->dev_mutex;
@@ -837,7 +837,7 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         dst_vq->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF;
         dst_vq->drv_priv = ctx;
         dst_vq->buf_struct_size = sizeof(struct v4l2_m2m_buffer);
-        dst_vq->ops = &m2mtest_qops;
+        dst_vq->ops = &vim2m_qops;
         dst_vq->mem_ops = &vb2_vmalloc_memops;
         dst_vq->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_COPY;
         dst_vq->lock = &ctx->dev->dev_mutex;
@@ -845,8 +845,8 @@ static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *ds
         return vb2_queue_init(dst_vq);
 }
 
-static const struct v4l2_ctrl_config m2mtest_ctrl_trans_time_msec = {
-        .ops = &m2mtest_ctrl_ops,
+static const struct v4l2_ctrl_config vim2m_ctrl_trans_time_msec = {
+        .ops = &vim2m_ctrl_ops,
         .id = V4L2_CID_TRANS_TIME_MSEC,
         .name = "Transaction Time (msec)",
         .type = V4L2_CTRL_TYPE_INTEGER,
@@ -856,8 +856,8 @@ static const struct v4l2_ctrl_config m2mtest_ctrl_trans_time_msec = {
         .step = 1,
 };
 
-static const struct v4l2_ctrl_config m2mtest_ctrl_trans_num_bufs = {
-        .ops = &m2mtest_ctrl_ops,
+static const struct v4l2_ctrl_config vim2m_ctrl_trans_num_bufs = {
+        .ops = &vim2m_ctrl_ops,
         .id = V4L2_CID_TRANS_NUM_BUFS,
         .name = "Buffers Per Transaction",
         .type = V4L2_CTRL_TYPE_INTEGER,
@@ -870,10 +870,10 @@ static const struct v4l2_ctrl_config m2mtest_ctrl_trans_num_bufs = {
 /*
  * File operations
  */
-static int m2mtest_open(struct file *file)
+static int vim2m_open(struct file *file)
 {
-        struct m2mtest_dev *dev = video_drvdata(file);
-        struct m2mtest_ctx *ctx = NULL;
+        struct vim2m_dev *dev = video_drvdata(file);
+        struct vim2m_ctx *ctx = NULL;
         struct v4l2_ctrl_handler *hdl;
         int rc = 0;
 
@@ -890,10 +890,10 @@ static int m2mtest_open(struct file *file)
         ctx->dev = dev;
         hdl = &ctx->hdl;
         v4l2_ctrl_handler_init(hdl, 4);
-        v4l2_ctrl_new_std(hdl, &m2mtest_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0);
-        v4l2_ctrl_new_std(hdl, &m2mtest_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0);
-        v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_time_msec, NULL);
-        v4l2_ctrl_new_custom(hdl, &m2mtest_ctrl_trans_num_bufs, NULL);
+        v4l2_ctrl_new_std(hdl, &vim2m_ctrl_ops, V4L2_CID_HFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_std(hdl, &vim2m_ctrl_ops, V4L2_CID_VFLIP, 0, 1, 1, 0);
+        v4l2_ctrl_new_custom(hdl, &vim2m_ctrl_trans_time_msec, NULL);
+        v4l2_ctrl_new_custom(hdl, &vim2m_ctrl_trans_num_bufs, NULL);
         if (hdl->error) {
                 rc = hdl->error;
                 v4l2_ctrl_handler_free(hdl);
@@ -933,10 +933,10 @@ open_unlock:
         return rc;
 }
 
-static int m2mtest_release(struct file *file)
+static int vim2m_release(struct file *file)
 {
-        struct m2mtest_dev *dev = video_drvdata(file);
-        struct m2mtest_ctx *ctx = file2ctx(file);
+        struct vim2m_dev *dev = video_drvdata(file);
+        struct vim2m_ctx *ctx = file2ctx(file);
 
         dprintk(dev, "Releasing instance %p\n", ctx);
 
@@ -953,20 +953,20 @@ static int m2mtest_release(struct file *file)
         return 0;
 }
 
-static const struct v4l2_file_operations m2mtest_fops = {
+static const struct v4l2_file_operations vim2m_fops = {
         .owner          = THIS_MODULE,
-        .open           = m2mtest_open,
-        .release        = m2mtest_release,
+        .open           = vim2m_open,
+        .release        = vim2m_release,
         .poll           = v4l2_m2m_fop_poll,
         .unlocked_ioctl = video_ioctl2,
         .mmap           = v4l2_m2m_fop_mmap,
 };
 
-static struct video_device m2mtest_videodev = {
+static struct video_device vim2m_videodev = {
         .name           = MEM2MEM_NAME,
         .vfl_dir        = VFL_DIR_M2M,
-        .fops           = &m2mtest_fops,
-        .ioctl_ops      = &m2mtest_ioctl_ops,
+        .fops           = &vim2m_fops,
+        .ioctl_ops      = &vim2m_ioctl_ops,
         .minor          = -1,
         .release        = video_device_release,
 };
@@ -977,9 +977,9 @@ static struct v4l2_m2m_ops m2m_ops = {
         .job_abort      = job_abort,
 };
 
-static int m2mtest_probe(struct platform_device *pdev)
+static int vim2m_probe(struct platform_device *pdev)
 {
-        struct m2mtest_dev *dev;
+        struct vim2m_dev *dev;
         struct video_device *vfd;
         int ret;
 
@@ -1003,7 +1003,7 @@ static int m2mtest_probe(struct platform_device *pdev)
                 goto unreg_dev;
         }
 
-        *vfd = m2mtest_videodev;
+        *vfd = vim2m_videodev;
         vfd->lock = &dev->dev_mutex;
         vfd->v4l2_dev = &dev->v4l2_dev;
 
@@ -1014,7 +1014,7 @@ static int m2mtest_probe(struct platform_device *pdev)
         }
 
         video_set_drvdata(vfd, dev);
-        snprintf(vfd->name, sizeof(vfd->name), "%s", m2mtest_videodev.name);
+        snprintf(vfd->name, sizeof(vfd->name), "%s", vim2m_videodev.name);
         dev->vfd = vfd;
         v4l2_info(&dev->v4l2_dev,
                         "Device registered as /dev/video%d\n", vfd->num);
@@ -1042,11 +1042,11 @@ unreg_dev:
         return ret;
 }
 
-static int m2mtest_remove(struct platform_device *pdev)
+static int vim2m_remove(struct platform_device *pdev)
 {
-        struct m2mtest_dev *dev = platform_get_drvdata(pdev);
+        struct vim2m_dev *dev = platform_get_drvdata(pdev);
 
-        v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_TEST_MODULE_NAME);
+        v4l2_info(&dev->v4l2_dev, "Removing " MEM2MEM_NAME);
         v4l2_m2m_release(dev->m2m_dev);
         del_timer_sync(&dev->timer);
         video_unregister_device(dev->vfd);
@@ -1055,35 +1055,35 @@ static int m2mtest_remove(struct platform_device *pdev)
         return 0;
 }
 
-static struct platform_driver m2mtest_pdrv = {
-        .probe          = m2mtest_probe,
-        .remove         = m2mtest_remove,
+static struct platform_driver vim2m_pdrv = {
+        .probe          = vim2m_probe,
+        .remove         = vim2m_remove,
         .driver         = {
                 .name   = MEM2MEM_NAME,
                 .owner  = THIS_MODULE,
         },
 };
 
-static void __exit m2mtest_exit(void)
+static void __exit vim2m_exit(void)
 {
-        platform_driver_unregister(&m2mtest_pdrv);
-        platform_device_unregister(&m2mtest_pdev);
+        platform_driver_unregister(&vim2m_pdrv);
+        platform_device_unregister(&vim2m_pdev);
 }
 
-static int __init m2mtest_init(void)
+static int __init vim2m_init(void)
 {
         int ret;
 
-        ret = platform_device_register(&m2mtest_pdev);
+        ret = platform_device_register(&vim2m_pdev);
         if (ret)
                 return ret;
 
-        ret = platform_driver_register(&m2mtest_pdrv);
+        ret = platform_driver_register(&vim2m_pdrv);
         if (ret)
-                platform_device_unregister(&m2mtest_pdev);
+                platform_device_unregister(&vim2m_pdev);
 
         return 0;
 }
 
-module_init(m2mtest_init);
-module_exit(m2mtest_exit);
+module_init(vim2m_init);
+module_exit(vim2m_exit);
diff --git a/drivers/media/platform/vino.c b/drivers/media/platform/vino.c
index 91d44ea16f27..2c85357f774d 100644
--- a/drivers/media/platform/vino.c
+++ b/drivers/media/platform/vino.c
@@ -2932,10 +2932,8 @@ static int vino_querycap(struct file *file, void *__fh,
         strcpy(cap->driver, vino_driver_name);
         strcpy(cap->card, vino_driver_description);
         strcpy(cap->bus_info, vino_bus_name);
-        cap->capabilities =
-                V4L2_CAP_VIDEO_CAPTURE |
-                V4L2_CAP_STREAMING;
-        // V4L2_CAP_OVERLAY, V4L2_CAP_READWRITE
+        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        cap->capabilities = cap->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 686c3c2ad05b..a7e033a5d291 100644
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -195,20 +195,6 @@ static const u8 vivid_hdmi_edid[256] = {
         0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd7
 };
 
-void vivid_lock(struct vb2_queue *vq)
-{
-        struct vivid_dev *dev = vb2_get_drv_priv(vq);
-
-        mutex_lock(&dev->mutex);
-}
-
-void vivid_unlock(struct vb2_queue *vq)
-{
-        struct vivid_dev *dev = vb2_get_drv_priv(vq);
-
-        mutex_unlock(&dev->mutex);
-}
-
 static int vidioc_querycap(struct file *file, void  *priv,
                                         struct v4l2_capability *cap)
 {
@@ -586,7 +572,7 @@ static const struct v4l2_ioctl_ops vivid_ioctl_ops = {
         .vidioc_querybuf                = vb2_ioctl_querybuf,
         .vidioc_qbuf                    = vb2_ioctl_qbuf,
         .vidioc_dqbuf                   = vb2_ioctl_dqbuf,
-/* Not yet      .vidioc_expbuf          = vb2_ioctl_expbuf,*/
+        .vidioc_expbuf                  = vb2_ioctl_expbuf,
         .vidioc_streamon                = vb2_ioctl_streamon,
         .vidioc_streamoff               = vb2_ioctl_streamoff,
 
@@ -1018,6 +1004,7 @@ static int __init vivid_create_instance(int inst)
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 q->min_buffers_needed = 2;
+                q->lock = &dev->mutex;
 
                 ret = vb2_queue_init(q);
                 if (ret)
@@ -1036,6 +1023,7 @@ static int __init vivid_create_instance(int inst)
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 q->min_buffers_needed = 2;
+                q->lock = &dev->mutex;
 
                 ret = vb2_queue_init(q);
                 if (ret)
@@ -1054,6 +1042,7 @@ static int __init vivid_create_instance(int inst)
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 q->min_buffers_needed = 2;
+                q->lock = &dev->mutex;
 
                 ret = vb2_queue_init(q);
                 if (ret)
@@ -1072,6 +1061,7 @@ static int __init vivid_create_instance(int inst)
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 q->min_buffers_needed = 2;
+                q->lock = &dev->mutex;
 
                 ret = vb2_queue_init(q);
                 if (ret)
@@ -1089,6 +1079,7 @@ static int __init vivid_create_instance(int inst)
                 q->mem_ops = &vb2_vmalloc_memops;
                 q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC;
                 q->min_buffers_needed = 8;
+                q->lock = &dev->mutex;
 
                 ret = vb2_queue_init(q);
                 if (ret)
diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h
index 811c286491a5..4b497df4b6a4 100644
--- a/drivers/media/platform/vivid/vivid-core.h
+++ b/drivers/media/platform/vivid/vivid-core.h
@@ -116,6 +116,17 @@ enum vivid_signal_mode {
         CUSTOM_DV_TIMINGS,
 };
 
+enum vivid_colorspace {
+        VIVID_CS_170M,
+        VIVID_CS_709,
+        VIVID_CS_SRGB,
+        VIVID_CS_ADOBERGB,
+        VIVID_CS_2020,
+        VIVID_CS_240M,
+        VIVID_CS_SYS_M,
+        VIVID_CS_SYS_BG,
+};
+
 #define VIVID_INVALID_SIGNAL(mode) \
         ((mode) == NO_SIGNAL || (mode) == NO_LOCK || (mode) == OUT_OF_RANGE)
 
@@ -318,6 +329,8 @@ struct vivid_dev {
         v4l2_std_id                     std_out;
         struct v4l2_dv_timings          dv_timings_out;
         u32                             colorspace_out;
+        u32                             ycbcr_enc_out;
+        u32                             quantization_out;
         u32                             service_set_out;
         u32                             bytesperline_out[2];
         unsigned                        tv_field_out;
@@ -514,7 +527,4 @@ static inline bool vivid_is_hdmi_out(const struct vivid_dev *dev)
         return dev->output_type[dev->output] == HDMI;
 }
 
-void vivid_lock(struct vb2_queue *vq);
-void vivid_unlock(struct vb2_queue *vq);
-
 #endif
diff --git a/drivers/media/platform/vivid/vivid-ctrls.c b/drivers/media/platform/vivid/vivid-ctrls.c
index d5cbf0038f24..857e7866e8bc 100644
--- a/drivers/media/platform/vivid/vivid-ctrls.c
+++ b/drivers/media/platform/vivid/vivid-ctrls.c
@@ -40,6 +40,9 @@
 #define VIVID_CID_STRING                (VIVID_CID_CUSTOM_BASE + 5)
 #define VIVID_CID_BITMASK               (VIVID_CID_CUSTOM_BASE + 6)
 #define VIVID_CID_INTMENU               (VIVID_CID_CUSTOM_BASE + 7)
+#define VIVID_CID_U32_ARRAY             (VIVID_CID_CUSTOM_BASE + 8)
+#define VIVID_CID_U16_MATRIX            (VIVID_CID_CUSTOM_BASE + 9)
+#define VIVID_CID_U8_4D_ARRAY           (VIVID_CID_CUSTOM_BASE + 10)
 
 #define VIVID_CID_VIVID_BASE            (0x00f00000 | 0xf000)
 #define VIVID_CID_VIVID_CLASS           (0x00f00000 | 1)
@@ -59,19 +62,21 @@
 #define VIVID_CID_DV_TIMINGS_ASPECT_RATIO       (VIVID_CID_VIVID_BASE + 23)
 #define VIVID_CID_TSTAMP_SRC            (VIVID_CID_VIVID_BASE + 24)
 #define VIVID_CID_COLORSPACE            (VIVID_CID_VIVID_BASE + 25)
-#define VIVID_CID_LIMITED_RGB_RANGE     (VIVID_CID_VIVID_BASE + 26)
-#define VIVID_CID_ALPHA_MODE            (VIVID_CID_VIVID_BASE + 27)
-#define VIVID_CID_HAS_CROP_CAP          (VIVID_CID_VIVID_BASE + 28)
-#define VIVID_CID_HAS_COMPOSE_CAP       (VIVID_CID_VIVID_BASE + 29)
-#define VIVID_CID_HAS_SCALER_CAP        (VIVID_CID_VIVID_BASE + 30)
-#define VIVID_CID_HAS_CROP_OUT          (VIVID_CID_VIVID_BASE + 31)
-#define VIVID_CID_HAS_COMPOSE_OUT       (VIVID_CID_VIVID_BASE + 32)
-#define VIVID_CID_HAS_SCALER_OUT        (VIVID_CID_VIVID_BASE + 33)
-#define VIVID_CID_LOOP_VIDEO            (VIVID_CID_VIVID_BASE + 34)
-#define VIVID_CID_SEQ_WRAP              (VIVID_CID_VIVID_BASE + 35)
-#define VIVID_CID_TIME_WRAP             (VIVID_CID_VIVID_BASE + 36)
-#define VIVID_CID_MAX_EDID_BLOCKS       (VIVID_CID_VIVID_BASE + 37)
-#define VIVID_CID_PERCENTAGE_FILL       (VIVID_CID_VIVID_BASE + 38)
+#define VIVID_CID_YCBCR_ENC             (VIVID_CID_VIVID_BASE + 26)
+#define VIVID_CID_QUANTIZATION          (VIVID_CID_VIVID_BASE + 27)
+#define VIVID_CID_LIMITED_RGB_RANGE     (VIVID_CID_VIVID_BASE + 28)
+#define VIVID_CID_ALPHA_MODE            (VIVID_CID_VIVID_BASE + 29)
+#define VIVID_CID_HAS_CROP_CAP          (VIVID_CID_VIVID_BASE + 30)
+#define VIVID_CID_HAS_COMPOSE_CAP       (VIVID_CID_VIVID_BASE + 31)
+#define VIVID_CID_HAS_SCALER_CAP        (VIVID_CID_VIVID_BASE + 32)
+#define VIVID_CID_HAS_CROP_OUT          (VIVID_CID_VIVID_BASE + 33)
+#define VIVID_CID_HAS_COMPOSE_OUT       (VIVID_CID_VIVID_BASE + 34)
+#define VIVID_CID_HAS_SCALER_OUT        (VIVID_CID_VIVID_BASE + 35)
+#define VIVID_CID_LOOP_VIDEO            (VIVID_CID_VIVID_BASE + 36)
+#define VIVID_CID_SEQ_WRAP              (VIVID_CID_VIVID_BASE + 37)
+#define VIVID_CID_TIME_WRAP             (VIVID_CID_VIVID_BASE + 38)
+#define VIVID_CID_MAX_EDID_BLOCKS       (VIVID_CID_VIVID_BASE + 39)
+#define VIVID_CID_PERCENTAGE_FILL       (VIVID_CID_VIVID_BASE + 40)
 
 #define VIVID_CID_STD_SIGNAL_MODE       (VIVID_CID_VIVID_BASE + 60)
 #define VIVID_CID_STANDARD              (VIVID_CID_VIVID_BASE + 61)
@@ -163,6 +168,42 @@ static const struct v4l2_ctrl_config vivid_ctrl_int64 = {
         .step = 1,
 };
 
+static const struct v4l2_ctrl_config vivid_ctrl_u32_array = {
+        .ops = &vivid_user_gen_ctrl_ops,
+        .id = VIVID_CID_U32_ARRAY,
+        .name = "U32 1 Element Array",
+        .type = V4L2_CTRL_TYPE_U32,
+        .def = 0x18,
+        .min = 0x10,
+        .max = 0x20000,
+        .step = 1,
+        .dims = { 1 },
+};
+
+static const struct v4l2_ctrl_config vivid_ctrl_u16_matrix = {
+        .ops = &vivid_user_gen_ctrl_ops,
+        .id = VIVID_CID_U16_MATRIX,
+        .name = "U16 8x16 Matrix",
+        .type = V4L2_CTRL_TYPE_U16,
+        .def = 0x18,
+        .min = 0x10,
+        .max = 0x2000,
+        .step = 1,
+        .dims = { 8, 16 },
+};
+
+static const struct v4l2_ctrl_config vivid_ctrl_u8_4d_array = {
+        .ops = &vivid_user_gen_ctrl_ops,
+        .id = VIVID_CID_U8_4D_ARRAY,
+        .name = "U8 2x3x4x5 Array",
+        .type = V4L2_CTRL_TYPE_U8,
+        .def = 0x18,
+        .min = 0x10,
+        .max = 0x20,
+        .step = 1,
+        .dims = { 2, 3, 4, 5 },
+};
+
 static const char * const vivid_ctrl_menu_strings[] = {
         "Menu Item 0 (Skipped)",
         "Menu Item 1",
@@ -294,6 +335,16 @@ static const struct v4l2_ctrl_ops vivid_user_vid_ctrl_ops = {
 
 static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl)
 {
+        static const u32 colorspaces[] = {
+                V4L2_COLORSPACE_SMPTE170M,
+                V4L2_COLORSPACE_REC709,
+                V4L2_COLORSPACE_SRGB,
+                V4L2_COLORSPACE_ADOBERGB,
+                V4L2_COLORSPACE_BT2020,
+                V4L2_COLORSPACE_SMPTE240M,
+                V4L2_COLORSPACE_470_SYSTEM_M,
+                V4L2_COLORSPACE_470_SYSTEM_BG,
+        };
         struct vivid_dev *dev = container_of(ctrl->handler, struct vivid_dev, ctrl_hdl_vid_cap);
         unsigned i;
 
@@ -303,7 +354,21 @@ static int vivid_vid_cap_s_ctrl(struct v4l2_ctrl *ctrl)
                 tpg_s_pattern(&dev->tpg, ctrl->val);
                 break;
         case VIVID_CID_COLORSPACE:
-                tpg_s_colorspace(&dev->tpg, ctrl->val);
+                tpg_s_colorspace(&dev->tpg, colorspaces[ctrl->val]);
+                vivid_send_source_change(dev, TV);
+                vivid_send_source_change(dev, SVID);
+                vivid_send_source_change(dev, HDMI);
+                vivid_send_source_change(dev, WEBCAM);
+                break;
+        case VIVID_CID_YCBCR_ENC:
+                tpg_s_ycbcr_enc(&dev->tpg, ctrl->val);
+                vivid_send_source_change(dev, TV);
+                vivid_send_source_change(dev, SVID);
+                vivid_send_source_change(dev, HDMI);
+                vivid_send_source_change(dev, WEBCAM);
+                break;
+        case VIVID_CID_QUANTIZATION:
+                tpg_s_quantization(&dev->tpg, ctrl->val);
                 vivid_send_source_change(dev, TV);
                 vivid_send_source_change(dev, SVID);
                 vivid_send_source_change(dev, HDMI);
@@ -623,15 +688,14 @@ static const struct v4l2_ctrl_config vivid_ctrl_max_edid_blocks = {
 };
 
 static const char * const vivid_ctrl_colorspace_strings[] = {
-        "",
         "SMPTE 170M",
-        "SMPTE 240M",
         "REC 709",
-        "", /* Skip Bt878 entry */
+        "sRGB",
+        "AdobeRGB",
+        "BT.2020",
+        "SMPTE 240M",
         "470 System M",
         "470 System BG",
-        "", /* Skip JPEG entry */
-        "sRGB",
         NULL,
 };
 
@@ -640,13 +704,49 @@ static const struct v4l2_ctrl_config vivid_ctrl_colorspace = {
         .id = VIVID_CID_COLORSPACE,
         .name = "Colorspace",
         .type = V4L2_CTRL_TYPE_MENU,
-        .min = 1,
-        .max = 8,
-        .menu_skip_mask = (1 << 4) | (1 << 7),
-        .def = 8,
+        .max = 7,
+        .def = 2,
         .qmenu = vivid_ctrl_colorspace_strings,
 };
 
+static const char * const vivid_ctrl_ycbcr_enc_strings[] = {
+        "Default",
+        "ITU-R 601",
+        "Rec. 709",
+        "xvYCC 601",
+        "xvYCC 709",
+        "sYCC",
+        "BT.2020 Non-Constant Luminance",
+        "BT.2020 Constant Luminance",
+        "SMPTE 240M",
+        NULL,
+};
+
+static const struct v4l2_ctrl_config vivid_ctrl_ycbcr_enc = {
+        .ops = &vivid_vid_cap_ctrl_ops,
+        .id = VIVID_CID_YCBCR_ENC,
+        .name = "Y'CbCr Encoding",
+        .type = V4L2_CTRL_TYPE_MENU,
+        .max = 8,
+        .qmenu = vivid_ctrl_ycbcr_enc_strings,
+};
+
+static const char * const vivid_ctrl_quantization_strings[] = {
+        "Default",
+        "Full Range",
+        "Limited Range",
+        NULL,
+};
+
+static const struct v4l2_ctrl_config vivid_ctrl_quantization = {
+        .ops = &vivid_vid_cap_ctrl_ops,
+        .id = VIVID_CID_QUANTIZATION,
+        .name = "Quantization",
+        .type = V4L2_CTRL_TYPE_MENU,
+        .max = 2,
+        .qmenu = vivid_ctrl_quantization_strings,
+};
+
 static const struct v4l2_ctrl_config vivid_ctrl_alpha_mode = {
         .ops = &vivid_vid_cap_ctrl_ops,
         .id = VIVID_CID_ALPHA_MODE,
@@ -723,8 +823,12 @@ static int vivid_vid_out_s_ctrl(struct v4l2_ctrl *ctrl)
                                 dev->colorspace_out = V4L2_COLORSPACE_SMPTE170M;
                         else
                                 dev->colorspace_out = V4L2_COLORSPACE_REC709;
+                        dev->quantization_out = V4L2_QUANTIZATION_DEFAULT;
                 } else {
                         dev->colorspace_out = V4L2_COLORSPACE_SRGB;
+                        dev->quantization_out = dev->dvi_d_out ?
+                                        V4L2_QUANTIZATION_LIM_RANGE :
+                                        V4L2_QUANTIZATION_DEFAULT;
                 }
                 if (dev->loop_video)
                         vivid_send_source_change(dev, HDMI);
@@ -792,15 +896,15 @@ static int vivid_streaming_s_ctrl(struct v4l2_ctrl *ctrl)
                 dev->start_streaming_error = true;
                 break;
         case VIVID_CID_QUEUE_ERROR:
-                if (dev->vb_vid_cap_q.start_streaming_called)
+                if (vb2_start_streaming_called(&dev->vb_vid_cap_q))
                         vb2_queue_error(&dev->vb_vid_cap_q);
-                if (dev->vb_vbi_cap_q.start_streaming_called)
+                if (vb2_start_streaming_called(&dev->vb_vbi_cap_q))
                         vb2_queue_error(&dev->vb_vbi_cap_q);
-                if (dev->vb_vid_out_q.start_streaming_called)
+                if (vb2_start_streaming_called(&dev->vb_vid_out_q))
                         vb2_queue_error(&dev->vb_vid_out_q);
-                if (dev->vb_vbi_out_q.start_streaming_called)
+                if (vb2_start_streaming_called(&dev->vb_vbi_out_q))
                         vb2_queue_error(&dev->vb_vbi_out_q);
-                if (dev->vb_sdr_cap_q.start_streaming_called)
+                if (vb2_start_streaming_called(&dev->vb_sdr_cap_q))
                         vb2_queue_error(&dev->vb_sdr_cap_q);
                 break;
         case VIVID_CID_SEQ_WRAP:
@@ -1222,6 +1326,9 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
         dev->string = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_string, NULL);
         dev->bitmask = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_bitmask, NULL);
         dev->int_menu = v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_int_menu, NULL);
+        v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u32_array, NULL);
+        v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u16_matrix, NULL);
+        v4l2_ctrl_new_custom(hdl_user_gen, &vivid_ctrl_u8_4d_array, NULL);
 
         if (dev->has_vid_cap) {
                 /* Image Processing Controls */
@@ -1258,6 +1365,8 @@ int vivid_create_controls(struct vivid_dev *dev, bool show_ccs_cap,
                 v4l2_ctrl_new_custom(hdl_vid_cap, &vivid_ctrl_tstamp_src, NULL);
                 dev->colorspace = v4l2_ctrl_new_custom(hdl_vid_cap,
                         &vivid_ctrl_colorspace, NULL);
+                v4l2_ctrl_new_custom(hdl_vid_cap, &vivid_ctrl_ycbcr_enc, NULL);
+                v4l2_ctrl_new_custom(hdl_vid_cap, &vivid_ctrl_quantization, NULL);
                 v4l2_ctrl_new_custom(hdl_vid_cap, &vivid_ctrl_alpha_mode, NULL);
         }
 
diff --git a/drivers/media/platform/vivid/vivid-sdr-cap.c b/drivers/media/platform/vivid/vivid-sdr-cap.c
index 8c5d661cfc49..4af55f18829f 100644
--- a/drivers/media/platform/vivid/vivid-sdr-cap.c
+++ b/drivers/media/platform/vivid/vivid-sdr-cap.c
@@ -297,8 +297,8 @@ const struct vb2_ops vivid_sdr_cap_qops = {
         .buf_queue              = sdr_cap_buf_queue,
         .start_streaming        = sdr_cap_start_streaming,
         .stop_streaming         = sdr_cap_stop_streaming,
-        .wait_prepare           = vivid_unlock,
-        .wait_finish            = vivid_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 int vivid_sdr_enum_freq_bands(struct file *file, void *fh, struct v4l2_frequency_band *band)
diff --git a/drivers/media/platform/vivid/vivid-tpg-colors.c b/drivers/media/platform/vivid/vivid-tpg-colors.c
index 2adddc0ca662..424aa7abc723 100644
--- a/drivers/media/platform/vivid/vivid-tpg-colors.c
+++ b/drivers/media/platform/vivid/vivid-tpg-colors.c
@@ -12,7 +12,7 @@
  * This source also contains the code used to generate the tpg_csc_colors
  * table. Run the following command to compile it:
  *
- *      gcc vivid-colors.c -DCOMPILE_APP -o gen-colors -lm
+ *      gcc vivid-tpg-colors.c -DCOMPILE_APP -o gen-colors -lm
  *
  * and run the utility.
  *
@@ -78,22 +78,542 @@ const struct color tpg_colors[TPG_COLOR_MAX] = {
 #ifndef COMPILE_APP
 
 /* Generated table */
-const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLACK + 1] = {
-        [V4L2_COLORSPACE_SMPTE170M][0] = { 2953, 2939, 2939 },
-        [V4L2_COLORSPACE_SMPTE170M][1] = { 2954, 2963, 585 },
-        [V4L2_COLORSPACE_SMPTE170M][2] = { 84, 2967, 2937 },
-        [V4L2_COLORSPACE_SMPTE170M][3] = { 93, 2990, 575 },
-        [V4L2_COLORSPACE_SMPTE170M][4] = { 3030, 259, 2933 },
-        [V4L2_COLORSPACE_SMPTE170M][5] = { 3031, 406, 557 },
-        [V4L2_COLORSPACE_SMPTE170M][6] = { 544, 428, 2931 },
-        [V4L2_COLORSPACE_SMPTE170M][7] = { 551, 547, 547 },
+const unsigned short tpg_rec709_to_linear[255 * 16 + 1] = {
+           0,    0,    0,    1,    1,    1,    1,    2,    2,    2,    2,    2,    3,    3,    3,    3,
+           4,    4,    4,    4,    4,    5,    5,    5,    5,    6,    6,    6,    6,    6,    7,    7,
+           7,    7,    8,    8,    8,    8,    8,    9,    9,    9,    9,   10,   10,   10,   10,   10,
+          11,   11,   11,   11,   12,   12,   12,   12,   12,   13,   13,   13,   13,   14,   14,   14,
+          14,   14,   15,   15,   15,   15,   16,   16,   16,   16,   16,   17,   17,   17,   17,   18,
+          18,   18,   18,   18,   19,   19,   19,   19,   20,   20,   20,   20,   20,   21,   21,   21,
+          21,   22,   22,   22,   22,   22,   23,   23,   23,   23,   24,   24,   24,   24,   24,   25,
+          25,   25,   25,   26,   26,   26,   26,   26,   27,   27,   27,   27,   28,   28,   28,   28,
+          28,   29,   29,   29,   29,   30,   30,   30,   30,   30,   31,   31,   31,   31,   32,   32,
+          32,   32,   32,   33,   33,   33,   33,   34,   34,   34,   34,   34,   35,   35,   35,   35,
+          36,   36,   36,   36,   36,   37,   37,   37,   37,   38,   38,   38,   38,   38,   39,   39,
+          39,   39,   40,   40,   40,   40,   40,   41,   41,   41,   41,   42,   42,   42,   42,   42,
+          43,   43,   43,   43,   44,   44,   44,   44,   44,   45,   45,   45,   45,   46,   46,   46,
+          46,   46,   47,   47,   47,   47,   48,   48,   48,   48,   48,   49,   49,   49,   49,   50,
+          50,   50,   50,   50,   51,   51,   51,   51,   52,   52,   52,   52,   52,   53,   53,   53,
+          53,   54,   54,   54,   54,   54,   55,   55,   55,   55,   56,   56,   56,   56,   56,   57,
+          57,   57,   57,   58,   58,   58,   58,   58,   59,   59,   59,   59,   60,   60,   60,   60,
+          60,   61,   61,   61,   61,   62,   62,   62,   62,   62,   63,   63,   63,   63,   64,   64,
+          64,   64,   64,   65,   65,   65,   65,   66,   66,   66,   66,   66,   67,   67,   67,   67,
+          68,   68,   68,   68,   68,   69,   69,   69,   69,   70,   70,   70,   70,   70,   71,   71,
+          71,   71,   72,   72,   72,   72,   72,   73,   73,   73,   73,   73,   74,   74,   74,   74,
+          74,   75,   75,   75,   75,   76,   76,   76,   76,   76,   77,   77,   77,   77,   78,   78,
+          78,   78,   79,   79,   79,   79,   79,   80,   80,   80,   80,   81,   81,   81,   81,   82,
+          82,   82,   82,   82,   83,   83,   83,   83,   84,   84,   84,   84,   85,   85,   85,   85,
+          86,   86,   86,   86,   87,   87,   87,   87,   88,   88,   88,   88,   89,   89,   89,   89,
+          90,   90,   90,   90,   91,   91,   91,   91,   92,   92,   92,   92,   93,   93,   93,   93,
+          94,   94,   94,   94,   95,   95,   95,   95,   96,   96,   96,   96,   97,   97,   97,   97,
+          98,   98,   98,   98,   99,   99,   99,   99,  100,  100,  100,  101,  101,  101,  101,  102,
+         102,  102,  102,  103,  103,  103,  103,  104,  104,  104,  105,  105,  105,  105,  106,  106,
+         106,  106,  107,  107,  107,  107,  108,  108,  108,  109,  109,  109,  109,  110,  110,  110,
+         111,  111,  111,  111,  112,  112,  112,  112,  113,  113,  113,  114,  114,  114,  114,  115,
+         115,  115,  116,  116,  116,  116,  117,  117,  117,  118,  118,  118,  118,  119,  119,  119,
+         120,  120,  120,  120,  121,  121,  121,  122,  122,  122,  123,  123,  123,  123,  124,  124,
+         124,  125,  125,  125,  125,  126,  126,  126,  127,  127,  127,  128,  128,  128,  128,  129,
+         129,  129,  130,  130,  130,  131,  131,  131,  132,  132,  132,  132,  133,  133,  133,  134,
+         134,  134,  135,  135,  135,  136,  136,  136,  136,  137,  137,  137,  138,  138,  138,  139,
+         139,  139,  140,  140,  140,  141,  141,  141,  142,  142,  142,  142,  143,  143,  143,  144,
+         144,  144,  145,  145,  145,  146,  146,  146,  147,  147,  147,  148,  148,  148,  149,  149,
+         149,  150,  150,  150,  151,  151,  151,  152,  152,  152,  153,  153,  153,  154,  154,  154,
+         155,  155,  155,  156,  156,  156,  157,  157,  157,  158,  158,  158,  159,  159,  159,  160,
+         160,  160,  161,  161,  161,  162,  162,  162,  163,  163,  163,  164,  164,  164,  165,  165,
+         165,  166,  166,  167,  167,  167,  168,  168,  168,  169,  169,  169,  170,  170,  170,  171,
+         171,  171,  172,  172,  172,  173,  173,  174,  174,  174,  175,  175,  175,  176,  176,  176,
+         177,  177,  177,  178,  178,  179,  179,  179,  180,  180,  180,  181,  181,  181,  182,  182,
+         183,  183,  183,  184,  184,  184,  185,  185,  186,  186,  186,  187,  187,  187,  188,  188,
+         188,  189,  189,  190,  190,  190,  191,  191,  191,  192,  192,  193,  193,  193,  194,  194,
+         194,  195,  195,  196,  196,  196,  197,  197,  198,  198,  198,  199,  199,  199,  200,  200,
+         201,  201,  201,  202,  202,  203,  203,  203,  204,  204,  204,  205,  205,  206,  206,  206,
+         207,  207,  208,  208,  208,  209,  209,  210,  210,  210,  211,  211,  212,  212,  212,  213,
+         213,  214,  214,  214,  215,  215,  216,  216,  216,  217,  217,  218,  218,  218,  219,  219,
+         220,  220,  220,  221,  221,  222,  222,  222,  223,  223,  224,  224,  224,  225,  225,  226,
+         226,  227,  227,  227,  228,  228,  229,  229,  229,  230,  230,  231,  231,  232,  232,  232,
+         233,  233,  234,  234,  234,  235,  235,  236,  236,  237,  237,  237,  238,  238,  239,  239,
+         240,  240,  240,  241,  241,  242,  242,  243,  243,  243,  244,  244,  245,  245,  246,  246,
+         246,  247,  247,  248,  248,  249,  249,  249,  250,  250,  251,  251,  252,  252,  252,  253,
+         253,  254,  254,  255,  255,  256,  256,  256,  257,  257,  258,  258,  259,  259,  260,  260,
+         260,  261,  261,  262,  262,  263,  263,  264,  264,  264,  265,  265,  266,  266,  267,  267,
+         268,  268,  269,  269,  269,  270,  270,  271,  271,  272,  272,  273,  273,  274,  274,  274,
+         275,  275,  276,  276,  277,  277,  278,  278,  279,  279,  279,  280,  280,  281,  281,  282,
+         282,  283,  283,  284,  284,  285,  285,  286,  286,  286,  287,  287,  288,  288,  289,  289,
+         290,  290,  291,  291,  292,  292,  293,  293,  294,  294,  295,  295,  295,  296,  296,  297,
+         297,  298,  298,  299,  299,  300,  300,  301,  301,  302,  302,  303,  303,  304,  304,  305,
+         305,  306,  306,  307,  307,  308,  308,  309,  309,  309,  310,  310,  311,  311,  312,  312,
+         313,  313,  314,  314,  315,  315,  316,  316,  317,  317,  318,  318,  319,  319,  320,  320,
+         321,  321,  322,  322,  323,  323,  324,  324,  325,  325,  326,  326,  327,  327,  328,  328,
+         329,  329,  330,  330,  331,  331,  332,  332,  333,  333,  334,  335,  335,  336,  336,  337,
+         337,  338,  338,  339,  339,  340,  340,  341,  341,  342,  342,  343,  343,  344,  344,  345,
+         345,  346,  346,  347,  347,  348,  348,  349,  349,  350,  351,  351,  352,  352,  353,  353,
+         354,  354,  355,  355,  356,  356,  357,  357,  358,  358,  359,  360,  360,  361,  361,  362,
+         362,  363,  363,  364,  364,  365,  365,  366,  366,  367,  368,  368,  369,  369,  370,  370,
+         371,  371,  372,  372,  373,  373,  374,  375,  375,  376,  376,  377,  377,  378,  378,  379,
+         379,  380,  381,  381,  382,  382,  383,  383,  384,  384,  385,  386,  386,  387,  387,  388,
+         388,  389,  389,  390,  391,  391,  392,  392,  393,  393,  394,  394,  395,  396,  396,  397,
+         397,  398,  398,  399,  399,  400,  401,  401,  402,  402,  403,  403,  404,  405,  405,  406,
+         406,  407,  407,  408,  409,  409,  410,  410,  411,  411,  412,  413,  413,  414,  414,  415,
+         415,  416,  417,  417,  418,  418,  419,  419,  420,  421,  421,  422,  422,  423,  424,  424,
+         425,  425,  426,  426,  427,  428,  428,  429,  429,  430,  431,  431,  432,  432,  433,  433,
+         434,  435,  435,  436,  436,  437,  438,  438,  439,  439,  440,  441,  441,  442,  442,  443,
+         444,  444,  445,  445,  446,  447,  447,  448,  448,  449,  450,  450,  451,  451,  452,  453,
+         453,  454,  454,  455,  456,  456,  457,  457,  458,  459,  459,  460,  460,  461,  462,  462,
+         463,  463,  464,  465,  465,  466,  467,  467,  468,  468,  469,  470,  470,  471,  471,  472,
+         473,  473,  474,  475,  475,  476,  476,  477,  478,  478,  479,  480,  480,  481,  481,  482,
+         483,  483,  484,  485,  485,  486,  486,  487,  488,  488,  489,  490,  490,  491,  491,  492,
+         493,  493,  494,  495,  495,  496,  497,  497,  498,  498,  499,  500,  500,  501,  502,  502,
+         503,  504,  504,  505,  505,  506,  507,  507,  508,  509,  509,  510,  511,  511,  512,  513,
+         513,  514,  514,  515,  516,  516,  517,  518,  518,  519,  520,  520,  521,  522,  522,  523,
+         524,  524,  525,  526,  526,  527,  528,  528,  529,  529,  530,  531,  531,  532,  533,  533,
+         534,  535,  535,  536,  537,  537,  538,  539,  539,  540,  541,  541,  542,  543,  543,  544,
+         545,  545,  546,  547,  547,  548,  549,  549,  550,  551,  551,  552,  553,  553,  554,  555,
+         555,  556,  557,  557,  558,  559,  560,  560,  561,  562,  562,  563,  564,  564,  565,  566,
+         566,  567,  568,  568,  569,  570,  570,  571,  572,  572,  573,  574,  575,  575,  576,  577,
+         577,  578,  579,  579,  580,  581,  581,  582,  583,  584,  584,  585,  586,  586,  587,  588,
+         588,  589,  590,  590,  591,  592,  593,  593,  594,  595,  595,  596,  597,  598,  598,  599,
+         600,  600,  601,  602,  602,  603,  604,  605,  605,  606,  607,  607,  608,  609,  610,  610,
+         611,  612,  612,  613,  614,  615,  615,  616,  617,  617,  618,  619,  620,  620,  621,  622,
+         622,  623,  624,  625,  625,  626,  627,  627,  628,  629,  630,  630,  631,  632,  632,  633,
+         634,  635,  635,  636,  637,  638,  638,  639,  640,  640,  641,  642,  643,  643,  644,  645,
+         646,  646,  647,  648,  649,  649,  650,  651,  652,  652,  653,  654,  654,  655,  656,  657,
+         657,  658,  659,  660,  660,  661,  662,  663,  663,  664,  665,  666,  666,  667,  668,  669,
+         669,  670,  671,  672,  672,  673,  674,  675,  675,  676,  677,  678,  678,  679,  680,  681,
+         681,  682,  683,  684,  684,  685,  686,  687,  687,  688,  689,  690,  690,  691,  692,  693,
+         694,  694,  695,  696,  697,  697,  698,  699,  700,  700,  701,  702,  703,  703,  704,  705,
+         706,  707,  707,  708,  709,  710,  710,  711,  712,  713,  714,  714,  715,  716,  717,  717,
+         718,  719,  720,  720,  721,  722,  723,  724,  724,  725,  726,  727,  728,  728,  729,  730,
+         731,  731,  732,  733,  734,  735,  735,  736,  737,  738,  739,  739,  740,  741,  742,  742,
+         743,  744,  745,  746,  746,  747,  748,  749,  750,  750,  751,  752,  753,  754,  754,  755,
+         756,  757,  758,  758,  759,  760,  761,  762,  762,  763,  764,  765,  766,  766,  767,  768,
+         769,  770,  771,  771,  772,  773,  774,  775,  775,  776,  777,  778,  779,  779,  780,  781,
+         782,  783,  783,  784,  785,  786,  787,  788,  788,  789,  790,  791,  792,  793,  793,  794,
+         795,  796,  797,  797,  798,  799,  800,  801,  802,  802,  803,  804,  805,  806,  807,  807,
+         808,  809,  810,  811,  812,  812,  813,  814,  815,  816,  817,  817,  818,  819,  820,  821,
+         822,  822,  823,  824,  825,  826,  827,  827,  828,  829,  830,  831,  832,  832,  833,  834,
+         835,  836,  837,  838,  838,  839,  840,  841,  842,  843,  843,  844,  845,  846,  847,  848,
+         849,  849,  850,  851,  852,  853,  854,  855,  855,  856,  857,  858,  859,  860,  861,  861,
+         862,  863,  864,  865,  866,  867,  867,  868,  869,  870,  871,  872,  873,  873,  874,  875,
+         876,  877,  878,  879,  880,  880,  881,  882,  883,  884,  885,  886,  887,  887,  888,  889,
+         890,  891,  892,  893,  894,  894,  895,  896,  897,  898,  899,  900,  901,  901,  902,  903,
+         904,  905,  906,  907,  908,  909,  909,  910,  911,  912,  913,  914,  915,  916,  916,  917,
+         918,  919,  920,  921,  922,  923,  924,  925,  925,  926,  927,  928,  929,  930,  931,  932,
+         933,  933,  934,  935,  936,  937,  938,  939,  940,  941,  942,  942,  943,  944,  945,  946,
+         947,  948,  949,  950,  951,  952,  952,  953,  954,  955,  956,  957,  958,  959,  960,  961,
+         962,  962,  963,  964,  965,  966,  967,  968,  969,  970,  971,  972,  973,  973,  974,  975,
+         976,  977,  978,  979,  980,  981,  982,  983,  984,  985,  985,  986,  987,  988,  989,  990,
+         991,  992,  993,  994,  995,  996,  997,  998,  998,  999, 1000, 1001, 1002, 1003, 1004, 1005,
+        1006, 1007, 1008, 1009, 1010, 1011, 1012, 1013, 1013, 1014, 1015, 1016, 1017, 1018, 1019, 1020,
+        1021, 1022, 1023, 1024, 1025, 1026, 1027, 1028, 1029, 1030, 1030, 1031, 1032, 1033, 1034, 1035,
+        1036, 1037, 1038, 1039, 1040, 1041, 1042, 1043, 1044, 1045, 1046, 1047, 1048, 1049, 1050, 1050,
+        1051, 1052, 1053, 1054, 1055, 1056, 1057, 1058, 1059, 1060, 1061, 1062, 1063, 1064, 1065, 1066,
+        1067, 1068, 1069, 1070, 1071, 1072, 1073, 1074, 1075, 1076, 1077, 1078, 1078, 1079, 1080, 1081,
+        1082, 1083, 1084, 1085, 1086, 1087, 1088, 1089, 1090, 1091, 1092, 1093, 1094, 1095, 1096, 1097,
+        1098, 1099, 1100, 1101, 1102, 1103, 1104, 1105, 1106, 1107, 1108, 1109, 1110, 1111, 1112, 1113,
+        1114, 1115, 1116, 1117, 1118, 1119, 1120, 1121, 1122, 1123, 1124, 1125, 1126, 1127, 1128, 1129,
+        1130, 1131, 1132, 1133, 1134, 1135, 1136, 1137, 1138, 1139, 1140, 1141, 1142, 1143, 1144, 1145,
+        1146, 1147, 1148, 1149, 1150, 1151, 1152, 1153, 1154, 1155, 1156, 1157, 1158, 1159, 1160, 1161,
+        1162, 1163, 1164, 1165, 1166, 1167, 1168, 1169, 1170, 1171, 1172, 1173, 1174, 1175, 1176, 1177,
+        1178, 1179, 1180, 1181, 1182, 1183, 1184, 1185, 1186, 1187, 1188, 1189, 1190, 1191, 1193, 1194,
+        1195, 1196, 1197, 1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209, 1210,
+        1211, 1212, 1213, 1214, 1215, 1216, 1217, 1218, 1219, 1220, 1221, 1223, 1224, 1225, 1226, 1227,
+        1228, 1229, 1230, 1231, 1232, 1233, 1234, 1235, 1236, 1237, 1238, 1239, 1240, 1241, 1242, 1243,
+        1245, 1246, 1247, 1248, 1249, 1250, 1251, 1252, 1253, 1254, 1255, 1256, 1257, 1258, 1259, 1260,
+        1261, 1262, 1264, 1265, 1266, 1267, 1268, 1269, 1270, 1271, 1272, 1273, 1274, 1275, 1276, 1277,
+        1278, 1280, 1281, 1282, 1283, 1284, 1285, 1286, 1287, 1288, 1289, 1290, 1291, 1292, 1293, 1295,
+        1296, 1297, 1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1309, 1310, 1311, 1312,
+        1313, 1314, 1315, 1316, 1317, 1318, 1319, 1320, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329,
+        1330, 1331, 1332, 1334, 1335, 1336, 1337, 1338, 1339, 1340, 1341, 1342, 1343, 1345, 1346, 1347,
+        1348, 1349, 1350, 1351, 1352, 1353, 1354, 1356, 1357, 1358, 1359, 1360, 1361, 1362, 1363, 1364,
+        1365, 1367, 1368, 1369, 1370, 1371, 1372, 1373, 1374, 1375, 1377, 1378, 1379, 1380, 1381, 1382,
+        1383, 1384, 1385, 1387, 1388, 1389, 1390, 1391, 1392, 1393, 1394, 1396, 1397, 1398, 1399, 1400,
+        1401, 1402, 1403, 1405, 1406, 1407, 1408, 1409, 1410, 1411, 1412, 1414, 1415, 1416, 1417, 1418,
+        1419, 1420, 1421, 1423, 1424, 1425, 1426, 1427, 1428, 1429, 1431, 1432, 1433, 1434, 1435, 1436,
+        1437, 1439, 1440, 1441, 1442, 1443, 1444, 1445, 1446, 1448, 1449, 1450, 1451, 1452, 1453, 1455,
+        1456, 1457, 1458, 1459, 1460, 1461, 1463, 1464, 1465, 1466, 1467, 1468, 1469, 1471, 1472, 1473,
+        1474, 1475, 1476, 1478, 1479, 1480, 1481, 1482, 1483, 1484, 1486, 1487, 1488, 1489, 1490, 1491,
+        1493, 1494, 1495, 1496, 1497, 1498, 1500, 1501, 1502, 1503, 1504, 1505, 1507, 1508, 1509, 1510,
+        1511, 1512, 1514, 1515, 1516, 1517, 1518, 1519, 1521, 1522, 1523, 1524, 1525, 1527, 1528, 1529,
+        1530, 1531, 1532, 1534, 1535, 1536, 1537, 1538, 1540, 1541, 1542, 1543, 1544, 1545, 1547, 1548,
+        1549, 1550, 1551, 1553, 1554, 1555, 1556, 1557, 1559, 1560, 1561, 1562, 1563, 1564, 1566, 1567,
+        1568, 1569, 1570, 1572, 1573, 1574, 1575, 1576, 1578, 1579, 1580, 1581, 1582, 1584, 1585, 1586,
+        1587, 1588, 1590, 1591, 1592, 1593, 1594, 1596, 1597, 1598, 1599, 1601, 1602, 1603, 1604, 1605,
+        1607, 1608, 1609, 1610, 1611, 1613, 1614, 1615, 1616, 1617, 1619, 1620, 1621, 1622, 1624, 1625,
+        1626, 1627, 1628, 1630, 1631, 1632, 1633, 1635, 1636, 1637, 1638, 1639, 1641, 1642, 1643, 1644,
+        1646, 1647, 1648, 1649, 1650, 1652, 1653, 1654, 1655, 1657, 1658, 1659, 1660, 1662, 1663, 1664,
+        1665, 1667, 1668, 1669, 1670, 1671, 1673, 1674, 1675, 1676, 1678, 1679, 1680, 1681, 1683, 1684,
+        1685, 1686, 1688, 1689, 1690, 1691, 1693, 1694, 1695, 1696, 1698, 1699, 1700, 1701, 1703, 1704,
+        1705, 1706, 1708, 1709, 1710, 1711, 1713, 1714, 1715, 1716, 1718, 1719, 1720, 1721, 1723, 1724,
+        1725, 1726, 1728, 1729, 1730, 1731, 1733, 1734, 1735, 1737, 1738, 1739, 1740, 1742, 1743, 1744,
+        1745, 1747, 1748, 1749, 1750, 1752, 1753, 1754, 1756, 1757, 1758, 1759, 1761, 1762, 1763, 1764,
+        1766, 1767, 1768, 1770, 1771, 1772, 1773, 1775, 1776, 1777, 1778, 1780, 1781, 1782, 1784, 1785,
+        1786, 1787, 1789, 1790, 1791, 1793, 1794, 1795, 1796, 1798, 1799, 1800, 1802, 1803, 1804, 1806,
+        1807, 1808, 1809, 1811, 1812, 1813, 1815, 1816, 1817, 1818, 1820, 1821, 1822, 1824, 1825, 1826,
+        1828, 1829, 1830, 1831, 1833, 1834, 1835, 1837, 1838, 1839, 1841, 1842, 1843, 1844, 1846, 1847,
+        1848, 1850, 1851, 1852, 1854, 1855, 1856, 1858, 1859, 1860, 1862, 1863, 1864, 1865, 1867, 1868,
+        1869, 1871, 1872, 1873, 1875, 1876, 1877, 1879, 1880, 1881, 1883, 1884, 1885, 1887, 1888, 1889,
+        1891, 1892, 1893, 1894, 1896, 1897, 1898, 1900, 1901, 1902, 1904, 1905, 1906, 1908, 1909, 1910,
+        1912, 1913, 1914, 1916, 1917, 1918, 1920, 1921, 1922, 1924, 1925, 1926, 1928, 1929, 1930, 1932,
+        1933, 1935, 1936, 1937, 1939, 1940, 1941, 1943, 1944, 1945, 1947, 1948, 1949, 1951, 1952, 1953,
+        1955, 1956, 1957, 1959, 1960, 1961, 1963, 1964, 1965, 1967, 1968, 1970, 1971, 1972, 1974, 1975,
+        1976, 1978, 1979, 1980, 1982, 1983, 1984, 1986, 1987, 1989, 1990, 1991, 1993, 1994, 1995, 1997,
+        1998, 1999, 2001, 2002, 2004, 2005, 2006, 2008, 2009, 2010, 2012, 2013, 2015, 2016, 2017, 2019,
+        2020, 2021, 2023, 2024, 2026, 2027, 2028, 2030, 2031, 2032, 2034, 2035, 2037, 2038, 2039, 2041,
+        2042, 2043, 2045, 2046, 2048, 2049, 2050, 2052, 2053, 2055, 2056, 2057, 2059, 2060, 2061, 2063,
+        2064, 2066, 2067, 2068, 2070, 2071, 2073, 2074, 2075, 2077, 2078, 2080, 2081, 2082, 2084, 2085,
+        2087, 2088, 2089, 2091, 2092, 2094, 2095, 2096, 2098, 2099, 2101, 2102, 2103, 2105, 2106, 2108,
+        2109, 2110, 2112, 2113, 2115, 2116, 2117, 2119, 2120, 2122, 2123, 2124, 2126, 2127, 2129, 2130,
+        2132, 2133, 2134, 2136, 2137, 2139, 2140, 2141, 2143, 2144, 2146, 2147, 2149, 2150, 2151, 2153,
+        2154, 2156, 2157, 2159, 2160, 2161, 2163, 2164, 2166, 2167, 2169, 2170, 2171, 2173, 2174, 2176,
+        2177, 2179, 2180, 2181, 2183, 2184, 2186, 2187, 2189, 2190, 2191, 2193, 2194, 2196, 2197, 2199,
+        2200, 2202, 2203, 2204, 2206, 2207, 2209, 2210, 2212, 2213, 2214, 2216, 2217, 2219, 2220, 2222,
+        2223, 2225, 2226, 2228, 2229, 2230, 2232, 2233, 2235, 2236, 2238, 2239, 2241, 2242, 2243, 2245,
+        2246, 2248, 2249, 2251, 2252, 2254, 2255, 2257, 2258, 2260, 2261, 2262, 2264, 2265, 2267, 2268,
+        2270, 2271, 2273, 2274, 2276, 2277, 2279, 2280, 2282, 2283, 2284, 2286, 2287, 2289, 2290, 2292,
+        2293, 2295, 2296, 2298, 2299, 2301, 2302, 2304, 2305, 2307, 2308, 2310, 2311, 2312, 2314, 2315,
+        2317, 2318, 2320, 2321, 2323, 2324, 2326, 2327, 2329, 2330, 2332, 2333, 2335, 2336, 2338, 2339,
+        2341, 2342, 2344, 2345, 2347, 2348, 2350, 2351, 2353, 2354, 2356, 2357, 2359, 2360, 2362, 2363,
+        2365, 2366, 2368, 2369, 2371, 2372, 2374, 2375, 2377, 2378, 2380, 2381, 2383, 2384, 2386, 2387,
+        2389, 2390, 2392, 2393, 2395, 2396, 2398, 2399, 2401, 2402, 2404, 2405, 2407, 2408, 2410, 2411,
+        2413, 2414, 2416, 2417, 2419, 2420, 2422, 2423, 2425, 2426, 2428, 2429, 2431, 2433, 2434, 2436,
+        2437, 2439, 2440, 2442, 2443, 2445, 2446, 2448, 2449, 2451, 2452, 2454, 2455, 2457, 2458, 2460,
+        2462, 2463, 2465, 2466, 2468, 2469, 2471, 2472, 2474, 2475, 2477, 2478, 2480, 2481, 2483, 2485,
+        2486, 2488, 2489, 2491, 2492, 2494, 2495, 2497, 2498, 2500, 2502, 2503, 2505, 2506, 2508, 2509,
+        2511, 2512, 2514, 2515, 2517, 2519, 2520, 2522, 2523, 2525, 2526, 2528, 2529, 2531, 2533, 2534,
+        2536, 2537, 2539, 2540, 2542, 2543, 2545, 2547, 2548, 2550, 2551, 2553, 2554, 2556, 2557, 2559,
+        2561, 2562, 2564, 2565, 2567, 2568, 2570, 2572, 2573, 2575, 2576, 2578, 2579, 2581, 2583, 2584,
+        2586, 2587, 2589, 2590, 2592, 2594, 2595, 2597, 2598, 2600, 2601, 2603, 2605, 2606, 2608, 2609,
+        2611, 2613, 2614, 2616, 2617, 2619, 2620, 2622, 2624, 2625, 2627, 2628, 2630, 2632, 2633, 2635,
+        2636, 2638, 2640, 2641, 2643, 2644, 2646, 2647, 2649, 2651, 2652, 2654, 2655, 2657, 2659, 2660,
+        2662, 2663, 2665, 2667, 2668, 2670, 2671, 2673, 2675, 2676, 2678, 2679, 2681, 2683, 2684, 2686,
+        2687, 2689, 2691, 2692, 2694, 2696, 2697, 2699, 2700, 2702, 2704, 2705, 2707, 2708, 2710, 2712,
+        2713, 2715, 2716, 2718, 2720, 2721, 2723, 2725, 2726, 2728, 2729, 2731, 2733, 2734, 2736, 2738,
+        2739, 2741, 2742, 2744, 2746, 2747, 2749, 2751, 2752, 2754, 2755, 2757, 2759, 2760, 2762, 2764,
+        2765, 2767, 2769, 2770, 2772, 2773, 2775, 2777, 2778, 2780, 2782, 2783, 2785, 2787, 2788, 2790,
+        2791, 2793, 2795, 2796, 2798, 2800, 2801, 2803, 2805, 2806, 2808, 2810, 2811, 2813, 2814, 2816,
+        2818, 2819, 2821, 2823, 2824, 2826, 2828, 2829, 2831, 2833, 2834, 2836, 2838, 2839, 2841, 2843,
+        2844, 2846, 2848, 2849, 2851, 2853, 2854, 2856, 2857, 2859, 2861, 2862, 2864, 2866, 2867, 2869,
+        2871, 2872, 2874, 2876, 2877, 2879, 2881, 2882, 2884, 2886, 2888, 2889, 2891, 2893, 2894, 2896,
+        2898, 2899, 2901, 2903, 2904, 2906, 2908, 2909, 2911, 2913, 2914, 2916, 2918, 2919, 2921, 2923,
+        2924, 2926, 2928, 2929, 2931, 2933, 2935, 2936, 2938, 2940, 2941, 2943, 2945, 2946, 2948, 2950,
+        2951, 2953, 2955, 2956, 2958, 2960, 2962, 2963, 2965, 2967, 2968, 2970, 2972, 2973, 2975, 2977,
+        2979, 2980, 2982, 2984, 2985, 2987, 2989, 2990, 2992, 2994, 2996, 2997, 2999, 3001, 3002, 3004,
+        3006, 3008, 3009, 3011, 3013, 3014, 3016, 3018, 3020, 3021, 3023, 3025, 3026, 3028, 3030, 3032,
+        3033, 3035, 3037, 3038, 3040, 3042, 3044, 3045, 3047, 3049, 3050, 3052, 3054, 3056, 3057, 3059,
+        3061, 3063, 3064, 3066, 3068, 3069, 3071, 3073, 3075, 3076, 3078, 3080, 3082, 3083, 3085, 3087,
+        3089, 3090, 3092, 3094, 3095, 3097, 3099, 3101, 3102, 3104, 3106, 3108, 3109, 3111, 3113, 3115,
+        3116, 3118, 3120, 3122, 3123, 3125, 3127, 3129, 3130, 3132, 3134, 3136, 3137, 3139, 3141, 3143,
+        3144, 3146, 3148, 3150, 3151, 3153, 3155, 3157, 3158, 3160, 3162, 3164, 3165, 3167, 3169, 3171,
+        3172, 3174, 3176, 3178, 3179, 3181, 3183, 3185, 3187, 3188, 3190, 3192, 3194, 3195, 3197, 3199,
+        3201, 3202, 3204, 3206, 3208, 3209, 3211, 3213, 3215, 3217, 3218, 3220, 3222, 3224, 3225, 3227,
+        3229, 3231, 3233, 3234, 3236, 3238, 3240, 3241, 3243, 3245, 3247, 3249, 3250, 3252, 3254, 3256,
+        3258, 3259, 3261, 3263, 3265, 3266, 3268, 3270, 3272, 3274, 3275, 3277, 3279, 3281, 3283, 3284,
+        3286, 3288, 3290, 3292, 3293, 3295, 3297, 3299, 3301, 3302, 3304, 3306, 3308, 3310, 3311, 3313,
+        3315, 3317, 3319, 3320, 3322, 3324, 3326, 3328, 3329, 3331, 3333, 3335, 3337, 3338, 3340, 3342,
+        3344, 3346, 3348, 3349, 3351, 3353, 3355, 3357, 3358, 3360, 3362, 3364, 3366, 3368, 3369, 3371,
+        3373, 3375, 3377, 3378, 3380, 3382, 3384, 3386, 3388, 3389, 3391, 3393, 3395, 3397, 3399, 3400,
+        3402, 3404, 3406, 3408, 3410, 3411, 3413, 3415, 3417, 3419, 3421, 3422, 3424, 3426, 3428, 3430,
+        3432, 3433, 3435, 3437, 3439, 3441, 3443, 3444, 3446, 3448, 3450, 3452, 3454, 3455, 3457, 3459,
+        3461, 3463, 3465, 3467, 3468, 3470, 3472, 3474, 3476, 3478, 3480, 3481, 3483, 3485, 3487, 3489,
+        3491, 3492, 3494, 3496, 3498, 3500, 3502, 3504, 3506, 3507, 3509, 3511, 3513, 3515, 3517, 3519,
+        3520, 3522, 3524, 3526, 3528, 3530, 3532, 3533, 3535, 3537, 3539, 3541, 3543, 3545, 3547, 3548,
+        3550, 3552, 3554, 3556, 3558, 3560, 3562, 3563, 3565, 3567, 3569, 3571, 3573, 3575, 3577, 3578,
+        3580, 3582, 3584, 3586, 3588, 3590, 3592, 3594, 3595, 3597, 3599, 3601, 3603, 3605, 3607, 3609,
+        3611, 3612, 3614, 3616, 3618, 3620, 3622, 3624, 3626, 3628, 3629, 3631, 3633, 3635, 3637, 3639,
+        3641, 3643, 3645, 3647, 3648, 3650, 3652, 3654, 3656, 3658, 3660, 3662, 3664, 3666, 3667, 3669,
+        3671, 3673, 3675, 3677, 3679, 3681, 3683, 3685, 3687, 3688, 3690, 3692, 3694, 3696, 3698, 3700,
+        3702, 3704, 3706, 3708, 3710, 3711, 3713, 3715, 3717, 3719, 3721, 3723, 3725, 3727, 3729, 3731,
+        3733, 3735, 3736, 3738, 3740, 3742, 3744, 3746, 3748, 3750, 3752, 3754, 3756, 3758, 3760, 3762,
+        3764, 3765, 3767, 3769, 3771, 3773, 3775, 3777, 3779, 3781, 3783, 3785, 3787, 3789, 3791, 3793,
+        3795, 3796, 3798, 3800, 3802, 3804, 3806, 3808, 3810, 3812, 3814, 3816, 3818, 3820, 3822, 3824,
+        3826, 3828, 3830, 3832, 3833, 3835, 3837, 3839, 3841, 3843, 3845, 3847, 3849, 3851, 3853, 3855,
+        3857, 3859, 3861, 3863, 3865, 3867, 3869, 3871, 3873, 3875, 3877, 3879, 3881, 3883, 3884, 3886,
+        3888, 3890, 3892, 3894, 3896, 3898, 3900, 3902, 3904, 3906, 3908, 3910, 3912, 3914, 3916, 3918,
+        3920, 3922, 3924, 3926, 3928, 3930, 3932, 3934, 3936, 3938, 3940, 3942, 3944, 3946, 3948, 3950,
+        3952, 3954, 3956, 3958, 3960, 3962, 3964, 3966, 3968, 3970, 3972, 3974, 3976, 3978, 3980, 3982,
+        3984, 3986, 3988, 3990, 3992, 3994, 3996, 3998, 4000, 4002, 4004, 4006, 4008, 4010, 4012, 4014,
+        4016, 4018, 4020, 4022, 4024, 4026, 4028, 4030, 4032, 4034, 4036, 4038, 4040, 4042, 4044, 4046,
+        4048, 4050, 4052, 4054, 4056, 4058, 4060, 4062, 4064, 4066, 4068, 4070, 4072, 4074, 4076, 4078,
+        4080,
+};
+
+/* Generated table */
+const unsigned short tpg_linear_to_rec709[255 * 16 + 1] = {
+           0,    5,    9,   14,   18,   22,   27,   32,   36,   41,   45,   50,   54,   59,   63,   68,
+          72,   77,   81,   86,   90,   95,   99,  104,  108,  113,  117,  122,  126,  131,  135,  139,
+         144,  149,  153,  158,  162,  167,  171,  176,  180,  185,  189,  194,  198,  203,  207,  212,
+         216,  221,  225,  230,  234,  239,  243,  248,  252,  257,  261,  266,  270,  275,  279,  284,
+         288,  293,  297,  302,  306,  311,  315,  320,  324,  328,  334,  338,  343,  347,  352,  356,
+         360,  365,  369,  373,  377,  381,  386,  390,  394,  398,  402,  406,  410,  414,  418,  422,
+         426,  430,  433,  437,  441,  445,  449,  452,  456,  460,  464,  467,  471,  475,  478,  482,
+         485,  489,  492,  496,  499,  503,  506,  510,  513,  517,  520,  524,  527,  530,  534,  537,
+         540,  544,  547,  550,  554,  557,  560,  563,  566,  570,  573,  576,  579,  582,  586,  589,
+         592,  595,  598,  601,  604,  607,  610,  613,  616,  619,  622,  625,  628,  631,  634,  637,
+         640,  643,  646,  649,  652,  655,  658,  660,  663,  666,  669,  672,  675,  677,  680,  683,
+         686,  689,  691,  694,  697,  700,  702,  705,  708,  711,  713,  716,  719,  721,  724,  727,
+         729,  732,  735,  737,  740,  743,  745,  748,  750,  753,  756,  758,  761,  763,  766,  768,
+         771,  773,  776,  779,  781,  784,  786,  789,  791,  794,  796,  799,  801,  803,  806,  808,
+         811,  813,  816,  818,  821,  823,  825,  828,  830,  833,  835,  837,  840,  842,  844,  847,
+         849,  851,  854,  856,  858,  861,  863,  865,  868,  870,  872,  875,  877,  879,  881,  884,
+         886,  888,  891,  893,  895,  897,  900,  902,  904,  906,  908,  911,  913,  915,  917,  919,
+         922,  924,  926,  928,  930,  933,  935,  937,  939,  941,  943,  946,  948,  950,  952,  954,
+         956,  958,  960,  963,  965,  967,  969,  971,  973,  975,  977,  979,  981,  984,  986,  988,
+         990,  992,  994,  996,  998, 1000, 1002, 1004, 1006, 1008, 1010, 1012, 1014, 1016, 1018, 1020,
+        1022, 1024, 1026, 1028, 1030, 1032, 1034, 1036, 1038, 1040, 1042, 1044, 1046, 1048, 1050, 1052,
+        1054, 1056, 1058, 1060, 1062, 1064, 1066, 1068, 1069, 1071, 1073, 1075, 1077, 1079, 1081, 1083,
+        1085, 1087, 1089, 1090, 1092, 1094, 1096, 1098, 1100, 1102, 1104, 1106, 1107, 1109, 1111, 1113,
+        1115, 1117, 1119, 1120, 1122, 1124, 1126, 1128, 1130, 1131, 1133, 1135, 1137, 1139, 1141, 1142,
+        1144, 1146, 1148, 1150, 1151, 1153, 1155, 1157, 1159, 1160, 1162, 1164, 1166, 1168, 1169, 1171,
+        1173, 1175, 1176, 1178, 1180, 1182, 1184, 1185, 1187, 1189, 1191, 1192, 1194, 1196, 1198, 1199,
+        1201, 1203, 1204, 1206, 1208, 1210, 1211, 1213, 1215, 1217, 1218, 1220, 1222, 1223, 1225, 1227,
+        1228, 1230, 1232, 1234, 1235, 1237, 1239, 1240, 1242, 1244, 1245, 1247, 1249, 1250, 1252, 1254,
+        1255, 1257, 1259, 1260, 1262, 1264, 1265, 1267, 1269, 1270, 1272, 1274, 1275, 1277, 1279, 1280,
+        1282, 1283, 1285, 1287, 1288, 1290, 1292, 1293, 1295, 1296, 1298, 1300, 1301, 1303, 1305, 1306,
+        1308, 1309, 1311, 1313, 1314, 1316, 1317, 1319, 1321, 1322, 1324, 1325, 1327, 1328, 1330, 1332,
+        1333, 1335, 1336, 1338, 1339, 1341, 1343, 1344, 1346, 1347, 1349, 1350, 1352, 1354, 1355, 1357,
+        1358, 1360, 1361, 1363, 1364, 1366, 1367, 1369, 1371, 1372, 1374, 1375, 1377, 1378, 1380, 1381,
+        1383, 1384, 1386, 1387, 1389, 1390, 1392, 1393, 1395, 1396, 1398, 1399, 1401, 1402, 1404, 1405,
+        1407, 1408, 1410, 1411, 1413, 1414, 1416, 1417, 1419, 1420, 1422, 1423, 1425, 1426, 1428, 1429,
+        1431, 1432, 1434, 1435, 1437, 1438, 1440, 1441, 1442, 1444, 1445, 1447, 1448, 1450, 1451, 1453,
+        1454, 1456, 1457, 1458, 1460, 1461, 1463, 1464, 1466, 1467, 1469, 1470, 1471, 1473, 1474, 1476,
+        1477, 1479, 1480, 1481, 1483, 1484, 1486, 1487, 1489, 1490, 1491, 1493, 1494, 1496, 1497, 1498,
+        1500, 1501, 1503, 1504, 1505, 1507, 1508, 1510, 1511, 1512, 1514, 1515, 1517, 1518, 1519, 1521,
+        1522, 1524, 1525, 1526, 1528, 1529, 1531, 1532, 1533, 1535, 1536, 1537, 1539, 1540, 1542, 1543,
+        1544, 1546, 1547, 1548, 1550, 1551, 1553, 1554, 1555, 1557, 1558, 1559, 1561, 1562, 1563, 1565,
+        1566, 1567, 1569, 1570, 1571, 1573, 1574, 1576, 1577, 1578, 1580, 1581, 1582, 1584, 1585, 1586,
+        1588, 1589, 1590, 1592, 1593, 1594, 1596, 1597, 1598, 1600, 1601, 1602, 1603, 1605, 1606, 1607,
+        1609, 1610, 1611, 1613, 1614, 1615, 1617, 1618, 1619, 1621, 1622, 1623, 1624, 1626, 1627, 1628,
+        1630, 1631, 1632, 1634, 1635, 1636, 1637, 1639, 1640, 1641, 1643, 1644, 1645, 1647, 1648, 1649,
+        1650, 1652, 1653, 1654, 1655, 1657, 1658, 1659, 1661, 1662, 1663, 1664, 1666, 1667, 1668, 1670,
+        1671, 1672, 1673, 1675, 1676, 1677, 1678, 1680, 1681, 1682, 1683, 1685, 1686, 1687, 1688, 1690,
+        1691, 1692, 1693, 1695, 1696, 1697, 1698, 1700, 1701, 1702, 1703, 1705, 1706, 1707, 1708, 1710,
+        1711, 1712, 1713, 1715, 1716, 1717, 1718, 1720, 1721, 1722, 1723, 1724, 1726, 1727, 1728, 1729,
+        1731, 1732, 1733, 1734, 1736, 1737, 1738, 1739, 1740, 1742, 1743, 1744, 1745, 1746, 1748, 1749,
+        1750, 1751, 1753, 1754, 1755, 1756, 1757, 1759, 1760, 1761, 1762, 1763, 1765, 1766, 1767, 1768,
+        1769, 1771, 1772, 1773, 1774, 1775, 1777, 1778, 1779, 1780, 1781, 1783, 1784, 1785, 1786, 1787,
+        1788, 1790, 1791, 1792, 1793, 1794, 1796, 1797, 1798, 1799, 1800, 1801, 1803, 1804, 1805, 1806,
+        1807, 1809, 1810, 1811, 1812, 1813, 1814, 1816, 1817, 1818, 1819, 1820, 1821, 1823, 1824, 1825,
+        1826, 1827, 1828, 1829, 1831, 1832, 1833, 1834, 1835, 1836, 1838, 1839, 1840, 1841, 1842, 1843,
+        1845, 1846, 1847, 1848, 1849, 1850, 1851, 1853, 1854, 1855, 1856, 1857, 1858, 1859, 1861, 1862,
+        1863, 1864, 1865, 1866, 1867, 1868, 1870, 1871, 1872, 1873, 1874, 1875, 1876, 1878, 1879, 1880,
+        1881, 1882, 1883, 1884, 1885, 1887, 1888, 1889, 1890, 1891, 1892, 1893, 1894, 1896, 1897, 1898,
+        1899, 1900, 1901, 1902, 1903, 1904, 1906, 1907, 1908, 1909, 1910, 1911, 1912, 1913, 1914, 1916,
+        1917, 1918, 1919, 1920, 1921, 1922, 1923, 1924, 1925, 1927, 1928, 1929, 1930, 1931, 1932, 1933,
+        1934, 1935, 1936, 1938, 1939, 1940, 1941, 1942, 1943, 1944, 1945, 1946, 1947, 1948, 1950, 1951,
+        1952, 1953, 1954, 1955, 1956, 1957, 1958, 1959, 1960, 1961, 1963, 1964, 1965, 1966, 1967, 1968,
+        1969, 1970, 1971, 1972, 1973, 1974, 1975, 1977, 1978, 1979, 1980, 1981, 1982, 1983, 1984, 1985,
+        1986, 1987, 1988, 1989, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+        2003, 2004, 2005, 2006, 2007, 2008, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019,
+        2020, 2021, 2022, 2023, 2024, 2025, 2026, 2027, 2028, 2029, 2031, 2032, 2033, 2034, 2035, 2036,
+        2037, 2038, 2039, 2040, 2041, 2042, 2043, 2044, 2045, 2046, 2047, 2048, 2049, 2050, 2051, 2052,
+        2053, 2054, 2055, 2056, 2057, 2058, 2060, 2061, 2062, 2063, 2064, 2065, 2066, 2067, 2068, 2069,
+        2070, 2071, 2072, 2073, 2074, 2075, 2076, 2077, 2078, 2079, 2080, 2081, 2082, 2083, 2084, 2085,
+        2086, 2087, 2088, 2089, 2090, 2091, 2092, 2093, 2094, 2095, 2096, 2097, 2098, 2099, 2100, 2101,
+        2102, 2103, 2104, 2105, 2106, 2107, 2108, 2109, 2110, 2111, 2112, 2113, 2114, 2115, 2116, 2117,
+        2118, 2119, 2120, 2121, 2122, 2123, 2124, 2125, 2126, 2127, 2128, 2129, 2130, 2131, 2132, 2133,
+        2134, 2135, 2136, 2137, 2138, 2139, 2140, 2141, 2142, 2143, 2144, 2145, 2146, 2147, 2148, 2149,
+        2150, 2151, 2152, 2153, 2154, 2155, 2156, 2157, 2158, 2159, 2160, 2161, 2162, 2163, 2164, 2165,
+        2166, 2167, 2168, 2169, 2170, 2171, 2172, 2173, 2173, 2174, 2175, 2176, 2177, 2178, 2179, 2180,
+        2181, 2182, 2183, 2184, 2185, 2186, 2187, 2188, 2189, 2190, 2191, 2192, 2193, 2194, 2195, 2196,
+        2197, 2198, 2199, 2200, 2201, 2202, 2202, 2203, 2204, 2205, 2206, 2207, 2208, 2209, 2210, 2211,
+        2212, 2213, 2214, 2215, 2216, 2217, 2218, 2219, 2220, 2221, 2222, 2223, 2224, 2224, 2225, 2226,
+        2227, 2228, 2229, 2230, 2231, 2232, 2233, 2234, 2235, 2236, 2237, 2238, 2239, 2240, 2241, 2241,
+        2242, 2243, 2244, 2245, 2246, 2247, 2248, 2249, 2250, 2251, 2252, 2253, 2254, 2255, 2256, 2257,
+        2257, 2258, 2259, 2260, 2261, 2262, 2263, 2264, 2265, 2266, 2267, 2268, 2269, 2270, 2271, 2271,
+        2272, 2273, 2274, 2275, 2276, 2277, 2278, 2279, 2280, 2281, 2282, 2283, 2283, 2284, 2285, 2286,
+        2287, 2288, 2289, 2290, 2291, 2292, 2293, 2294, 2295, 2295, 2296, 2297, 2298, 2299, 2300, 2301,
+        2302, 2303, 2304, 2305, 2306, 2306, 2307, 2308, 2309, 2310, 2311, 2312, 2313, 2314, 2315, 2316,
+        2317, 2317, 2318, 2319, 2320, 2321, 2322, 2323, 2324, 2325, 2326, 2327, 2327, 2328, 2329, 2330,
+        2331, 2332, 2333, 2334, 2335, 2336, 2336, 2337, 2338, 2339, 2340, 2341, 2342, 2343, 2344, 2345,
+        2345, 2346, 2347, 2348, 2349, 2350, 2351, 2352, 2353, 2354, 2354, 2355, 2356, 2357, 2358, 2359,
+        2360, 2361, 2362, 2363, 2363, 2364, 2365, 2366, 2367, 2368, 2369, 2370, 2371, 2371, 2372, 2373,
+        2374, 2375, 2376, 2377, 2378, 2379, 2379, 2380, 2381, 2382, 2383, 2384, 2385, 2386, 2386, 2387,
+        2388, 2389, 2390, 2391, 2392, 2393, 2394, 2394, 2395, 2396, 2397, 2398, 2399, 2400, 2401, 2401,
+        2402, 2403, 2404, 2405, 2406, 2407, 2408, 2408, 2409, 2410, 2411, 2412, 2413, 2414, 2415, 2415,
+        2416, 2417, 2418, 2419, 2420, 2421, 2422, 2422, 2423, 2424, 2425, 2426, 2427, 2428, 2428, 2429,
+        2430, 2431, 2432, 2433, 2434, 2435, 2435, 2436, 2437, 2438, 2439, 2440, 2441, 2441, 2442, 2443,
+        2444, 2445, 2446, 2447, 2447, 2448, 2449, 2450, 2451, 2452, 2453, 2453, 2454, 2455, 2456, 2457,
+        2458, 2459, 2459, 2460, 2461, 2462, 2463, 2464, 2465, 2465, 2466, 2467, 2468, 2469, 2470, 2471,
+        2471, 2472, 2473, 2474, 2475, 2476, 2477, 2477, 2478, 2479, 2480, 2481, 2482, 2482, 2483, 2484,
+        2485, 2486, 2487, 2488, 2488, 2489, 2490, 2491, 2492, 2493, 2493, 2494, 2495, 2496, 2497, 2498,
+        2499, 2499, 2500, 2501, 2502, 2503, 2504, 2504, 2505, 2506, 2507, 2508, 2509, 2509, 2510, 2511,
+        2512, 2513, 2514, 2514, 2515, 2516, 2517, 2518, 2519, 2519, 2520, 2521, 2522, 2523, 2524, 2524,
+        2525, 2526, 2527, 2528, 2529, 2529, 2530, 2531, 2532, 2533, 2534, 2534, 2535, 2536, 2537, 2538,
+        2539, 2539, 2540, 2541, 2542, 2543, 2544, 2544, 2545, 2546, 2547, 2548, 2548, 2549, 2550, 2551,
+        2552, 2553, 2553, 2554, 2555, 2556, 2557, 2558, 2558, 2559, 2560, 2561, 2562, 2562, 2563, 2564,
+        2565, 2566, 2567, 2567, 2568, 2569, 2570, 2571, 2571, 2572, 2573, 2574, 2575, 2576, 2576, 2577,
+        2578, 2579, 2580, 2580, 2581, 2582, 2583, 2584, 2584, 2585, 2586, 2587, 2588, 2589, 2589, 2590,
+        2591, 2592, 2593, 2593, 2594, 2595, 2596, 2597, 2597, 2598, 2599, 2600, 2601, 2601, 2602, 2603,
+        2604, 2605, 2605, 2606, 2607, 2608, 2609, 2610, 2610, 2611, 2612, 2613, 2614, 2614, 2615, 2616,
+        2617, 2618, 2618, 2619, 2620, 2621, 2622, 2622, 2623, 2624, 2625, 2626, 2626, 2627, 2628, 2629,
+        2630, 2630, 2631, 2632, 2633, 2634, 2634, 2635, 2636, 2637, 2637, 2638, 2639, 2640, 2641, 2641,
+        2642, 2643, 2644, 2645, 2645, 2646, 2647, 2648, 2649, 2649, 2650, 2651, 2652, 2653, 2653, 2654,
+        2655, 2656, 2656, 2657, 2658, 2659, 2660, 2660, 2661, 2662, 2663, 2664, 2664, 2665, 2666, 2667,
+        2668, 2668, 2669, 2670, 2671, 2671, 2672, 2673, 2674, 2675, 2675, 2676, 2677, 2678, 2678, 2679,
+        2680, 2681, 2682, 2682, 2683, 2684, 2685, 2686, 2686, 2687, 2688, 2689, 2689, 2690, 2691, 2692,
+        2693, 2693, 2694, 2695, 2696, 2696, 2697, 2698, 2699, 2700, 2700, 2701, 2702, 2703, 2703, 2704,
+        2705, 2706, 2706, 2707, 2708, 2709, 2710, 2710, 2711, 2712, 2713, 2713, 2714, 2715, 2716, 2717,
+        2717, 2718, 2719, 2720, 2720, 2721, 2722, 2723, 2723, 2724, 2725, 2726, 2727, 2727, 2728, 2729,
+        2730, 2730, 2731, 2732, 2733, 2733, 2734, 2735, 2736, 2736, 2737, 2738, 2739, 2740, 2740, 2741,
+        2742, 2743, 2743, 2744, 2745, 2746, 2746, 2747, 2748, 2749, 2749, 2750, 2751, 2752, 2752, 2753,
+        2754, 2755, 2755, 2756, 2757, 2758, 2759, 2759, 2760, 2761, 2762, 2762, 2763, 2764, 2765, 2765,
+        2766, 2767, 2768, 2768, 2769, 2770, 2771, 2771, 2772, 2773, 2774, 2774, 2775, 2776, 2777, 2777,
+        2778, 2779, 2780, 2780, 2781, 2782, 2783, 2783, 2784, 2785, 2786, 2786, 2787, 2788, 2789, 2789,
+        2790, 2791, 2792, 2792, 2793, 2794, 2795, 2795, 2796, 2797, 2798, 2798, 2799, 2800, 2801, 2801,
+        2802, 2803, 2804, 2804, 2805, 2806, 2807, 2807, 2808, 2809, 2810, 2810, 2811, 2812, 2813, 2813,
+        2814, 2815, 2815, 2816, 2817, 2818, 2818, 2819, 2820, 2821, 2821, 2822, 2823, 2824, 2824, 2825,
+        2826, 2827, 2827, 2828, 2829, 2830, 2830, 2831, 2832, 2832, 2833, 2834, 2835, 2835, 2836, 2837,
+        2838, 2838, 2839, 2840, 2841, 2841, 2842, 2843, 2844, 2844, 2845, 2846, 2846, 2847, 2848, 2849,
+        2849, 2850, 2851, 2852, 2852, 2853, 2854, 2855, 2855, 2856, 2857, 2857, 2858, 2859, 2860, 2860,
+        2861, 2862, 2863, 2863, 2864, 2865, 2865, 2866, 2867, 2868, 2868, 2869, 2870, 2871, 2871, 2872,
+        2873, 2873, 2874, 2875, 2876, 2876, 2877, 2878, 2879, 2879, 2880, 2881, 2881, 2882, 2883, 2884,
+        2884, 2885, 2886, 2886, 2887, 2888, 2889, 2889, 2890, 2891, 2892, 2892, 2893, 2894, 2894, 2895,
+        2896, 2897, 2897, 2898, 2899, 2899, 2900, 2901, 2902, 2902, 2903, 2904, 2904, 2905, 2906, 2907,
+        2907, 2908, 2909, 2909, 2910, 2911, 2912, 2912, 2913, 2914, 2914, 2915, 2916, 2917, 2917, 2918,
+        2919, 2919, 2920, 2921, 2922, 2922, 2923, 2924, 2924, 2925, 2926, 2927, 2927, 2928, 2929, 2929,
+        2930, 2931, 2932, 2932, 2933, 2934, 2934, 2935, 2936, 2937, 2937, 2938, 2939, 2939, 2940, 2941,
+        2941, 2942, 2943, 2944, 2944, 2945, 2946, 2946, 2947, 2948, 2949, 2949, 2950, 2951, 2951, 2952,
+        2953, 2953, 2954, 2955, 2956, 2956, 2957, 2958, 2958, 2959, 2960, 2961, 2961, 2962, 2963, 2963,
+        2964, 2965, 2965, 2966, 2967, 2968, 2968, 2969, 2970, 2970, 2971, 2972, 2972, 2973, 2974, 2975,
+        2975, 2976, 2977, 2977, 2978, 2979, 2979, 2980, 2981, 2982, 2982, 2983, 2984, 2984, 2985, 2986,
+        2986, 2987, 2988, 2988, 2989, 2990, 2991, 2991, 2992, 2993, 2993, 2994, 2995, 2995, 2996, 2997,
+        2998, 2998, 2999, 3000, 3000, 3001, 3002, 3002, 3003, 3004, 3004, 3005, 3006, 3006, 3007, 3008,
+        3009, 3009, 3010, 3011, 3011, 3012, 3013, 3013, 3014, 3015, 3015, 3016, 3017, 3018, 3018, 3019,
+        3020, 3020, 3021, 3022, 3022, 3023, 3024, 3024, 3025, 3026, 3026, 3027, 3028, 3029, 3029, 3030,
+        3031, 3031, 3032, 3033, 3033, 3034, 3035, 3035, 3036, 3037, 3037, 3038, 3039, 3039, 3040, 3041,
+        3042, 3042, 3043, 3044, 3044, 3045, 3046, 3046, 3047, 3048, 3048, 3049, 3050, 3050, 3051, 3052,
+        3052, 3053, 3054, 3054, 3055, 3056, 3056, 3057, 3058, 3059, 3059, 3060, 3061, 3061, 3062, 3063,
+        3063, 3064, 3065, 3065, 3066, 3067, 3067, 3068, 3069, 3069, 3070, 3071, 3071, 3072, 3073, 3073,
+        3074, 3075, 3075, 3076, 3077, 3077, 3078, 3079, 3079, 3080, 3081, 3081, 3082, 3083, 3084, 3084,
+        3085, 3086, 3086, 3087, 3088, 3088, 3089, 3090, 3090, 3091, 3092, 3092, 3093, 3094, 3094, 3095,
+        3096, 3096, 3097, 3098, 3098, 3099, 3100, 3100, 3101, 3102, 3102, 3103, 3104, 3104, 3105, 3106,
+        3106, 3107, 3108, 3108, 3109, 3110, 3110, 3111, 3112, 3112, 3113, 3114, 3114, 3115, 3116, 3116,
+        3117, 3118, 3118, 3119, 3120, 3120, 3121, 3122, 3122, 3123, 3124, 3124, 3125, 3126, 3126, 3127,
+        3128, 3128, 3129, 3130, 3130, 3131, 3132, 3132, 3133, 3134, 3134, 3135, 3135, 3136, 3137, 3137,
+        3138, 3139, 3139, 3140, 3141, 3141, 3142, 3143, 3143, 3144, 3145, 3145, 3146, 3147, 3147, 3148,
+        3149, 3149, 3150, 3151, 3151, 3152, 3153, 3153, 3154, 3155, 3155, 3156, 3157, 3157, 3158, 3159,
+        3159, 3160, 3160, 3161, 3162, 3162, 3163, 3164, 3164, 3165, 3166, 3166, 3167, 3168, 3168, 3169,
+        3170, 3170, 3171, 3172, 3172, 3173, 3174, 3174, 3175, 3175, 3176, 3177, 3177, 3178, 3179, 3179,
+        3180, 3181, 3181, 3182, 3183, 3183, 3184, 3185, 3185, 3186, 3187, 3187, 3188, 3188, 3189, 3190,
+        3190, 3191, 3192, 3192, 3193, 3194, 3194, 3195, 3196, 3196, 3197, 3198, 3198, 3199, 3199, 3200,
+        3201, 3201, 3202, 3203, 3203, 3204, 3205, 3205, 3206, 3207, 3207, 3208, 3209, 3209, 3210, 3210,
+        3211, 3212, 3212, 3213, 3214, 3214, 3215, 3216, 3216, 3217, 3218, 3218, 3219, 3219, 3220, 3221,
+        3221, 3222, 3223, 3223, 3224, 3225, 3225, 3226, 3227, 3227, 3228, 3228, 3229, 3230, 3230, 3231,
+        3232, 3232, 3233, 3234, 3234, 3235, 3235, 3236, 3237, 3237, 3238, 3239, 3239, 3240, 3241, 3241,
+        3242, 3242, 3243, 3244, 3244, 3245, 3246, 3246, 3247, 3248, 3248, 3249, 3249, 3250, 3251, 3251,
+        3252, 3253, 3253, 3254, 3255, 3255, 3256, 3256, 3257, 3258, 3258, 3259, 3260, 3260, 3261, 3262,
+        3262, 3263, 3263, 3264, 3265, 3265, 3266, 3267, 3267, 3268, 3268, 3269, 3270, 3270, 3271, 3272,
+        3272, 3273, 3274, 3274, 3275, 3275, 3276, 3277, 3277, 3278, 3279, 3279, 3280, 3280, 3281, 3282,
+        3282, 3283, 3284, 3284, 3285, 3285, 3286, 3287, 3287, 3288, 3289, 3289, 3290, 3290, 3291, 3292,
+        3292, 3293, 3294, 3294, 3295, 3295, 3296, 3297, 3297, 3298, 3299, 3299, 3300, 3300, 3301, 3302,
+        3302, 3303, 3304, 3304, 3305, 3305, 3306, 3307, 3307, 3308, 3309, 3309, 3310, 3310, 3311, 3312,
+        3312, 3313, 3314, 3314, 3315, 3315, 3316, 3317, 3317, 3318, 3319, 3319, 3320, 3320, 3321, 3322,
+        3322, 3323, 3323, 3324, 3325, 3325, 3326, 3327, 3327, 3328, 3328, 3329, 3330, 3330, 3331, 3332,
+        3332, 3333, 3333, 3334, 3335, 3335, 3336, 3336, 3337, 3338, 3338, 3339, 3340, 3340, 3341, 3341,
+        3342, 3343, 3343, 3344, 3345, 3345, 3346, 3346, 3347, 3348, 3348, 3349, 3349, 3350, 3351, 3351,
+        3352, 3352, 3353, 3354, 3354, 3355, 3356, 3356, 3357, 3357, 3358, 3359, 3359, 3360, 3360, 3361,
+        3362, 3362, 3363, 3364, 3364, 3365, 3365, 3366, 3367, 3367, 3368, 3368, 3369, 3370, 3370, 3371,
+        3371, 3372, 3373, 3373, 3374, 3375, 3375, 3376, 3376, 3377, 3378, 3378, 3379, 3379, 3380, 3381,
+        3381, 3382, 3382, 3383, 3384, 3384, 3385, 3385, 3386, 3387, 3387, 3388, 3389, 3389, 3390, 3390,
+        3391, 3392, 3392, 3393, 3393, 3394, 3395, 3395, 3396, 3396, 3397, 3398, 3398, 3399, 3399, 3400,
+        3401, 3401, 3402, 3402, 3403, 3404, 3404, 3405, 3405, 3406, 3407, 3407, 3408, 3408, 3409, 3410,
+        3410, 3411, 3411, 3412, 3413, 3413, 3414, 3414, 3415, 3416, 3416, 3417, 3418, 3418, 3419, 3419,
+        3420, 3421, 3421, 3422, 3422, 3423, 3424, 3424, 3425, 3425, 3426, 3427, 3427, 3428, 3428, 3429,
+        3430, 3430, 3431, 3431, 3432, 3433, 3433, 3434, 3434, 3435, 3435, 3436, 3437, 3437, 3438, 3438,
+        3439, 3440, 3440, 3441, 3441, 3442, 3443, 3443, 3444, 3444, 3445, 3446, 3446, 3447, 3447, 3448,
+        3449, 3449, 3450, 3450, 3451, 3452, 3452, 3453, 3453, 3454, 3455, 3455, 3456, 3456, 3457, 3458,
+        3458, 3459, 3459, 3460, 3461, 3461, 3462, 3462, 3463, 3463, 3464, 3465, 3465, 3466, 3466, 3467,
+        3468, 3468, 3469, 3469, 3470, 3471, 3471, 3472, 3472, 3473, 3474, 3474, 3475, 3475, 3476, 3476,
+        3477, 3478, 3478, 3479, 3479, 3480, 3481, 3481, 3482, 3482, 3483, 3484, 3484, 3485, 3485, 3486,
+        3486, 3487, 3488, 3488, 3489, 3489, 3490, 3491, 3491, 3492, 3492, 3493, 3494, 3494, 3495, 3495,
+        3496, 3496, 3497, 3498, 3498, 3499, 3499, 3500, 3501, 3501, 3502, 3502, 3503, 3504, 3504, 3505,
+        3505, 3506, 3506, 3507, 3508, 3508, 3509, 3509, 3510, 3511, 3511, 3512, 3512, 3513, 3513, 3514,
+        3515, 3515, 3516, 3516, 3517, 3518, 3518, 3519, 3519, 3520, 3520, 3521, 3522, 3522, 3523, 3523,
+        3524, 3525, 3525, 3526, 3526, 3527, 3527, 3528, 3529, 3529, 3530, 3530, 3531, 3531, 3532, 3533,
+        3533, 3534, 3534, 3535, 3536, 3536, 3537, 3537, 3538, 3538, 3539, 3540, 3540, 3541, 3541, 3542,
+        3542, 3543, 3544, 3544, 3545, 3545, 3546, 3547, 3547, 3548, 3548, 3549, 3549, 3550, 3551, 3551,
+        3552, 3552, 3553, 3553, 3554, 3555, 3555, 3556, 3556, 3557, 3557, 3558, 3559, 3559, 3560, 3560,
+        3561, 3561, 3562, 3563, 3563, 3564, 3564, 3565, 3566, 3566, 3567, 3567, 3568, 3568, 3569, 3570,
+        3570, 3571, 3571, 3572, 3572, 3573, 3574, 3574, 3575, 3575, 3576, 3576, 3577, 3578, 3578, 3579,
+        3579, 3580, 3580, 3581, 3582, 3582, 3583, 3583, 3584, 3584, 3585, 3586, 3586, 3587, 3587, 3588,
+        3588, 3589, 3590, 3590, 3591, 3591, 3592, 3592, 3593, 3594, 3594, 3595, 3595, 3596, 3596, 3597,
+        3597, 3598, 3599, 3599, 3600, 3600, 3601, 3601, 3602, 3603, 3603, 3604, 3604, 3605, 3605, 3606,
+        3607, 3607, 3608, 3608, 3609, 3609, 3610, 3611, 3611, 3612, 3612, 3613, 3613, 3614, 3615, 3615,
+        3616, 3616, 3617, 3617, 3618, 3618, 3619, 3620, 3620, 3621, 3621, 3622, 3622, 3623, 3624, 3624,
+        3625, 3625, 3626, 3626, 3627, 3627, 3628, 3629, 3629, 3630, 3630, 3631, 3631, 3632, 3633, 3633,
+        3634, 3634, 3635, 3635, 3636, 3636, 3637, 3638, 3638, 3639, 3639, 3640, 3640, 3641, 3642, 3642,
+        3643, 3643, 3644, 3644, 3645, 3645, 3646, 3647, 3647, 3648, 3648, 3649, 3649, 3650, 3650, 3651,
+        3652, 3652, 3653, 3653, 3654, 3654, 3655, 3656, 3656, 3657, 3657, 3658, 3658, 3659, 3659, 3660,
+        3661, 3661, 3662, 3662, 3663, 3663, 3664, 3664, 3665, 3666, 3666, 3667, 3667, 3668, 3668, 3669,
+        3669, 3670, 3671, 3671, 3672, 3672, 3673, 3673, 3674, 3674, 3675, 3676, 3676, 3677, 3677, 3678,
+        3678, 3679, 3679, 3680, 3681, 3681, 3682, 3682, 3683, 3683, 3684, 3684, 3685, 3686, 3686, 3687,
+        3687, 3688, 3688, 3689, 3689, 3690, 3691, 3691, 3692, 3692, 3693, 3693, 3694, 3694, 3695, 3695,
+        3696, 3697, 3697, 3698, 3698, 3699, 3699, 3700, 3700, 3701, 3702, 3702, 3703, 3703, 3704, 3704,
+        3705, 3705, 3706, 3707, 3707, 3708, 3708, 3709, 3709, 3710, 3710, 3711, 3711, 3712, 3713, 3713,
+        3714, 3714, 3715, 3715, 3716, 3716, 3717, 3717, 3718, 3719, 3719, 3720, 3720, 3721, 3721, 3722,
+        3722, 3723, 3724, 3724, 3725, 3725, 3726, 3726, 3727, 3727, 3728, 3728, 3729, 3730, 3730, 3731,
+        3731, 3732, 3732, 3733, 3733, 3734, 3734, 3735, 3736, 3736, 3737, 3737, 3738, 3738, 3739, 3739,
+        3740, 3740, 3741, 3742, 3742, 3743, 3743, 3744, 3744, 3745, 3745, 3746, 3746, 3747, 3748, 3748,
+        3749, 3749, 3750, 3750, 3751, 3751, 3752, 3752, 3753, 3753, 3754, 3755, 3755, 3756, 3756, 3757,
+        3757, 3758, 3758, 3759, 3759, 3760, 3761, 3761, 3762, 3762, 3763, 3763, 3764, 3764, 3765, 3765,
+        3766, 3766, 3767, 3768, 3768, 3769, 3769, 3770, 3770, 3771, 3771, 3772, 3772, 3773, 3773, 3774,
+        3775, 3775, 3776, 3776, 3777, 3777, 3778, 3778, 3779, 3779, 3780, 3781, 3781, 3782, 3782, 3783,
+        3783, 3784, 3784, 3785, 3785, 3786, 3786, 3787, 3787, 3788, 3789, 3789, 3790, 3790, 3791, 3791,
+        3792, 3792, 3793, 3793, 3794, 3794, 3795, 3796, 3796, 3797, 3797, 3798, 3798, 3799, 3799, 3800,
+        3800, 3801, 3801, 3802, 3802, 3803, 3804, 3804, 3805, 3805, 3806, 3806, 3807, 3807, 3808, 3808,
+        3809, 3809, 3810, 3811, 3811, 3812, 3812, 3813, 3813, 3814, 3814, 3815, 3815, 3816, 3816, 3817,
+        3817, 3818, 3819, 3819, 3820, 3820, 3821, 3821, 3822, 3822, 3823, 3823, 3824, 3824, 3825, 3825,
+        3826, 3826, 3827, 3828, 3828, 3829, 3829, 3830, 3830, 3831, 3831, 3832, 3832, 3833, 3833, 3834,
+        3834, 3835, 3835, 3836, 3837, 3837, 3838, 3838, 3839, 3839, 3840, 3840, 3841, 3841, 3842, 3842,
+        3843, 3843, 3844, 3844, 3845, 3846, 3846, 3847, 3847, 3848, 3848, 3849, 3849, 3850, 3850, 3851,
+        3851, 3852, 3852, 3853, 3853, 3854, 3855, 3855, 3856, 3856, 3857, 3857, 3858, 3858, 3859, 3859,
+        3860, 3860, 3861, 3861, 3862, 3862, 3863, 3863, 3864, 3864, 3865, 3866, 3866, 3867, 3867, 3868,
+        3868, 3869, 3869, 3870, 3870, 3871, 3871, 3872, 3872, 3873, 3873, 3874, 3874, 3875, 3876, 3876,
+        3877, 3877, 3878, 3878, 3879, 3879, 3880, 3880, 3881, 3881, 3882, 3882, 3883, 3883, 3884, 3884,
+        3885, 3885, 3886, 3886, 3887, 3888, 3888, 3889, 3889, 3890, 3890, 3891, 3891, 3892, 3892, 3893,
+        3893, 3894, 3894, 3895, 3895, 3896, 3896, 3897, 3897, 3898, 3898, 3899, 3900, 3900, 3901, 3901,
+        3902, 3902, 3903, 3903, 3904, 3904, 3905, 3905, 3906, 3906, 3907, 3907, 3908, 3908, 3909, 3909,
+        3910, 3910, 3911, 3911, 3912, 3912, 3913, 3914, 3914, 3915, 3915, 3916, 3916, 3917, 3917, 3918,
+        3918, 3919, 3919, 3920, 3920, 3921, 3921, 3922, 3922, 3923, 3923, 3924, 3924, 3925, 3925, 3926,
+        3926, 3927, 3927, 3928, 3929, 3929, 3930, 3930, 3931, 3931, 3932, 3932, 3933, 3933, 3934, 3934,
+        3935, 3935, 3936, 3936, 3937, 3937, 3938, 3938, 3939, 3939, 3940, 3940, 3941, 3941, 3942, 3942,
+        3943, 3943, 3944, 3944, 3945, 3945, 3946, 3947, 3947, 3948, 3948, 3949, 3949, 3950, 3950, 3951,
+        3951, 3952, 3952, 3953, 3953, 3954, 3954, 3955, 3955, 3956, 3956, 3957, 3957, 3958, 3958, 3959,
+        3959, 3960, 3960, 3961, 3961, 3962, 3962, 3963, 3963, 3964, 3964, 3965, 3965, 3966, 3966, 3967,
+        3967, 3968, 3969, 3969, 3970, 3970, 3971, 3971, 3972, 3972, 3973, 3973, 3974, 3974, 3975, 3975,
+        3976, 3976, 3977, 3977, 3978, 3978, 3979, 3979, 3980, 3980, 3981, 3981, 3982, 3982, 3983, 3983,
+        3984, 3984, 3985, 3985, 3986, 3986, 3987, 3987, 3988, 3988, 3989, 3989, 3990, 3990, 3991, 3991,
+        3992, 3992, 3993, 3993, 3994, 3994, 3995, 3995, 3996, 3996, 3997, 3997, 3998, 3998, 3999, 3999,
+        4000, 4001, 4001, 4002, 4002, 4003, 4003, 4004, 4004, 4005, 4005, 4006, 4006, 4007, 4007, 4008,
+        4008, 4009, 4009, 4010, 4010, 4011, 4011, 4012, 4012, 4013, 4013, 4014, 4014, 4015, 4015, 4016,
+        4016, 4017, 4017, 4018, 4018, 4019, 4019, 4020, 4020, 4021, 4021, 4022, 4022, 4023, 4023, 4024,
+        4024, 4025, 4025, 4026, 4026, 4027, 4027, 4028, 4028, 4029, 4029, 4030, 4030, 4031, 4031, 4032,
+        4032, 4033, 4033, 4034, 4034, 4035, 4035, 4036, 4036, 4037, 4037, 4038, 4038, 4039, 4039, 4040,
+        4040, 4041, 4041, 4042, 4042, 4043, 4043, 4044, 4044, 4045, 4045, 4046, 4046, 4047, 4047, 4048,
+        4048, 4049, 4049, 4050, 4050, 4051, 4051, 4052, 4052, 4053, 4053, 4054, 4054, 4055, 4055, 4056,
+        4056, 4057, 4057, 4058, 4058, 4059, 4059, 4060, 4060, 4061, 4061, 4062, 4062, 4063, 4063, 4064,
+        4064, 4065, 4065, 4066, 4066, 4067, 4067, 4068, 4068, 4069, 4069, 4070, 4070, 4071, 4071, 4072,
+        4072, 4073, 4073, 4074, 4074, 4075, 4075, 4076, 4076, 4077, 4077, 4078, 4078, 4079, 4079, 4080,
+        4080,
+};
+
+/* Generated table */
+const struct color16 tpg_csc_colors[V4L2_COLORSPACE_BT2020 + 1][TPG_COLOR_CSC_BLACK + 1] = {
+        [V4L2_COLORSPACE_SMPTE170M][0] = { 2939, 2939, 2939 },
+        [V4L2_COLORSPACE_SMPTE170M][1] = { 2953, 2963, 586 },
+        [V4L2_COLORSPACE_SMPTE170M][2] = { 0, 2967, 2937 },
+        [V4L2_COLORSPACE_SMPTE170M][3] = { 88, 2990, 575 },
+        [V4L2_COLORSPACE_SMPTE170M][4] = { 3016, 259, 2933 },
+        [V4L2_COLORSPACE_SMPTE170M][5] = { 3030, 405, 558 },
+        [V4L2_COLORSPACE_SMPTE170M][6] = { 478, 428, 2931 },
+        [V4L2_COLORSPACE_SMPTE170M][7] = { 547, 547, 547 },
         [V4L2_COLORSPACE_SMPTE240M][0] = { 2926, 2926, 2926 },
-        [V4L2_COLORSPACE_SMPTE240M][1] = { 2926, 2926, 857 },
-        [V4L2_COLORSPACE_SMPTE240M][2] = { 1594, 2901, 2901 },
-        [V4L2_COLORSPACE_SMPTE240M][3] = { 1594, 2901, 774 },
-        [V4L2_COLORSPACE_SMPTE240M][4] = { 2484, 618, 2858 },
-        [V4L2_COLORSPACE_SMPTE240M][5] = { 2484, 618, 617 },
-        [V4L2_COLORSPACE_SMPTE240M][6] = { 507, 507, 2832 },
+        [V4L2_COLORSPACE_SMPTE240M][1] = { 2941, 2950, 546 },
+        [V4L2_COLORSPACE_SMPTE240M][2] = { 0, 2954, 2924 },
+        [V4L2_COLORSPACE_SMPTE240M][3] = { 78, 2978, 536 },
+        [V4L2_COLORSPACE_SMPTE240M][4] = { 3004, 230, 2920 },
+        [V4L2_COLORSPACE_SMPTE240M][5] = { 3018, 363, 518 },
+        [V4L2_COLORSPACE_SMPTE240M][6] = { 437, 387, 2918 },
         [V4L2_COLORSPACE_SMPTE240M][7] = { 507, 507, 507 },
         [V4L2_COLORSPACE_REC709][0] = { 2939, 2939, 2939 },
         [V4L2_COLORSPACE_REC709][1] = { 2939, 2939, 547 },
@@ -103,21 +623,21 @@ const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLAC
         [V4L2_COLORSPACE_REC709][5] = { 2939, 547, 547 },
         [V4L2_COLORSPACE_REC709][6] = { 547, 547, 2939 },
         [V4L2_COLORSPACE_REC709][7] = { 547, 547, 547 },
-        [V4L2_COLORSPACE_470_SYSTEM_M][0] = { 2894, 2988, 2808 },
-        [V4L2_COLORSPACE_470_SYSTEM_M][1] = { 2847, 3070, 843 },
+        [V4L2_COLORSPACE_470_SYSTEM_M][0] = { 2892, 2988, 2807 },
+        [V4L2_COLORSPACE_470_SYSTEM_M][1] = { 2846, 3070, 843 },
         [V4L2_COLORSPACE_470_SYSTEM_M][2] = { 1656, 2962, 2783 },
         [V4L2_COLORSPACE_470_SYSTEM_M][3] = { 1572, 3045, 763 },
-        [V4L2_COLORSPACE_470_SYSTEM_M][4] = { 2477, 229, 2743 },
-        [V4L2_COLORSPACE_470_SYSTEM_M][5] = { 2422, 672, 614 },
+        [V4L2_COLORSPACE_470_SYSTEM_M][4] = { 2476, 229, 2742 },
+        [V4L2_COLORSPACE_470_SYSTEM_M][5] = { 2420, 672, 614 },
         [V4L2_COLORSPACE_470_SYSTEM_M][6] = { 725, 63, 2718 },
         [V4L2_COLORSPACE_470_SYSTEM_M][7] = { 534, 561, 509 },
         [V4L2_COLORSPACE_470_SYSTEM_BG][0] = { 2939, 2939, 2939 },
-        [V4L2_COLORSPACE_470_SYSTEM_BG][1] = { 2939, 2939, 621 },
+        [V4L2_COLORSPACE_470_SYSTEM_BG][1] = { 2939, 2939, 464 },
         [V4L2_COLORSPACE_470_SYSTEM_BG][2] = { 786, 2939, 2939 },
-        [V4L2_COLORSPACE_470_SYSTEM_BG][3] = { 786, 2939, 621 },
-        [V4L2_COLORSPACE_470_SYSTEM_BG][4] = { 2879, 547, 2923 },
+        [V4L2_COLORSPACE_470_SYSTEM_BG][3] = { 786, 2939, 464 },
+        [V4L2_COLORSPACE_470_SYSTEM_BG][4] = { 2879, 547, 2956 },
         [V4L2_COLORSPACE_470_SYSTEM_BG][5] = { 2879, 547, 547 },
-        [V4L2_COLORSPACE_470_SYSTEM_BG][6] = { 547, 547, 2923 },
+        [V4L2_COLORSPACE_470_SYSTEM_BG][6] = { 547, 547, 2956 },
         [V4L2_COLORSPACE_470_SYSTEM_BG][7] = { 547, 547, 547 },
         [V4L2_COLORSPACE_SRGB][0] = { 3056, 3056, 3056 },
         [V4L2_COLORSPACE_SRGB][1] = { 3056, 3056, 800 },
@@ -127,6 +647,22 @@ const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLAC
         [V4L2_COLORSPACE_SRGB][5] = { 3056, 800, 800 },
         [V4L2_COLORSPACE_SRGB][6] = { 800, 800, 3056 },
         [V4L2_COLORSPACE_SRGB][7] = { 800, 800, 800 },
+        [V4L2_COLORSPACE_ADOBERGB][0] = { 3033, 3033, 3033 },
+        [V4L2_COLORSPACE_ADOBERGB][1] = { 3033, 3033, 1063 },
+        [V4L2_COLORSPACE_ADOBERGB][2] = { 1828, 3033, 3033 },
+        [V4L2_COLORSPACE_ADOBERGB][3] = { 1828, 3033, 1063 },
+        [V4L2_COLORSPACE_ADOBERGB][4] = { 2633, 851, 2979 },
+        [V4L2_COLORSPACE_ADOBERGB][5] = { 2633, 851, 851 },
+        [V4L2_COLORSPACE_ADOBERGB][6] = { 851, 851, 2979 },
+        [V4L2_COLORSPACE_ADOBERGB][7] = { 851, 851, 851 },
+        [V4L2_COLORSPACE_BT2020][0] = { 2939, 2939, 2939 },
+        [V4L2_COLORSPACE_BT2020][1] = { 2877, 2923, 1058 },
+        [V4L2_COLORSPACE_BT2020][2] = { 1837, 2840, 2916 },
+        [V4L2_COLORSPACE_BT2020][3] = { 1734, 2823, 993 },
+        [V4L2_COLORSPACE_BT2020][4] = { 2427, 961, 2812 },
+        [V4L2_COLORSPACE_BT2020][5] = { 2351, 912, 648 },
+        [V4L2_COLORSPACE_BT2020][6] = { 792, 618, 2788 },
+        [V4L2_COLORSPACE_BT2020][7] = { 547, 547, 547 },
 };
 
 #else
@@ -138,29 +674,40 @@ const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLAC
 #include <stdlib.h>
 
 static const double rec709_to_ntsc1953[3][3] = {
-        { 0.6698, 0.2678,  0.0323 },
-        { 0.0185, 1.0742, -0.0603 },
-        { 0.0162, 0.0432,  0.8551 }
+        { 0.6689794, 0.2678309, 0.0323187 },
+        { 0.0184901, 1.0742442, -0.0602820 },
+        { 0.0162259, 0.0431716, 0.8549253 }
 };
 
 static const double rec709_to_ebu[3][3] = {
-        { 0.9578, 0.0422, 0      },
-        { 0     , 1     , 0      },
-        { 0     , 0.0118, 0.9882 }
+        { 0.9578221, 0.0421779, -0.0000000 },
+        { -0.0000000, 1.0000000, 0.0000000 },
+        { -0.0000000, -0.0119367, 1.0119367 }
 };
 
 static const double rec709_to_170m[3][3] = {
-        {  1.0654, -0.0554, -0.0010 },
-        { -0.0196,  1.0364, -0.0167 },
-        {  0.0016,  0.0044,  0.9940 }
+        { 1.0653640, -0.0553900, -0.0099740 },
+        { -0.0196361, 1.0363630, -0.0167269 },
+        { 0.0016327, 0.0044133, 0.9939540 },
 };
 
 static const double rec709_to_240m[3][3] = {
-        { 0.7151, 0.2849, 0      },
-        { 0.0179, 0.9821, 0      },
-        { 0.0177, 0.0472, 0.9350 }
+        { 1.0653640, -0.0553900, -0.0099740 },
+        { -0.0196361, 1.0363630, -0.0167269 },
+        { 0.0016327, 0.0044133, 0.9939540 },
+};
+
+static const double rec709_to_adobergb[3][3] = {
+        { 0.7151627, 0.2848373, -0.0000000 },
+        { 0.0000000, 1.0000000, 0.0000000 },
+        { -0.0000000, 0.0411705, 0.9588295 },
 };
 
+static const double rec709_to_bt2020[3][3] = {
+        { 0.6274524, 0.3292485, 0.0432991 },
+        { 0.0691092, 0.9195311, 0.0113597 },
+        { 0.0163976, 0.0880301, 0.8955723 },
+};
 
 static void mult_matrix(double *r, double *g, double *b, const double m[3][3])
 {
@@ -176,7 +723,18 @@ static void mult_matrix(double *r, double *g, double *b, const double m[3][3])
 
 static double transfer_srgb_to_rgb(double v)
 {
-        return (v <= 0.03928) ? v / 12.92 : pow((v + 0.055) / 1.055, 2.4);
+        if (v < -0.04045)
+                return pow((-v + 0.055) / 1.055, 2.4);
+        return (v <= 0.04045) ? v / 12.92 : pow((v + 0.055) / 1.055, 2.4);
+}
+
+static double transfer_rgb_to_srgb(double v)
+{
+        if (v <= -0.0031308)
+                return -1.055 * pow(-v, 1.0 / 2.4) + 0.055;
+        if (v <= 0.0031308)
+                return v * 12.92;
+        return 1.055 * pow(v, 1.0 / 2.4) - 0.055;
 }
 
 static double transfer_rgb_to_smpte240m(double v)
@@ -186,9 +744,21 @@ static double transfer_rgb_to_smpte240m(double v)
 
 static double transfer_rgb_to_rec709(double v)
 {
+        if (v <= -0.018)
+                return -1.099 * pow(-v, 0.45) + 0.099;
         return (v < 0.018) ? v * 4.5 : 1.099 * pow(v, 0.45) - 0.099;
 }
 
+static double transfer_rec709_to_rgb(double v)
+{
+        return (v < 0.081) ? v / 4.5 : pow((v + 0.099) / 1.099, 1.0 / 0.45);
+}
+
+static double transfer_rgb_to_adobergb(double v)
+{
+        return pow(v, 1.0 / 2.19921875);
+}
+
 static double transfer_srgb_to_rec709(double v)
 {
         return transfer_rgb_to_rec709(transfer_srgb_to_rgb(v));
@@ -196,6 +766,8 @@ static double transfer_srgb_to_rec709(double v)
 
 static void csc(enum v4l2_colorspace colorspace, double *r, double *g, double *b)
 {
+        int clamp = 1;
+
         /* Convert the primaries of Rec. 709 Linear RGB */
         switch (colorspace) {
         case V4L2_COLORSPACE_SMPTE240M:
@@ -222,15 +794,29 @@ static void csc(enum v4l2_colorspace colorspace, double *r, double *g, double *b
                 *b = transfer_srgb_to_rgb(*b);
                 mult_matrix(r, g, b, rec709_to_ntsc1953);
                 break;
+        case V4L2_COLORSPACE_ADOBERGB:
+                *r = transfer_srgb_to_rgb(*r);
+                *g = transfer_srgb_to_rgb(*g);
+                *b = transfer_srgb_to_rgb(*b);
+                mult_matrix(r, g, b, rec709_to_adobergb);
+                break;
+        case V4L2_COLORSPACE_BT2020:
+                *r = transfer_srgb_to_rgb(*r);
+                *g = transfer_srgb_to_rgb(*g);
+                *b = transfer_srgb_to_rgb(*b);
+                mult_matrix(r, g, b, rec709_to_bt2020);
+                break;
         case V4L2_COLORSPACE_SRGB:
         case V4L2_COLORSPACE_REC709:
         default:
                 break;
         }
 
-        *r = ((*r) < 0) ? 0 : (((*r) > 1) ? 1 : (*r));
-        *g = ((*g) < 0) ? 0 : (((*g) > 1) ? 1 : (*g));
-        *b = ((*b) < 0) ? 0 : (((*b) > 1) ? 1 : (*b));
+        if (clamp) {
+                *r = ((*r) < 0) ? 0 : (((*r) > 1) ? 1 : (*r));
+                *g = ((*g) < 0) ? 0 : (((*g) > 1) ? 1 : (*g));
+                *b = ((*b) < 0) ? 0 : (((*b) > 1) ? 1 : (*b));
+        }
 
         /* Encode to gamma corrected colorspace */
         switch (colorspace) {
@@ -242,12 +828,18 @@ static void csc(enum v4l2_colorspace colorspace, double *r, double *g, double *b
         case V4L2_COLORSPACE_SMPTE170M:
         case V4L2_COLORSPACE_470_SYSTEM_M:
         case V4L2_COLORSPACE_470_SYSTEM_BG:
+        case V4L2_COLORSPACE_BT2020:
                 *r = transfer_rgb_to_rec709(*r);
                 *g = transfer_rgb_to_rec709(*g);
                 *b = transfer_rgb_to_rec709(*b);
                 break;
         case V4L2_COLORSPACE_SRGB:
                 break;
+        case V4L2_COLORSPACE_ADOBERGB:
+                *r = transfer_rgb_to_adobergb(*r);
+                *g = transfer_rgb_to_adobergb(*g);
+                *b = transfer_rgb_to_adobergb(*b);
+                break;
         case V4L2_COLORSPACE_REC709:
         default:
                 *r = transfer_srgb_to_rec709(*r);
@@ -269,6 +861,8 @@ int main(int argc, char **argv)
                 V4L2_COLORSPACE_470_SYSTEM_BG,
                 0,
                 V4L2_COLORSPACE_SRGB,
+                V4L2_COLORSPACE_ADOBERGB,
+                V4L2_COLORSPACE_BT2020,
         };
         static const char * const colorspace_names[] = {
                 "",
@@ -280,13 +874,39 @@ int main(int argc, char **argv)
                 "V4L2_COLORSPACE_470_SYSTEM_BG",
                 "",
                 "V4L2_COLORSPACE_SRGB",
+                "V4L2_COLORSPACE_ADOBERGB",
+                "V4L2_COLORSPACE_BT2020",
         };
         int i;
         int c;
 
         printf("/* Generated table */\n");
-        printf("const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLACK + 1] = {\n");
-        for (c = 0; c <= V4L2_COLORSPACE_SRGB; c++) {
+        printf("const unsigned short tpg_rec709_to_linear[255 * 16 + 1] = {");
+        for (i = 0; i <= 255 * 16; i++) {
+                if (i % 16 == 0)
+                        printf("\n\t");
+                printf("%4d,%s",
+                        (int)(0.5 + 16.0 * 255.0 *
+                                transfer_rec709_to_rgb(i / (16.0 * 255.0))),
+                        i % 16 == 15 || i == 255 * 16 ? "" : " ");
+        }
+        printf("\n};\n\n");
+
+        printf("/* Generated table */\n");
+        printf("const unsigned short tpg_linear_to_rec709[255 * 16 + 1] = {");
+        for (i = 0; i <= 255 * 16; i++) {
+                if (i % 16 == 0)
+                        printf("\n\t");
+                printf("%4d,%s",
+                        (int)(0.5 + 16.0 * 255.0 *
+                                transfer_rgb_to_rec709(i / (16.0 * 255.0))),
+                        i % 16 == 15 || i == 255 * 16 ? "" : " ");
+        }
+        printf("\n};\n\n");
+
+        printf("/* Generated table */\n");
+        printf("const struct color16 tpg_csc_colors[V4L2_COLORSPACE_BT2020 + 1][TPG_COLOR_CSC_BLACK + 1] = {\n");
+        for (c = 0; c <= V4L2_COLORSPACE_BT2020; c++) {
                 for (i = 0; i <= TPG_COLOR_CSC_BLACK; i++) {
                         double r, g, b;
 
diff --git a/drivers/media/platform/vivid/vivid-tpg-colors.h b/drivers/media/platform/vivid/vivid-tpg-colors.h
index a2678fbec256..2c333356451c 100644
--- a/drivers/media/platform/vivid/vivid-tpg-colors.h
+++ b/drivers/media/platform/vivid/vivid-tpg-colors.h
@@ -59,6 +59,8 @@ enum tpg_color {
 };
 
 extern const struct color tpg_colors[TPG_COLOR_MAX];
-extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_SRGB + 1][TPG_COLOR_CSC_BLACK + 1];
+extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
+extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
+extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_BT2020 + 1][TPG_COLOR_CSC_BLACK + 1];
 
 #endif
diff --git a/drivers/media/platform/vivid/vivid-tpg.c b/drivers/media/platform/vivid/vivid-tpg.c
index cbcd6250e7b2..fc9c6536ba02 100644
--- a/drivers/media/platform/vivid/vivid-tpg.c
+++ b/drivers/media/platform/vivid/vivid-tpg.c
@@ -296,127 +296,193 @@ static enum tpg_color tpg_get_textfg_color(struct tpg_data *tpg)
         }
 }
 
-static u16 color_to_y(struct tpg_data *tpg, int r, int g, int b)
+static inline int rec709_to_linear(int v)
 {
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                return ((16829 * r + 33039 * g + 6416 * b + 16 * 32768) >> 16) + (16 << 4);
-        case V4L2_COLORSPACE_SMPTE240M:
-                return ((11932 * r + 39455 * g + 4897 * b + 16 * 32768) >> 16) + (16 << 4);
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
-        default:
-                return ((11966 * r + 40254 * g + 4064 * b + 16 * 32768) >> 16) + (16 << 4);
-        }
+        v = clamp(v, 0, 0xff0);
+        return tpg_rec709_to_linear[v];
 }
 
-static u16 color_to_cb(struct tpg_data *tpg, int r, int g, int b)
+static inline int linear_to_rec709(int v)
 {
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                return ((-9714 * r - 19070 * g + 28784 * b + 16 * 32768) >> 16) + (128 << 4);
-        case V4L2_COLORSPACE_SMPTE240M:
-                return ((-6684 * r - 22100 * g + 28784 * b + 16 * 32768) >> 16) + (128 << 4);
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
-        default:
-                return ((-6596 * r - 22189 * g + 28784 * b + 16 * 32768) >> 16) + (128 << 4);
-        }
+        v = clamp(v, 0, 0xff0);
+        return tpg_linear_to_rec709[v];
 }
 
-static u16 color_to_cr(struct tpg_data *tpg, int r, int g, int b)
+static void rgb2ycbcr(const int m[3][3], int r, int g, int b,
+                        int y_offset, int *y, int *cb, int *cr)
 {
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                return ((28784 * r - 24103 * g - 4681 * b + 16 * 32768) >> 16) + (128 << 4);
-        case V4L2_COLORSPACE_SMPTE240M:
-                return ((28784 * r - 25606 * g - 3178 * b + 16 * 32768) >> 16) + (128 << 4);
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
-        default:
-                return ((28784 * r - 26145 * g - 2639 * b + 16 * 32768) >> 16) + (128 << 4);
-        }
+        *y  = ((m[0][0] * r + m[0][1] * g + m[0][2] * b) >> 16) + (y_offset << 4);
+        *cb = ((m[1][0] * r + m[1][1] * g + m[1][2] * b) >> 16) + (128 << 4);
+        *cr = ((m[2][0] * r + m[2][1] * g + m[2][2] * b) >> 16) + (128 << 4);
 }
 
-static u16 ycbcr_to_r(struct tpg_data *tpg, int y, int cb, int cr)
+static void color_to_ycbcr(struct tpg_data *tpg, int r, int g, int b,
+                           int *y, int *cb, int *cr)
 {
-        int r;
+#define COEFF(v, r) ((int)(0.5 + (v) * (r) * 256.0))
 
-        y -= 16 << 4;
-        cb -= 128 << 4;
-        cr -= 128 << 4;
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                r = 4769 * y + 6537 * cr;
+        static const int bt601[3][3] = {
+                { COEFF(0.299, 219),  COEFF(0.587, 219),  COEFF(0.114, 219)  },
+                { COEFF(-0.169, 224), COEFF(-0.331, 224), COEFF(0.5, 224)    },
+                { COEFF(0.5, 224),    COEFF(-0.419, 224), COEFF(-0.081, 224) },
+        };
+        static const int bt601_full[3][3] = {
+                { COEFF(0.299, 255),  COEFF(0.587, 255),  COEFF(0.114, 255)  },
+                { COEFF(-0.169, 255), COEFF(-0.331, 255), COEFF(0.5, 255)    },
+                { COEFF(0.5, 255),    COEFF(-0.419, 255), COEFF(-0.081, 255) },
+        };
+        static const int rec709[3][3] = {
+                { COEFF(0.2126, 219),  COEFF(0.7152, 219),  COEFF(0.0722, 219)  },
+                { COEFF(-0.1146, 224), COEFF(-0.3854, 224), COEFF(0.5, 224)     },
+                { COEFF(0.5, 224),     COEFF(-0.4542, 224), COEFF(-0.0458, 224) },
+        };
+        static const int rec709_full[3][3] = {
+                { COEFF(0.2126, 255),  COEFF(0.7152, 255),  COEFF(0.0722, 255)  },
+                { COEFF(-0.1146, 255), COEFF(-0.3854, 255), COEFF(0.5, 255)     },
+                { COEFF(0.5, 255),     COEFF(-0.4542, 255), COEFF(-0.0458, 255) },
+        };
+        static const int smpte240m[3][3] = {
+                { COEFF(0.212, 219),  COEFF(0.701, 219),  COEFF(0.087, 219)  },
+                { COEFF(-0.116, 224), COEFF(-0.384, 224), COEFF(0.5, 224)    },
+                { COEFF(0.5, 224),    COEFF(-0.445, 224), COEFF(-0.055, 224) },
+        };
+        static const int bt2020[3][3] = {
+                { COEFF(0.2726, 219),  COEFF(0.6780, 219),  COEFF(0.0593, 219)  },
+                { COEFF(-0.1396, 224), COEFF(-0.3604, 224), COEFF(0.5, 224)     },
+                { COEFF(0.5, 224),     COEFF(-0.4629, 224), COEFF(-0.0405, 224) },
+        };
+        bool full = tpg->real_quantization == V4L2_QUANTIZATION_FULL_RANGE;
+        int lin_y, yc;
+
+        switch (tpg->real_ycbcr_enc) {
+        case V4L2_YCBCR_ENC_601:
+        case V4L2_YCBCR_ENC_XV601:
+        case V4L2_YCBCR_ENC_SYCC:
+                rgb2ycbcr(full ? bt601_full : bt601, r, g, b, 16, y, cb, cr);
+                break;
+        case V4L2_YCBCR_ENC_BT2020:
+                rgb2ycbcr(bt2020, r, g, b, 16, y, cb, cr);
                 break;
-        case V4L2_COLORSPACE_SMPTE240M:
-                r = 4769 * y + 7376 * cr;
+        case V4L2_YCBCR_ENC_BT2020_CONST_LUM:
+                lin_y = (COEFF(0.2627, 255) * rec709_to_linear(r) +
+                         COEFF(0.6780, 255) * rec709_to_linear(g) +
+                         COEFF(0.0593, 255) * rec709_to_linear(b)) >> 16;
+                yc = linear_to_rec709(lin_y);
+                *y = (yc * 219) / 255 + (16 << 4);
+                if (b <= yc)
+                        *cb = (((b - yc) * COEFF(1.0 / 1.9404, 224)) >> 16) + (128 << 4);
+                else
+                        *cb = (((b - yc) * COEFF(1.0 / 1.5816, 224)) >> 16) + (128 << 4);
+                if (r <= yc)
+                        *cr = (((r - yc) * COEFF(1.0 / 1.7184, 224)) >> 16) + (128 << 4);
+                else
+                        *cr = (((r - yc) * COEFF(1.0 / 0.9936, 224)) >> 16) + (128 << 4);
                 break;
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
+        case V4L2_YCBCR_ENC_SMPTE240M:
+                rgb2ycbcr(smpte240m, r, g, b, 16, y, cb, cr);
+                break;
+        case V4L2_YCBCR_ENC_709:
+        case V4L2_YCBCR_ENC_XV709:
         default:
-                r = 4769 * y + 7343 * cr;
+                rgb2ycbcr(full ? rec709_full : rec709, r, g, b, 0, y, cb, cr);
                 break;
         }
-        return clamp(r >> 12, 0, 0xff0);
 }
 
-static u16 ycbcr_to_g(struct tpg_data *tpg, int y, int cb, int cr)
+static void ycbcr2rgb(const int m[3][3], int y, int cb, int cr,
+                        int y_offset, int *r, int *g, int *b)
 {
-        int g;
-
-        y -= 16 << 4;
+        y -= y_offset << 4;
         cb -= 128 << 4;
         cr -= 128 << 4;
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                g = 4769 * y - 1605 * cb - 3330 * cr;
-                break;
-        case V4L2_COLORSPACE_SMPTE240M:
-                g = 4769 * y - 1055 * cb - 2341 * cr;
-                break;
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
-        default:
-                g = 4769 * y - 873 * cb - 2183 * cr;
-                break;
-        }
-        return clamp(g >> 12, 0, 0xff0);
+        *r = m[0][0] * y + m[0][1] * cb + m[0][2] * cr;
+        *g = m[1][0] * y + m[1][1] * cb + m[1][2] * cr;
+        *b = m[2][0] * y + m[2][1] * cb + m[2][2] * cr;
+        *r = clamp(*r >> 12, 0, 0xff0);
+        *g = clamp(*g >> 12, 0, 0xff0);
+        *b = clamp(*b >> 12, 0, 0xff0);
 }
 
-static u16 ycbcr_to_b(struct tpg_data *tpg, int y, int cb, int cr)
+static void ycbcr_to_color(struct tpg_data *tpg, int y, int cb, int cr,
+                           int *r, int *g, int *b)
 {
-        int b;
+#undef COEFF
+#define COEFF(v, r) ((int)(0.5 + (v) * ((255.0 * 255.0 * 16.0) / (r))))
+        static const int bt601[3][3] = {
+                { COEFF(1, 219), COEFF(0, 224),       COEFF(1.4020, 224)  },
+                { COEFF(1, 219), COEFF(-0.3441, 224), COEFF(-0.7141, 224) },
+                { COEFF(1, 219), COEFF(1.7720, 224),  COEFF(0, 224)       },
+        };
+        static const int bt601_full[3][3] = {
+                { COEFF(1, 255), COEFF(0, 255),       COEFF(1.4020, 255)  },
+                { COEFF(1, 255), COEFF(-0.3441, 255), COEFF(-0.7141, 255) },
+                { COEFF(1, 255), COEFF(1.7720, 255),  COEFF(0, 255)       },
+        };
+        static const int rec709[3][3] = {
+                { COEFF(1, 219), COEFF(0, 224),       COEFF(1.5748, 224)  },
+                { COEFF(1, 219), COEFF(-0.1873, 224), COEFF(-0.4681, 224) },
+                { COEFF(1, 219), COEFF(1.8556, 224),  COEFF(0, 224)       },
+        };
+        static const int rec709_full[3][3] = {
+                { COEFF(1, 255), COEFF(0, 255),       COEFF(1.5748, 255)  },
+                { COEFF(1, 255), COEFF(-0.1873, 255), COEFF(-0.4681, 255) },
+                { COEFF(1, 255), COEFF(1.8556, 255),  COEFF(0, 255)       },
+        };
+        static const int smpte240m[3][3] = {
+                { COEFF(1, 219), COEFF(0, 224),       COEFF(1.5756, 224)  },
+                { COEFF(1, 219), COEFF(-0.2253, 224), COEFF(-0.4767, 224) },
+                { COEFF(1, 219), COEFF(1.8270, 224),  COEFF(0, 224)       },
+        };
+        static const int bt2020[3][3] = {
+                { COEFF(1, 219), COEFF(0, 224),       COEFF(1.4746, 224)  },
+                { COEFF(1, 219), COEFF(-0.1646, 224), COEFF(-0.5714, 224) },
+                { COEFF(1, 219), COEFF(1.8814, 224),  COEFF(0, 224)       },
+        };
+        bool full = tpg->real_quantization == V4L2_QUANTIZATION_FULL_RANGE;
+        int lin_r, lin_g, lin_b, lin_y;
+
+        switch (tpg->real_ycbcr_enc) {
+        case V4L2_YCBCR_ENC_601:
+        case V4L2_YCBCR_ENC_XV601:
+        case V4L2_YCBCR_ENC_SYCC:
+                ycbcr2rgb(full ? bt601_full : bt601, y, cb, cr, 16, r, g, b);
+                break;
+        case V4L2_YCBCR_ENC_BT2020:
+                ycbcr2rgb(bt2020, y, cb, cr, 16, r, g, b);
+                break;
+        case V4L2_YCBCR_ENC_BT2020_CONST_LUM:
+                y -= 16 << 4;
+                cb -= 128 << 4;
+                cr -= 128 << 4;
 
-        y -= 16 << 4;
-        cb -= 128 << 4;
-        cr -= 128 << 4;
-        switch (tpg->colorspace) {
-        case V4L2_COLORSPACE_SMPTE170M:
-        case V4L2_COLORSPACE_470_SYSTEM_M:
-        case V4L2_COLORSPACE_470_SYSTEM_BG:
-                b = 4769 * y + 7343 * cb;
+                if (cb <= 0)
+                        *b = COEFF(1.0, 219) * y + COEFF(1.9404, 224) * cb;
+                else
+                        *b = COEFF(1.0, 219) * y + COEFF(1.5816, 224) * cb;
+                *b = *b >> 12;
+                if (cr <= 0)
+                        *r = COEFF(1.0, 219) * y + COEFF(1.7184, 224) * cr;
+                else
+                        *r = COEFF(1.0, 219) * y + COEFF(0.9936, 224) * cr;
+                *r = *r >> 12;
+                lin_r = rec709_to_linear(*r);
+                lin_b = rec709_to_linear(*b);
+                lin_y = rec709_to_linear((y * 255) / 219);
+
+                lin_g = COEFF(1.0 / 0.6780, 255) * lin_y -
+                        COEFF(0.2627 / 0.6780, 255) * lin_r -
+                        COEFF(0.0593 / 0.6780, 255) * lin_b;
+                *g = linear_to_rec709(lin_g >> 12);
                 break;
-        case V4L2_COLORSPACE_SMPTE240M:
-                b = 4769 * y + 8552 * cb;
+        case V4L2_YCBCR_ENC_SMPTE240M:
+                ycbcr2rgb(smpte240m, y, cb, cr, 16, r, g, b);
                 break;
-        case V4L2_COLORSPACE_REC709:
-        case V4L2_COLORSPACE_SRGB:
+        case V4L2_YCBCR_ENC_709:
+        case V4L2_YCBCR_ENC_XV709:
         default:
-                b = 4769 * y + 8652 * cb;
+                ycbcr2rgb(full ? rec709_full : rec709, y, cb, cr, 16, r, g, b);
                 break;
         }
-        return clamp(b >> 12, 0, 0xff0);
 }
 
 /* precalculate color bar values to speed up rendering */
@@ -456,18 +522,17 @@ static void precalculate_color(struct tpg_data *tpg, int k)
                 g <<= 4;
                 b <<= 4;
         }
-        if (tpg->qual == TPG_QUAL_GRAY)
-                r = g = b = color_to_y(tpg, r, g, b);
+        if (tpg->qual == TPG_QUAL_GRAY) {
+                /* Rec. 709 Luma function */
+                /* (0.2126, 0.7152, 0.0722) * (255 * 256) */
+                r = g = b = ((13879 * r + 46688 * g + 4713 * b) >> 16) + (16 << 4);
+        }
 
         /*
          * The assumption is that the RGB output is always full range,
          * so only if the rgb_range overrides the 'real' rgb range do
          * we need to convert the RGB values.
          *
-         * Currently there is no way of signalling to userspace if you
-         * are actually giving it limited range RGB (or full range
-         * YUV for that matter).
-         *
          * Remember that r, g and b are still in the 0 - 0xff0 range.
          */
         if (tpg->real_rgb_range == V4L2_DV_RGB_RANGE_LIMITED &&
@@ -497,12 +562,12 @@ static void precalculate_color(struct tpg_data *tpg, int k)
         if (tpg->brightness != 128 || tpg->contrast != 128 ||
             tpg->saturation != 128 || tpg->hue) {
                 /* Implement these operations */
+                int y, cb, cr;
+                int tmp_cb, tmp_cr;
 
                 /* First convert to YCbCr */
-                int y = color_to_y(tpg, r, g, b);       /* Luma */
-                int cb = color_to_cb(tpg, r, g, b);     /* Cb */
-                int cr = color_to_cr(tpg, r, g, b);     /* Cr */
-                int tmp_cb, tmp_cr;
+
+                color_to_ycbcr(tpg, r, g, b, &y, &cb, &cr);
 
                 y = (16 << 4) + ((y - (16 << 4)) * tpg->contrast) / 128;
                 y += (tpg->brightness << 4) - (128 << 4);
@@ -520,21 +585,29 @@ static void precalculate_color(struct tpg_data *tpg, int k)
                         tpg->colors[k][2] = clamp(cr >> 4, 1, 254);
                         return;
                 }
-                r = ycbcr_to_r(tpg, y, cb, cr);
-                g = ycbcr_to_g(tpg, y, cb, cr);
-                b = ycbcr_to_b(tpg, y, cb, cr);
+                ycbcr_to_color(tpg, y, cb, cr, &r, &g, &b);
         }
 
         if (tpg->is_yuv) {
                 /* Convert to YCbCr */
-                u16 y = color_to_y(tpg, r, g, b);       /* Luma */
-                u16 cb = color_to_cb(tpg, r, g, b);     /* Cb */
-                u16 cr = color_to_cr(tpg, r, g, b);     /* Cr */
+                int y, cb, cr;
+
+                color_to_ycbcr(tpg, r, g, b, &y, &cb, &cr);
 
+                if (tpg->real_quantization == V4L2_QUANTIZATION_LIM_RANGE) {
+                        y = clamp(y, 16 << 4, 235 << 4);
+                        cb = clamp(cb, 16 << 4, 240 << 4);
+                        cr = clamp(cr, 16 << 4, 240 << 4);
+                }
                 tpg->colors[k][0] = clamp(y >> 4, 1, 254);
                 tpg->colors[k][1] = clamp(cb >> 4, 1, 254);
                 tpg->colors[k][2] = clamp(cr >> 4, 1, 254);
         } else {
+                if (tpg->real_quantization == V4L2_QUANTIZATION_LIM_RANGE) {
+                        r = (r * 219) / 255 + (16 << 4);
+                        g = (g * 219) / 255 + (16 << 4);
+                        b = (b * 219) / 255 + (16 << 4);
+                }
                 switch (tpg->fourcc) {
                 case V4L2_PIX_FMT_RGB565:
                 case V4L2_PIX_FMT_RGB565X:
@@ -1152,6 +1225,46 @@ static void tpg_recalc(struct tpg_data *tpg)
         if (tpg->recalc_colors) {
                 tpg->recalc_colors = false;
                 tpg->recalc_lines = true;
+                tpg->real_ycbcr_enc = tpg->ycbcr_enc;
+                tpg->real_quantization = tpg->quantization;
+                if (tpg->ycbcr_enc == V4L2_YCBCR_ENC_DEFAULT) {
+                        switch (tpg->colorspace) {
+                        case V4L2_COLORSPACE_REC709:
+                                tpg->real_ycbcr_enc = V4L2_YCBCR_ENC_709;
+                                break;
+                        case V4L2_COLORSPACE_SRGB:
+                                tpg->real_ycbcr_enc = V4L2_YCBCR_ENC_SYCC;
+                                break;
+                        case V4L2_COLORSPACE_BT2020:
+                                tpg->real_ycbcr_enc = V4L2_YCBCR_ENC_BT2020;
+                                break;
+                        case V4L2_COLORSPACE_SMPTE240M:
+                                tpg->real_ycbcr_enc = V4L2_YCBCR_ENC_SMPTE240M;
+                                break;
+                        case V4L2_COLORSPACE_SMPTE170M:
+                        case V4L2_COLORSPACE_470_SYSTEM_M:
+                        case V4L2_COLORSPACE_470_SYSTEM_BG:
+                        case V4L2_COLORSPACE_ADOBERGB:
+                        default:
+                                tpg->real_ycbcr_enc = V4L2_YCBCR_ENC_601;
+                                break;
+                        }
+                }
+                if (tpg->quantization == V4L2_QUANTIZATION_DEFAULT) {
+                        tpg->real_quantization = V4L2_QUANTIZATION_FULL_RANGE;
+                        if (tpg->is_yuv) {
+                                switch (tpg->real_ycbcr_enc) {
+                                case V4L2_YCBCR_ENC_SYCC:
+                                case V4L2_YCBCR_ENC_XV601:
+                                case V4L2_YCBCR_ENC_XV709:
+                                        break;
+                                default:
+                                        tpg->real_quantization =
+                                                V4L2_QUANTIZATION_LIM_RANGE;
+                                        break;
+                                }
+                        }
+                }
                 tpg_precalculate_colors(tpg);
         }
         if (tpg->recalc_square_border) {
diff --git a/drivers/media/platform/vivid/vivid-tpg.h b/drivers/media/platform/vivid/vivid-tpg.h
index 8ef3e52ba3be..9dc463a40ed3 100644
--- a/drivers/media/platform/vivid/vivid-tpg.h
+++ b/drivers/media/platform/vivid/vivid-tpg.h
@@ -119,6 +119,18 @@ struct tpg_data {
         u32                             fourcc;
         bool                            is_yuv;
         u32                             colorspace;
+        u32                             ycbcr_enc;
+        /*
+         * Stores the actual Y'CbCr encoding, i.e. will never be
+         * V4L2_YCBCR_ENC_DEFAULT.
+         */
+        u32                             real_ycbcr_enc;
+        u32                             quantization;
+        /*
+         * Stores the actual quantization, i.e. will never be
+         * V4L2_QUANTIZATION_DEFAULT.
+         */
+        u32                             real_quantization;
         enum tpg_video_aspect           vid_aspect;
         enum tpg_pixel_aspect           pix_aspect;
         unsigned                        rgb_range;
@@ -286,6 +298,32 @@ static inline u32 tpg_g_colorspace(const struct tpg_data *tpg)
         return tpg->colorspace;
 }
 
+static inline void tpg_s_ycbcr_enc(struct tpg_data *tpg, u32 ycbcr_enc)
+{
+        if (tpg->ycbcr_enc == ycbcr_enc)
+                return;
+        tpg->ycbcr_enc = ycbcr_enc;
+        tpg->recalc_colors = true;
+}
+
+static inline u32 tpg_g_ycbcr_enc(const struct tpg_data *tpg)
+{
+        return tpg->ycbcr_enc;
+}
+
+static inline void tpg_s_quantization(struct tpg_data *tpg, u32 quantization)
+{
+        if (tpg->quantization == quantization)
+                return;
+        tpg->quantization = quantization;
+        tpg->recalc_colors = true;
+}
+
+static inline u32 tpg_g_quantization(const struct tpg_data *tpg)
+{
+        return tpg->quantization;
+}
+
 static inline unsigned tpg_g_planes(const struct tpg_data *tpg)
 {
         return tpg->planes;
diff --git a/drivers/media/platform/vivid/vivid-vbi-cap.c b/drivers/media/platform/vivid/vivid-vbi-cap.c
index 2166d0bf6fe2..ef81b01b53d2 100644
--- a/drivers/media/platform/vivid/vivid-vbi-cap.c
+++ b/drivers/media/platform/vivid/vivid-vbi-cap.c
@@ -236,8 +236,8 @@ const struct vb2_ops vivid_vbi_cap_qops = {
         .buf_queue              = vbi_cap_buf_queue,
         .start_streaming        = vbi_cap_start_streaming,
         .stop_streaming         = vbi_cap_stop_streaming,
-        .wait_prepare           = vivid_unlock,
-        .wait_finish            = vivid_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 int vidioc_g_fmt_vbi_cap(struct file *file, void *priv,
diff --git a/drivers/media/platform/vivid/vivid-vbi-out.c b/drivers/media/platform/vivid/vivid-vbi-out.c
index 9d00a07ecdcd..4e4c70e1e04a 100644
--- a/drivers/media/platform/vivid/vivid-vbi-out.c
+++ b/drivers/media/platform/vivid/vivid-vbi-out.c
@@ -131,8 +131,8 @@ const struct vb2_ops vivid_vbi_out_qops = {
         .buf_queue              = vbi_out_buf_queue,
         .start_streaming        = vbi_out_start_streaming,
         .stop_streaming         = vbi_out_stop_streaming,
-        .wait_prepare           = vivid_unlock,
-        .wait_finish            = vivid_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 int vidioc_g_fmt_vbi_out(struct file *file, void *priv,
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c
index 331c54429b40..867a29a6d18f 100644
--- a/drivers/media/platform/vivid/vivid-vid-cap.c
+++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -288,8 +288,8 @@ const struct vb2_ops vivid_vid_cap_qops = {
         .buf_queue              = vid_cap_buf_queue,
         .start_streaming        = vid_cap_start_streaming,
         .stop_streaming         = vid_cap_stop_streaming,
-        .wait_prepare           = vivid_unlock,
-        .wait_finish            = vivid_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 /*
@@ -443,12 +443,12 @@ void vivid_update_format_cap(struct vivid_dev *dev, bool keep_controls)
                         break;
                 if (bt->standards & V4L2_DV_BT_STD_CEA861) {
                         if (bt->width == 720 && bt->height <= 576)
-                                v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SMPTE170M);
+                                v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);
                         else
-                                v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_REC709);
+                                v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_709);
                         v4l2_ctrl_s_ctrl(dev->real_rgb_range_cap, 1);
                 } else {
-                        v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SRGB);
+                        v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_SRGB);
                         v4l2_ctrl_s_ctrl(dev->real_rgb_range_cap, 0);
                 }
                 tpg_s_rgb_range(&dev->tpg, v4l2_ctrl_g_ctrl(dev->rgb_range_cap));
@@ -498,6 +498,20 @@ static unsigned vivid_colorspace_cap(struct vivid_dev *dev)
         return dev->colorspace_out;
 }
 
+static unsigned vivid_ycbcr_enc_cap(struct vivid_dev *dev)
+{
+        if (!dev->loop_video || vivid_is_webcam(dev) || vivid_is_tv_cap(dev))
+                return tpg_g_ycbcr_enc(&dev->tpg);
+        return dev->ycbcr_enc_out;
+}
+
+static unsigned vivid_quantization_cap(struct vivid_dev *dev)
+{
+        if (!dev->loop_video || vivid_is_webcam(dev) || vivid_is_tv_cap(dev))
+                return tpg_g_quantization(&dev->tpg);
+        return dev->quantization_out;
+}
+
 int vivid_g_fmt_vid_cap(struct file *file, void *priv,
                                         struct v4l2_format *f)
 {
@@ -510,6 +524,8 @@ int vivid_g_fmt_vid_cap(struct file *file, void *priv,
         mp->field        = dev->field_cap;
         mp->pixelformat  = dev->fmt_cap->fourcc;
         mp->colorspace   = vivid_colorspace_cap(dev);
+        mp->ycbcr_enc    = vivid_ycbcr_enc_cap(dev);
+        mp->quantization = vivid_quantization_cap(dev);
         mp->num_planes = dev->fmt_cap->planes;
         for (p = 0; p < mp->num_planes; p++) {
                 mp->plane_fmt[p].bytesperline = tpg_g_bytesperline(&dev->tpg, p);
@@ -595,6 +611,8 @@ int vivid_try_fmt_vid_cap(struct file *file, void *priv,
                 memset(pfmt[p].reserved, 0, sizeof(pfmt[p].reserved));
         }
         mp->colorspace = vivid_colorspace_cap(dev);
+        mp->ycbcr_enc = vivid_ycbcr_enc_cap(dev);
+        mp->quantization = vivid_quantization_cap(dev);
         memset(mp->reserved, 0, sizeof(mp->reserved));
         return 0;
 }
@@ -1307,20 +1325,20 @@ int vidioc_s_input(struct file *file, void *priv, unsigned i)
         if (dev->colorspace) {
                 switch (dev->input_type[i]) {
                 case WEBCAM:
-                        v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SRGB);
+                        v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_SRGB);
                         break;
                 case TV:
                 case SVID:
-                        v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SMPTE170M);
+                        v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);
                         break;
                 case HDMI:
                         if (bt->standards & V4L2_DV_BT_STD_CEA861) {
                                 if (dev->src_rect.width == 720 && dev->src_rect.height <= 576)
-                                        v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SMPTE170M);
+                                        v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_170M);
                                 else
-                                        v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_REC709);
+                                        v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_709);
                         } else {
-                                v4l2_ctrl_s_ctrl(dev->colorspace, V4L2_COLORSPACE_SRGB);
+                                v4l2_ctrl_s_ctrl(dev->colorspace, VIVID_CS_SRGB);
                         }
                         break;
                 }
diff --git a/drivers/media/platform/vivid/vivid-vid-common.c b/drivers/media/platform/vivid/vivid-vid-common.c
index 16cd6d2d2ed6..6bef1e6d6788 100644
--- a/drivers/media/platform/vivid/vivid-vid-common.c
+++ b/drivers/media/platform/vivid/vivid-vid-common.c
@@ -259,6 +259,8 @@ void fmt_sp2mp(const struct v4l2_format *sp_fmt, struct v4l2_format *mp_fmt)
         mp->pixelformat = pix->pixelformat;
         mp->field = pix->field;
         mp->colorspace = pix->colorspace;
+        mp->ycbcr_enc = pix->ycbcr_enc;
+        mp->quantization = pix->quantization;
         mp->num_planes = 1;
         mp->flags = pix->flags;
         ppix->sizeimage = pix->sizeimage;
@@ -285,6 +287,8 @@ int fmt_sp2mp_func(struct file *file, void *priv,
         pix->pixelformat = mp->pixelformat;
         pix->field = mp->field;
         pix->colorspace = mp->colorspace;
+        pix->ycbcr_enc = mp->ycbcr_enc;
+        pix->quantization = mp->quantization;
         pix->sizeimage = ppix->sizeimage;
         pix->bytesperline = ppix->bytesperline;
         pix->flags = mp->flags;
diff --git a/drivers/media/platform/vivid/vivid-vid-out.c b/drivers/media/platform/vivid/vivid-vid-out.c
index 69c2dbd2d165..ee5c3992b276 100644
--- a/drivers/media/platform/vivid/vivid-vid-out.c
+++ b/drivers/media/platform/vivid/vivid-vid-out.c
@@ -209,8 +209,8 @@ const struct vb2_ops vivid_vid_out_qops = {
         .buf_queue              = vid_out_buf_queue,
         .start_streaming        = vid_out_start_streaming,
         .stop_streaming         = vid_out_stop_streaming,
-        .wait_prepare           = vivid_unlock,
-        .wait_finish            = vivid_lock,
+        .wait_prepare           = vb2_ops_wait_prepare,
+        .wait_finish            = vb2_ops_wait_finish,
 };
 
 /*
@@ -259,6 +259,8 @@ void vivid_update_format_out(struct vivid_dev *dev)
                 }
                 break;
         }
+        dev->ycbcr_enc_out = V4L2_YCBCR_ENC_DEFAULT;
+        dev->quantization_out = V4L2_QUANTIZATION_DEFAULT;
         dev->compose_out = dev->sink_rect;
         dev->compose_bounds_out = dev->sink_rect;
         dev->crop_out = dev->compose_out;
@@ -318,6 +320,8 @@ int vivid_g_fmt_vid_out(struct file *file, void *priv,
         mp->field        = dev->field_out;
         mp->pixelformat  = dev->fmt_out->fourcc;
         mp->colorspace   = dev->colorspace_out;
+        mp->ycbcr_enc    = dev->ycbcr_enc_out;
+        mp->quantization = dev->quantization_out;
         mp->num_planes = dev->fmt_out->planes;
         for (p = 0; p < mp->num_planes; p++) {
                 mp->plane_fmt[p].bytesperline = dev->bytesperline_out[p];
@@ -394,16 +398,23 @@ int vivid_try_fmt_vid_out(struct file *file, void *priv,
                 pfmt[p].sizeimage = pfmt[p].bytesperline * mp->height;
                 memset(pfmt[p].reserved, 0, sizeof(pfmt[p].reserved));
         }
-        if (vivid_is_svid_out(dev))
+        mp->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
+        mp->quantization = V4L2_QUANTIZATION_DEFAULT;
+        if (vivid_is_svid_out(dev)) {
                 mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
-        else if (dev->dvi_d_out || !(bt->standards & V4L2_DV_BT_STD_CEA861))
+        } else if (dev->dvi_d_out || !(bt->standards & V4L2_DV_BT_STD_CEA861)) {
                 mp->colorspace = V4L2_COLORSPACE_SRGB;
-        else if (bt->width == 720 && bt->height <= 576)
+                if (dev->dvi_d_out)
+                        mp->quantization = V4L2_QUANTIZATION_LIM_RANGE;
+        } else if (bt->width == 720 && bt->height <= 576) {
                 mp->colorspace = V4L2_COLORSPACE_SMPTE170M;
-        else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M &&
-                 mp->colorspace != V4L2_COLORSPACE_REC709 &&
-                 mp->colorspace != V4L2_COLORSPACE_SRGB)
+        } else if (mp->colorspace != V4L2_COLORSPACE_SMPTE170M &&
+                   mp->colorspace != V4L2_COLORSPACE_REC709 &&
+                   mp->colorspace != V4L2_COLORSPACE_ADOBERGB &&
+                   mp->colorspace != V4L2_COLORSPACE_BT2020 &&
+                   mp->colorspace != V4L2_COLORSPACE_SRGB) {
                 mp->colorspace = V4L2_COLORSPACE_REC709;
+        }
         memset(mp->reserved, 0, sizeof(mp->reserved));
         return 0;
 }
@@ -522,6 +533,8 @@ int vivid_s_fmt_vid_out(struct file *file, void *priv,
 
 set_colorspace:
         dev->colorspace_out = mp->colorspace;
+        dev->ycbcr_enc_out = mp->ycbcr_enc;
+        dev->quantization_out = mp->quantization;
         if (dev->loop_video) {
                 vivid_send_source_change(dev, SVID);
                 vivid_send_source_change(dev, HDMI);
diff --git a/drivers/media/platform/vsp1/vsp1_bru.c b/drivers/media/platform/vsp1/vsp1_bru.c
index a0c1984c733e..b21f381a9862 100644
--- a/drivers/media/platform/vsp1/vsp1_bru.c
+++ b/drivers/media/platform/vsp1/vsp1_bru.c
@@ -187,8 +187,8 @@ static int bru_enum_mbus_code(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
         struct v4l2_mbus_framefmt *format;
 
@@ -215,8 +215,8 @@ static int bru_enum_frame_size(struct v4l2_subdev *subdev,
         if (fse->index)
                 return -EINVAL;
 
-        if (fse->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-            fse->code != V4L2_MBUS_FMT_AYUV8_1X32)
+        if (fse->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+            fse->code != MEDIA_BUS_FMT_AYUV8_1X32)
                 return -EINVAL;
 
         fse->min_width = BRU_MIN_SIZE;
@@ -261,9 +261,9 @@ static void bru_try_format(struct vsp1_bru *bru, struct v4l2_subdev_fh *fh,
         switch (pad) {
         case BRU_PAD_SINK(0):
                 /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
                 break;
 
         default:
diff --git a/drivers/media/platform/vsp1/vsp1_hsit.c b/drivers/media/platform/vsp1/vsp1_hsit.c
index db2950a73c60..80bedc554ee3 100644
--- a/drivers/media/platform/vsp1/vsp1_hsit.c
+++ b/drivers/media/platform/vsp1/vsp1_hsit.c
@@ -70,9 +70,9 @@ static int hsit_enum_mbus_code(struct v4l2_subdev *subdev,
 
         if ((code->pad == HSIT_PAD_SINK && !hsit->inverse) |
             (code->pad == HSIT_PAD_SOURCE && hsit->inverse))
-                code->code = V4L2_MBUS_FMT_ARGB8888_1X32;
+                code->code = MEDIA_BUS_FMT_ARGB8888_1X32;
         else
-                code->code = V4L2_MBUS_FMT_AHSV8888_1X32;
+                code->code = MEDIA_BUS_FMT_AHSV8888_1X32;
 
         return 0;
 }
@@ -136,8 +136,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
                 return 0;
         }
 
-        format->code = hsit->inverse ? V4L2_MBUS_FMT_AHSV8888_1X32
-                     : V4L2_MBUS_FMT_ARGB8888_1X32;
+        format->code = hsit->inverse ? MEDIA_BUS_FMT_AHSV8888_1X32
+                     : MEDIA_BUS_FMT_ARGB8888_1X32;
         format->width = clamp_t(unsigned int, fmt->format.width,
                                 HSIT_MIN_SIZE, HSIT_MAX_SIZE);
         format->height = clamp_t(unsigned int, fmt->format.height,
@@ -151,8 +151,8 @@ static int hsit_set_format(struct v4l2_subdev *subdev,
         format = vsp1_entity_get_pad_format(&hsit->entity, fh, HSIT_PAD_SOURCE,
                                             fmt->which);
         *format = fmt->format;
-        format->code = hsit->inverse ? V4L2_MBUS_FMT_ARGB8888_1X32
-                     : V4L2_MBUS_FMT_AHSV8888_1X32;
+        format->code = hsit->inverse ? MEDIA_BUS_FMT_ARGB8888_1X32
+                     : MEDIA_BUS_FMT_AHSV8888_1X32;
 
         return 0;
 }
diff --git a/drivers/media/platform/vsp1/vsp1_lif.c b/drivers/media/platform/vsp1/vsp1_lif.c
index d4fb23e9c4a8..17a6ca7dafe6 100644
--- a/drivers/media/platform/vsp1/vsp1_lif.c
+++ b/drivers/media/platform/vsp1/vsp1_lif.c
@@ -78,8 +78,8 @@ static int lif_enum_mbus_code(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
 
         if (code->pad == LIF_PAD_SINK) {
@@ -147,9 +147,9 @@ static int lif_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
         struct v4l2_mbus_framefmt *format;
 
         /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
 
         format = vsp1_entity_get_pad_format(&lif->entity, fh, fmt->pad,
                                             fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_lut.c b/drivers/media/platform/vsp1/vsp1_lut.c
index fea36ebe2565..6f185c3621fe 100644
--- a/drivers/media/platform/vsp1/vsp1_lut.c
+++ b/drivers/media/platform/vsp1/vsp1_lut.c
@@ -86,9 +86,9 @@ static int lut_enum_mbus_code(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AHSV8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AHSV8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
         struct v4l2_mbus_framefmt *format;
 
@@ -158,10 +158,10 @@ static int lut_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
         struct v4l2_mbus_framefmt *format;
 
         /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AHSV8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+            fmt->format.code != MEDIA_BUS_FMT_AHSV8888_1X32 &&
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
 
         format = vsp1_entity_get_pad_format(&lut->entity, fh, fmt->pad,
                                             fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_rwpf.c b/drivers/media/platform/vsp1/vsp1_rwpf.c
index ec3dab6a9b9b..1f1ba26a834a 100644
--- a/drivers/media/platform/vsp1/vsp1_rwpf.c
+++ b/drivers/media/platform/vsp1/vsp1_rwpf.c
@@ -29,8 +29,8 @@ int vsp1_rwpf_enum_mbus_code(struct v4l2_subdev *subdev,
                              struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
 
         if (code->index >= ARRAY_SIZE(codes))
@@ -103,9 +103,9 @@ int vsp1_rwpf_set_format(struct v4l2_subdev *subdev, struct v4l2_subdev_fh *fh,
         struct v4l2_rect *crop;
 
         /* Default to YUV if the requested format is not supported. */
-        if (fmt->format.code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-            fmt->format.code != V4L2_MBUS_FMT_AYUV8_1X32)
-                fmt->format.code = V4L2_MBUS_FMT_AYUV8_1X32;
+        if (fmt->format.code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+            fmt->format.code != MEDIA_BUS_FMT_AYUV8_1X32)
+                fmt->format.code = MEDIA_BUS_FMT_AYUV8_1X32;
 
         format = vsp1_entity_get_pad_format(&rwpf->entity, fh, fmt->pad,
                                             fmt->which);
diff --git a/drivers/media/platform/vsp1/vsp1_sru.c b/drivers/media/platform/vsp1/vsp1_sru.c
index b7d3c8b9f189..1129494c7cfc 100644
--- a/drivers/media/platform/vsp1/vsp1_sru.c
+++ b/drivers/media/platform/vsp1/vsp1_sru.c
@@ -139,7 +139,7 @@ static int sru_s_stream(struct v4l2_subdev *subdev, int enable)
         input = &sru->entity.formats[SRU_PAD_SINK];
         output = &sru->entity.formats[SRU_PAD_SOURCE];
 
-        if (input->code == V4L2_MBUS_FMT_ARGB8888_1X32)
+        if (input->code == MEDIA_BUS_FMT_ARGB8888_1X32)
                 ctrl0 = VI6_SRU_CTRL0_PARAM2 | VI6_SRU_CTRL0_PARAM3
                       | VI6_SRU_CTRL0_PARAM4;
         else
@@ -170,8 +170,8 @@ static int sru_enum_mbus_code(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
         struct v4l2_mbus_framefmt *format;
 
@@ -248,9 +248,9 @@ static void sru_try_format(struct vsp1_sru *sru, struct v4l2_subdev_fh *fh,
         switch (pad) {
         case SRU_PAD_SINK:
                 /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
 
                 fmt->width = clamp(fmt->width, SRU_MIN_SIZE, SRU_MAX_SIZE);
                 fmt->height = clamp(fmt->height, SRU_MIN_SIZE, SRU_MAX_SIZE);
diff --git a/drivers/media/platform/vsp1/vsp1_uds.c b/drivers/media/platform/vsp1/vsp1_uds.c
index de92ef4944b3..a4afec133800 100644
--- a/drivers/media/platform/vsp1/vsp1_uds.c
+++ b/drivers/media/platform/vsp1/vsp1_uds.c
@@ -173,8 +173,8 @@ static int uds_enum_mbus_code(struct v4l2_subdev *subdev,
                               struct v4l2_subdev_mbus_code_enum *code)
 {
         static const unsigned int codes[] = {
-                V4L2_MBUS_FMT_ARGB8888_1X32,
-                V4L2_MBUS_FMT_AYUV8_1X32,
+                MEDIA_BUS_FMT_ARGB8888_1X32,
+                MEDIA_BUS_FMT_AYUV8_1X32,
         };
 
         if (code->pad == UDS_PAD_SINK) {
@@ -246,9 +246,9 @@ static void uds_try_format(struct vsp1_uds *uds, struct v4l2_subdev_fh *fh,
         switch (pad) {
         case UDS_PAD_SINK:
                 /* Default to YUV if the requested format is not supported. */
-                if (fmt->code != V4L2_MBUS_FMT_ARGB8888_1X32 &&
-                    fmt->code != V4L2_MBUS_FMT_AYUV8_1X32)
-                        fmt->code = V4L2_MBUS_FMT_AYUV8_1X32;
+                if (fmt->code != MEDIA_BUS_FMT_ARGB8888_1X32 &&
+                    fmt->code != MEDIA_BUS_FMT_AYUV8_1X32)
+                        fmt->code = MEDIA_BUS_FMT_AYUV8_1X32;
 
                 fmt->width = clamp(fmt->width, UDS_MIN_SIZE, UDS_MAX_SIZE);
                 fmt->height = clamp(fmt->height, UDS_MIN_SIZE, UDS_MAX_SIZE);
diff --git a/drivers/media/platform/vsp1/vsp1_video.c b/drivers/media/platform/vsp1/vsp1_video.c
index 915a20eb003e..d91f19a9e1c1 100644
--- a/drivers/media/platform/vsp1/vsp1_video.c
+++ b/drivers/media/platform/vsp1/vsp1_video.c
@@ -48,85 +48,85 @@
  */
 
 static const struct vsp1_format_info vsp1_video_formats[] = {
-        { V4L2_PIX_FMT_RGB332, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB332, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_RGB_332, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 8, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB444, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS,
           1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB444, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB444, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_XRGB_4444, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS,
           1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_ARGB555, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS,
           1, { 16, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB555, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB555, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_XRGB_1555, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS,
           1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB565, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB565, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_RGB_565, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS,
           1, { 16, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_BGR24, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_BGR24, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_BGR_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_RGB24, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_RGB24, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_RGB_888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 24, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ABGR32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ABGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
           1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XBGR32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XBGR32, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS,
           1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_ARGB32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_ARGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 32, 0, 0 }, false, false, 1, 1, true },
-        { V4L2_PIX_FMT_XRGB32, V4L2_MBUS_FMT_ARGB8888_1X32,
+        { V4L2_PIX_FMT_XRGB32, MEDIA_BUS_FMT_ARGB8888_1X32,
           VI6_FMT_ARGB_8888, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 32, 0, 0 }, false, false, 1, 1, false },
-        { V4L2_PIX_FMT_UYVY, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_UYVY, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 16, 0, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_VYUY, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_VYUY, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 16, 0, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUYV, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YUYV, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 16, 0, 0 }, true, false, 2, 1, false },
-        { V4L2_PIX_FMT_YVYU, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YVYU, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_YUYV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           1, { 16, 0, 0 }, true, true, 2, 1, false },
-        { V4L2_PIX_FMT_NV12M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV12M, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           2, { 8, 16, 0 }, false, false, 2, 2, false },
-        { V4L2_PIX_FMT_NV21M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV21M, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_Y_UV_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           2, { 8, 16, 0 }, false, true, 2, 2, false },
-        { V4L2_PIX_FMT_NV16M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV16M, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           2, { 8, 16, 0 }, false, false, 2, 1, false },
-        { V4L2_PIX_FMT_NV61M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_NV61M, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_Y_UV_422, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           2, { 8, 16, 0 }, false, true, 2, 1, false },
-        { V4L2_PIX_FMT_YUV420M, V4L2_MBUS_FMT_AYUV8_1X32,
+        { V4L2_PIX_FMT_YUV420M, MEDIA_BUS_FMT_AYUV8_1X32,
           VI6_FMT_Y_U_V_420, VI6_RPF_DSWAP_P_LLS | VI6_RPF_DSWAP_P_LWS |
           VI6_RPF_DSWAP_P_WDS | VI6_RPF_DSWAP_P_BTS,
           3, { 8, 8, 8 }, false, false, 2, 2, false },
diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 9cf6731fb816..284f789265e0 100644
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1279,10 +1279,12 @@ static int wl1273_fm_vidioc_querycap(struct file *file, void *priv,
         strlcpy(capability->bus_info, radio->bus_type,
                 sizeof(capability->bus_info));
 
-        capability->capabilities = V4L2_CAP_HW_FREQ_SEEK |
+        capability->device_caps = V4L2_CAP_HW_FREQ_SEEK |
                 V4L2_CAP_TUNER | V4L2_CAP_RADIO | V4L2_CAP_AUDIO |
                 V4L2_CAP_RDS_CAPTURE | V4L2_CAP_MODULATOR |
                 V4L2_CAP_RDS_OUTPUT;
+        capability->capabilities = capability->device_caps |
+                V4L2_CAP_DEVICE_CAPS;
 
         return 0;
 }
diff --git a/drivers/media/radio/si4713/radio-platform-si4713.c b/drivers/media/radio/si4713/radio-platform-si4713.c
index a47502a330f0..2de5439b9c79 100644
--- a/drivers/media/radio/si4713/radio-platform-si4713.c
+++ b/drivers/media/radio/si4713/radio-platform-si4713.c
@@ -34,7 +34,7 @@
 #include <media/v4l2-fh.h>
 #include <media/v4l2-ctrls.h>
 #include <media/v4l2-event.h>
-#include <media/radio-si4713.h>
+#include "si4713.h"
 
 /* module parameters */
 static int radio_nr = -1;       /* radio device minor (-1 ==> auto assign) */
@@ -153,7 +153,6 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
 {
         struct radio_si4713_platform_data *pdata = pdev->dev.platform_data;
         struct radio_si4713_device *rsdev;
-        struct i2c_adapter *adapter;
         struct v4l2_subdev *sd;
         int rval = 0;
 
@@ -177,20 +176,11 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
                 goto exit;
         }
 
-        adapter = i2c_get_adapter(pdata->i2c_bus);
-        if (!adapter) {
-                dev_err(&pdev->dev, "Cannot get i2c adapter %d\n",
-                        pdata->i2c_bus);
-                rval = -ENODEV;
-                goto unregister_v4l2_dev;
-        }
-
-        sd = v4l2_i2c_new_subdev_board(&rsdev->v4l2_dev, adapter,
-                                       pdata->subdev_board_info, NULL);
-        if (!sd) {
+        sd = i2c_get_clientdata(pdata->subdev);
+        rval = v4l2_device_register_subdev(&rsdev->v4l2_dev, sd);
+        if (rval) {
                 dev_err(&pdev->dev, "Cannot get v4l2 subdevice\n");
-                rval = -ENODEV;
-                goto put_adapter;
+                goto unregister_v4l2_dev;
         }
 
         rsdev->radio_dev = radio_si4713_vdev_template;
@@ -202,14 +192,12 @@ static int radio_si4713_pdriver_probe(struct platform_device *pdev)
         if (video_register_device(&rsdev->radio_dev, VFL_TYPE_RADIO, radio_nr)) {
                 dev_err(&pdev->dev, "Could not register video device.\n");
                 rval = -EIO;
-                goto put_adapter;
+                goto unregister_v4l2_dev;
         }
         dev_info(&pdev->dev, "New device successfully probed\n");
 
         goto exit;
 
-put_adapter:
-        i2c_put_adapter(adapter);
 unregister_v4l2_dev:
         v4l2_device_unregister(&rsdev->v4l2_dev);
 exit:
@@ -220,14 +208,10 @@ exit:
 static int radio_si4713_pdriver_remove(struct platform_device *pdev)
 {
         struct v4l2_device *v4l2_dev = platform_get_drvdata(pdev);
-        struct v4l2_subdev *sd = list_entry(v4l2_dev->subdevs.next,
-                                            struct v4l2_subdev, list);
-        struct i2c_client *client = v4l2_get_subdevdata(sd);
         struct radio_si4713_device *rsdev;
 
         rsdev = container_of(v4l2_dev, struct radio_si4713_device, v4l2_dev);
         video_unregister_device(&rsdev->radio_dev);
-        i2c_put_adapter(client->adapter);
         v4l2_device_unregister(&rsdev->v4l2_dev);
 
         return 0;
diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c
index b5765557ea3d..c90004dac170 100644
--- a/drivers/media/radio/si4713/si4713.c
+++ b/drivers/media/radio/si4713/si4713.c
@@ -23,6 +23,7 @@
 
 #include <linux/completion.h>
 #include <linux/delay.h>
+#include <linux/err.h>
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
@@ -366,16 +367,25 @@ static int si4713_powerup(struct si4713_device *sdev)
         if (sdev->power_state)
                 return 0;
 
-        if (sdev->supplies) {
-                err = regulator_bulk_enable(sdev->supplies, sdev->supply_data);
+        if (sdev->vdd) {
+                err = regulator_enable(sdev->vdd);
                 if (err) {
-                        v4l2_err(&sdev->sd, "Failed to enable supplies: %d\n", err);
+                        v4l2_err(&sdev->sd, "Failed to enable vdd: %d\n", err);
                         return err;
                 }
         }
-        if (gpio_is_valid(sdev->gpio_reset)) {
+
+        if (sdev->vio) {
+                err = regulator_enable(sdev->vio);
+                if (err) {
+                        v4l2_err(&sdev->sd, "Failed to enable vio: %d\n", err);
+                        return err;
+                }
+        }
+
+        if (!IS_ERR(sdev->gpio_reset)) {
                 udelay(50);
-                gpio_set_value(sdev->gpio_reset, 1);
+                gpiod_set_value(sdev->gpio_reset, 1);
         }
 
         if (client->irq)
@@ -397,13 +407,20 @@ static int si4713_powerup(struct si4713_device *sdev)
                                                 SI4713_STC_INT | SI4713_CTS);
                 return err;
         }
-        if (gpio_is_valid(sdev->gpio_reset))
-                gpio_set_value(sdev->gpio_reset, 0);
-        if (sdev->supplies) {
-                err = regulator_bulk_disable(sdev->supplies, sdev->supply_data);
+        if (!IS_ERR(sdev->gpio_reset))
+                gpiod_set_value(sdev->gpio_reset, 0);
+
+
+        if (sdev->vdd) {
+                err = regulator_disable(sdev->vdd);
                 if (err)
-                        v4l2_err(&sdev->sd,
-                                 "Failed to disable supplies: %d\n", err);
+                        v4l2_err(&sdev->sd, "Failed to disable vdd: %d\n", err);
+        }
+
+        if (sdev->vio) {
+                err = regulator_disable(sdev->vio);
+                if (err)
+                        v4l2_err(&sdev->sd, "Failed to disable vio: %d\n", err);
         }
 
         return err;
@@ -430,14 +447,23 @@ static int si4713_powerdown(struct si4713_device *sdev)
                 v4l2_dbg(1, debug, &sdev->sd, "Power down response: 0x%02x\n",
                                 resp[0]);
                 v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");
-                if (gpio_is_valid(sdev->gpio_reset))
-                        gpio_set_value(sdev->gpio_reset, 0);
-                if (sdev->supplies) {
-                        err = regulator_bulk_disable(sdev->supplies,
-                                                     sdev->supply_data);
-                        if (err)
+                if (!IS_ERR(sdev->gpio_reset))
+                        gpiod_set_value(sdev->gpio_reset, 0);
+
+                if (sdev->vdd) {
+                        err = regulator_disable(sdev->vdd);
+                        if (err) {
                                 v4l2_err(&sdev->sd,
-                                         "Failed to disable supplies: %d\n", err);
+                                        "Failed to disable vdd: %d\n", err);
+                        }
+                }
+
+                if (sdev->vio) {
+                        err = regulator_disable(sdev->vio);
+                        if (err) {
+                                v4l2_err(&sdev->sd,
+                                        "Failed to disable vio: %d\n", err);
+                        }
                 }
                 sdev->power_state = POWER_OFF;
         }
@@ -1420,38 +1446,51 @@ static int si4713_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
         struct si4713_device *sdev;
-        struct si4713_platform_data *pdata = client->dev.platform_data;
         struct v4l2_ctrl_handler *hdl;
-        int rval, i;
+        struct si4713_platform_data *pdata = client->dev.platform_data;
+        struct device_node *np = client->dev.of_node;
+        struct radio_si4713_platform_data si4713_pdev_pdata;
+        struct platform_device *si4713_pdev;
+        int rval;
 
-        sdev = kzalloc(sizeof(*sdev), GFP_KERNEL);
+        sdev = devm_kzalloc(&client->dev, sizeof(*sdev), GFP_KERNEL);
         if (!sdev) {
                 dev_err(&client->dev, "Failed to alloc video device.\n");
                 rval = -ENOMEM;
                 goto exit;
         }
 
-        sdev->gpio_reset = -1;
-        if (pdata && gpio_is_valid(pdata->gpio_reset)) {
-                rval = gpio_request(pdata->gpio_reset, "si4713 reset");
-                if (rval) {
-                        dev_err(&client->dev,
-                                "Failed to request gpio: %d\n", rval);
-                        goto free_sdev;
-                }
-                sdev->gpio_reset = pdata->gpio_reset;
-                gpio_direction_output(sdev->gpio_reset, 0);
-                sdev->supplies = pdata->supplies;
+        sdev->gpio_reset = devm_gpiod_get(&client->dev, "reset");
+        if (!IS_ERR(sdev->gpio_reset)) {
+                gpiod_direction_output(sdev->gpio_reset, 0);
+        } else if (PTR_ERR(sdev->gpio_reset) == -ENOENT) {
+                dev_dbg(&client->dev, "No reset GPIO assigned\n");
+        } else if (PTR_ERR(sdev->gpio_reset) == -ENOSYS) {
+                dev_dbg(&client->dev, "No reset GPIO support\n");
+        } else {
+                rval = PTR_ERR(sdev->gpio_reset);
+                dev_err(&client->dev, "Failed to request gpio: %d\n", rval);
+                goto exit;
         }
 
-        for (i = 0; i < sdev->supplies; i++)
-                sdev->supply_data[i].supply = pdata->supply_names[i];
+        sdev->vdd = devm_regulator_get_optional(&client->dev, "vdd");
+        if (IS_ERR(sdev->vdd)) {
+                rval = PTR_ERR(sdev->vdd);
+                if (rval == -EPROBE_DEFER)
+                        goto exit;
 
-        rval = regulator_bulk_get(&client->dev, sdev->supplies,
-                                  sdev->supply_data);
-        if (rval) {
-                dev_err(&client->dev, "Cannot get regulators: %d\n", rval);
-                goto free_gpio;
+                dev_dbg(&client->dev, "no vdd regulator found: %d\n", rval);
+                sdev->vdd = NULL;
+        }
+
+        sdev->vio = devm_regulator_get_optional(&client->dev, "vio");
+        if (IS_ERR(sdev->vio)) {
+                rval = PTR_ERR(sdev->vio);
+                if (rval == -EPROBE_DEFER)
+                        goto exit;
+
+                dev_dbg(&client->dev, "no vio regulator found: %d\n", rval);
+                sdev->vio = NULL;
         }
 
         v4l2_i2c_subdev_init(&sdev->sd, client, &si4713_subdev_ops);
@@ -1554,12 +1593,12 @@ static int si4713_probe(struct i2c_client *client,
         sdev->sd.ctrl_handler = hdl;
 
         if (client->irq) {
-                rval = request_irq(client->irq,
+                rval = devm_request_irq(&client->dev, client->irq,
                         si4713_handler, IRQF_TRIGGER_FALLING,
                         client->name, sdev);
                 if (rval < 0) {
                         v4l2_err(&sdev->sd, "Could not request IRQ\n");
-                        goto put_reg;
+                        goto free_ctrls;
                 }
                 v4l2_dbg(1, debug, &sdev->sd, "IRQ requested.\n");
         } else {
@@ -1569,23 +1608,35 @@ static int si4713_probe(struct i2c_client *client,
         rval = si4713_initialize(sdev);
         if (rval < 0) {
                 v4l2_err(&sdev->sd, "Failed to probe device information.\n");
-                goto free_irq;
+                goto free_ctrls;
         }
 
+        if (!np && (!pdata || !pdata->is_platform_device))
+                return 0;
+
+        si4713_pdev = platform_device_alloc("radio-si4713", -1);
+        if (!si4713_pdev)
+                goto put_main_pdev;
+
+        si4713_pdev_pdata.subdev = client;
+        rval = platform_device_add_data(si4713_pdev, &si4713_pdev_pdata,
+                                        sizeof(si4713_pdev_pdata));
+        if (rval)
+                goto put_main_pdev;
+
+        rval = platform_device_add(si4713_pdev);
+        if (rval)
+                goto put_main_pdev;
+
+        sdev->pd = si4713_pdev;
+
         return 0;
 
-free_irq:
-        if (client->irq)
-                free_irq(client->irq, sdev);
+put_main_pdev:
+        platform_device_put(si4713_pdev);
+        v4l2_device_unregister_subdev(&sdev->sd);
 free_ctrls:
         v4l2_ctrl_handler_free(hdl);
-put_reg:
-        regulator_bulk_free(sdev->supplies, sdev->supply_data);
-free_gpio:
-        if (gpio_is_valid(sdev->gpio_reset))
-                gpio_free(sdev->gpio_reset);
-free_sdev:
-        kfree(sdev);
 exit:
         return rval;
 }
@@ -1596,18 +1647,13 @@ static int si4713_remove(struct i2c_client *client)
         struct v4l2_subdev *sd = i2c_get_clientdata(client);
         struct si4713_device *sdev = to_si4713_device(sd);
 
+        platform_device_unregister(sdev->pd);
+
         if (sdev->power_state)
                 si4713_set_power_state(sdev, POWER_DOWN);
 
-        if (client->irq > 0)
-                free_irq(client->irq, sdev);
-
         v4l2_device_unregister_subdev(sd);
         v4l2_ctrl_handler_free(sd->ctrl_handler);
-        regulator_bulk_free(sdev->supplies, sdev->supply_data);
-        if (gpio_is_valid(sdev->gpio_reset))
-                gpio_free(sdev->gpio_reset);
-        kfree(sdev);
 
         return 0;
 }
diff --git a/drivers/media/radio/si4713/si4713.h b/drivers/media/radio/si4713/si4713.h
index ed700e387605..8a376e142188 100644
--- a/drivers/media/radio/si4713/si4713.h
+++ b/drivers/media/radio/si4713/si4713.h
@@ -15,7 +15,9 @@
 #ifndef SI4713_I2C_H
 #define SI4713_I2C_H
 
+#include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
+#include <linux/gpio/consumer.h>
 #include <media/v4l2-subdev.h>
 #include <media/v4l2-ctrls.h>
 #include <media/si4713.h>
@@ -190,8 +192,6 @@
 #define MIN_ACOMP_THRESHOLD             (-40)
 #define MAX_ACOMP_GAIN                  20
 
-#define SI4713_NUM_SUPPLIES             2
-
 /*
  * si4713_device - private data
  */
@@ -236,9 +236,10 @@ struct si4713_device {
                 struct v4l2_ctrl *tune_ant_cap;
         };
         struct completion work;
-        unsigned supplies;
-        struct regulator_bulk_data supply_data[SI4713_NUM_SUPPLIES];
-        int gpio_reset;
+        struct regulator *vdd;
+        struct regulator *vio;
+        struct gpio_desc *gpio_reset;
+        struct platform_device *pd;
         u32 power_state;
         u32 rds_enabled;
         u32 frequency;
@@ -246,4 +247,8 @@ struct si4713_device {
         u32 stereo;
         u32 tune_rnl;
 };
+
+struct radio_si4713_platform_data {
+        struct i2c_client *subdev;
+};
 #endif /* ifndef SI4713_I2C_H */
diff --git a/drivers/media/radio/wl128x/fmdrv_v4l2.c b/drivers/media/radio/wl128x/fmdrv_v4l2.c
index b55012c11842..a5bd3f674bbd 100644
--- a/drivers/media/radio/wl128x/fmdrv_v4l2.c
+++ b/drivers/media/radio/wl128x/fmdrv_v4l2.c
@@ -198,10 +198,12 @@ static int fm_v4l2_vidioc_querycap(struct file *file, void *priv,
         strlcpy(capability->card, FM_DRV_CARD_SHORT_NAME,
                         sizeof(capability->card));
         sprintf(capability->bus_info, "UART");
-        capability->capabilities = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER |
+        capability->device_caps = V4L2_CAP_HW_FREQ_SEEK | V4L2_CAP_TUNER |
                 V4L2_CAP_RADIO | V4L2_CAP_MODULATOR |
                 V4L2_CAP_AUDIO | V4L2_CAP_READWRITE |
                 V4L2_CAP_RDS_CAPTURE;
+        capability->capabilities = capability->device_caps |
+                V4L2_CAP_DEVICE_CAPS;
 
         return 0;
 }
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig
index 8ce08107a69d..ddfab256b9a5 100644
--- a/drivers/media/rc/Kconfig
+++ b/drivers/media/rc/Kconfig
@@ -223,6 +223,17 @@ config IR_FINTEK
            To compile this driver as a module, choose M here: the
            module will be called fintek-cir.
 
+config IR_MESON
+        tristate "Amlogic Meson IR remote receiver"
+        depends on RC_CORE
+        depends on ARCH_MESON || COMPILE_TEST
+        ---help---
+           Say Y if you want to use the IR remote receiver available
+           on Amlogic Meson SoCs.
+
+           To compile this driver as a module, choose M here: the
+           module will be called meson-ir.
+
 config IR_NUVOTON
         tristate "Nuvoton w836x7hg Consumer Infrared Transceiver"
         depends on PNP
@@ -277,6 +288,21 @@ config IR_WINBOND_CIR
            To compile this driver as a module, choose M here: the module will
            be called winbond_cir.
 
+config IR_IGORPLUGUSB
+        tristate "IgorPlug-USB IR Receiver"
+        depends on USB_ARCH_HAS_HCD
+        depends on RC_CORE
+        select USB
+        ---help---
+           Say Y here if you want to use the IgorPlug-USB IR Receiver by
+           Igor Cesko. This device is included on the Fit-PC2.
+
+           Note that this device can only record bursts of 36 IR pulses and
+           spaces, which is not enough for the NEC, Sanyo and RC-6 protocol.
+
+           To compile this driver as a module, choose M here: the module will
+           be called igorplugusb.
+
 config IR_IGUANA
         tristate "IguanaWorks USB IR Transceiver"
         depends on USB_ARCH_HAS_HCD
diff --git a/drivers/media/rc/Makefile b/drivers/media/rc/Makefile
index 0989f940e9cf..379a5c0f1379 100644
--- a/drivers/media/rc/Makefile
+++ b/drivers/media/rc/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_IR_IMON) += imon.o
 obj-$(CONFIG_IR_ITE_CIR) += ite-cir.o
 obj-$(CONFIG_IR_MCEUSB) += mceusb.o
 obj-$(CONFIG_IR_FINTEK) += fintek-cir.o
+obj-$(CONFIG_IR_MESON) += meson-ir.o
 obj-$(CONFIG_IR_NUVOTON) += nuvoton-cir.o
 obj-$(CONFIG_IR_ENE) += ene_ir.o
 obj-$(CONFIG_IR_REDRAT3) += redrat3.o
@@ -30,6 +31,7 @@ obj-$(CONFIG_IR_STREAMZAP) += streamzap.o
 obj-$(CONFIG_IR_WINBOND_CIR) += winbond-cir.o
 obj-$(CONFIG_RC_LOOPBACK) += rc-loopback.o
 obj-$(CONFIG_IR_GPIO_CIR) += gpio-ir-recv.o
+obj-$(CONFIG_IR_IGORPLUGUSB) += igorplugusb.o
 obj-$(CONFIG_IR_IGUANA) += iguanair.o
 obj-$(CONFIG_IR_TTUSBIR) += ttusbir.o
 obj-$(CONFIG_RC_ST) += st_rc.o
diff --git a/drivers/media/rc/igorplugusb.c b/drivers/media/rc/igorplugusb.c
new file mode 100644
index 000000000000..b36e51576f8e
--- /dev/null
+++ b/drivers/media/rc/igorplugusb.c
@@ -0,0 +1,261 @@
+/*
+ * IgorPlug-USB IR Receiver
+ *
+ * Copyright (C) 2014 Sean Young <sean@mess.org>
+ *
+ * Supports the standard homebrew IgorPlugUSB receiver with Igor's firmware.
+ * See http://www.cesko.host.sk/IgorPlugUSB/IgorPlug-USB%20(AVR)_eng.htm
+ *
+ * Based on the lirc_igorplugusb.c driver:
+ *      Copyright (C) 2004 Jan M. Hochstein
+ *      <hochstein@algo.informatik.tu-darmstadt.de>
+ *
+ * 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 of the License, 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.
+ */
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/usb.h>
+#include <linux/usb/input.h>
+#include <media/rc-core.h>
+
+#define DRIVER_DESC             "IgorPlug-USB IR Receiver"
+#define DRIVER_NAME             "igorplugusb"
+
+#define HEADERLEN               3
+#define BUFLEN                  36
+#define MAX_PACKET              (HEADERLEN + BUFLEN)
+
+#define SET_INFRABUFFER_EMPTY   1
+#define GET_INFRACODE           2
+
+
+struct igorplugusb {
+        struct rc_dev *rc;
+        struct device *dev;
+
+        struct urb *urb;
+        struct usb_ctrlrequest request;
+
+        struct timer_list timer;
+
+        uint8_t buf_in[MAX_PACKET];
+
+        char phys[64];
+};
+
+static void igorplugusb_cmd(struct igorplugusb *ir, int cmd);
+
+static void igorplugusb_irdata(struct igorplugusb *ir, unsigned len)
+{
+        DEFINE_IR_RAW_EVENT(rawir);
+        unsigned i, start, overflow;
+
+        dev_dbg(ir->dev, "irdata: %*ph (len=%u)", len, ir->buf_in, len);
+
+        /*
+         * If more than 36 pulses and spaces follow each other, the igorplugusb
+         * overwrites its buffer from the beginning. The overflow value is the
+         * last offset which was not overwritten. Everything from this offset
+         * onwards occurred before everything until this offset.
+         */
+        overflow = ir->buf_in[2];
+        i = start = overflow + HEADERLEN;
+
+        if (start >= len) {
+                dev_err(ir->dev, "receive overflow invalid: %u", overflow);
+        } else {
+                if (overflow > 0)
+                        dev_warn(ir->dev, "receive overflow, at least %u lost",
+                                                                overflow);
+
+                do {
+                        rawir.duration = ir->buf_in[i] * 85333;
+                        rawir.pulse = i & 1;
+
+                        ir_raw_event_store_with_filter(ir->rc, &rawir);
+
+                        if (++i == len)
+                                i = HEADERLEN;
+                } while (i != start);
+
+                /* add a trailing space */
+                rawir.duration = ir->rc->timeout;
+                rawir.pulse = false;
+                ir_raw_event_store_with_filter(ir->rc, &rawir);
+
+                ir_raw_event_handle(ir->rc);
+        }
+
+        igorplugusb_cmd(ir, SET_INFRABUFFER_EMPTY);
+}
+
+static void igorplugusb_callback(struct urb *urb)
+{
+        struct usb_ctrlrequest *req;
+        struct igorplugusb *ir = urb->context;
+
+        req = (struct usb_ctrlrequest *)urb->setup_packet;
+
+        switch (urb->status) {
+        case 0:
+                if (req->bRequest == GET_INFRACODE &&
+                                        urb->actual_length > HEADERLEN)
+                        igorplugusb_irdata(ir, urb->actual_length);
+                else /* request IR */
+                        mod_timer(&ir->timer, jiffies + msecs_to_jiffies(50));
+                break;
+        case -EPROTO:
+        case -ECONNRESET:
+        case -ENOENT:
+        case -ESHUTDOWN:
+                usb_unlink_urb(urb);
+                return;
+        default:
+                dev_warn(ir->dev, "Error: urb status = %d\n", urb->status);
+                igorplugusb_cmd(ir, SET_INFRABUFFER_EMPTY);
+                break;
+        }
+}
+
+static void igorplugusb_cmd(struct igorplugusb *ir, int cmd)
+{
+        int ret;
+
+        ir->request.bRequest = cmd;
+        ir->urb->transfer_flags = 0;
+        ret = usb_submit_urb(ir->urb, GFP_ATOMIC);
+        if (ret)
+                dev_err(ir->dev, "submit urb failed: %d", ret);
+}
+
+static void igorplugusb_timer(unsigned long data)
+{
+        struct igorplugusb *ir = (struct igorplugusb *)data;
+
+        igorplugusb_cmd(ir, GET_INFRACODE);
+}
+
+static int igorplugusb_probe(struct usb_interface *intf,
+                                        const struct usb_device_id *id)
+{
+        struct usb_device *udev;
+        struct usb_host_interface *idesc;
+        struct usb_endpoint_descriptor *ep;
+        struct igorplugusb *ir;
+        struct rc_dev *rc;
+        int ret;
+
+        udev = interface_to_usbdev(intf);
+        idesc = intf->cur_altsetting;
+
+        if (idesc->desc.bNumEndpoints != 1) {
+                dev_err(&intf->dev, "incorrect number of endpoints");
+                return -ENODEV;
+        }
+
+        ep = &idesc->endpoint[0].desc;
+        if (!usb_endpoint_dir_in(ep) || !usb_endpoint_xfer_control(ep)) {
+                dev_err(&intf->dev, "endpoint incorrect");
+                return -ENODEV;
+        }
+
+        ir = devm_kzalloc(&intf->dev, sizeof(*ir), GFP_KERNEL);
+        if (!ir)
+                return -ENOMEM;
+
+        ir->dev = &intf->dev;
+
+        setup_timer(&ir->timer, igorplugusb_timer, (unsigned long)ir);
+
+        ir->request.bRequest = GET_INFRACODE;
+        ir->request.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN;
+        ir->request.wLength = cpu_to_le16(sizeof(ir->buf_in));
+
+        ir->urb = usb_alloc_urb(0, GFP_KERNEL);
+        if (!ir->urb)
+                return -ENOMEM;
+
+        usb_fill_control_urb(ir->urb, udev,
+                usb_rcvctrlpipe(udev, 0), (uint8_t *)&ir->request,
+                ir->buf_in, sizeof(ir->buf_in), igorplugusb_callback, ir);
+
+        usb_make_path(udev, ir->phys, sizeof(ir->phys));
+
+        rc = rc_allocate_device();
+        rc->input_name = DRIVER_DESC;
+        rc->input_phys = ir->phys;
+        usb_to_input_id(udev, &rc->input_id);
+        rc->dev.parent = &intf->dev;
+        rc->driver_type = RC_DRIVER_IR_RAW;
+        /*
+         * This device can only store 36 pulses + spaces, which is not enough
+         * for the NEC protocol and many others.
+         */
+        rc->allowed_protocols = RC_BIT_ALL & ~(RC_BIT_NEC | RC_BIT_RC6_6A_20 |
+                        RC_BIT_RC6_6A_24 | RC_BIT_RC6_6A_32 | RC_BIT_RC6_MCE |
+                        RC_BIT_SONY20 | RC_BIT_MCE_KBD | RC_BIT_SANYO);
+
+        rc->priv = ir;
+        rc->driver_name = DRIVER_NAME;
+        rc->map_name = RC_MAP_HAUPPAUGE;
+        rc->timeout = MS_TO_NS(100);
+        rc->rx_resolution = 85333;
+
+        ir->rc = rc;
+        ret = rc_register_device(rc);
+        if (ret) {
+                dev_err(&intf->dev, "failed to register rc device: %d", ret);
+                rc_free_device(rc);
+                usb_free_urb(ir->urb);
+                return ret;
+        }
+
+        usb_set_intfdata(intf, ir);
+
+        igorplugusb_cmd(ir, SET_INFRABUFFER_EMPTY);
+
+        return 0;
+}
+
+static void igorplugusb_disconnect(struct usb_interface *intf)
+{
+        struct igorplugusb *ir = usb_get_intfdata(intf);
+
+        rc_unregister_device(ir->rc);
+        del_timer_sync(&ir->timer);
+        usb_set_intfdata(intf, NULL);
+        usb_kill_urb(ir->urb);
+        usb_free_urb(ir->urb);
+}
+
+static struct usb_device_id igorplugusb_table[] = {
+        /* Igor Plug USB (Atmel's Manufact. ID) */
+        { USB_DEVICE(0x03eb, 0x0002) },
+        /* Fit PC2 Infrared Adapter */
+        { USB_DEVICE(0x03eb, 0x21fe) },
+        /* Terminating entry */
+        { }
+};
+
+static struct usb_driver igorplugusb_driver = {
+        .name = DRIVER_NAME,
+        .probe = igorplugusb_probe,
+        .disconnect = igorplugusb_disconnect,
+        .id_table = igorplugusb_table
+};
+
+module_usb_driver(igorplugusb_driver);
+
+MODULE_DESCRIPTION(DRIVER_DESC);
+MODULE_AUTHOR("Sean Young <sean@mess.org>");
+MODULE_LICENSE("GPL");
+MODULE_DEVICE_TABLE(usb, igorplugusb_table);
diff --git a/drivers/media/rc/img-ir/Kconfig b/drivers/media/rc/img-ir/Kconfig
index 03ba9fc170fb..580715c7fc5e 100644
--- a/drivers/media/rc/img-ir/Kconfig
+++ b/drivers/media/rc/img-ir/Kconfig
@@ -1,6 +1,7 @@
 config IR_IMG
         tristate "ImgTec IR Decoder"
         depends on RC_CORE
+        depends on METAG || MIPS || COMPILE_TEST
         select IR_IMG_HW if !IR_IMG_RAW
         help
            Say Y or M here if you want to use the ImgTec infrared decoder
diff --git a/drivers/media/rc/img-ir/img-ir-core.c b/drivers/media/rc/img-ir/img-ir-core.c
index a0cac2f09109..77c78de4f5bf 100644
--- a/drivers/media/rc/img-ir/img-ir-core.c
+++ b/drivers/media/rc/img-ir/img-ir-core.c
@@ -166,7 +166,6 @@ MODULE_DEVICE_TABLE(of, img_ir_match);
 static struct platform_driver img_ir_driver = {
         .driver = {
                 .name = "img-ir",
-                .owner  = THIS_MODULE,
                 .of_match_table = img_ir_match,
                 .pm = &img_ir_pmops,
         },
diff --git a/drivers/media/rc/img-ir/img-ir-hw.c b/drivers/media/rc/img-ir/img-ir-hw.c
index ec49f94425fc..2fd47c9bf5d8 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.c
+++ b/drivers/media/rc/img-ir/img-ir-hw.c
@@ -530,6 +530,22 @@ static void img_ir_set_decoder(struct img_ir_priv *priv,
         u32 ir_status, irq_en;
         spin_lock_irq(&priv->lock);
 
+        /*
+         * First record that the protocol is being stopped so that the end timer
+         * isn't restarted while we're trying to stop it.
+         */
+        hw->stopping = true;
+
+        /*
+         * Release the lock to stop the end timer, since the end timer handler
+         * acquires the lock and we don't want to deadlock waiting for it.
+         */
+        spin_unlock_irq(&priv->lock);
+        del_timer_sync(&hw->end_timer);
+        spin_lock_irq(&priv->lock);
+
+        hw->stopping = false;
+
         /* switch off and disable interrupts */
         img_ir_write(priv, IMG_IR_CONTROL, 0);
         irq_en = img_ir_read(priv, IMG_IR_IRQ_ENABLE);
@@ -541,12 +557,13 @@ static void img_ir_set_decoder(struct img_ir_priv *priv,
         if (ir_status & (IMG_IR_RXDVAL | IMG_IR_RXDVALD2)) {
                 ir_status &= ~(IMG_IR_RXDVAL | IMG_IR_RXDVALD2);
                 img_ir_write(priv, IMG_IR_STATUS, ir_status);
-                img_ir_read(priv, IMG_IR_DATA_LW);
-                img_ir_read(priv, IMG_IR_DATA_UP);
         }
 
-        /* stop the end timer and switch back to normal mode */
-        del_timer_sync(&hw->end_timer);
+        /* always read data to clear buffer if IR wakes the device */
+        img_ir_read(priv, IMG_IR_DATA_LW);
+        img_ir_read(priv, IMG_IR_DATA_UP);
+
+        /* switch back to normal mode */
         hw->mode = IMG_IR_M_NORMAL;
 
         /* clear the wakeup scancode filter */
@@ -817,7 +834,8 @@ static void img_ir_handle_data(struct img_ir_priv *priv, u32 len, u64 raw)
         }
 
 
-        if (dec->repeat) {
+        /* we mustn't update the end timer while trying to stop it */
+        if (dec->repeat && !hw->stopping) {
                 unsigned long interval;
 
                 img_ir_begin_repeat(priv);
diff --git a/drivers/media/rc/img-ir/img-ir-hw.h b/drivers/media/rc/img-ir/img-ir-hw.h
index 8fcc16c32c5b..5c2b216c5fe3 100644
--- a/drivers/media/rc/img-ir/img-ir-hw.h
+++ b/drivers/media/rc/img-ir/img-ir-hw.h
@@ -186,9 +186,6 @@ struct img_ir_reg_timings {
         struct img_ir_timing_regvals    rtimings;
 };
 
-int img_ir_register_decoder(struct img_ir_decoder *dec);
-void img_ir_unregister_decoder(struct img_ir_decoder *dec);
-
 struct img_ir_priv;
 
 #ifdef CONFIG_IR_IMG_HW
@@ -214,6 +211,8 @@ enum img_ir_mode {
  * @flags:              IMG_IR_F_*.
  * @filters:            HW filters (derived from scancode filters).
  * @mode:               Current decode mode.
+ * @stopping:           Indicates that decoder is being taken down and timers
+ *                      should not be restarted.
  * @suspend_irqen:      Saved IRQ enable mask over suspend.
  */
 struct img_ir_priv_hw {
@@ -229,6 +228,7 @@ struct img_ir_priv_hw {
         struct img_ir_filter            filters[RC_FILTER_MAX];
 
         enum img_ir_mode                mode;
+        bool                            stopping;
         u32                             suspend_irqen;
 };
 
diff --git a/drivers/media/rc/ir-lirc-codec.c b/drivers/media/rc/ir-lirc-codec.c
index ed2c8a1ed8ca..98893a8332c7 100644
--- a/drivers/media/rc/ir-lirc-codec.c
+++ b/drivers/media/rc/ir-lirc-codec.c
@@ -42,11 +42,17 @@ static int ir_lirc_decode(struct rc_dev *dev, struct ir_raw_event ev)
                 return -EINVAL;
 
         /* Packet start */
-        if (ev.reset)
-                return 0;
+        if (ev.reset) {
+                /* Userspace expects a long space event before the start of
+                 * the signal to use as a sync.  This may be done with repeat
+                 * packets and normal samples.  But if a reset has been sent
+                 * then we assume that a long time has passed, so we send a
+                 * space with the maximum time value. */
+                sample = LIRC_SPACE(LIRC_VALUE_MASK);
+                IR_dprintk(2, "delivering reset sync space to lirc_dev\n");
 
         /* Carrier reports */
-        if (ev.carrier_report) {
+        } else if (ev.carrier_report) {
                 sample = LIRC_FREQUENCY(ev.carrier);
                 IR_dprintk(2, "carrier report (freq: %d)\n", sample);
 
diff --git a/drivers/media/rc/lirc_dev.c b/drivers/media/rc/lirc_dev.c
index 249d2fbc8f37..1e0545a67959 100644
--- a/drivers/media/rc/lirc_dev.c
+++ b/drivers/media/rc/lirc_dev.c
@@ -518,8 +518,7 @@ int lirc_dev_fop_close(struct inode *inode, struct file *file)
 
         WARN_ON(mutex_lock_killable(&lirc_dev_lock));
 
-        if (ir->d.rdev)
-                rc_close(ir->d.rdev);
+        rc_close(ir->d.rdev);
 
         ir->open--;
         if (ir->attached) {
diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c
new file mode 100644
index 000000000000..fcc3b82d1454
--- /dev/null
+++ b/drivers/media/rc/meson-ir.c
@@ -0,0 +1,216 @@
+/*
+ * Driver for Amlogic Meson IR remote receiver
+ *
+ * Copyright (C) 2014 Beniamino Galvani <b.galvani@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/interrupt.h>
+#include <linux/io.h>
+#include <linux/module.h>
+#include <linux/of_platform.h>
+#include <linux/platform_device.h>
+#include <linux/spinlock.h>
+
+#include <media/rc-core.h>
+
+#define DRIVER_NAME             "meson-ir"
+
+#define IR_DEC_LDR_ACTIVE       0x00
+#define IR_DEC_LDR_IDLE         0x04
+#define IR_DEC_LDR_REPEAT       0x08
+#define IR_DEC_BIT_0            0x0c
+#define IR_DEC_REG0             0x10
+#define IR_DEC_FRAME            0x14
+#define IR_DEC_STATUS           0x18
+#define IR_DEC_REG1             0x1c
+
+#define REG0_RATE_MASK          (BIT(11) - 1)
+
+#define REG1_MODE_MASK          (BIT(7) | BIT(8))
+#define REG1_MODE_NEC           (0 << 7)
+#define REG1_MODE_GENERAL       (2 << 7)
+
+#define REG1_TIME_IV_SHIFT      16
+#define REG1_TIME_IV_MASK       ((BIT(13) - 1) << REG1_TIME_IV_SHIFT)
+
+#define REG1_IRQSEL_MASK        (BIT(2) | BIT(3))
+#define REG1_IRQSEL_NEC_MODE    (0 << 2)
+#define REG1_IRQSEL_RISE_FALL   (1 << 2)
+#define REG1_IRQSEL_FALL        (2 << 2)
+#define REG1_IRQSEL_RISE        (3 << 2)
+
+#define REG1_RESET              BIT(0)
+#define REG1_ENABLE             BIT(15)
+
+#define STATUS_IR_DEC_IN        BIT(8)
+
+#define MESON_TRATE             10      /* us */
+
+struct meson_ir {
+        void __iomem    *reg;
+        struct rc_dev   *rc;
+        int             irq;
+        spinlock_t      lock;
+};
+
+static void meson_ir_set_mask(struct meson_ir *ir, unsigned int reg,
+                              u32 mask, u32 value)
+{
+        u32 data;
+
+        data = readl(ir->reg + reg);
+        data &= ~mask;
+        data |= (value & mask);
+        writel(data, ir->reg + reg);
+}
+
+static irqreturn_t meson_ir_irq(int irqno, void *dev_id)
+{
+        struct meson_ir *ir = dev_id;
+        u32 duration;
+        DEFINE_IR_RAW_EVENT(rawir);
+
+        spin_lock(&ir->lock);
+
+        duration = readl(ir->reg + IR_DEC_REG1);
+        duration = (duration & REG1_TIME_IV_MASK) >> REG1_TIME_IV_SHIFT;
+        rawir.duration = US_TO_NS(duration * MESON_TRATE);
+
+        rawir.pulse = !!(readl(ir->reg + IR_DEC_STATUS) & STATUS_IR_DEC_IN);
+
+        ir_raw_event_store_with_filter(ir->rc, &rawir);
+        ir_raw_event_handle(ir->rc);
+
+        spin_unlock(&ir->lock);
+
+        return IRQ_HANDLED;
+}
+
+static int meson_ir_probe(struct platform_device *pdev)
+{
+        struct device *dev = &pdev->dev;
+        struct device_node *node = dev->of_node;
+        struct resource *res;
+        const char *map_name;
+        struct meson_ir *ir;
+        int ret;
+
+        ir = devm_kzalloc(dev, sizeof(struct meson_ir), GFP_KERNEL);
+        if (!ir)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        ir->reg = devm_ioremap_resource(dev, res);
+        if (IS_ERR(ir->reg)) {
+                dev_err(dev, "failed to map registers\n");
+                return PTR_ERR(ir->reg);
+        }
+
+        ir->irq = platform_get_irq(pdev, 0);
+        if (ir->irq < 0) {
+                dev_err(dev, "no irq resource\n");
+                return ir->irq;
+        }
+
+        ir->rc = rc_allocate_device();
+        if (!ir->rc) {
+                dev_err(dev, "failed to allocate rc device\n");
+                return -ENOMEM;
+        }
+
+        ir->rc->priv = ir;
+        ir->rc->input_name = DRIVER_NAME;
+        ir->rc->input_phys = DRIVER_NAME "/input0";
+        ir->rc->input_id.bustype = BUS_HOST;
+        map_name = of_get_property(node, "linux,rc-map-name", NULL);
+        ir->rc->map_name = map_name ? map_name : RC_MAP_EMPTY;
+        ir->rc->dev.parent = dev;
+        ir->rc->driver_type = RC_DRIVER_IR_RAW;
+        ir->rc->allowed_protocols = RC_BIT_ALL;
+        ir->rc->rx_resolution = US_TO_NS(MESON_TRATE);
+        ir->rc->timeout = MS_TO_NS(200);
+        ir->rc->driver_name = DRIVER_NAME;
+
+        spin_lock_init(&ir->lock);
+        platform_set_drvdata(pdev, ir);
+
+        ret = rc_register_device(ir->rc);
+        if (ret) {
+                dev_err(dev, "failed to register rc device\n");
+                goto out_free;
+        }
+
+        ret = devm_request_irq(dev, ir->irq, meson_ir_irq, 0, "ir-meson", ir);
+        if (ret) {
+                dev_err(dev, "failed to request irq\n");
+                goto out_unreg;
+        }
+
+        /* Reset the decoder */
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, REG1_RESET);
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_RESET, 0);
+        /* Set general operation mode */
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_MODE_MASK, REG1_MODE_GENERAL);
+        /* Set rate */
+        meson_ir_set_mask(ir, IR_DEC_REG0, REG0_RATE_MASK, MESON_TRATE - 1);
+        /* IRQ on rising and falling edges */
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_IRQSEL_MASK,
+                          REG1_IRQSEL_RISE_FALL);
+        /* Enable the decoder */
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, REG1_ENABLE);
+
+        dev_info(dev, "receiver initialized\n");
+
+        return 0;
+out_unreg:
+        rc_unregister_device(ir->rc);
+        ir->rc = NULL;
+out_free:
+        rc_free_device(ir->rc);
+
+        return ret;
+}
+
+static int meson_ir_remove(struct platform_device *pdev)
+{
+        struct meson_ir *ir = platform_get_drvdata(pdev);
+        unsigned long flags;
+
+        /* Disable the decoder */
+        spin_lock_irqsave(&ir->lock, flags);
+        meson_ir_set_mask(ir, IR_DEC_REG1, REG1_ENABLE, 0);
+        spin_unlock_irqrestore(&ir->lock, flags);
+
+        rc_unregister_device(ir->rc);
+
+        return 0;
+}
+
+static const struct of_device_id meson_ir_match[] = {
+        { .compatible = "amlogic,meson6-ir" },
+        { },
+};
+
+static struct platform_driver meson_ir_driver = {
+        .probe          = meson_ir_probe,
+        .remove         = meson_ir_remove,
+        .driver = {
+                .name           = DRIVER_NAME,
+                .of_match_table = meson_ir_match,
+        },
+};
+
+module_platform_driver(meson_ir_driver);
+
+MODULE_DESCRIPTION("Amlogic Meson IR remote receiver driver");
+MODULE_AUTHOR("Beniamino Galvani <b.galvani@gmail.com>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 8d3b74c5a717..86ffcd54339e 100644
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -1298,8 +1298,7 @@ void rc_free_device(struct rc_dev *dev)
         if (!dev)
                 return;
 
-        if (dev->input_dev)
-                input_free_device(dev->input_dev);
+        input_free_device(dev->input_dev);
 
         put_device(&dev->dev);
 
@@ -1414,13 +1413,16 @@ int rc_register_device(struct rc_dev *dev)
                         ir_raw_init();
                         raw_init = true;
                 }
+                /* calls ir_register_device so unlock mutex here*/
+                mutex_unlock(&dev->lock);
                 rc = ir_raw_event_register(dev);
+                mutex_lock(&dev->lock);
                 if (rc < 0)
                         goto out_input;
         }
 
         if (dev->change_protocol) {
-                u64 rc_type = (1 << rc_map->rc_type);
+                u64 rc_type = (1ll << rc_map->rc_type);
                 if (dev->driver_type == RC_DRIVER_IR_RAW)
                         rc_type |= RC_BIT_LIRC;
                 rc = dev->change_protocol(dev, &rc_type);
diff --git a/drivers/media/rc/redrat3.c b/drivers/media/rc/redrat3.c
index 795b394a5d84..c4def66f9aa2 100644
--- a/drivers/media/rc/redrat3.c
+++ b/drivers/media/rc/redrat3.c
@@ -966,7 +966,7 @@ static int redrat3_dev_probe(struct usb_interface *intf,
 
         rr3->ep_in = ep_in;
         rr3->bulk_in_buf = usb_alloc_coherent(udev,
-                le16_to_cpu(ep_in->wMaxPacketSize), GFP_ATOMIC, &rr3->dma_in);
+                le16_to_cpu(ep_in->wMaxPacketSize), GFP_KERNEL, &rr3->dma_in);
         if (!rr3->bulk_in_buf) {
                 dev_err(dev, "Read buffer allocation failure\n");
                 goto error;
@@ -975,6 +975,8 @@ static int redrat3_dev_probe(struct usb_interface *intf,
         pipe = usb_rcvbulkpipe(udev, ep_in->bEndpointAddress);
         usb_fill_bulk_urb(rr3->read_urb, udev, pipe, rr3->bulk_in_buf,
                 le16_to_cpu(ep_in->wMaxPacketSize), redrat3_handle_async, rr3);
+        rr3->read_urb->transfer_dma = rr3->dma_in;
+        rr3->read_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
 
         rr3->ep_out = ep_out;
         rr3->udev = udev;
diff --git a/drivers/media/tuners/Kconfig b/drivers/media/tuners/Kconfig
index f039dc2a21cf..42e5a01b9192 100644
--- a/drivers/media/tuners/Kconfig
+++ b/drivers/media/tuners/Kconfig
@@ -232,6 +232,14 @@ config MEDIA_TUNER_M88TS2022
         help
           Montage M88TS2022 silicon tuner driver.
 
+config MEDIA_TUNER_M88RS6000T
+        tristate "Montage M88RS6000 internal tuner"
+        depends on MEDIA_SUPPORT && I2C
+        select REGMAP_I2C
+        default m if !MEDIA_SUBDRV_AUTOSELECT
+        help
+          Montage M88RS6000 internal tuner.
+
 config MEDIA_TUNER_TUA9001
         tristate "Infineon TUA 9001 silicon tuner"
         depends on MEDIA_SUPPORT && I2C
diff --git a/drivers/media/tuners/Makefile b/drivers/media/tuners/Makefile
index 49fcf8033848..da4fe6ef73e7 100644
--- a/drivers/media/tuners/Makefile
+++ b/drivers/media/tuners/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_MEDIA_TUNER_IT913X) += it913x.o
 obj-$(CONFIG_MEDIA_TUNER_R820T) += r820t.o
 obj-$(CONFIG_MEDIA_TUNER_MXL301RF) += mxl301rf.o
 obj-$(CONFIG_MEDIA_TUNER_QM1D1C0042) += qm1d1c0042.o
+obj-$(CONFIG_MEDIA_TUNER_M88RS6000T) += m88rs6000t.o
 
 ccflags-y += -I$(srctree)/drivers/media/dvb-core
 ccflags-y += -I$(srctree)/drivers/media/dvb-frontends
diff --git a/drivers/media/tuners/m88rs6000t.c b/drivers/media/tuners/m88rs6000t.c
new file mode 100644
index 000000000000..d4c13fe6e7b3
--- /dev/null
+++ b/drivers/media/tuners/m88rs6000t.c
@@ -0,0 +1,744 @@
+/*
+ * Driver for the internal tuner of Montage M88RS6000
+ *
+ * Copyright (C) 2014 Max nibble <nibble.max@gmail.com>
+ *
+ *    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 of the License, 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.
+ */
+
+#include "m88rs6000t.h"
+#include <linux/regmap.h>
+
+struct m88rs6000t_dev {
+        struct m88rs6000t_config cfg;
+        struct i2c_client *client;
+        struct regmap *regmap;
+        u32 frequency_khz;
+};
+
+struct m88rs6000t_reg_val {
+        u8 reg;
+        u8 val;
+};
+
+/* set demod main mclk and ts mclk */
+static int m88rs6000t_set_demod_mclk(struct dvb_frontend *fe)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        u8 reg11, reg15, reg16, reg1D, reg1E, reg1F;
+        u8 N, f0 = 0, f1 = 0, f2 = 0, f3 = 0;
+        u16 pll_div_fb;
+        u32 div, ts_mclk;
+        unsigned int utmp;
+        int ret;
+
+        /* select demod main mclk */
+        ret = regmap_read(dev->regmap, 0x15, &utmp);
+        if (ret)
+                goto err;
+        reg15 = utmp;
+        if (c->symbol_rate > 45010000) {
+                reg11 = 0x0E;
+                reg15 |= 0x02;
+                reg16 = 115; /* mclk = 110.25MHz */
+        } else {
+                reg11 = 0x0A;
+                reg15 &= ~0x02;
+                reg16 = 96; /* mclk = 96MHz */
+        }
+
+        /* set ts mclk */
+        if (c->delivery_system == SYS_DVBS)
+                ts_mclk = 96000;
+        else
+                ts_mclk = 144000;
+
+        pll_div_fb = (reg15 & 0x01) << 8;
+        pll_div_fb += reg16;
+        pll_div_fb += 32;
+
+        div = 36000 * pll_div_fb;
+        div /= ts_mclk;
+
+        if (div <= 32) {
+                N = 2;
+                f0 = 0;
+                f1 = div / 2;
+                f2 = div - f1;
+                f3 = 0;
+        } else if (div <= 48) {
+                N = 3;
+                f0 = div / 3;
+                f1 = (div - f0) / 2;
+                f2 = div - f0 - f1;
+                f3 = 0;
+        } else if (div <= 64) {
+                N = 4;
+                f0 = div / 4;
+                f1 = (div - f0) / 3;
+                f2 = (div - f0 - f1) / 2;
+                f3 = div - f0 - f1 - f2;
+        } else {
+                N = 4;
+                f0 = 16;
+                f1 = 16;
+                f2 = 16;
+                f3 = 16;
+        }
+
+        if (f0 == 16)
+                f0 = 0;
+        if (f1 == 16)
+                f1 = 0;
+        if (f2 == 16)
+                f2 = 0;
+        if (f3 == 16)
+                f3 = 0;
+
+        ret = regmap_read(dev->regmap, 0x1D, &utmp);
+        if (ret)
+                goto err;
+        reg1D = utmp;
+        reg1D &= ~0x03;
+        reg1D |= N - 1;
+        reg1E = ((f3 << 4) + f2) & 0xFF;
+        reg1F = ((f1 << 4) + f0) & 0xFF;
+
+        /* program and recalibrate demod PLL */
+        ret = regmap_write(dev->regmap, 0x05, 0x40);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x11, 0x08);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x15, reg15);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x16, reg16);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x1D, reg1D);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x1E, reg1E);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x1F, reg1F);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x17, 0xc1);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x17, 0x81);
+        if (ret)
+                goto err;
+        usleep_range(5000, 50000);
+        ret = regmap_write(dev->regmap, 0x05, 0x00);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x11, reg11);
+        if (ret)
+                goto err;
+        usleep_range(5000, 50000);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static int m88rs6000t_set_pll_freq(struct m88rs6000t_dev *dev,
+                        u32 tuner_freq_MHz)
+{
+        u32 fcry_KHz, ulNDiv1, ulNDiv2, ulNDiv;
+        u8 refDiv, ucLoDiv1, ucLomod1, ucLoDiv2, ucLomod2, ucLoDiv, ucLomod;
+        u8 reg27, reg29, reg42, reg42buf;
+        unsigned int utmp;
+        int ret;
+
+        fcry_KHz = 27000; /* in kHz */
+        refDiv = 27;
+
+        ret = regmap_write(dev->regmap, 0x36, (refDiv - 8));
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x31, 0x00);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x2c, 0x02);
+        if (ret)
+                goto err;
+
+        if (tuner_freq_MHz >= 1550) {
+                ucLoDiv1 = 2;
+                ucLomod1 = 0;
+                ucLoDiv2 = 2;
+                ucLomod2 = 0;
+        } else if (tuner_freq_MHz >= 1380) {
+                ucLoDiv1 = 3;
+                ucLomod1 = 16;
+                ucLoDiv2 = 2;
+                ucLomod2 = 0;
+        } else if (tuner_freq_MHz >= 1070) {
+                ucLoDiv1 = 3;
+                ucLomod1 = 16;
+                ucLoDiv2 = 3;
+                ucLomod2 = 16;
+        } else if (tuner_freq_MHz >= 1000) {
+                ucLoDiv1 = 3;
+                ucLomod1 = 16;
+                ucLoDiv2 = 4;
+                ucLomod2 = 64;
+        } else if (tuner_freq_MHz >= 775) {
+                ucLoDiv1 = 4;
+                ucLomod1 = 64;
+                ucLoDiv2 = 4;
+                ucLomod2 = 64;
+        } else if (tuner_freq_MHz >= 700) {
+                ucLoDiv1 = 6;
+                ucLomod1 = 48;
+                ucLoDiv2 = 4;
+                ucLomod2 = 64;
+        } else if (tuner_freq_MHz >= 520) {
+                ucLoDiv1 = 6;
+                ucLomod1 = 48;
+                ucLoDiv2 = 6;
+                ucLomod2 = 48;
+        } else {
+                ucLoDiv1 = 8;
+                ucLomod1 = 96;
+                ucLoDiv2 = 8;
+                ucLomod2 = 96;
+        }
+
+        ulNDiv1 = ((tuner_freq_MHz * ucLoDiv1 * 1000) * refDiv
+                        / fcry_KHz - 1024) / 2;
+        ulNDiv2 = ((tuner_freq_MHz * ucLoDiv2 * 1000) * refDiv
+                        / fcry_KHz - 1024) / 2;
+
+        reg27 = (((ulNDiv1 >> 8) & 0x0F) + ucLomod1) & 0x7F;
+        ret = regmap_write(dev->regmap, 0x27, reg27);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x28, (u8)(ulNDiv1 & 0xFF));
+        if (ret)
+                goto err;
+        reg29 = (((ulNDiv2 >> 8) & 0x0F) + ucLomod2) & 0x7f;
+        ret = regmap_write(dev->regmap, 0x29, reg29);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x2a, (u8)(ulNDiv2 & 0xFF));
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x2F, 0xf5);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x30, 0x05);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x1f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x3f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x20);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x00);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x3e, 0x11);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x2f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x3f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x10);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x00);
+        if (ret)
+                goto err;
+        usleep_range(2000, 50000);
+
+        ret = regmap_read(dev->regmap, 0x42, &utmp);
+        if (ret)
+                goto err;
+        reg42 = utmp;
+
+        ret = regmap_write(dev->regmap, 0x3e, 0x10);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x2f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x08, 0x3f);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x10);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x09, 0x00);
+        if (ret)
+                goto err;
+        usleep_range(2000, 50000);
+
+        ret = regmap_read(dev->regmap, 0x42, &utmp);
+        if (ret)
+                goto err;
+        reg42buf = utmp;
+        if (reg42buf < reg42) {
+                ret = regmap_write(dev->regmap, 0x3e, 0x11);
+                if (ret)
+                        goto err;
+        }
+        usleep_range(5000, 50000);
+
+        ret = regmap_read(dev->regmap, 0x2d, &utmp);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x2d, utmp);
+        if (ret)
+                goto err;
+        ret = regmap_read(dev->regmap, 0x2e, &utmp);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x2e, utmp);
+        if (ret)
+                goto err;
+
+        ret = regmap_read(dev->regmap, 0x27, &utmp);
+        if (ret)
+                goto err;
+        reg27 = utmp & 0x70;
+        ret = regmap_read(dev->regmap, 0x83, &utmp);
+        if (ret)
+                goto err;
+        if (reg27 == (utmp & 0x70)) {
+                ucLoDiv = ucLoDiv1;
+                ulNDiv = ulNDiv1;
+                ucLomod = ucLomod1 / 16;
+        } else {
+                ucLoDiv = ucLoDiv2;
+                ulNDiv = ulNDiv2;
+                ucLomod = ucLomod2 / 16;
+        }
+
+        if ((ucLoDiv == 3) || (ucLoDiv == 6)) {
+                refDiv = 18;
+                ret = regmap_write(dev->regmap, 0x36, (refDiv - 8));
+                if (ret)
+                        goto err;
+                ulNDiv = ((tuner_freq_MHz * ucLoDiv * 1000) * refDiv
+                                / fcry_KHz - 1024) / 2;
+        }
+
+        reg27 = (0x80 + ((ucLomod << 4) & 0x70)
+                        + ((ulNDiv >> 8) & 0x0F)) & 0xFF;
+        ret = regmap_write(dev->regmap, 0x27, reg27);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x28, (u8)(ulNDiv & 0xFF));
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x29, 0x80);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x31, 0x03);
+        if (ret)
+                goto err;
+
+        if (ucLoDiv == 3)
+                utmp = 0xCE;
+        else
+                utmp = 0x8A;
+        ret = regmap_write(dev->regmap, 0x3b, utmp);
+        if (ret)
+                goto err;
+
+        dev->frequency_khz = fcry_KHz * (ulNDiv * 2 + 1024) / refDiv / ucLoDiv;
+
+        dev_dbg(&dev->client->dev,
+                "actual tune frequency=%d\n", dev->frequency_khz);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static int m88rs6000t_set_bb(struct m88rs6000t_dev *dev,
+                u32 symbol_rate_KSs, s32 lpf_offset_KHz)
+{
+        u32 f3dB;
+        u8  reg40;
+
+        f3dB = symbol_rate_KSs * 9 / 14 + 2000;
+        f3dB += lpf_offset_KHz;
+        f3dB = clamp_val(f3dB, 6000U, 43000U);
+        reg40 = f3dB / 1000;
+        return regmap_write(dev->regmap, 0x40, reg40);
+}
+
+static int m88rs6000t_set_params(struct dvb_frontend *fe)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
+        int ret;
+        s32 lpf_offset_KHz;
+        u32 realFreq, freq_MHz;
+
+        dev_dbg(&dev->client->dev,
+                        "frequency=%d symbol_rate=%d\n",
+                        c->frequency, c->symbol_rate);
+
+        if (c->symbol_rate < 5000000)
+                lpf_offset_KHz = 3000;
+        else
+                lpf_offset_KHz = 0;
+
+        realFreq = c->frequency + lpf_offset_KHz;
+        /* set tuner pll.*/
+        freq_MHz = (realFreq + 500) / 1000;
+        ret = m88rs6000t_set_pll_freq(dev, freq_MHz);
+        if (ret)
+                goto err;
+        ret = m88rs6000t_set_bb(dev, c->symbol_rate / 1000, lpf_offset_KHz);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x00, 0x01);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x00, 0x00);
+        if (ret)
+                goto err;
+        /* set demod mlck */
+        ret = m88rs6000t_set_demod_mclk(fe);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static int m88rs6000t_init(struct dvb_frontend *fe)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+        int ret;
+
+        dev_dbg(&dev->client->dev, "%s:\n", __func__);
+
+        ret = regmap_update_bits(dev->regmap, 0x11, 0x08, 0x08);
+        if (ret)
+                goto err;
+        usleep_range(5000, 50000);
+        ret = regmap_update_bits(dev->regmap, 0x10, 0x01, 0x01);
+        if (ret)
+                goto err;
+        usleep_range(10000, 50000);
+        ret = regmap_write(dev->regmap, 0x07, 0x7d);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static int m88rs6000t_sleep(struct dvb_frontend *fe)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+        int ret;
+
+        dev_dbg(&dev->client->dev, "%s:\n", __func__);
+
+        ret = regmap_write(dev->regmap, 0x07, 0x6d);
+        if (ret)
+                goto err;
+        usleep_range(5000, 10000);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static int m88rs6000t_get_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+
+        dev_dbg(&dev->client->dev, "\n");
+
+        *frequency = dev->frequency_khz;
+        return 0;
+}
+
+static int m88rs6000t_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+
+        dev_dbg(&dev->client->dev, "\n");
+
+        *frequency = 0; /* Zero-IF */
+        return 0;
+}
+
+
+static int m88rs6000t_get_rf_strength(struct dvb_frontend *fe, u16 *strength)
+{
+        struct m88rs6000t_dev *dev = fe->tuner_priv;
+        unsigned int val, i;
+        int ret;
+        u16 gain;
+        u32 PGA2_cri_GS = 46, PGA2_crf_GS = 290, TIA_GS = 290;
+        u32 RF_GC = 1200, IF_GC = 1100, BB_GC = 300;
+        u32 PGA2_GC = 300, TIA_GC = 300, PGA2_cri = 0, PGA2_crf = 0;
+        u32 RFG = 0, IFG = 0, BBG = 0, PGA2G = 0, TIAG = 0;
+        u32 RFGS[13] = {0, 245, 266, 268, 270, 285,
+                        298, 295, 283, 285, 285, 300, 300};
+        u32 IFGS[12] = {0, 300, 230, 270, 270, 285,
+                        295, 285, 290, 295, 295, 310};
+        u32 BBGS[14] = {0, 286, 275, 290, 294, 300, 290,
+                        290, 285, 283, 260, 295, 290, 260};
+
+        ret = regmap_read(dev->regmap, 0x5A, &val);
+        if (ret)
+                goto err;
+        RF_GC = val & 0x0f;
+
+        ret = regmap_read(dev->regmap, 0x5F, &val);
+        if (ret)
+                goto err;
+        IF_GC = val & 0x0f;
+
+        ret = regmap_read(dev->regmap, 0x3F, &val);
+        if (ret)
+                goto err;
+        TIA_GC = (val >> 4) & 0x07;
+
+        ret = regmap_read(dev->regmap, 0x77, &val);
+        if (ret)
+                goto err;
+        BB_GC = (val >> 4) & 0x0f;
+
+        ret = regmap_read(dev->regmap, 0x76, &val);
+        if (ret)
+                goto err;
+        PGA2_GC = val & 0x3f;
+        PGA2_cri = PGA2_GC >> 2;
+        PGA2_crf = PGA2_GC & 0x03;
+
+        for (i = 0; i <= RF_GC; i++)
+                RFG += RFGS[i];
+
+        if (RF_GC == 0)
+                RFG += 400;
+        if (RF_GC == 1)
+                RFG += 300;
+        if (RF_GC == 2)
+                RFG += 200;
+        if (RF_GC == 3)
+                RFG += 100;
+
+        for (i = 0; i <= IF_GC; i++)
+                IFG += IFGS[i];
+
+        TIAG = TIA_GC * TIA_GS;
+
+        for (i = 0; i <= BB_GC; i++)
+                BBG += BBGS[i];
+
+        PGA2G = PGA2_cri * PGA2_cri_GS + PGA2_crf * PGA2_crf_GS;
+
+        gain = RFG + IFG - TIAG + BBG + PGA2G;
+
+        /* scale value to 0x0000-0xffff */
+        gain = clamp_val(gain, 1000U, 10500U);
+        *strength = (10500 - gain) * 0xffff / (10500 - 1000);
+err:
+        if (ret)
+                dev_dbg(&dev->client->dev, "failed=%d\n", ret);
+        return ret;
+}
+
+static const struct dvb_tuner_ops m88rs6000t_tuner_ops = {
+        .info = {
+                .name          = "Montage M88RS6000 Internal Tuner",
+                .frequency_min = 950000,
+                .frequency_max = 2150000,
+        },
+
+        .init = m88rs6000t_init,
+        .sleep = m88rs6000t_sleep,
+        .set_params = m88rs6000t_set_params,
+        .get_frequency = m88rs6000t_get_frequency,
+        .get_if_frequency = m88rs6000t_get_if_frequency,
+        .get_rf_strength = m88rs6000t_get_rf_strength,
+};
+
+static int m88rs6000t_probe(struct i2c_client *client,
+                const struct i2c_device_id *id)
+{
+        struct m88rs6000t_config *cfg = client->dev.platform_data;
+        struct dvb_frontend *fe = cfg->fe;
+        struct m88rs6000t_dev *dev;
+        int ret, i;
+        unsigned int utmp;
+        static const struct regmap_config regmap_config = {
+                .reg_bits = 8,
+                .val_bits = 8,
+        };
+        static const struct m88rs6000t_reg_val reg_vals[] = {
+                {0x10, 0xfb},
+                {0x24, 0x38},
+                {0x11, 0x0a},
+                {0x12, 0x00},
+                {0x2b, 0x1c},
+                {0x44, 0x48},
+                {0x54, 0x24},
+                {0x55, 0x06},
+                {0x59, 0x00},
+                {0x5b, 0x4c},
+                {0x60, 0x8b},
+                {0x61, 0xf4},
+                {0x65, 0x07},
+                {0x6d, 0x6f},
+                {0x6e, 0x31},
+                {0x3c, 0xf3},
+                {0x37, 0x0f},
+                {0x48, 0x28},
+                {0x49, 0xd8},
+                {0x70, 0x66},
+                {0x71, 0xCF},
+                {0x72, 0x81},
+                {0x73, 0xA7},
+                {0x74, 0x4F},
+                {0x75, 0xFC},
+        };
+
+        dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+        if (!dev) {
+                ret = -ENOMEM;
+                dev_err(&client->dev, "kzalloc() failed\n");
+                goto err;
+        }
+
+        memcpy(&dev->cfg, cfg, sizeof(struct m88rs6000t_config));
+        dev->client = client;
+        dev->regmap = devm_regmap_init_i2c(client, &regmap_config);
+        if (IS_ERR(dev->regmap)) {
+                ret = PTR_ERR(dev->regmap);
+                goto err;
+        }
+
+        ret = regmap_update_bits(dev->regmap, 0x11, 0x08, 0x08);
+        if (ret)
+                goto err;
+        usleep_range(5000, 50000);
+        ret = regmap_update_bits(dev->regmap, 0x10, 0x01, 0x01);
+        if (ret)
+                goto err;
+        usleep_range(10000, 50000);
+        ret = regmap_write(dev->regmap, 0x07, 0x7d);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x04, 0x01);
+        if (ret)
+                goto err;
+
+        /* check tuner chip id */
+        ret = regmap_read(dev->regmap, 0x01, &utmp);
+        if (ret)
+                goto err;
+        dev_info(&dev->client->dev, "chip_id=%02x\n", utmp);
+        if (utmp != 0x64) {
+                ret = -ENODEV;
+                goto err;
+        }
+
+        /* tuner init. */
+        ret = regmap_write(dev->regmap, 0x05, 0x40);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x11, 0x08);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x15, 0x6c);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x17, 0xc1);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x17, 0x81);
+        if (ret)
+                goto err;
+        usleep_range(10000, 50000);
+        ret = regmap_write(dev->regmap, 0x05, 0x00);
+        if (ret)
+                goto err;
+        ret = regmap_write(dev->regmap, 0x11, 0x0a);
+        if (ret)
+                goto err;
+
+        for (i = 0; i < ARRAY_SIZE(reg_vals); i++) {
+                ret = regmap_write(dev->regmap,
+                                reg_vals[i].reg, reg_vals[i].val);
+                if (ret)
+                        goto err;
+        }
+
+        dev_info(&dev->client->dev, "Montage M88RS6000 internal tuner successfully identified\n");
+
+        fe->tuner_priv = dev;
+        memcpy(&fe->ops.tuner_ops, &m88rs6000t_tuner_ops,
+                        sizeof(struct dvb_tuner_ops));
+        i2c_set_clientdata(client, dev);
+        return 0;
+err:
+        dev_dbg(&client->dev, "failed=%d\n", ret);
+        kfree(dev);
+        return ret;
+}
+
+static int m88rs6000t_remove(struct i2c_client *client)
+{
+        struct m88rs6000t_dev *dev = i2c_get_clientdata(client);
+        struct dvb_frontend *fe = dev->cfg.fe;
+
+        dev_dbg(&client->dev, "\n");
+
+        memset(&fe->ops.tuner_ops, 0, sizeof(struct dvb_tuner_ops));
+        fe->tuner_priv = NULL;
+        kfree(dev);
+
+        return 0;
+}
+
+static const struct i2c_device_id m88rs6000t_id[] = {
+        {"m88rs6000t", 0},
+        {}
+};
+MODULE_DEVICE_TABLE(i2c, m88rs6000t_id);
+
+static struct i2c_driver m88rs6000t_driver = {
+        .driver = {
+                .owner  = THIS_MODULE,
+                .name   = "m88rs6000t",
+        },
+        .probe          = m88rs6000t_probe,
+        .remove         = m88rs6000t_remove,
+        .id_table       = m88rs6000t_id,
+};
+
+module_i2c_driver(m88rs6000t_driver);
+
+MODULE_AUTHOR("Max nibble <nibble.max@gmail.com>");
+MODULE_DESCRIPTION("Montage M88RS6000 internal tuner driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/media/tuners/m88rs6000t.h b/drivers/media/tuners/m88rs6000t.h
new file mode 100644
index 000000000000..264c13e2cd39
--- /dev/null
+++ b/drivers/media/tuners/m88rs6000t.h
@@ -0,0 +1,29 @@
+/*
+ * Driver for the internal tuner of Montage M88RS6000
+ *
+ * Copyright (C) 2014 Max nibble <nibble.max@gmail.com>
+ *
+ *    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 of the License, 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 _M88RS6000T_H_
+#define _M88RS6000T_H_
+
+#include "dvb_frontend.h"
+
+struct m88rs6000t_config {
+        /*
+         * pointer to DVB frontend
+         */
+        struct dvb_frontend *fe;
+};
+
+#endif
diff --git a/drivers/media/tuners/m88ts2022.c b/drivers/media/tuners/m88ts2022.c
index caa542346891..066e5431da93 100644
--- a/drivers/media/tuners/m88ts2022.c
+++ b/drivers/media/tuners/m88ts2022.c
@@ -488,6 +488,7 @@ static int m88ts2022_probe(struct i2c_client *client,
         case 0x83:
                 break;
         default:
+                ret = -ENODEV;
                 goto err;
         }
 
@@ -505,6 +506,7 @@ static int m88ts2022_probe(struct i2c_client *client,
                 u8tmp = 0x6c;
                 break;
         default:
+                ret = -EINVAL;
                 goto err;
         }
 
diff --git a/drivers/media/tuners/mxl5007t.c b/drivers/media/tuners/mxl5007t.c
index 69e453ef0a1a..1810ad66888e 100644
--- a/drivers/media/tuners/mxl5007t.c
+++ b/drivers/media/tuners/mxl5007t.c
@@ -374,7 +374,6 @@ static struct reg_pair_t *mxl5007t_calc_init_regs(struct mxl5007t_state *state,
         mxl5007t_set_if_freq_bits(state, cfg->if_freq_hz, cfg->invert_if);
         mxl5007t_set_xtal_freq_bits(state, cfg->xtal_freq_hz);
 
-        set_reg_bits(state->tab_init, 0x04, 0x01, cfg->loop_thru_enable);
         set_reg_bits(state->tab_init, 0x03, 0x08, cfg->clk_out_enable << 3);
         set_reg_bits(state->tab_init, 0x03, 0x07, cfg->clk_out_amp);
 
@@ -531,10 +530,6 @@ static int mxl5007t_tuner_init(struct mxl5007t_state *state,
         struct reg_pair_t *init_regs;
         int ret;
 
-        ret = mxl5007t_soft_reset(state);
-        if (mxl_fail(ret))
-                goto fail;
-
         /* calculate initialization reg array */
         init_regs = mxl5007t_calc_init_regs(state, mode);
 
@@ -900,7 +895,32 @@ struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe,
                 /* existing tuner instance */
                 break;
         }
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = mxl5007t_soft_reset(state);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        if (mxl_fail(ret))
+                goto fail;
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 1);
+
+        ret = mxl5007t_write_reg(state, 0x04,
+                state->config->loop_thru_enable);
+
+        if (fe->ops.i2c_gate_ctrl)
+                fe->ops.i2c_gate_ctrl(fe, 0);
+
+        if (mxl_fail(ret))
+                goto fail;
+
         fe->tuner_priv = state;
+
         mutex_unlock(&mxl5007t_list_mutex);
 
         memcpy(&fe->ops.tuner_ops, &mxl5007t_tuner_ops,
diff --git a/drivers/media/tuners/r820t.c b/drivers/media/tuners/r820t.c
index a759742cae7b..8e040cf9cf13 100644
--- a/drivers/media/tuners/r820t.c
+++ b/drivers/media/tuners/r820t.c
@@ -959,6 +959,18 @@ static int r820t_set_tv_standard(struct r820t_priv *priv,
                 lt_att = 0x00;          /* r31[7], lt att enable */
                 flt_ext_widest = 0x00;  /* r15[7]: flt_ext_wide off */
                 polyfil_cur = 0x60;     /* r25[6:5]:min */
+        } else if (delsys == SYS_DVBC_ANNEX_A) {
+                if_khz = 5070;
+                filt_cal_lo = 73500;
+                filt_gain = 0x10;       /* +3db, 6mhz on */
+                img_r = 0x00;           /* image negative */
+                filt_q = 0x10;          /* r10[4]:low q(1'b1) */
+                hp_cor = 0x0b;          /* 1.7m disable, +0cap, 1.0mhz */
+                ext_enable = 0x40;      /* r30[6]=1 ext enable; r30[5]:1 ext at lna max-1 */
+                loop_through = 0x00;    /* r5[7], lt on */
+                lt_att = 0x00;          /* r31[7], lt att enable */
+                flt_ext_widest = 0x00;  /* r15[7]: flt_ext_wide off */
+                polyfil_cur = 0x60;     /* r25[6:5]:min */
         } else {
                 if (bw <= 6) {
                         if_khz = 3570;
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c
index cf97142e01e6..2180de9d654a 100644
--- a/drivers/media/tuners/si2157.c
+++ b/drivers/media/tuners/si2157.c
@@ -1,5 +1,5 @@
 /*
- * Silicon Labs Si2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
  *
  * Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
  *
@@ -93,8 +93,13 @@ static int si2157_init(struct dvb_frontend *fe)
                 goto warm;
 
         /* power up */
-        memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
-        cmd.wlen = 15;
+        if (s->chiptype == SI2157_CHIPTYPE_SI2146) {
+                memcpy(cmd.args, "\xc0\x05\x01\x00\x00\x0b\x00\x00\x01", 9);
+                cmd.wlen = 9;
+        } else {
+                memcpy(cmd.args, "\xc0\x00\x0c\x00\x00\x01\x01\x01\x01\x01\x01\x02\x00\x00\x01", 15);
+                cmd.wlen = 15;
+        }
         cmd.rlen = 1;
         ret = si2157_cmd_execute(s, &cmd);
         if (ret)
@@ -112,17 +117,20 @@ static int si2157_init(struct dvb_frontend *fe)
                         cmd.args[4] << 0;
 
         #define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0)
+        #define SI2148_A20 ('A' << 24 | 48 << 16 | '2' << 8 | '0' << 0)
         #define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)
         #define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0)
+        #define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0)
 
         switch (chip_id) {
         case SI2158_A20:
+        case SI2148_A20:
                 fw_file = SI2158_A20_FIRMWARE;
                 break;
         case SI2157_A30:
         case SI2147_A30:
+        case SI2146_A10:
                 goto skip_fw_download;
-                break;
         default:
                 dev_err(&s->client->dev,
                                 "unknown chip version Si21%d-%c%c%c\n",
@@ -149,7 +157,7 @@ static int si2157_init(struct dvb_frontend *fe)
                 dev_err(&s->client->dev, "firmware file '%s' is invalid\n",
                                 fw_file);
                 ret = -EINVAL;
-                goto err;
+                goto fw_release_exit;
         }
 
         dev_info(&s->client->dev, "downloading firmware from file '%s'\n",
@@ -165,7 +173,7 @@ static int si2157_init(struct dvb_frontend *fe)
                         dev_err(&s->client->dev,
                                         "firmware download failed=%d\n",
                                         ret);
-                        goto err;
+                        goto fw_release_exit;
                 }
         }
 
@@ -187,10 +195,9 @@ warm:
         s->active = true;
         return 0;
 
+fw_release_exit:
+        release_firmware(fw);
 err:
-        if (fw)
-                release_firmware(fw);
-
         dev_dbg(&s->client->dev, "failed=%d\n", ret);
         return ret;
 }
@@ -250,6 +257,9 @@ static int si2157_set_params(struct dvb_frontend *fe)
         case SYS_ATSC:
                         delivery_system = 0x00;
                         break;
+        case SYS_DVBC_ANNEX_B:
+                        delivery_system = 0x10;
+                        break;
         case SYS_DVBT:
         case SYS_DVBT2: /* it seems DVB-T and DVB-T2 both are 0x20 here */
                         delivery_system = 0x20;
@@ -272,7 +282,10 @@ static int si2157_set_params(struct dvb_frontend *fe)
         if (ret)
                 goto err;
 
-        memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6);
+        if (s->chiptype == SI2157_CHIPTYPE_SI2146)
+                memcpy(cmd.args, "\x14\x00\x02\x07\x00\x01", 6);
+        else
+                memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6);
         cmd.wlen = 6;
         cmd.rlen = 4;
         ret = si2157_cmd_execute(s, &cmd);
@@ -305,7 +318,7 @@ static int si2157_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
 
 static const struct dvb_tuner_ops si2157_ops = {
         .info = {
-                .name           = "Silicon Labs Si2157/Si2158",
+                .name           = "Silicon Labs Si2146/2147/2148/2157/2158",
                 .frequency_min  = 110000000,
                 .frequency_max  = 862000000,
         },
@@ -336,6 +349,7 @@ static int si2157_probe(struct i2c_client *client,
         s->fe = cfg->fe;
         s->inversion = cfg->inversion;
         s->fw_loaded = false;
+        s->chiptype = (u8)id->driver_data;
         mutex_init(&s->i2c_mutex);
 
         /* check if the tuner is there */
@@ -352,7 +366,10 @@ static int si2157_probe(struct i2c_client *client,
         i2c_set_clientdata(client, s);
 
         dev_info(&s->client->dev,
-                        "Silicon Labs Si2157/Si2158 successfully attached\n");
+                        "Silicon Labs %s successfully attached\n",
+                        s->chiptype == SI2157_CHIPTYPE_SI2146 ?
+                        "Si2146" : "Si2147/2148/2157/2158");
+
         return 0;
 err:
         dev_dbg(&client->dev, "failed=%d\n", ret);
@@ -377,6 +394,7 @@ static int si2157_remove(struct i2c_client *client)
 
 static const struct i2c_device_id si2157_id[] = {
         {"si2157", 0},
+        {"si2146", 1},
         {}
 };
 MODULE_DEVICE_TABLE(i2c, si2157_id);
@@ -393,7 +411,7 @@ static struct i2c_driver si2157_driver = {
 
 module_i2c_driver(si2157_driver);
 
-MODULE_DESCRIPTION("Silicon Labs Si2157/Si2158 silicon tuner driver");
+MODULE_DESCRIPTION("Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver");
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_LICENSE("GPL");
 MODULE_FIRMWARE(SI2158_A20_FIRMWARE);
diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h
index d3b19cadb4a1..a564c4a9fba7 100644
--- a/drivers/media/tuners/si2157.h
+++ b/drivers/media/tuners/si2157.h
@@ -1,5 +1,5 @@
 /*
- * Silicon Labs Si2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
  *
  * Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
  *
diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h
index e71ffafed951..d6e07cdd2a07 100644
--- a/drivers/media/tuners/si2157_priv.h
+++ b/drivers/media/tuners/si2157_priv.h
@@ -1,5 +1,5 @@
 /*
- * Silicon Labs Si2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
  *
  * Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
  *
@@ -28,9 +28,13 @@ struct si2157 {
         bool active;
         bool fw_loaded;
         bool inversion;
+        u8 chiptype;
 };
 
-/* firmare command struct */
+#define SI2157_CHIPTYPE_SI2157 0
+#define SI2157_CHIPTYPE_SI2146 1
+
+/* firmware command struct */
 #define SI2157_ARGLEN      30
 struct si2157_cmd {
         u8 args[SI2157_ARGLEN];
diff --git a/drivers/media/tuners/tda18271-common.c b/drivers/media/tuners/tda18271-common.c
index 86e5e3110118..a26bb33102b8 100644
--- a/drivers/media/tuners/tda18271-common.c
+++ b/drivers/media/tuners/tda18271-common.c
@@ -178,7 +178,7 @@ int tda18271_read_extended(struct dvb_frontend *fe)
                     (i != R_EB17) &&
                     (i != R_EB19) &&
                     (i != R_EB20))
-                regs[i] = regdump[i];
+                        regs[i] = regdump[i];
         }
 
         if (tda18271_debug & DBG_REG)
diff --git a/drivers/media/tuners/xc5000.c b/drivers/media/tuners/xc5000.c
index 803a0e63d47e..2a039de8ab9a 100644
--- a/drivers/media/tuners/xc5000.c
+++ b/drivers/media/tuners/xc5000.c
@@ -62,6 +62,7 @@ struct xc5000_priv {
         unsigned int mode;
         u8  rf_mode;
         u8  radio_input;
+        u16  output_amp;
 
         int chip_id;
         u16 pll_register_no;
@@ -744,7 +745,9 @@ static int xc5000_tune_digital(struct dvb_frontend *fe)
                 return -EIO;
         }
 
-        xc_write_reg(priv, XREG_OUTPUT_AMP, 0x8a);
+        dprintk(1, "%s() setting OUTPUT_AMP to 0x%x\n",
+                __func__, priv->output_amp);
+        xc_write_reg(priv, XREG_OUTPUT_AMP, priv->output_amp);
 
         xc_tune_channel(priv, priv->freq_hz, XC_TUNE_DIGITAL);
 
@@ -1333,8 +1336,7 @@ static int xc5000_release(struct dvb_frontend *fe)
 
         if (priv) {
                 cancel_delayed_work(&priv->timer_sleep);
-                if (priv->firmware)
-                        release_firmware(priv->firmware);
+                release_firmware(priv->firmware);
                 hybrid_tuner_release_state(priv);
         }
 
@@ -1358,6 +1360,9 @@ static int xc5000_set_config(struct dvb_frontend *fe, void *priv_cfg)
         if (p->radio_input)
                 priv->radio_input = p->radio_input;
 
+        if (p->output_amp)
+                priv->output_amp = p->output_amp;
+
         return 0;
 }
 
@@ -1438,6 +1443,12 @@ struct dvb_frontend *xc5000_attach(struct dvb_frontend *fe,
                    it can be overridden if this is a hybrid driver */
                 priv->chip_id = (cfg->chip_id) ? cfg->chip_id : 0;
 
+        /* don't override output_amp if it's already been set
+           unless explicitly specified */
+        if ((priv->output_amp == 0) || (cfg->output_amp))
+                /* use default output_amp value if none specified */
+                priv->output_amp = (cfg->output_amp) ? cfg->output_amp : 0x8a;
+
         /* Check if firmware has been loaded. It is possible that another
            instance of the driver has loaded the firmware.
          */
diff --git a/drivers/media/tuners/xc5000.h b/drivers/media/tuners/xc5000.h
index 7245cae19f0c..6aa534f17a30 100644
--- a/drivers/media/tuners/xc5000.h
+++ b/drivers/media/tuners/xc5000.h
@@ -36,6 +36,7 @@ struct xc5000_config {
         u32  if_khz;
         u8   radio_input;
         u16  xtal_khz;
+        u16  output_amp;
 
         int chip_id;
 };
diff --git a/drivers/media/usb/au0828/au0828-cards.c b/drivers/media/usb/au0828/au0828-cards.c
index 9eb77ac2153b..da87f1cc31a9 100644
--- a/drivers/media/usb/au0828/au0828-cards.c
+++ b/drivers/media/usb/au0828/au0828-cards.c
@@ -36,6 +36,11 @@ static void hvr950q_cs5340_audio(void *priv, int enable)
                 au0828_clear(dev, REG_000, 0x10);
 }
 
+/*
+ * WARNING: There's a quirks table at sound/usb/quirks-table.h
+ * that should also be updated every time a new device with V4L2 support
+ * is added here.
+ */
 struct au0828_board au0828_boards[] = {
         [AU0828_BOARD_UNKNOWN] = {
                 .name   = "Unknown board",
diff --git a/drivers/media/usb/au0828/au0828-core.c b/drivers/media/usb/au0828/au0828-core.c
index bc064803b6c7..082ae6ba492f 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -153,6 +153,14 @@ static void au0828_usb_disconnect(struct usb_interface *interface)
 
         dprintk(1, "%s()\n", __func__);
 
+        /* there is a small window after disconnect, before
+           dev->usbdev is NULL, for poll (e.g: IR) try to access
+           the device and fill the dmesg with error messages.
+           Set the status so poll routines can check and avoid
+           access after disconnect.
+        */
+        dev->dev_state = DEV_DISCONNECTED;
+
         au0828_rc_unregister(dev);
         /* Digital TV */
         au0828_dvb_unregister(dev);
diff --git a/drivers/media/usb/au0828/au0828-dvb.c b/drivers/media/usb/au0828/au0828-dvb.c
index 00ab1563d142..c267d76f5b3c 100644
--- a/drivers/media/usb/au0828/au0828-dvb.c
+++ b/drivers/media/usb/au0828/au0828-dvb.c
@@ -88,12 +88,14 @@ static struct xc5000_config hauppauge_xc5000a_config = {
         .i2c_address      = 0x61,
         .if_khz           = 6000,
         .chip_id          = XC5000A,
+        .output_amp       = 0x8f,
 };
 
 static struct xc5000_config hauppauge_xc5000c_config = {
         .i2c_address      = 0x61,
         .if_khz           = 6000,
         .chip_id          = XC5000C,
+        .output_amp       = 0x8f,
 };
 
 static struct mxl5007t_config mxl5007t_hvr950q_config = {
diff --git a/drivers/media/usb/au0828/au0828-input.c b/drivers/media/usb/au0828/au0828-input.c
index 63995f97dc65..b0f067971979 100644
--- a/drivers/media/usb/au0828/au0828-input.c
+++ b/drivers/media/usb/au0828/au0828-input.c
@@ -129,6 +129,10 @@ static int au0828_get_key_au8522(struct au0828_rc *ir)
         int prv_bit, bit, width;
         bool first = true;
 
+        /* do nothing if device is disconnected */
+        if (ir->dev->dev_state == DEV_DISCONNECTED)
+                return 0;
+
         /* Check IR int */
         rc = au8522_rc_read(ir, 0xe1, -1, buf, 1);
         if (rc < 0 || !(buf[0] & (1 << 4))) {
@@ -255,8 +259,11 @@ static void au0828_rc_stop(struct rc_dev *rc)
 
         cancel_delayed_work_sync(&ir->work);
 
-        /* Disable IR */
-        au8522_rc_clear(ir, 0xe0, 1 << 4);
+        /* do nothing if device is disconnected */
+        if (ir->dev->dev_state != DEV_DISCONNECTED) {
+                /* Disable IR */
+                au8522_rc_clear(ir, 0xe0, 1 << 4);
+        }
 }
 
 static int au0828_probe_i2c_ir(struct au0828_dev *dev)
@@ -363,8 +370,7 @@ void au0828_rc_unregister(struct au0828_dev *dev)
         if (!ir)
                 return;
 
-        if (ir->rc)
-                rc_unregister_device(ir->rc);
+        rc_unregister_device(ir->rc);
 
         /* done */
         kfree(ir);
diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig
index 569aa298c03f..173c0e287a08 100644
--- a/drivers/media/usb/cx231xx/Kconfig
+++ b/drivers/media/usb/cx231xx/Kconfig
@@ -7,6 +7,7 @@ config VIDEO_CX231XX
         select VIDEOBUF_VMALLOC
         select VIDEO_CX25840
         select VIDEO_CX2341X
+        select I2C_MUX
 
         ---help---
           This is a video4linux driver for Conexant 231xx USB based TV cards.
diff --git a/drivers/media/usb/cx231xx/cx231xx-417.c b/drivers/media/usb/cx231xx/cx231xx-417.c
index 459bb0e98971..3f295b4d1a3d 100644
--- a/drivers/media/usb/cx231xx/cx231xx-417.c
+++ b/drivers/media/usb/cx231xx/cx231xx-417.c
@@ -24,6 +24,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
+
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/init.h>
@@ -37,9 +39,6 @@
 #include <media/v4l2-event.h>
 #include <media/cx2341x.h>
 #include <media/tuner.h>
-#include <linux/usb.h>
-
-#include "cx231xx.h"
 
 #define CX231xx_FIRM_IMAGE_SIZE 376836
 #define CX231xx_FIRM_IMAGE_NAME "v4l-cx23885-enc.fw"
@@ -90,10 +89,10 @@ static unsigned int v4l_debug = 1;
 module_param(v4l_debug, int, 0644);
 MODULE_PARM_DESC(v4l_debug, "enable V4L debug messages");
 
-#define dprintk(level, fmt, arg...)\
-        do { if (v4l_debug >= level) \
-                pr_info("%s: " fmt, \
-                (dev) ? dev->name : "cx231xx[?]", ## arg); \
+#define dprintk(level, fmt, arg...)     \
+        do {                            \
+                if (v4l_debug >= level) \
+                        printk(KERN_DEBUG pr_fmt(fmt), ## arg); \
         } while (0)
 
 static struct cx231xx_tvnorm cx231xx_tvnorms[] = {
@@ -988,29 +987,34 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
                 IVTV_REG_APU, 0);
 
         if (retval != 0) {
-                pr_err("%s: Error with mc417_register_write\n", __func__);
+                dev_err(dev->dev,
+                        "%s: Error with mc417_register_write\n", __func__);
                 return -1;
         }
 
         retval = request_firmware(&firmware, CX231xx_FIRM_IMAGE_NAME,
-                                  &dev->udev->dev);
+                                  dev->dev);
 
         if (retval != 0) {
-                pr_err("ERROR: Hotplug firmware request failed (%s).\n",
+                dev_err(dev->dev,
+                        "ERROR: Hotplug firmware request failed (%s).\n",
                         CX231xx_FIRM_IMAGE_NAME);
-                pr_err("Please fix your hotplug setup, the board will not work without firmware loaded!\n");
+                dev_err(dev->dev,
+                        "Please fix your hotplug setup, the board will not work without firmware loaded!\n");
                 return -1;
         }
 
         if (firmware->size != CX231xx_FIRM_IMAGE_SIZE) {
-                pr_err("ERROR: Firmware size mismatch (have %zd, expected %d)\n",
+                dev_err(dev->dev,
+                        "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
                         firmware->size, CX231xx_FIRM_IMAGE_SIZE);
                 release_firmware(firmware);
                 return -1;
         }
 
         if (0 != memcmp(firmware->data, magic, 8)) {
-                pr_err("ERROR: Firmware magic mismatch, wrong file?\n");
+                dev_err(dev->dev,
+                        "ERROR: Firmware magic mismatch, wrong file?\n");
                 release_firmware(firmware);
                 return -1;
         }
@@ -1057,7 +1061,8 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
         retval |= mc417_register_write(dev, IVTV_REG_HW_BLOCKS,
                 IVTV_CMD_HW_BLOCKS_RST);
         if (retval < 0) {
-                pr_err("%s: Error with mc417_register_write\n",
+                dev_err(dev->dev,
+                        "%s: Error with mc417_register_write\n",
                         __func__);
                 return retval;
         }
@@ -1069,7 +1074,8 @@ static int cx231xx_load_firmware(struct cx231xx *dev)
         retval |= mc417_register_write(dev, IVTV_REG_VPU, value & 0xFFFFFFE8);
 
         if (retval < 0) {
-                pr_err("%s: Error with mc417_register_write\n",
+                dev_err(dev->dev,
+                        "%s: Error with mc417_register_write\n",
                         __func__);
                 return retval;
         }
@@ -1114,28 +1120,31 @@ static int cx231xx_initialize_codec(struct cx231xx *dev)
         cx231xx_disable656(dev);
         retval = cx231xx_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0); /* ping */
         if (retval < 0) {
-                dprintk(2, "%s() PING OK\n", __func__);
+                dprintk(2, "%s: PING OK\n", __func__);
                 retval = cx231xx_load_firmware(dev);
                 if (retval < 0) {
-                        pr_err("%s() f/w load failed\n", __func__);
+                        dev_err(dev->dev,
+                                "%s: f/w load failed\n", __func__);
                         return retval;
                 }
                 retval = cx231xx_find_mailbox(dev);
                 if (retval < 0) {
-                        pr_err("%s() mailbox < 0, error\n",
+                        dev_err(dev->dev, "%s: mailbox < 0, error\n",
                                 __func__);
                         return -1;
                 }
                 dev->cx23417_mailbox = retval;
                 retval = cx231xx_api_cmd(dev, CX2341X_ENC_PING_FW, 0, 0);
                 if (retval < 0) {
-                        pr_err("ERROR: cx23417 firmware ping failed!\n");
+                        dev_err(dev->dev,
+                                "ERROR: cx23417 firmware ping failed!\n");
                         return -1;
                 }
                 retval = cx231xx_api_cmd(dev, CX2341X_ENC_GET_VERSION, 0, 1,
                         &version);
                 if (retval < 0) {
-                        pr_err("ERROR: cx23417 firmware get encoder: version failed!\n");
+                        dev_err(dev->dev,
+                                "ERROR: cx23417 firmware get encoder: version failed!\n");
                         return -1;
                 }
                 dprintk(1, "cx23417 firmware version is 0x%08x\n", version);
@@ -1416,8 +1425,9 @@ static int bb_buf_prepare(struct videobuf_queue *q,
                 if (!dev->video_mode.bulk_ctl.num_bufs)
                         urb_init = 1;
         }
-        /*cx231xx_info("urb_init=%d dev->video_mode.max_pkt_size=%d\n",
-                urb_init, dev->video_mode.max_pkt_size);*/
+        dev_dbg(dev->dev,
+                "urb_init=%d dev->video_mode.max_pkt_size=%d\n",
+                urb_init, dev->video_mode.max_pkt_size);
         dev->mode_tv = 1;
 
         if (urb_init) {
@@ -1688,7 +1698,7 @@ static int mpeg_open(struct file *file)
                             sizeof(struct cx231xx_buffer), fh, &dev->lock);
 /*
         videobuf_queue_sg_init(&fh->vidq, &cx231xx_qops,
-                            &dev->udev->dev, &dev->ts1.slock,
+                            dev->dev, &dev->ts1.slock,
                             V4L2_BUF_TYPE_VIDEO_CAPTURE,
                             V4L2_FIELD_INTERLACED,
                             sizeof(struct cx231xx_buffer),
@@ -1798,7 +1808,6 @@ static unsigned int mpeg_poll(struct file *file,
 static int mpeg_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct cx231xx_fh *fh = file->private_data;
-        struct cx231xx *dev = fh->dev;
 
         dprintk(2, "%s()\n", __func__);
 
@@ -1878,7 +1887,7 @@ static int cx231xx_s_video_encoding(struct cx2341x_handler *cxhdl, u32 val)
         /* fix videodecoder resolution */
         fmt.width = cxhdl->width / (is_mpeg1 ? 2 : 1);
         fmt.height = cxhdl->height;
-        fmt.code = V4L2_MBUS_FMT_FIXED;
+        fmt.code = MEDIA_BUS_FMT_FIXED;
         v4l2_subdev_call(dev->sd_cx25840, video, s_mbus_fmt, &fmt);
         return 0;
 }
diff --git a/drivers/media/usb/cx231xx/cx231xx-audio.c b/drivers/media/usb/cx231xx/cx231xx-audio.c
index 9b925874d392..de4ae5eb4830 100644
--- a/drivers/media/usb/cx231xx/cx231xx-audio.c
+++ b/drivers/media/usb/cx231xx/cx231xx-audio.c
@@ -20,8 +20,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/kernel.h>
-#include <linux/usb.h>
 #include <linux/init.h>
 #include <linux/sound.h>
 #include <linux/spinlock.h>
@@ -37,25 +37,18 @@
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <media/v4l2-common.h>
-#include "cx231xx.h"
 
 static int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "activates debug info");
 
-#define dprintk(fmt, arg...) do {                                       \
-                if (debug)                                              \
-                        printk(KERN_INFO "cx231xx-audio %s: " fmt,      \
-                                __func__, ##arg);                       \
-        } while (0)
-
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 
 static int cx231xx_isoc_audio_deinit(struct cx231xx *dev)
 {
         int i;
 
-        dprintk("Stopping isoc\n");
+        dev_dbg(dev->dev, "Stopping isoc\n");
 
         for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
                 if (dev->adev.urb[i]) {
@@ -79,7 +72,7 @@ static int cx231xx_bulk_audio_deinit(struct cx231xx *dev)
 {
         int i;
 
-        dprintk("Stopping bulk\n");
+        dev_dbg(dev->dev, "Stopping bulk\n");
 
         for (i = 0; i < CX231XX_AUDIO_BUFS; i++) {
                 if (dev->adev.urb[i]) {
@@ -123,7 +116,8 @@ static void cx231xx_audio_isocirq(struct urb *urb)
         case -ESHUTDOWN:
                 return;
         default:                /* error */
-                dprintk("urb completition error %d.\n", urb->status);
+                dev_dbg(dev->dev, "urb completition error %d.\n",
+                        urb->status);
                 break;
         }
 
@@ -182,8 +176,9 @@ static void cx231xx_audio_isocirq(struct urb *urb)
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status < 0) {
-                cx231xx_errdev("resubmit of audio urb failed (error=%i)\n",
-                               status);
+                dev_err(dev->dev,
+                        "resubmit of audio urb failed (error=%i)\n",
+                        status);
         }
         return;
 }
@@ -211,7 +206,8 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
         case -ESHUTDOWN:
                 return;
         default:                /* error */
-                dprintk("urb completition error %d.\n", urb->status);
+                dev_dbg(dev->dev, "urb completition error %d.\n",
+                        urb->status);
                 break;
         }
 
@@ -266,8 +262,9 @@ static void cx231xx_audio_bulkirq(struct urb *urb)
 
         status = usb_submit_urb(urb, GFP_ATOMIC);
         if (status < 0) {
-                cx231xx_errdev("resubmit of audio urb failed (error=%i)\n",
-                               status);
+                dev_err(dev->dev,
+                        "resubmit of audio urb failed (error=%i)\n",
+                        status);
         }
         return;
 }
@@ -277,7 +274,8 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)
         int i, errCode;
         int sb_size;
 
-        cx231xx_info("%s: Starting ISO AUDIO transfers\n", __func__);
+        dev_dbg(dev->dev,
+                "%s: Starting ISO AUDIO transfers\n", __func__);
 
         if (dev->state & DEV_DISCONNECTED)
                 return -ENODEV;
@@ -295,7 +293,7 @@ static int cx231xx_init_audio_isoc(struct cx231xx *dev)
                 memset(dev->adev.transfer_buffer[i], 0x80, sb_size);
                 urb = usb_alloc_urb(CX231XX_ISO_NUM_AUDIO_PACKETS, GFP_ATOMIC);
                 if (!urb) {
-                        cx231xx_errdev("usb_alloc_urb failed!\n");
+                        dev_err(dev->dev, "usb_alloc_urb failed!\n");
                         for (j = 0; j < i; j++) {
                                 usb_free_urb(dev->adev.urb[j]);
                                 kfree(dev->adev.transfer_buffer[j]);
@@ -338,7 +336,8 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)
         int i, errCode;
         int sb_size;
 
-        cx231xx_info("%s: Starting BULK AUDIO transfers\n", __func__);
+        dev_dbg(dev->dev,
+                "%s: Starting BULK AUDIO transfers\n", __func__);
 
         if (dev->state & DEV_DISCONNECTED)
                 return -ENODEV;
@@ -356,7 +355,7 @@ static int cx231xx_init_audio_bulk(struct cx231xx *dev)
                 memset(dev->adev.transfer_buffer[i], 0x80, sb_size);
                 urb = usb_alloc_urb(CX231XX_NUM_AUDIO_PACKETS, GFP_ATOMIC);
                 if (!urb) {
-                        cx231xx_errdev("usb_alloc_urb failed!\n");
+                        dev_err(dev->dev, "usb_alloc_urb failed!\n");
                         for (j = 0; j < i; j++) {
                                 usb_free_urb(dev->adev.urb[j]);
                                 kfree(dev->adev.transfer_buffer[j]);
@@ -392,8 +391,9 @@ static int snd_pcm_alloc_vmalloc_buffer(struct snd_pcm_substream *subs,
                                         size_t size)
 {
         struct snd_pcm_runtime *runtime = subs->runtime;
+        struct cx231xx *dev = snd_pcm_substream_chip(subs);
 
-        dprintk("Allocating vbuffer\n");
+        dev_dbg(dev->dev, "Allocating vbuffer\n");
         if (runtime->dma_area) {
                 if (runtime->dma_bytes > size)
                         return 0;
@@ -436,16 +436,12 @@ static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream)
         struct snd_pcm_runtime *runtime = substream->runtime;
         int ret = 0;
 
-        dprintk("opening device and trying to acquire exclusive lock\n");
-
-        if (!dev) {
-                cx231xx_errdev("BUG: cx231xx can't find device struct."
-                               " Can't proceed with open\n");
-                return -ENODEV;
-        }
+        dev_dbg(dev->dev,
+                "opening device and trying to acquire exclusive lock\n");
 
         if (dev->state & DEV_DISCONNECTED) {
-                cx231xx_errdev("Can't open. the device was removed.\n");
+                dev_err(dev->dev,
+                        "Can't open. the device was removed.\n");
                 return -ENODEV;
         }
 
@@ -458,7 +454,8 @@ static int snd_cx231xx_capture_open(struct snd_pcm_substream *substream)
                 ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 0);
         mutex_unlock(&dev->lock);
         if (ret < 0) {
-                cx231xx_errdev("failed to set alternate setting !\n");
+                dev_err(dev->dev,
+                        "failed to set alternate setting !\n");
 
                 return ret;
         }
@@ -484,7 +481,7 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
         int ret;
         struct cx231xx *dev = snd_pcm_substream_chip(substream);
 
-        dprintk("closing device\n");
+        dev_dbg(dev->dev, "closing device\n");
 
         /* inform hardware to stop streaming */
         mutex_lock(&dev->lock);
@@ -494,7 +491,8 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
         /* 1 - 48000 samples per sec */
         ret = cx231xx_set_alt_setting(dev, INDEX_AUDIO, 0);
         if (ret < 0) {
-                cx231xx_errdev("failed to set alternate setting !\n");
+                dev_err(dev->dev,
+                        "failed to set alternate setting !\n");
 
                 mutex_unlock(&dev->lock);
                 return ret;
@@ -504,10 +502,10 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
         mutex_unlock(&dev->lock);
 
         if (dev->adev.users == 0 && dev->adev.shutdown == 1) {
-                dprintk("audio users: %d\n", dev->adev.users);
-                dprintk("disabling audio stream!\n");
+                dev_dbg(dev->dev, "audio users: %d\n", dev->adev.users);
+                dev_dbg(dev->dev, "disabling audio stream!\n");
                 dev->adev.shutdown = 0;
-                dprintk("released lock\n");
+                dev_dbg(dev->dev, "released lock\n");
                 if (atomic_read(&dev->stream_started) > 0) {
                         atomic_set(&dev->stream_started, 0);
                         schedule_work(&dev->wq_trigger);
@@ -519,9 +517,10 @@ static int snd_cx231xx_pcm_close(struct snd_pcm_substream *substream)
 static int snd_cx231xx_hw_capture_params(struct snd_pcm_substream *substream,
                                          struct snd_pcm_hw_params *hw_params)
 {
+        struct cx231xx *dev = snd_pcm_substream_chip(substream);
         int ret;
 
-        dprintk("Setting capture parameters\n");
+        dev_dbg(dev->dev, "Setting capture parameters\n");
 
         ret = snd_pcm_alloc_vmalloc_buffer(substream,
                                            params_buffer_bytes(hw_params));
@@ -543,7 +542,7 @@ static int snd_cx231xx_hw_capture_free(struct snd_pcm_substream *substream)
 {
         struct cx231xx *dev = snd_pcm_substream_chip(substream);
 
-        dprintk("Stop capture, if needed\n");
+        dev_dbg(dev->dev, "Stop capture, if needed\n");
 
         if (atomic_read(&dev->stream_started) > 0) {
                 atomic_set(&dev->stream_started, 0);
@@ -568,7 +567,7 @@ static void audio_trigger(struct work_struct *work)
         struct cx231xx *dev = container_of(work, struct cx231xx, wq_trigger);
 
         if (atomic_read(&dev->stream_started)) {
-                dprintk("starting capture");
+                dev_dbg(dev->dev, "starting capture");
                 if (is_fw_load(dev) == 0)
                         cx25840_call(dev, core, load_fw);
                 if (dev->USE_ISO)
@@ -576,7 +575,7 @@ static void audio_trigger(struct work_struct *work)
                 else
                         cx231xx_init_audio_bulk(dev);
         } else {
-                dprintk("stopping capture");
+                dev_dbg(dev->dev, "stopping capture");
                 cx231xx_isoc_audio_deinit(dev);
         }
 }
@@ -662,10 +661,10 @@ static int cx231xx_audio_init(struct cx231xx *dev)
                 return 0;
         }
 
-        cx231xx_info("cx231xx-audio.c: probing for cx231xx "
-                     "non standard usbaudio\n");
+        dev_dbg(dev->dev,
+                "probing for cx231xx non standard usbaudio\n");
 
-        err = snd_card_new(&dev->udev->dev, index[devnr], "Cx231xx Audio",
+        err = snd_card_new(dev->dev, index[devnr], "Cx231xx Audio",
                            THIS_MODULE, 0, &card);
         if (err < 0)
                 return err;
@@ -707,14 +706,13 @@ static int cx231xx_audio_init(struct cx231xx *dev)
                         bEndpointAddress;
 
         adev->num_alt = uif->num_altsetting;
-        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                     adev->end_point_addr, adev->num_alt);
+        dev_info(dev->dev,
+                "audio EndPoint Addr 0x%x, Alternate settings: %i\n",
+                adev->end_point_addr, adev->num_alt);
         adev->alt_max_pkt_size = kmalloc(32 * adev->num_alt, GFP_KERNEL);
 
-        if (adev->alt_max_pkt_size == NULL) {
-                cx231xx_errdev("out of memory!\n");
+        if (adev->alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < adev->num_alt; i++) {
                 u16 tmp =
@@ -722,8 +720,9 @@ static int cx231xx_audio_init(struct cx231xx *dev)
                                 wMaxPacketSize);
                 adev->alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                cx231xx_info("Alternate setting %i, max size= %i\n", i,
-                             adev->alt_max_pkt_size[i]);
+                dev_dbg(dev->dev,
+                        "audio alternate setting %i, max size= %i\n", i,
+                        adev->alt_max_pkt_size[i]);
         }
 
         return 0;
diff --git a/drivers/media/usb/cx231xx/cx231xx-avcore.c b/drivers/media/usb/cx231xx/cx231xx-avcore.c
index 40a69879fc0a..39e887925e3d 100644
--- a/drivers/media/usb/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/usb/cx231xx/cx231xx-avcore.c
@@ -22,12 +22,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/bitmap.h>
-#include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
@@ -36,7 +36,6 @@
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 
-#include "cx231xx.h"
 #include "cx231xx-dif.h"
 
 #define TUNER_MODE_FM_RADIO 0
@@ -83,10 +82,10 @@ void initGPIO(struct cx231xx *dev)
         cx231xx_send_gpio_cmd(dev, _gpio_direction, (u8 *)&value, 4, 0, 0);
 
         verve_read_byte(dev, 0x07, &val);
-        cx231xx_info(" verve_read_byte address0x07=0x%x\n", val);
+        dev_dbg(dev->dev, "verve_read_byte address0x07=0x%x\n", val);
         verve_write_byte(dev, 0x07, 0xF4);
         verve_read_byte(dev, 0x07, &val);
-        cx231xx_info(" verve_read_byte address0x07=0x%x\n", val);
+        dev_dbg(dev->dev, "verve_read_byte address0x07=0x%x\n", val);
 
         cx231xx_capture_start(dev, 1, Vbi);
 
@@ -156,22 +155,25 @@ int cx231xx_afe_init_super_block(struct cx231xx *dev, u32 ref_count)
         while (afe_power_status != 0x18) {
                 status = afe_write_byte(dev, SUP_BLK_PWRDN, 0x18);
                 if (status < 0) {
-                        cx231xx_info(
-                        ": Init Super Block failed in send cmd\n");
+                        dev_dbg(dev->dev,
+                                "%s: Init Super Block failed in send cmd\n",
+                                __func__);
                         break;
                 }
 
                 status = afe_read_byte(dev, SUP_BLK_PWRDN, &afe_power_status);
                 afe_power_status &= 0xff;
                 if (status < 0) {
-                        cx231xx_info(
-                        ": Init Super Block failed in receive cmd\n");
+                        dev_dbg(dev->dev,
+                                "%s: Init Super Block failed in receive cmd\n",
+                                __func__);
                         break;
                 }
                 i++;
                 if (i == 10) {
-                        cx231xx_info(
-                        ": Init Super Block force break in loop !!!!\n");
+                        dev_dbg(dev->dev,
+                                "%s: Init Super Block force break in loop !!!!\n",
+                                __func__);
                         status = -1;
                         break;
                 }
@@ -410,7 +412,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev,
                         status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
                                                 0x00);
                 } else {
-                        cx231xx_info("Invalid AV mode input\n");
+                        dev_dbg(dev->dev, "Invalid AV mode input\n");
                         status = -1;
                 }
                 break;
@@ -467,7 +469,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev,
                         status |= afe_write_byte(dev, ADC_PWRDN_CLAMP_CH3,
                                                         0x40);
                 } else {
-                        cx231xx_info("Invalid AV mode input\n");
+                        dev_dbg(dev->dev, "Invalid AV mode input\n");
                         status = -1;
                 }
         }                       /* switch  */
@@ -573,9 +575,9 @@ int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input)
                         status = cx231xx_set_power_mode(dev,
                                         POLARIS_AVMODE_ENXTERNAL_AV);
                         if (status < 0) {
-                                cx231xx_errdev("%s: set_power_mode : Failed to"
-                                                " set Power - errCode [%d]!\n",
-                                                __func__, status);
+                                dev_err(dev->dev,
+                                        "%s: Failed to set Power - errCode [%d]!\n",
+                                        __func__, status);
                                 return status;
                         }
                 }
@@ -591,8 +593,8 @@ int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input)
                         status = cx231xx_set_power_mode(dev,
                                                 POLARIS_AVMODE_ANALOGT_TV);
                         if (status < 0) {
-                                cx231xx_errdev("%s: set_power_mode:Failed"
-                                        " to set Power - errCode [%d]!\n",
+                                dev_err(dev->dev,
+                                        "%s: Failed to set Power - errCode [%d]!\n",
                                         __func__, status);
                                 return status;
                         }
@@ -608,8 +610,8 @@ int cx231xx_set_video_input_mux(struct cx231xx *dev, u8 input)
 
                 break;
         default:
-                cx231xx_errdev("%s: set_power_mode : Unknown Input %d !\n",
-                     __func__, INPUT(input)->type);
+                dev_err(dev->dev, "%s: Unknown Input %d !\n",
+                        __func__, INPUT(input)->type);
                 break;
         }
 
@@ -628,8 +630,8 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
         if (pin_type != dev->video_input) {
                 status = cx231xx_afe_adjust_ref_count(dev, pin_type);
                 if (status < 0) {
-                        cx231xx_errdev("%s: adjust_ref_count :Failed to set"
-                                "AFE input mux - errCode [%d]!\n",
+                        dev_err(dev->dev,
+                                "%s: adjust_ref_count :Failed to set AFE input mux - errCode [%d]!\n",
                                 __func__, status);
                         return status;
                 }
@@ -638,9 +640,9 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
         /* call afe block to set video inputs */
         status = cx231xx_afe_set_input_mux(dev, input);
         if (status < 0) {
-                cx231xx_errdev("%s: set_input_mux :Failed to set"
-                                " AFE input mux - errCode [%d]!\n",
-                                __func__, status);
+                dev_err(dev->dev,
+                        "%s: set_input_mux :Failed to set AFE input mux - errCode [%d]!\n",
+                        __func__, status);
                 return status;
         }
 
@@ -670,8 +672,8 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
                 /* Tell DIF object to go to baseband mode  */
                 status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
                 if (status < 0) {
-                        cx231xx_errdev("%s: cx231xx_dif set to By pass"
-                                                   " mode- errCode [%d]!\n",
+                        dev_err(dev->dev,
+                                "%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",
                                 __func__, status);
                         return status;
                 }
@@ -715,8 +717,8 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
                 /* Tell DIF object to go to baseband mode */
                 status = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
                 if (status < 0) {
-                        cx231xx_errdev("%s: cx231xx_dif set to By pass"
-                                                   " mode- errCode [%d]!\n",
+                        dev_err(dev->dev,
+                                "%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",
                                 __func__, status);
                         return status;
                 }
@@ -790,9 +792,9 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
                         status = cx231xx_dif_set_standard(dev,
                                                           DIF_USE_BASEBAND);
                         if (status < 0) {
-                                cx231xx_errdev("%s: cx231xx_dif set to By pass"
-                                                " mode- errCode [%d]!\n",
-                                                __func__, status);
+                                dev_err(dev->dev,
+                                        "%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",
+                                       __func__, status);
                                 return status;
                         }
 
@@ -826,9 +828,9 @@ int cx231xx_set_decoder_video_input(struct cx231xx *dev,
                         /* Reinitialize the DIF */
                         status = cx231xx_dif_set_standard(dev, dev->norm);
                         if (status < 0) {
-                                cx231xx_errdev("%s: cx231xx_dif set to By pass"
-                                                " mode- errCode [%d]!\n",
-                                                __func__, status);
+                                dev_err(dev->dev,
+                                        "%s: cx231xx_dif set to By pass mode- errCode [%d]!\n",
+                                        __func__, status);
                                 return status;
                         }
 
@@ -970,14 +972,14 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev)
 {
         int status = 0;
 
-        cx231xx_info("do_mode_ctrl_overrides : 0x%x\n",
-                     (unsigned int)dev->norm);
+        dev_dbg(dev->dev, "%s: 0x%x\n",
+                __func__, (unsigned int)dev->norm);
 
         /* Change the DFE_CTRL3 bp_percent to fix flagging */
         status = vid_blk_write_word(dev, DFE_CTRL3, 0xCD3F0280);
 
         if (dev->norm & (V4L2_STD_NTSC | V4L2_STD_PAL_M)) {
-                cx231xx_info("do_mode_ctrl_overrides NTSC\n");
+                dev_dbg(dev->dev, "%s: NTSC\n", __func__);
 
                 /* Move the close caption lines out of active video,
                    adjust the active video start point */
@@ -1004,7 +1006,7 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev)
                                                         (FLD_HBLANK_CNT, 0x79));
 
         } else if (dev->norm & V4L2_STD_SECAM) {
-                cx231xx_info("do_mode_ctrl_overrides SECAM\n");
+                dev_dbg(dev->dev, "%s: SECAM\n", __func__);
                 status =  cx231xx_read_modify_write_i2c_dword(dev,
                                                         VID_BLK_I2C_ADDRESS,
                                                         VERT_TIM_CTRL,
@@ -1031,7 +1033,7 @@ int cx231xx_do_mode_ctrl_overrides(struct cx231xx *dev)
                                                         cx231xx_set_field
                                                         (FLD_HBLANK_CNT, 0x85));
         } else {
-                cx231xx_info("do_mode_ctrl_overrides PAL\n");
+                dev_dbg(dev->dev, "%s: PAL\n", __func__);
                 status = cx231xx_read_modify_write_i2c_dword(dev,
                                                         VID_BLK_I2C_ADDRESS,
                                                         VERT_TIM_CTRL,
@@ -1206,7 +1208,8 @@ int cx231xx_set_audio_decoder_input(struct cx231xx *dev,
                         /* This is just a casual suggestion to people adding
                            new boards in case they use a tuner type we don't
                            currently know about */
-                        printk(KERN_INFO "Unknown tuner type configuring SIF");
+                        dev_info(dev->dev,
+                                 "Unknown tuner type configuring SIF");
                         break;
                 }
                 break;
@@ -1270,8 +1273,13 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3)
         int status = 0;
         bool current_is_port_3;
 
-        if (dev->board.dont_use_port_3)
-                is_port_3 = false;
+        /*
+         * Should this code check dev->port_3_switch_enabled first
+         * to skip unnecessary reading of the register?
+         * If yes, the flag dev->port_3_switch_enabled must be initialized
+         * correctly.
+         */
+
         status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER,
                                        PWR_CTL_EN, value, 4);
         if (status < 0)
@@ -1288,12 +1296,13 @@ int cx231xx_enable_i2c_port_3(struct cx231xx *dev, bool is_port_3)
         else
                 value[0] &= ~I2C_DEMOD_EN;
 
-        cx231xx_info("Changing the i2c master port to %d\n",
-                     is_port_3 ?  3 : 1);
-
         status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
                                         PWR_CTL_EN, value, 4);
 
+        /* remember status of the switch for usage in is_tuner */
+        if (status >= 0)
+                dev->port_3_switch_enabled = is_port_3;
+
         return status;
 
 }
@@ -1325,113 +1334,131 @@ void cx231xx_dump_HH_reg(struct cx231xx *dev)
 
         for (i = 0x100; i < 0x140; i++) {
                 vid_blk_read_word(dev, i, &value);
-                cx231xx_info("reg0x%x=0x%x\n", i, value);
+                dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
                 i = i+3;
         }
 
         for (i = 0x300; i < 0x400; i++) {
                 vid_blk_read_word(dev, i, &value);
-                cx231xx_info("reg0x%x=0x%x\n", i, value);
+                dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
                 i = i+3;
         }
 
         for (i = 0x400; i < 0x440; i++) {
                 vid_blk_read_word(dev, i,  &value);
-                cx231xx_info("reg0x%x=0x%x\n", i, value);
+                dev_dbg(dev->dev, "reg0x%x=0x%x\n", i, value);
                 i = i+3;
         }
 
         vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);
-        cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
+        dev_dbg(dev->dev, "AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
         vid_blk_write_word(dev, AFE_CTRL_C2HH_SRC_CTRL, 0x4485D390);
         vid_blk_read_word(dev, AFE_CTRL_C2HH_SRC_CTRL, &value);
-        cx231xx_info("AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
+        dev_dbg(dev->dev, "AFE_CTRL_C2HH_SRC_CTRL=0x%x\n", value);
 }
 
-void cx231xx_dump_SC_reg(struct cx231xx *dev)
+#if 0
+static void cx231xx_dump_SC_reg(struct cx231xx *dev)
 {
         u8 value[4] = { 0, 0, 0, 0 };
-        cx231xx_info("cx231xx_dump_SC_reg!\n");
+        dev_dbg(dev->dev, "%s!\n", __func__);
 
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, BOARD_CFG_STAT,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", BOARD_CFG_STAT, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", BOARD_CFG_STAT, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS_MODE_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS_MODE_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS_MODE_REG, value[0],
+                 value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS1_CFG_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_CFG_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_CFG_REG, value[0],
+                 value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS1_LENGTH_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_LENGTH_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS1_LENGTH_REG, value[0],
+                value[1], value[2], value[3]);
 
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS2_CFG_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_CFG_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_CFG_REG, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, TS2_LENGTH_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_LENGTH_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", TS2_LENGTH_REG, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", EP_MODE_SET, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", EP_MODE_SET, value[0],
+                 value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN1,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN1, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN1, value[0],
+                value[1], value[2], value[3]);
 
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN2,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN2, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN2, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_PTN3,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN3, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_PTN3, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK0,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK0, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK0, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK1,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK1, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK1, value[0],
+                value[1], value[2], value[3]);
 
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_PWR_MASK2,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK2, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_PWR_MASK2, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_GAIN,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_GAIN, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_GAIN, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_CAR_REG,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_CAR_REG, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_CAR_REG, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_OT_CFG1,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG1, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG1, value[0],
+                value[1], value[2], value[3]);
 
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, CIR_OT_CFG2,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG2, value[0],
-                                 value[1], value[2], value[3]);
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", CIR_OT_CFG2, value[0],
+                value[1], value[2], value[3]);
         cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, PWR_CTL_EN,
                                  value, 4);
-        cx231xx_info("reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0],
-                                 value[1], value[2], value[3]);
-
-
+        dev_dbg(dev->dev,
+                "reg0x%x=0x%x 0x%x 0x%x 0x%x\n", PWR_CTL_EN, value[0],
+                value[1], value[2], value[3]);
 }
+#endif
 
 void cx231xx_Setup_AFE_for_LowIF(struct cx231xx *dev)
 
@@ -1497,7 +1524,7 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq,
         u32 standard = 0;
         u8 value[4] = { 0, 0, 0, 0 };
 
-        cx231xx_info("Enter cx231xx_set_Colibri_For_LowIF()\n");
+        dev_dbg(dev->dev, "Enter cx231xx_set_Colibri_For_LowIF()\n");
         value[0] = (u8) 0x6F;
         value[1] = (u8) 0x6F;
         value[2] = (u8) 0x6F;
@@ -1517,7 +1544,7 @@ void cx231xx_set_Colibri_For_LowIF(struct cx231xx *dev, u32 if_freq,
         colibri_carrier_offset = cx231xx_Get_Colibri_CarrierOffset(mode,
                                                                    standard);
 
-        cx231xx_info("colibri_carrier_offset=%d, standard=0x%x\n",
+        dev_dbg(dev->dev, "colibri_carrier_offset=%d, standard=0x%x\n",
                      colibri_carrier_offset, standard);
 
         /* Set the band Pass filter for DIF*/
@@ -1551,8 +1578,8 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq,
         u64 pll_freq_u64 = 0;
         u32 i = 0;
 
-        cx231xx_info("if_freq=%d;spectral_invert=0x%x;mode=0x%x\n",
-                         if_freq, spectral_invert, mode);
+        dev_dbg(dev->dev, "if_freq=%d;spectral_invert=0x%x;mode=0x%x\n",
+                if_freq, spectral_invert, mode);
 
 
         if (mode == TUNER_MODE_FM_RADIO) {
@@ -1595,8 +1622,7 @@ void cx231xx_set_DIF_bandpass(struct cx231xx *dev, u32 if_freq,
                 if_freq = 16000000;
         }
 
-        cx231xx_info("Enter IF=%zu\n",
-                        ARRAY_SIZE(Dif_set_array));
+        dev_dbg(dev->dev, "Enter IF=%zu\n", ARRAY_SIZE(Dif_set_array));
         for (i = 0; i < ARRAY_SIZE(Dif_set_array); i++) {
                 if (Dif_set_array[i].if_freq == if_freq) {
                         vid_blk_write_word(dev,
@@ -1708,7 +1734,7 @@ int cx231xx_dif_set_standard(struct cx231xx *dev, u32 standard)
         u32 dif_misc_ctrl_value = 0;
         u32 func_mode = 0;
 
-        cx231xx_info("%s: setStandard to %x\n", __func__, standard);
+        dev_dbg(dev->dev, "%s: setStandard to %x\n", __func__, standard);
 
         status = vid_blk_read_word(dev, DIF_MISC_CTRL, &dif_misc_ctrl_value);
         if (standard != DIF_USE_BASEBAND)
@@ -2111,8 +2137,8 @@ int cx231xx_tuner_post_channel_change(struct cx231xx *dev)
 {
         int status = 0;
         u32 dwval;
-        cx231xx_info("cx231xx_tuner_post_channel_change  dev->tuner_type =0%d\n",
-                     dev->tuner_type);
+        dev_dbg(dev->dev, "%s: dev->tuner_type =0%d\n",
+                __func__, dev->tuner_type);
         /* Set the RF and IF k_agc values to 4 for PAL/NTSC and 8 for
          * SECAM L/B/D standards */
         status = vid_blk_read_word(dev, DIF_AGC_IF_REF, &dwval);
@@ -2213,8 +2239,8 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
         if (dev->power_mode != mode)
                 dev->power_mode = mode;
         else {
-                cx231xx_info(" setPowerMode::mode = %d, No Change req.\n",
-                             mode);
+                dev_dbg(dev->dev, "%s: mode = %d, No Change req.\n",
+                         __func__, mode);
                 return 0;
         }
 
@@ -2264,7 +2290,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
         case POLARIS_AVMODE_ANALOGT_TV:
 
                 tmp |= PWR_DEMOD_EN;
-                tmp |= (I2C_DEMOD_EN);
                 value[0] = (u8) tmp;
                 value[1] = (u8) (tmp >> 8);
                 value[2] = (u8) (tmp >> 16);
@@ -2317,9 +2342,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
                 }
 
                 if (dev->board.tuner_type != TUNER_ABSENT) {
-                        /* Enable tuner */
-                        cx231xx_enable_i2c_port_3(dev, true);
-
                         /* reset the Tuner */
                         if (dev->board.tuner_gpio)
                                 cx231xx_gpio_set(dev, dev->board.tuner_gpio);
@@ -2363,7 +2385,7 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
                 }
 
                 tmp &= (~PWR_AV_MODE);
-                tmp |= POLARIS_AVMODE_DIGITAL | I2C_DEMOD_EN;
+                tmp |= POLARIS_AVMODE_DIGITAL;
                 value[0] = (u8) tmp;
                 value[1] = (u8) (tmp >> 8);
                 value[2] = (u8) (tmp >> 16);
@@ -2384,15 +2406,6 @@ int cx231xx_set_power_mode(struct cx231xx *dev, enum AV_MODE mode)
                 }
 
                 if (dev->board.tuner_type != TUNER_ABSENT) {
-                        /*
-                         * Enable tuner
-                         *      Hauppauge Exeter seems to need to do something different!
-                         */
-                        if (dev->model == CX231XX_BOARD_HAUPPAUGE_EXETER)
-                                cx231xx_enable_i2c_port_3(dev, false);
-                        else
-                                cx231xx_enable_i2c_port_3(dev, true);
-
                         /* reset the Tuner */
                         if (dev->board.tuner_gpio)
                                 cx231xx_gpio_set(dev, dev->board.tuner_gpio);
@@ -2466,7 +2479,7 @@ int cx231xx_start_stream(struct cx231xx *dev, u32 ep_mask)
         u32 tmp = 0;
         int status = 0;
 
-        cx231xx_info("cx231xx_start_stream():: ep_mask = %x\n", ep_mask);
+        dev_dbg(dev->dev, "%s: ep_mask = %x\n", __func__, ep_mask);
         status = cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET,
                                        value, 4);
         if (status < 0)
@@ -2491,7 +2504,7 @@ int cx231xx_stop_stream(struct cx231xx *dev, u32 ep_mask)
         u32 tmp = 0;
         int status = 0;
 
-        cx231xx_info("cx231xx_stop_stream():: ep_mask = %x\n", ep_mask);
+        dev_dbg(dev->dev, "%s: ep_mask = %x\n", __func__, ep_mask);
         status =
             cx231xx_read_ctrl_reg(dev, VRT_GET_REGISTER, EP_MODE_SET, value, 4);
         if (status < 0)
@@ -2519,61 +2532,72 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
         if (dev->udev->speed == USB_SPEED_HIGH) {
                 switch (media_type) {
                 case Audio:
-                        cx231xx_info("%s: Audio enter HANC\n", __func__);
+                        dev_dbg(dev->dev,
+                                "%s: Audio enter HANC\n", __func__);
                         status =
                             cx231xx_mode_register(dev, TS_MODE_REG, 0x9300);
                         break;
 
                 case Vbi:
-                        cx231xx_info("%s: set vanc registers\n", __func__);
+                        dev_dbg(dev->dev,
+                                "%s: set vanc registers\n", __func__);
                         status = cx231xx_mode_register(dev, TS_MODE_REG, 0x300);
                         break;
 
                 case Sliced_cc:
-                        cx231xx_info("%s: set hanc registers\n", __func__);
+                        dev_dbg(dev->dev,
+                                "%s: set hanc registers\n", __func__);
                         status =
                             cx231xx_mode_register(dev, TS_MODE_REG, 0x1300);
                         break;
 
                 case Raw_Video:
-                        cx231xx_info("%s: set video registers\n", __func__);
+                        dev_dbg(dev->dev,
+                                "%s: set video registers\n", __func__);
                         status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
                         break;
 
                 case TS1_serial_mode:
-                        cx231xx_info("%s: set ts1 registers", __func__);
-
-                if (dev->board.has_417) {
-                        cx231xx_info(" MPEG\n");
-                        value &= 0xFFFFFFFC;
-                        value |= 0x3;
-
-                        status = cx231xx_mode_register(dev, TS_MODE_REG, value);
-
-                        val[0] = 0x04;
-                        val[1] = 0xA3;
-                        val[2] = 0x3B;
-                        val[3] = 0x00;
-                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
-                                 TS1_CFG_REG, val, 4);
-
-                        val[0] = 0x00;
-                        val[1] = 0x08;
-                        val[2] = 0x00;
-                        val[3] = 0x08;
-                        status = cx231xx_write_ctrl_reg(dev, VRT_SET_REGISTER,
-                                 TS1_LENGTH_REG, val, 4);
-
-                } else {
-                        cx231xx_info(" BDA\n");
-                        status = cx231xx_mode_register(dev, TS_MODE_REG, 0x101);
-                        status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x010);
-                }
+                        dev_dbg(dev->dev,
+                                "%s: set ts1 registers", __func__);
+
+                        if (dev->board.has_417) {
+                                dev_dbg(dev->dev,
+                                        "%s: MPEG\n", __func__);
+                                value &= 0xFFFFFFFC;
+                                value |= 0x3;
+
+                                status = cx231xx_mode_register(dev,
+                                                         TS_MODE_REG, value);
+
+                                val[0] = 0x04;
+                                val[1] = 0xA3;
+                                val[2] = 0x3B;
+                                val[3] = 0x00;
+                                status = cx231xx_write_ctrl_reg(dev,
+                                                        VRT_SET_REGISTER,
+                                                        TS1_CFG_REG, val, 4);
+
+                                val[0] = 0x00;
+                                val[1] = 0x08;
+                                val[2] = 0x00;
+                                val[3] = 0x08;
+                                status = cx231xx_write_ctrl_reg(dev,
+                                                        VRT_SET_REGISTER,
+                                                        TS1_LENGTH_REG, val, 4);
+                        } else {
+                                dev_dbg(dev->dev, "%s: BDA\n", __func__);
+                                status = cx231xx_mode_register(dev,
+                                                         TS_MODE_REG, 0x101);
+                                status = cx231xx_mode_register(dev,
+                                                        TS1_CFG_REG, 0x010);
+                        }
                         break;
 
                 case TS1_parallel_mode:
-                        cx231xx_info("%s: set ts1 parallel mode registers\n",
-                                     __func__);
+                        dev_dbg(dev->dev,
+                                "%s: set ts1 parallel mode registers\n",
+                                __func__);
                         status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
                         status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
                         break;
@@ -2926,8 +2950,9 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev)
                          (nCnt > 0));
 
         if (nCnt == 0)
-                cx231xx_info("No ACK after %d msec -GPIO I2C failed!",
-                             nInit * 10);
+                dev_dbg(dev->dev,
+                        "No ACK after %d msec -GPIO I2C failed!",
+                        nInit * 10);
 
         /*
          * readAck
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 791f00c6276b..ae05d591f228 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -20,12 +20,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
 #include <linux/i2c.h>
-#include <linux/usb.h>
 #include <media/tuner.h>
 #include <media/tveeprom.h>
 #include <media/v4l2-common.h>
@@ -35,7 +35,6 @@
 #include "xc5000.h"
 #include "tda18271.h"
 
-#include "cx231xx.h"
 
 static int tuner = -1;
 module_param(tuner, int, 0444);
@@ -104,8 +103,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x02,
                 .norm = V4L2_STD_PAL,
@@ -144,8 +143,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x32,
                 .norm = V4L2_STD_NTSC,
@@ -184,8 +183,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x1c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x02,
                 .norm = V4L2_STD_PAL,
@@ -225,8 +224,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x1c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x02,
                 .norm = V4L2_STD_PAL,
@@ -262,7 +261,6 @@ struct cx231xx_board cx231xx_boards[] = {
                 .norm = V4L2_STD_PAL,
                 .no_alt_vanc = 1,
                 .external_av = 1,
-                .dont_use_port_3 = 1,
                 /* Actually, it has a 417, but it isn't working correctly.
                  * So set to 0 for now until someone can manage to get this
                  * to work reliably. */
@@ -297,8 +295,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x02,
                 .norm = V4L2_STD_PAL,
@@ -325,8 +323,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x32,
                 .norm = V4L2_STD_NTSC,
@@ -353,8 +351,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_1,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x0e,
                 .norm = V4L2_STD_NTSC,
@@ -390,7 +388,6 @@ struct cx231xx_board cx231xx_boards[] = {
                 .norm = V4L2_STD_NTSC,
                 .no_alt_vanc = 1,
                 .external_av = 1,
-                .dont_use_port_3 = 1,
                 .input = {{
                         .type = CX231XX_VMUX_COMPOSITE1,
                         .vmux = CX231XX_VIN_2_1,
@@ -418,9 +415,9 @@ struct cx231xx_board cx231xx_boards[] = {
                 .tuner_scl_gpio = -1,
                 .tuner_sda_gpio = -1,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 2,
-                .demod_i2c_master = 1,
-                .ir_i2c_master = 2,
+                .tuner_i2c_master = I2C_2,
+                .demod_i2c_master = I2C_1_MUX_3,
+                .ir_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x10,
                 .norm = V4L2_STD_PAL_M,
@@ -456,9 +453,9 @@ struct cx231xx_board cx231xx_boards[] = {
                 .tuner_scl_gpio = -1,
                 .tuner_sda_gpio = -1,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 2,
-                .demod_i2c_master = 1,
-                .ir_i2c_master = 2,
+                .tuner_i2c_master = I2C_2,
+                .demod_i2c_master = I2C_1_MUX_3,
+                .ir_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x10,
                 .norm = V4L2_STD_NTSC_M,
@@ -494,9 +491,9 @@ struct cx231xx_board cx231xx_boards[] = {
                 .tuner_scl_gpio = -1,
                 .tuner_sda_gpio = -1,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 2,
-                .demod_i2c_master = 1,
-                .ir_i2c_master = 2,
+                .tuner_i2c_master = I2C_2,
+                .demod_i2c_master = I2C_1_MUX_3,
+                .ir_i2c_master = I2C_2,
                 .rc_map_name = RC_MAP_PIXELVIEW_002T,
                 .has_dvb = 1,
                 .demod_addr = 0x10,
@@ -532,7 +529,6 @@ struct cx231xx_board cx231xx_boards[] = {
                 .norm = V4L2_STD_NTSC,
                 .no_alt_vanc = 1,
                 .external_av = 1,
-                .dont_use_port_3 = 1,
 
                 .input = {{
                                 .type = CX231XX_VMUX_COMPOSITE1,
@@ -587,7 +583,7 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
+                .tuner_i2c_master = I2C_1_MUX_3,
                 .norm = V4L2_STD_PAL,
 
                 .input = {{
@@ -622,7 +618,7 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
+                .tuner_i2c_master = I2C_1_MUX_3,
                 .norm = V4L2_STD_NTSC,
 
                 .input = {{
@@ -656,7 +652,6 @@ struct cx231xx_board cx231xx_boards[] = {
                 .norm = V4L2_STD_NTSC,
                 .no_alt_vanc = 1,
                 .external_av = 1,
-                .dont_use_port_3 = 1,
                 .input = {{
                         .type = CX231XX_VMUX_COMPOSITE1,
                         .vmux = CX231XX_VIN_2_1,
@@ -677,13 +672,12 @@ struct cx231xx_board cx231xx_boards[] = {
                 .decoder = CX231XX_AVDECODER,
                 .output_mode = OUT_MODE_VIP11,
                 .ctl_pin_status_mask = 0xFFFFFFC4,
-                .agc_analog_digital_select_gpio = 0x0c, 
+                .agc_analog_digital_select_gpio = 0x0c,
                         /* According with PV CxPlrCAP.inf file */
                 .gpio_pin_status_mask = 0x4001000,
                 .norm = V4L2_STD_NTSC,
                 .no_alt_vanc = 1,
                 .external_av = 1,
-                .dont_use_port_3 = 1,
                 /*.has_417 = 1, */
                 /* This board is believed to have a hardware encoding chip
                  * supporting mpeg1/2/4, but as the 417 is apparently not
@@ -718,8 +712,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x0e,
                 .norm = V4L2_STD_PAL,
@@ -757,8 +751,8 @@ struct cx231xx_board cx231xx_boards[] = {
                 .ctl_pin_status_mask = 0xFFFFFFC4,
                 .agc_analog_digital_select_gpio = 0x0c,
                 .gpio_pin_status_mask = 0x4001000,
-                .tuner_i2c_master = 1,
-                .demod_i2c_master = 2,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
                 .has_dvb = 1,
                 .demod_addr = 0x0e,
                 .norm = V4L2_STD_PAL,
@@ -861,9 +855,9 @@ int cx231xx_tuner_callback(void *ptr, int component, int command, int arg)
 
         if (dev->tuner_type == TUNER_XC5000) {
                 if (command == XC5000_TUNER_RESET) {
-                        cx231xx_info
-                                ("Tuner CB: RESET: cmd %d : tuner type %d \n",
-                                 command, dev->tuner_type);
+                        dev_dbg(dev->dev,
+                                "Tuner CB: RESET: cmd %d : tuner type %d\n",
+                                command, dev->tuner_type);
                         cx231xx_set_gpio_value(dev, dev->board.tuner_gpio->bit,
                                                1);
                         msleep(10);
@@ -921,8 +915,8 @@ void cx231xx_pre_card_setup(struct cx231xx *dev)
 
         cx231xx_set_model(dev);
 
-        cx231xx_info("Identified as %s (card=%d)\n",
-                     dev->board.name, dev->model);
+        dev_info(dev->dev, "Identified as %s (card=%d)\n",
+                dev->board.name, dev->model);
 
         /* set the direction for GPIO pins */
         if (dev->board.tuner_gpio) {
@@ -980,25 +974,22 @@ static void cx231xx_config_tuner(struct cx231xx *dev)
 
 }
 
-static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len)
+static int read_eeprom(struct cx231xx *dev, struct i2c_client *client,
+                       u8 *eedata, int len)
 {
         int ret = 0;
-        u8 addr = 0xa0 >> 1;
         u8 start_offset = 0;
         int len_todo = len;
         u8 *eedata_cur = eedata;
         int i;
-        struct i2c_msg msg_write = { .addr = addr, .flags = 0,
+        struct i2c_msg msg_write = { .addr = client->addr, .flags = 0,
                 .buf = &start_offset, .len = 1 };
-        struct i2c_msg msg_read = { .addr = addr, .flags = I2C_M_RD };
-
-        /* mutex_lock(&dev->i2c_lock); */
-        cx231xx_enable_i2c_port_3(dev, false);
+        struct i2c_msg msg_read = { .addr = client->addr, .flags = I2C_M_RD };
 
         /* start reading at offset 0 */
-        ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_write, 1);
+        ret = i2c_transfer(client->adapter, &msg_write, 1);
         if (ret < 0) {
-                cx231xx_err("Can't read eeprom\n");
+                dev_err(dev->dev, "Can't read eeprom\n");
                 return ret;
         }
 
@@ -1006,20 +997,18 @@ static int read_eeprom(struct cx231xx *dev, u8 *eedata, int len)
                 msg_read.len = (len_todo > 64) ? 64 : len_todo;
                 msg_read.buf = eedata_cur;
 
-                ret = i2c_transfer(&dev->i2c_bus[1].i2c_adap, &msg_read, 1);
+                ret = i2c_transfer(client->adapter, &msg_read, 1);
                 if (ret < 0) {
-                        cx231xx_err("Can't read eeprom\n");
+                        dev_err(dev->dev, "Can't read eeprom\n");
                         return ret;
                 }
                 eedata_cur += msg_read.len;
                 len_todo -= msg_read.len;
         }
 
-        cx231xx_enable_i2c_port_3(dev, true);
-        /* mutex_unlock(&dev->i2c_lock); */
-
         for (i = 0; i + 15 < len; i += 16)
-                cx231xx_info("i2c eeprom %02x: %*ph\n", i, 16, &eedata[i]);
+                dev_dbg(dev->dev, "i2c eeprom %02x: %*ph\n",
+                        i, 16, &eedata[i]);
 
         return 0;
 }
@@ -1036,22 +1025,26 @@ void cx231xx_card_setup(struct cx231xx *dev)
         /* request some modules */
         if (dev->board.decoder == CX231XX_AVDECODER) {
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                                        &dev->i2c_bus[0].i2c_adap,
+                                        cx231xx_get_i2c_adap(dev, I2C_0),
                                         "cx25840", 0x88 >> 1, NULL);
                 if (dev->sd_cx25840 == NULL)
-                        cx231xx_info("cx25840 subdev registration failure\n");
+                        dev_err(dev->dev,
+                                "cx25840 subdev registration failure\n");
                 cx25840_call(dev, core, load_fw);
 
         }
 
         /* Initialize the tuner */
         if (dev->board.tuner_type != TUNER_ABSENT) {
+                struct i2c_adapter *tuner_i2c = cx231xx_get_i2c_adap(dev,
+                                                dev->board.tuner_i2c_master);
                 dev->sd_tuner = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                                                    &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                                                    tuner_i2c,
                                                     "tuner",
                                                     dev->tuner_addr, NULL);
                 if (dev->sd_tuner == NULL)
-                        cx231xx_info("tuner subdev registration failure\n");
+                        dev_err(dev->dev,
+                                "tuner subdev registration failure\n");
                 else
                         cx231xx_config_tuner(dev);
         }
@@ -1062,9 +1055,14 @@ void cx231xx_card_setup(struct cx231xx *dev)
                 {
                         struct tveeprom tvee;
                         static u8 eeprom[256];
+                        struct i2c_client client;
+
+                        memset(&client, 0, sizeof(client));
+                        client.adapter = cx231xx_get_i2c_adap(dev, I2C_1_MUX_1);
+                        client.addr = 0xa0 >> 1;
 
-                        read_eeprom(dev, eeprom, sizeof(eeprom));
-                        tveeprom_hauppauge_analog(&dev->i2c_bus[1].i2c_client,
+                        read_eeprom(dev, &client, eeprom, sizeof(eeprom));
+                        tveeprom_hauppauge_analog(&client,
                                                 &tvee, eeprom + 0xc0);
                         break;
                 }
@@ -1152,7 +1150,7 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         /* Query cx231xx to find what pcb config it is related to */
         retval = initialize_cx231xx(dev);
         if (retval < 0) {
-                cx231xx_errdev("Failed to read PCB config\n");
+                dev_err(dev->dev, "Failed to read PCB config\n");
                 return retval;
         }
 
@@ -1168,7 +1166,7 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
 
         retval = cx231xx_config(dev);
         if (retval) {
-                cx231xx_errdev("error configuring device\n");
+                dev_err(dev->dev, "error configuring device\n");
                 return -ENOMEM;
         }
 
@@ -1178,8 +1176,9 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         /* register i2c bus */
         retval = cx231xx_dev_init(dev);
         if (retval) {
-                cx231xx_errdev("%s: cx231xx_i2c_register - errCode [%d]!\n",
-                               __func__, retval);
+                dev_err(dev->dev,
+                        "%s: cx231xx_i2c_register - errCode [%d]!\n",
+                        __func__, retval);
                 goto err_dev_init;
         }
 
@@ -1200,8 +1199,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
 
         retval = cx231xx_config(dev);
         if (retval) {
-                cx231xx_errdev("%s: cx231xx_config - errCode [%d]!\n",
-                               __func__, retval);
+                dev_err(dev->dev, "%s: cx231xx_config - errCode [%d]!\n",
+                        __func__, retval);
                 goto err_dev_init;
         }
 
@@ -1217,11 +1216,11 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         cx231xx_add_into_devlist(dev);
 
         if (dev->board.has_417) {
-                printk(KERN_INFO "attach 417 %d\n", dev->model);
+                dev_info(dev->dev, "attach 417 %d\n", dev->model);
                 if (cx231xx_417_register(dev) < 0) {
-                        printk(KERN_ERR
+                        dev_err(dev->dev,
                                 "%s() Failed to register 417 on VID_B\n",
-                               __func__);
+                                __func__);
                 }
         }
 
@@ -1285,7 +1284,8 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         /* compute alternate max packet sizes for video */
         idx = dev->current_pcb_config.hs_config_info[0].interface_info.video_index + 1;
         if (idx >= dev->max_iad_interface_count) {
-                cx231xx_errdev("Video PCB interface #%d doesn't exist\n", idx);
+                dev_err(dev->dev,
+                        "Video PCB interface #%d doesn't exist\n", idx);
                 return -ENODEV;
         }
 
@@ -1294,28 +1294,29 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         dev->video_mode.end_point_addr = uif->altsetting[0].endpoint[isoc_pipe].desc.bEndpointAddress;
         dev->video_mode.num_alt = uif->num_altsetting;
 
-        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                     dev->video_mode.end_point_addr,
-                     dev->video_mode.num_alt);
+        dev_info(dev->dev,
+                 "video EndPoint Addr 0x%x, Alternate settings: %i\n",
+                 dev->video_mode.end_point_addr,
+                 dev->video_mode.num_alt);
 
         dev->video_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->video_mode.num_alt, GFP_KERNEL);
-        if (dev->video_mode.alt_max_pkt_size == NULL) {
-                cx231xx_errdev("out of memory!\n");
+        if (dev->video_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->video_mode.num_alt; i++) {
                 u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].desc.wMaxPacketSize);
                 dev->video_mode.alt_max_pkt_size[i] = (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                cx231xx_info("Alternate setting %i, max size= %i\n", i,
-                             dev->video_mode.alt_max_pkt_size[i]);
+                dev_dbg(dev->dev,
+                        "Alternate setting %i, max size= %i\n", i,
+                        dev->video_mode.alt_max_pkt_size[i]);
         }
 
         /* VBI Init */
 
         idx = dev->current_pcb_config.hs_config_info[0].interface_info.vanc_index + 1;
         if (idx >= dev->max_iad_interface_count) {
-                cx231xx_errdev("VBI PCB interface #%d doesn't exist\n", idx);
+                dev_err(dev->dev,
+                        "VBI PCB interface #%d doesn't exist\n", idx);
                 return -ENODEV;
         }
         uif = udev->actconfig->interface[idx];
@@ -1325,16 +1326,15 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                         bEndpointAddress;
 
         dev->vbi_mode.num_alt = uif->num_altsetting;
-        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                     dev->vbi_mode.end_point_addr,
-                     dev->vbi_mode.num_alt);
+        dev_info(dev->dev,
+                 "VBI EndPoint Addr 0x%x, Alternate settings: %i\n",
+                 dev->vbi_mode.end_point_addr,
+                 dev->vbi_mode.num_alt);
 
         /* compute alternate max packet sizes for vbi */
         dev->vbi_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->vbi_mode.num_alt, GFP_KERNEL);
-        if (dev->vbi_mode.alt_max_pkt_size == NULL) {
-                cx231xx_errdev("out of memory!\n");
+        if (dev->vbi_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->vbi_mode.num_alt; i++) {
                 u16 tmp =
@@ -1342,8 +1342,9 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                                 desc.wMaxPacketSize);
                 dev->vbi_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                cx231xx_info("Alternate setting %i, max size= %i\n", i,
-                             dev->vbi_mode.alt_max_pkt_size[i]);
+                dev_dbg(dev->dev,
+                        "Alternate setting %i, max size= %i\n", i,
+                        dev->vbi_mode.alt_max_pkt_size[i]);
         }
 
         /* Sliced CC VBI init */
@@ -1351,7 +1352,8 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
         /* compute alternate max packet sizes for sliced CC */
         idx = dev->current_pcb_config.hs_config_info[0].interface_info.hanc_index + 1;
         if (idx >= dev->max_iad_interface_count) {
-                cx231xx_errdev("Sliced CC PCB interface #%d doesn't exist\n", idx);
+                dev_err(dev->dev,
+                        "Sliced CC PCB interface #%d doesn't exist\n", idx);
                 return -ENODEV;
         }
         uif = udev->actconfig->interface[idx];
@@ -1361,23 +1363,22 @@ static int cx231xx_init_v4l2(struct cx231xx *dev,
                         bEndpointAddress;
 
         dev->sliced_cc_mode.num_alt = uif->num_altsetting;
-        cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                     dev->sliced_cc_mode.end_point_addr,
-                     dev->sliced_cc_mode.num_alt);
+        dev_info(dev->dev,
+                 "sliced CC EndPoint Addr 0x%x, Alternate settings: %i\n",
+                 dev->sliced_cc_mode.end_point_addr,
+                 dev->sliced_cc_mode.num_alt);
         dev->sliced_cc_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->sliced_cc_mode.num_alt, GFP_KERNEL);
-
-        if (dev->sliced_cc_mode.alt_max_pkt_size == NULL) {
-                cx231xx_errdev("out of memory!\n");
+        if (dev->sliced_cc_mode.alt_max_pkt_size == NULL)
                 return -ENOMEM;
-        }
 
         for (i = 0; i < dev->sliced_cc_mode.num_alt; i++) {
                 u16 tmp = le16_to_cpu(uif->altsetting[i].endpoint[isoc_pipe].
                                 desc.wMaxPacketSize);
                 dev->sliced_cc_mode.alt_max_pkt_size[i] =
                     (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                cx231xx_info("Alternate setting %i, max size= %i\n", i,
-                             dev->sliced_cc_mode.alt_max_pkt_size[i]);
+                dev_dbg(dev->dev,
+                        "Alternate setting %i, max size= %i\n", i,
+                        dev->sliced_cc_mode.alt_max_pkt_size[i]);
         }
 
         return 0;
@@ -1391,6 +1392,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                              const struct usb_device_id *id)
 {
         struct usb_device *udev;
+        struct device *d = &interface->dev;
         struct usb_interface *uif;
         struct cx231xx *dev = NULL;
         int retval = -ENODEV;
@@ -1401,6 +1403,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         struct usb_interface_assoc_descriptor *assoc_desc;
 
         ifnum = interface->altsetting[0].desc.bInterfaceNumber;
+        udev = usb_get_dev(interface_to_usbdev(interface));
 
         /*
          * Interface number 0 - IR interface (handled by mceusb driver)
@@ -1414,18 +1417,16 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 nr = find_first_zero_bit(&cx231xx_devused, CX231XX_MAXBOARDS);
                 if (nr >= CX231XX_MAXBOARDS) {
                         /* No free device slots */
-                        cx231xx_err(DRIVER_NAME ": Supports only %i devices.\n",
-                                        CX231XX_MAXBOARDS);
+                        dev_err(d,
+                                "Supports only %i devices.\n",
+                                CX231XX_MAXBOARDS);
                         return -ENOMEM;
                 }
         } while (test_and_set_bit(nr, &cx231xx_devused));
 
-        udev = usb_get_dev(interface_to_usbdev(interface));
-
         /* allocate memory for our device state and initialize it */
         dev = devm_kzalloc(&udev->dev, sizeof(*dev), GFP_KERNEL);
         if (dev == NULL) {
-                cx231xx_err(DRIVER_NAME ": out of memory!\n");
                 clear_bit(nr, &cx231xx_devused);
                 return -ENOMEM;
         }
@@ -1434,6 +1435,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         dev->devno = nr;
         dev->model = id->driver_info;
         dev->video_mode.alt = -1;
+        dev->dev = d;
 
         dev->interface_count++;
         /* reset gpio dir and value */
@@ -1472,14 +1474,14 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 speed = "unknown";
         }
 
-        cx231xx_info("New device %s %s @ %s Mbps "
-             "(%04x:%04x) with %d interfaces\n",
-             udev->manufacturer ? udev->manufacturer : "",
-             udev->product ? udev->product : "",
-             speed,
-             le16_to_cpu(udev->descriptor.idVendor),
-             le16_to_cpu(udev->descriptor.idProduct),
-             dev->max_iad_interface_count);
+        dev_info(d,
+                 "New device %s %s @ %s Mbps (%04x:%04x) with %d interfaces\n",
+                 udev->manufacturer ? udev->manufacturer : "",
+                 udev->product ? udev->product : "",
+                 speed,
+                 le16_to_cpu(udev->descriptor.idVendor),
+                 le16_to_cpu(udev->descriptor.idProduct),
+                 dev->max_iad_interface_count);
 
         /* increment interface count */
         dev->interface_count++;
@@ -1489,13 +1491,12 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
 
         assoc_desc = udev->actconfig->intf_assoc[0];
         if (assoc_desc->bFirstInterface != ifnum) {
-                cx231xx_err(DRIVER_NAME ": Not found "
-                            "matching IAD interface\n");
+                dev_err(d, "Not found matching IAD interface\n");
                 retval = -ENODEV;
                 goto err_if;
         }
 
-        cx231xx_info("registering interface %d\n", ifnum);
+        dev_dbg(d, "registering interface %d\n", ifnum);
 
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, dev);
@@ -1503,7 +1504,7 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         /* Create v4l2 device */
         retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
         if (retval) {
-                cx231xx_errdev("v4l2_device_register failed\n");
+                dev_err(d, "v4l2_device_register failed\n");
                 goto err_v4l2;
         }
 
@@ -1520,7 +1521,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                 /* compute alternate max packet sizes for TS1 */
                 idx = dev->current_pcb_config.hs_config_info[0].interface_info.ts1_index + 1;
                 if (idx >= dev->max_iad_interface_count) {
-                        cx231xx_errdev("TS1 PCB interface #%d doesn't exist\n", idx);
+                        dev_err(d, "TS1 PCB interface #%d doesn't exist\n",
+                                idx);
                         retval = -ENODEV;
                         goto err_video_alt;
                 }
@@ -1531,13 +1533,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                                 desc.bEndpointAddress;
 
                 dev->ts1_mode.num_alt = uif->num_altsetting;
-                cx231xx_info("EndPoint Addr 0x%x, Alternate settings: %i\n",
-                             dev->ts1_mode.end_point_addr,
-                             dev->ts1_mode.num_alt);
+                dev_info(d,
+                         "TS EndPoint Addr 0x%x, Alternate settings: %i\n",
+                         dev->ts1_mode.end_point_addr,
+                         dev->ts1_mode.num_alt);
 
                 dev->ts1_mode.alt_max_pkt_size = devm_kmalloc_array(&udev->dev, 32, dev->ts1_mode.num_alt, GFP_KERNEL);
                 if (dev->ts1_mode.alt_max_pkt_size == NULL) {
-                        cx231xx_errdev("out of memory!\n");
                         retval = -ENOMEM;
                         goto err_video_alt;
                 }
@@ -1548,8 +1550,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
                                                 wMaxPacketSize);
                         dev->ts1_mode.alt_max_pkt_size[i] =
                             (tmp & 0x07ff) * (((tmp & 0x1800) >> 11) + 1);
-                        cx231xx_info("Alternate setting %i, max size= %i\n", i,
-                                     dev->ts1_mode.alt_max_pkt_size[i]);
+                        dev_dbg(d, "Alternate setting %i, max size= %i\n",
+                                i, dev->ts1_mode.alt_max_pkt_size[i]);
                 }
         }
 
@@ -1613,10 +1615,9 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)
         wake_up_interruptible_all(&dev->open);
 
         if (dev->users) {
-                cx231xx_warn
-                    ("device %s is open! Deregistration and memory "
-                     "deallocation are deferred on close.\n",
-                     video_device_node_name(dev->vdev));
+                dev_warn(dev->dev,
+                         "device %s is open! Deregistration and memory deallocation are deferred on close.\n",
+                         video_device_node_name(dev->vdev));
 
                 /* Even having users, it is safe to remove the RC i2c driver */
                 cx231xx_ir_exit(dev);
diff --git a/drivers/media/usb/cx231xx/cx231xx-core.c b/drivers/media/usb/cx231xx/cx231xx-core.c
index 180103e48036..4a3f28c4e8d3 100644
--- a/drivers/media/usb/cx231xx/cx231xx-core.c
+++ b/drivers/media/usb/cx231xx/cx231xx-core.c
@@ -20,16 +20,15 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
 #include <linux/vmalloc.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 
-#include "cx231xx.h"
 #include "cx231xx-reg.h"
 
 /* #define ENABLE_DEBUG_ISOC_FRAMES */
@@ -99,10 +98,10 @@ int cx231xx_register_extension(struct cx231xx_ops *ops)
 
         mutex_lock(&cx231xx_devlist_mutex);
         list_add_tail(&ops->next, &cx231xx_extension_devlist);
-        list_for_each_entry(dev, &cx231xx_devlist, devlist)
+        list_for_each_entry(dev, &cx231xx_devlist, devlist) {
                 ops->init(dev);
-
-        printk(KERN_INFO DRIVER_NAME ": %s initialized\n", ops->name);
+                dev_info(dev->dev, "%s initialized\n", ops->name);
+        }
         mutex_unlock(&cx231xx_devlist_mutex);
         return 0;
 }
@@ -113,11 +112,11 @@ void cx231xx_unregister_extension(struct cx231xx_ops *ops)
         struct cx231xx *dev = NULL;
 
         mutex_lock(&cx231xx_devlist_mutex);
-        list_for_each_entry(dev, &cx231xx_devlist, devlist)
+        list_for_each_entry(dev, &cx231xx_devlist, devlist) {
                 ops->fini(dev);
+                dev_info(dev->dev, "%s removed\n", ops->name);
+        }
 
-
-        printk(KERN_INFO DRIVER_NAME ": %s removed\n", ops->name);
         list_del(&ops->next);
         mutex_unlock(&cx231xx_devlist_mutex);
 }
@@ -227,10 +226,9 @@ int cx231xx_send_usb_command(struct cx231xx_i2c *i2c_bus,
 
         /* call common vendor command request */
         status = cx231xx_send_vendor_cmd(dev, &ven_req);
-        if (status < 0) {
-                cx231xx_info
-                    ("UsbInterface::sendCommand, failed with status -%d\n",
-                     status);
+        if (status < 0 && !dev->i2c_scan_running) {
+                dev_err(dev->dev, "%s: failed with status -%d\n",
+                        __func__, status);
         }
 
         return status;
@@ -524,9 +522,9 @@ int cx231xx_set_video_alternate(struct cx231xx *dev)
                     usb_set_interface(dev->udev, usb_interface_index,
                                       dev->video_mode.alt);
                 if (errCode < 0) {
-                        cx231xx_errdev
-                            ("cannot change alt number to %d (error=%i)\n",
-                             dev->video_mode.alt, errCode);
+                        dev_err(dev->dev,
+                                "cannot change alt number to %d (error=%i)\n",
+                                dev->video_mode.alt, errCode);
                         return errCode;
                 }
         }
@@ -600,9 +598,9 @@ int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt)
         }
 
         if (alt > 0 && max_pkt_size == 0) {
-                cx231xx_errdev
-                ("can't change interface %d alt no. to %d: Max. Pkt size = 0\n",
-                usb_interface_index, alt);
+                dev_err(dev->dev,
+                        "can't change interface %d alt no. to %d: Max. Pkt size = 0\n",
+                        usb_interface_index, alt);
                 /*To workaround error number=-71 on EP0 for videograbber,
                  need add following codes.*/
                 if (dev->board.no_alt_vanc)
@@ -616,9 +614,9 @@ int cx231xx_set_alt_setting(struct cx231xx *dev, u8 index, u8 alt)
         if (usb_interface_index > 0) {
                 status = usb_set_interface(dev->udev, usb_interface_index, alt);
                 if (status < 0) {
-                        cx231xx_errdev
-                        ("can't change interface %d alt no. to %d (err=%i)\n",
-                        usb_interface_index, alt, status);
+                        dev_err(dev->dev,
+                                "can't change interface %d alt no. to %d (err=%i)\n",
+                                usb_interface_index, alt, status);
                         return status;
                 }
         }
@@ -767,18 +765,17 @@ int cx231xx_ep5_bulkout(struct cx231xx *dev, u8 *firmware, u16 size)
         u32 *buffer;
 
         buffer = kzalloc(4096, GFP_KERNEL);
-        if (buffer == NULL) {
-                cx231xx_info("out of mem\n");
+        if (buffer == NULL)
                 return -ENOMEM;
-        }
         memcpy(&buffer[0], firmware, 4096);
 
         ret = usb_bulk_msg(dev->udev, usb_sndbulkpipe(dev->udev, 5),
                         buffer, 4096, &actlen, 2000);
 
         if (ret)
-                cx231xx_info("bulk message failed: %d (%d/%d)", ret,
-                                size, actlen);
+                dev_err(dev->dev,
+                        "bulk message failed: %d (%d/%d)", ret,
+                        size, actlen);
         else {
                 errCode = actlen != size ? -1 : 0;
         }
@@ -987,12 +984,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
         cx231xx_uninit_isoc(dev);
 
         dma_q->p_left_data = kzalloc(4096, GFP_KERNEL);
-        if (dma_q->p_left_data == NULL) {
-                cx231xx_info("out of mem\n");
+        if (dma_q->p_left_data == NULL)
                 return -ENOMEM;
-        }
-
-
 
         dev->video_mode.isoc_ctl.isoc_copy = isoc_copy;
         dev->video_mode.isoc_ctl.num_bufs = num_bufs;
@@ -1018,14 +1011,16 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
         dev->video_mode.isoc_ctl.urb =
             kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
         if (!dev->video_mode.isoc_ctl.urb) {
-                cx231xx_errdev("cannot alloc memory for usb buffers\n");
+                dev_err(dev->dev,
+                        "cannot alloc memory for usb buffers\n");
                 return -ENOMEM;
         }
 
         dev->video_mode.isoc_ctl.transfer_buffer =
             kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
         if (!dev->video_mode.isoc_ctl.transfer_buffer) {
-                cx231xx_errdev("cannot allocate memory for usbtransfer\n");
+                dev_err(dev->dev,
+                        "cannot allocate memory for usbtransfer\n");
                 kfree(dev->video_mode.isoc_ctl.urb);
                 return -ENOMEM;
         }
@@ -1045,7 +1040,8 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
         for (i = 0; i < dev->video_mode.isoc_ctl.num_bufs; i++) {
                 urb = usb_alloc_urb(max_packets, GFP_KERNEL);
                 if (!urb) {
-                        cx231xx_err("cannot alloc isoc_ctl.urb %i\n", i);
+                        dev_err(dev->dev,
+                                "cannot alloc isoc_ctl.urb %i\n", i);
                         cx231xx_uninit_isoc(dev);
                         return -ENOMEM;
                 }
@@ -1055,10 +1051,10 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
                     usb_alloc_coherent(dev->udev, sb_size, GFP_KERNEL,
                                        &urb->transfer_dma);
                 if (!dev->video_mode.isoc_ctl.transfer_buffer[i]) {
-                        cx231xx_err("unable to allocate %i bytes for transfer"
-                                    " buffer %i%s\n",
-                                    sb_size, i,
-                                    in_interrupt() ? " while in int" : "");
+                        dev_err(dev->dev,
+                                "unable to allocate %i bytes for transfer buffer %i%s\n",
+                                sb_size, i,
+                                in_interrupt() ? " while in int" : "");
                         cx231xx_uninit_isoc(dev);
                         return -ENOMEM;
                 }
@@ -1090,8 +1086,9 @@ int cx231xx_init_isoc(struct cx231xx *dev, int max_packets,
                 rc = usb_submit_urb(dev->video_mode.isoc_ctl.urb[i],
                                     GFP_ATOMIC);
                 if (rc) {
-                        cx231xx_err("submit of urb %i failed (error=%i)\n", i,
-                                    rc);
+                        dev_err(dev->dev,
+                                "submit of urb %i failed (error=%i)\n", i,
+                                rc);
                         cx231xx_uninit_isoc(dev);
                         return rc;
                 }
@@ -1151,14 +1148,16 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
         dev->video_mode.bulk_ctl.urb =
             kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
         if (!dev->video_mode.bulk_ctl.urb) {
-                cx231xx_errdev("cannot alloc memory for usb buffers\n");
+                dev_err(dev->dev,
+                        "cannot alloc memory for usb buffers\n");
                 return -ENOMEM;
         }
 
         dev->video_mode.bulk_ctl.transfer_buffer =
             kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
         if (!dev->video_mode.bulk_ctl.transfer_buffer) {
-                cx231xx_errdev("cannot allocate memory for usbtransfer\n");
+                dev_err(dev->dev,
+                        "cannot allocate memory for usbtransfer\n");
                 kfree(dev->video_mode.bulk_ctl.urb);
                 return -ENOMEM;
         }
@@ -1178,7 +1177,8 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
         for (i = 0; i < dev->video_mode.bulk_ctl.num_bufs; i++) {
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
-                        cx231xx_err("cannot alloc bulk_ctl.urb %i\n", i);
+                        dev_err(dev->dev,
+                                "cannot alloc bulk_ctl.urb %i\n", i);
                         cx231xx_uninit_bulk(dev);
                         return -ENOMEM;
                 }
@@ -1189,10 +1189,10 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
                     usb_alloc_coherent(dev->udev, sb_size, GFP_KERNEL,
                                      &urb->transfer_dma);
                 if (!dev->video_mode.bulk_ctl.transfer_buffer[i]) {
-                        cx231xx_err("unable to allocate %i bytes for transfer"
-                                    " buffer %i%s\n",
-                                    sb_size, i,
-                                    in_interrupt() ? " while in int" : "");
+                        dev_err(dev->dev,
+                                "unable to allocate %i bytes for transfer buffer %i%s\n",
+                                sb_size, i,
+                                in_interrupt() ? " while in int" : "");
                         cx231xx_uninit_bulk(dev);
                         return -ENOMEM;
                 }
@@ -1212,8 +1212,8 @@ int cx231xx_init_bulk(struct cx231xx *dev, int max_packets,
                 rc = usb_submit_urb(dev->video_mode.bulk_ctl.urb[i],
                                     GFP_ATOMIC);
                 if (rc) {
-                        cx231xx_err("submit of urb %i failed (error=%i)\n", i,
-                                    rc);
+                        dev_err(dev->dev,
+                                "submit of urb %i failed (error=%i)\n", i, rc);
                         cx231xx_uninit_bulk(dev);
                         return rc;
                 }
@@ -1300,6 +1300,15 @@ int cx231xx_dev_init(struct cx231xx *dev)
         cx231xx_i2c_register(&dev->i2c_bus[1]);
         cx231xx_i2c_register(&dev->i2c_bus[2]);
 
+        cx231xx_i2c_mux_register(dev, 0);
+        cx231xx_i2c_mux_register(dev, 1);
+
+        /* scan the real bus segments in the order of physical port numbers */
+        cx231xx_do_i2c_scan(dev, I2C_0);
+        cx231xx_do_i2c_scan(dev, I2C_1_MUX_1);
+        cx231xx_do_i2c_scan(dev, I2C_2);
+        cx231xx_do_i2c_scan(dev, I2C_1_MUX_3);
+
         /* init hardware */
         /* Note : with out calling set power mode function,
         afe can not be set up correctly */
@@ -1307,18 +1316,18 @@ int cx231xx_dev_init(struct cx231xx *dev)
                 errCode = cx231xx_set_power_mode(dev,
                                  POLARIS_AVMODE_ENXTERNAL_AV);
                 if (errCode < 0) {
-                        cx231xx_errdev
-                        ("%s: Failed to set Power - errCode [%d]!\n",
-                        __func__, errCode);
+                        dev_err(dev->dev,
+                                "%s: Failed to set Power - errCode [%d]!\n",
+                                __func__, errCode);
                         return errCode;
                 }
         } else {
                 errCode = cx231xx_set_power_mode(dev,
                                  POLARIS_AVMODE_ANALOGT_TV);
                 if (errCode < 0) {
-                        cx231xx_errdev
-                        ("%s: Failed to set Power - errCode [%d]!\n",
-                        __func__, errCode);
+                        dev_err(dev->dev,
+                                "%s: Failed to set Power - errCode [%d]!\n",
+                                __func__, errCode);
                         return errCode;
                 }
         }
@@ -1331,42 +1340,43 @@ int cx231xx_dev_init(struct cx231xx *dev)
         /* initialize Colibri block */
         errCode = cx231xx_afe_init_super_block(dev, 0x23c);
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("%s: cx231xx_afe init super block - errCode [%d]!\n",
-                     __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_afe init super block - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
         errCode = cx231xx_afe_init_channels(dev);
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("%s: cx231xx_afe init channels - errCode [%d]!\n",
-                     __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_afe init channels - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
 
         /* Set DIF in By pass mode */
         errCode = cx231xx_dif_set_standard(dev, DIF_USE_BASEBAND);
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("%s: cx231xx_dif set to By pass mode - errCode [%d]!\n",
-                     __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_dif set to By pass mode - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
 
         /* I2S block related functions */
         errCode = cx231xx_i2s_blk_initialize(dev);
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("%s: cx231xx_i2s block initialize - errCode [%d]!\n",
-                     __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_i2s block initialize - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
 
         /* init control pins */
         errCode = cx231xx_init_ctrl_pin_status(dev);
         if (errCode < 0) {
-                cx231xx_errdev("%s: cx231xx_init ctrl pins - errCode [%d]!\n",
-                               __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_init ctrl pins - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
 
@@ -1391,9 +1401,9 @@ int cx231xx_dev_init(struct cx231xx *dev)
                 break;
         }
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("%s: cx231xx_AGC mode to Analog - errCode [%d]!\n",
-                     __func__, errCode);
+                dev_err(dev->dev,
+                        "%s: cx231xx_AGC mode to Analog - errCode [%d]!\n",
+                        __func__, errCode);
                 return errCode;
         }
 
@@ -1404,9 +1414,7 @@ int cx231xx_dev_init(struct cx231xx *dev)
         if (dev->board.has_dvb)
                 cx231xx_set_alt_setting(dev, INDEX_TS1, 0);
 
-        /* set the I2C master port to 3 on channel 1 */
-        errCode = cx231xx_enable_i2c_port_3(dev, true);
-
+        errCode = 0;
         return errCode;
 }
 EXPORT_SYMBOL_GPL(cx231xx_dev_init);
@@ -1414,6 +1422,8 @@ EXPORT_SYMBOL_GPL(cx231xx_dev_init);
 void cx231xx_dev_uninit(struct cx231xx *dev)
 {
         /* Un Initialize I2C bus */
+        cx231xx_i2c_mux_unregister(dev, 1);
+        cx231xx_i2c_mux_unregister(dev, 0);
         cx231xx_i2c_unregister(&dev->i2c_bus[2]);
         cx231xx_i2c_unregister(&dev->i2c_bus[1]);
         cx231xx_i2c_unregister(&dev->i2c_bus[0]);
@@ -1468,9 +1478,8 @@ int cx231xx_send_gpio_cmd(struct cx231xx *dev, u32 gpio_bit, u8 *gpio_val,
         /* call common vendor command request */
         status = cx231xx_send_vendor_cmd(dev, &ven_req);
         if (status < 0) {
-                cx231xx_info
-                    ("UsbInterface::sendCommand, failed with status -%d\n",
-                     status);
+                dev_err(dev->dev, "%s: failed with status -%d\n",
+                        __func__, status);
         }
 
         return status;
diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 6c7b5e250eed..dd600b994e69 100644
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -19,11 +19,10 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/kernel.h>
 #include <linux/slab.h>
-#include <linux/usb.h>
 
-#include "cx231xx.h"
 #include <media/v4l2-common.h>
 #include <media/videobuf-vmalloc.h>
 
@@ -46,11 +45,6 @@ MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#define dprintk(level, fmt, arg...) do {                        \
-if (debug >= level)                                             \
-        printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg); \
-} while (0)
-
 #define CX231XX_DVB_NUM_BUFS 5
 #define CX231XX_DVB_MAX_PACKETSIZE 564
 #define CX231XX_DVB_MAX_PACKETS 64
@@ -197,9 +191,11 @@ static inline void print_err_status(struct cx231xx *dev, int packet, int status)
                 break;
         }
         if (packet < 0) {
-                dprintk(1, "URB status %d [%s].\n", status, errmsg);
+                dev_dbg(dev->dev,
+                        "URB status %d [%s].\n", status, errmsg);
         } else {
-                dprintk(1, "URB packet %d, status %d [%s].\n",
+                dev_dbg(dev->dev,
+                        "URB packet %d, status %d [%s].\n",
                         packet, status, errmsg);
         }
 }
@@ -265,12 +261,8 @@ static int start_streaming(struct cx231xx_dvb *dvb)
         struct cx231xx *dev = dvb->adapter.priv;
 
         if (dev->USE_ISO) {
-                cx231xx_info("DVB transfer mode is ISO.\n");
-                mutex_lock(&dev->i2c_lock);
-                cx231xx_enable_i2c_port_3(dev, false);
+                dev_dbg(dev->dev, "DVB transfer mode is ISO.\n");
                 cx231xx_set_alt_setting(dev, INDEX_TS1, 4);
-                cx231xx_enable_i2c_port_3(dev, true);
-                mutex_unlock(&dev->i2c_lock);
                 rc = cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
                 if (rc < 0)
                         return rc;
@@ -280,7 +272,7 @@ static int start_streaming(struct cx231xx_dvb *dvb)
                                         dev->ts1_mode.max_pkt_size,
                                         dvb_isoc_copy);
         } else {
-                cx231xx_info("DVB transfer mode is BULK.\n");
+                dev_dbg(dev->dev, "DVB transfer mode is BULK.\n");
                 cx231xx_set_alt_setting(dev, INDEX_TS1, 0);
                 rc = cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
                 if (rc < 0)
@@ -378,24 +370,24 @@ static int attach_xc5000(u8 addr, struct cx231xx *dev)
         struct xc5000_config cfg;
 
         memset(&cfg, 0, sizeof(cfg));
-        cfg.i2c_adap = &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap;
+        cfg.i2c_adap = cx231xx_get_i2c_adap(dev, dev->board.tuner_i2c_master);
         cfg.i2c_addr = addr;
 
         if (!dev->dvb->frontend) {
-                printk(KERN_ERR "%s/2: dvb frontend not attached. "
+                dev_err(dev->dev, "%s/2: dvb frontend not attached. "
                        "Can't attach xc5000\n", dev->name);
                 return -EINVAL;
         }
 
         fe = dvb_attach(xc5000_attach, dev->dvb->frontend, &cfg);
         if (!fe) {
-                printk(KERN_ERR "%s/2: xc5000 attach failed\n", dev->name);
+                dev_err(dev->dev, "%s/2: xc5000 attach failed\n", dev->name);
                 dvb_frontend_detach(dev->dvb->frontend);
                 dev->dvb->frontend = NULL;
                 return -EINVAL;
         }
 
-        printk(KERN_INFO "%s/2: xc5000 attached\n", dev->name);
+        dev_info(dev->dev, "%s/2: xc5000 attached\n", dev->name);
 
         return 0;
 }
@@ -434,16 +426,17 @@ int cx231xx_reset_analog_tuner(struct cx231xx *dev)
 
                 if (dops->init != NULL && !dev->xc_fw_load_done) {
 
-                        cx231xx_info("Reloading firmware for XC5000\n");
+                        dev_dbg(dev->dev,
+                                "Reloading firmware for XC5000\n");
                         status = dops->init(dev->dvb->frontend);
                         if (status == 0) {
                                 dev->xc_fw_load_done = 1;
-                                cx231xx_info
-                                    ("XC5000 firmware download completed\n");
+                                dev_dbg(dev->dev,
+                                        "XC5000 firmware download completed\n");
                         } else {
                                 dev->xc_fw_load_done = 0;
-                                cx231xx_info
-                                    ("XC5000 firmware download failed !!!\n");
+                                dev_dbg(dev->dev,
+                                        "XC5000 firmware download failed !!!\n");
                         }
                 }
 
@@ -466,7 +459,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
         result = dvb_register_adapter(&dvb->adapter, dev->name, module, device,
                                       adapter_nr);
         if (result < 0) {
-                printk(KERN_WARNING
+                dev_warn(dev->dev,
                        "%s: dvb_register_adapter failed (errno = %d)\n",
                        dev->name, result);
                 goto fail_adapter;
@@ -480,7 +473,7 @@ static int register_dvb(struct cx231xx_dvb *dvb,
         /* register frontend */
         result = dvb_register_frontend(&dvb->adapter, dvb->frontend);
         if (result < 0) {
-                printk(KERN_WARNING
+                dev_warn(dev->dev,
                        "%s: dvb_register_frontend failed (errno = %d)\n",
                        dev->name, result);
                 goto fail_frontend;
@@ -498,7 +491,8 @@ static int register_dvb(struct cx231xx_dvb *dvb,
 
         result = dvb_dmx_init(&dvb->demux);
         if (result < 0) {
-                printk(KERN_WARNING "%s: dvb_dmx_init failed (errno = %d)\n",
+                dev_warn(dev->dev,
+                         "%s: dvb_dmx_init failed (errno = %d)\n",
                        dev->name, result);
                 goto fail_dmx;
         }
@@ -508,15 +502,16 @@ static int register_dvb(struct cx231xx_dvb *dvb,
         dvb->dmxdev.capabilities = 0;
         result = dvb_dmxdev_init(&dvb->dmxdev, &dvb->adapter);
         if (result < 0) {
-                printk(KERN_WARNING "%s: dvb_dmxdev_init failed (errno = %d)\n",
-                       dev->name, result);
+                dev_warn(dev->dev,
+                         "%s: dvb_dmxdev_init failed (errno = %d)\n",
+                         dev->name, result);
                 goto fail_dmxdev;
         }
 
         dvb->fe_hw.source = DMX_FRONTEND_0;
         result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_hw);
         if (result < 0) {
-                printk(KERN_WARNING
+                dev_warn(dev->dev,
                        "%s: add_frontend failed (DMX_FRONTEND_0, errno = %d)\n",
                        dev->name, result);
                 goto fail_fe_hw;
@@ -525,17 +520,17 @@ static int register_dvb(struct cx231xx_dvb *dvb,
         dvb->fe_mem.source = DMX_MEMORY_FE;
         result = dvb->demux.dmx.add_frontend(&dvb->demux.dmx, &dvb->fe_mem);
         if (result < 0) {
-                printk(KERN_WARNING
-                       "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
-                       dev->name, result);
+                dev_warn(dev->dev,
+                         "%s: add_frontend failed (DMX_MEMORY_FE, errno = %d)\n",
+                         dev->name, result);
                 goto fail_fe_mem;
         }
 
         result = dvb->demux.dmx.connect_frontend(&dvb->demux.dmx, &dvb->fe_hw);
         if (result < 0) {
-                printk(KERN_WARNING
-                       "%s: connect_frontend failed (errno = %d)\n", dev->name,
-                       result);
+                dev_warn(dev->dev,
+                         "%s: connect_frontend failed (errno = %d)\n",
+                         dev->name, result);
                 goto fail_fe_conn;
         }
 
@@ -583,6 +578,8 @@ static int dvb_init(struct cx231xx *dev)
 {
         int result = 0;
         struct cx231xx_dvb *dvb;
+        struct i2c_adapter *tuner_i2c;
+        struct i2c_adapter *demod_i2c;
 
         if (!dev->board.has_dvb) {
                 /* This device does not support the extension */
@@ -592,13 +589,16 @@ static int dvb_init(struct cx231xx *dev)
         dvb = kzalloc(sizeof(struct cx231xx_dvb), GFP_KERNEL);
 
         if (dvb == NULL) {
-                printk(KERN_INFO "cx231xx_dvb: memory allocation failed\n");
+                dev_info(dev->dev,
+                         "cx231xx_dvb: memory allocation failed\n");
                 return -ENOMEM;
         }
         dev->dvb = dvb;
         dev->cx231xx_set_analog_freq = cx231xx_set_analog_freq;
         dev->cx231xx_reset_analog_tuner = cx231xx_reset_analog_tuner;
 
+        tuner_i2c = cx231xx_get_i2c_adap(dev, dev->board.tuner_i2c_master);
+        demod_i2c = cx231xx_get_i2c_adap(dev, dev->board.demod_i2c_master);
         mutex_lock(&dev->lock);
         cx231xx_set_mode(dev, CX231XX_DIGITAL_MODE);
         cx231xx_demod_reset(dev);
@@ -609,11 +609,11 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(s5h1432_attach,
                                         &dvico_s5h1432_config,
-                                        &dev->i2c_bus[dev->board.demod_i2c_master].i2c_adap);
+                                        demod_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach s5h1432 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach s5h1432 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -622,7 +622,7 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 if (!dvb_attach(xc5000_attach, dev->dvb->frontend,
-                               &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                               tuner_i2c,
                                &cnxt_rde250_tunerconfig)) {
                         result = -EINVAL;
                         goto out_free;
@@ -634,11 +634,11 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(s5h1411_attach,
                                                &xc5000_s5h1411_config,
-                                               &dev->i2c_bus[dev->board.demod_i2c_master].i2c_adap);
+                                               demod_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach s5h1411 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach s5h1411 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -647,7 +647,7 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 if (!dvb_attach(xc5000_attach, dev->dvb->frontend,
-                               &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                               tuner_i2c,
                                &cnxt_rdu250_tunerconfig)) {
                         result = -EINVAL;
                         goto out_free;
@@ -657,11 +657,11 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(s5h1432_attach,
                                         &dvico_s5h1432_config,
-                                        &dev->i2c_bus[dev->board.demod_i2c_master].i2c_adap);
+                                        demod_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach s5h1432 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach s5h1432 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -670,7 +670,7 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 if (!dvb_attach(tda18271_attach, dev->dvb->frontend,
-                               0x60, &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                               0x60, tuner_i2c,
                                &cnxt_rde253s_tunerconfig)) {
                         result = -EINVAL;
                         goto out_free;
@@ -681,11 +681,11 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(s5h1411_attach,
                                                &tda18271_s5h1411_config,
-                                               &dev->i2c_bus[dev->board.demod_i2c_master].i2c_adap);
+                                               demod_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach s5h1411 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach s5h1411 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -694,7 +694,7 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 if (!dvb_attach(tda18271_attach, dev->dvb->frontend,
-                               0x60, &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                               0x60, tuner_i2c,
                                &cnxt_rde253s_tunerconfig)) {
                         result = -EINVAL;
                         goto out_free;
@@ -702,16 +702,17 @@ static int dvb_init(struct cx231xx *dev)
                 break;
         case CX231XX_BOARD_HAUPPAUGE_EXETER:
 
-                printk(KERN_INFO "%s: looking for tuner / demod on i2c bus: %d\n",
-                       __func__, i2c_adapter_id(&dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap));
+                dev_info(dev->dev,
+                         "%s: looking for tuner / demod on i2c bus: %d\n",
+                       __func__, i2c_adapter_id(tuner_i2c));
 
                 dev->dvb->frontend = dvb_attach(lgdt3305_attach,
                                                 &hcw_lgdt3305_config,
-                                                &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap);
+                                                tuner_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach LG3305 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach LG3305 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -720,7 +721,7 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 dvb_attach(tda18271_attach, dev->dvb->frontend,
-                           0x60, &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                           0x60, tuner_i2c,
                            &hcw_tda18271_config);
                 break;
 
@@ -728,12 +729,12 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(si2165_attach,
                         &hauppauge_930C_HD_1113xx_si2165_config,
-                        &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap
+                        tuner_i2c
                         );
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach SI2165 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach SI2165 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -745,7 +746,7 @@ static int dvb_init(struct cx231xx *dev)
 
                 dvb_attach(tda18271_attach, dev->dvb->frontend,
                         0x60,
-                        &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                        tuner_i2c,
                         &hcw_tda18271_config);
 
                 dev->cx231xx_reset_analog_tuner = NULL;
@@ -761,12 +762,12 @@ static int dvb_init(struct cx231xx *dev)
 
                 dev->dvb->frontend = dvb_attach(si2165_attach,
                         &pctv_quatro_stick_1114xx_si2165_config,
-                        &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap
+                        tuner_i2c
                         );
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach SI2165 front end\n");
+                        dev_err(dev->dev,
+                                "Failed to attach SI2165 front end\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -786,7 +787,7 @@ static int dvb_init(struct cx231xx *dev)
                 request_module("si2157");
 
                 client = i2c_new_device(
-                        &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                        tuner_i2c,
                         &info);
                 if (client == NULL || client->dev.driver == NULL) {
                         dvb_frontend_detach(dev->dvb->frontend);
@@ -810,16 +811,17 @@ static int dvb_init(struct cx231xx *dev)
         case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
         case CX231XX_BOARD_KWORLD_UB430_USB_HYBRID:
 
-                printk(KERN_INFO "%s: looking for demod on i2c bus: %d\n",
-                       __func__, i2c_adapter_id(&dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap));
+                dev_info(dev->dev,
+                         "%s: looking for demod on i2c bus: %d\n",
+                         __func__, i2c_adapter_id(tuner_i2c));
 
                 dev->dvb->frontend = dvb_attach(mb86a20s_attach,
                                                 &pv_mb86a20s_config,
-                                                &dev->i2c_bus[dev->board.demod_i2c_master].i2c_adap);
+                                                demod_i2c);
 
                 if (dev->dvb->frontend == NULL) {
-                        printk(DRIVER_NAME
-                               ": Failed to attach mb86a20s demod\n");
+                        dev_err(dev->dev,
+                                "Failed to attach mb86a20s demod\n");
                         result = -EINVAL;
                         goto out_free;
                 }
@@ -828,30 +830,31 @@ static int dvb_init(struct cx231xx *dev)
                 dvb->frontend->callback = cx231xx_tuner_callback;
 
                 dvb_attach(tda18271_attach, dev->dvb->frontend,
-                           0x60, &dev->i2c_bus[dev->board.tuner_i2c_master].i2c_adap,
+                           0x60, tuner_i2c,
                            &pv_tda18271_config);
                 break;
 
         default:
-                printk(KERN_ERR "%s/2: The frontend of your DVB/ATSC card"
-                       " isn't supported yet\n", dev->name);
+                dev_err(dev->dev,
+                        "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",
+                        dev->name);
                 break;
         }
         if (NULL == dvb->frontend) {
-                printk(KERN_ERR
+                dev_err(dev->dev,
                        "%s/2: frontend initialization failed\n", dev->name);
                 result = -EINVAL;
                 goto out_free;
         }
 
         /* register everything */
-        result = register_dvb(dvb, THIS_MODULE, dev, &dev->udev->dev);
+        result = register_dvb(dvb, THIS_MODULE, dev, dev->dev);
 
         if (result < 0)
                 goto out_free;
 
 
-        printk(KERN_INFO "Successfully loaded cx231xx-dvb\n");
+        dev_info(dev->dev, "Successfully loaded cx231xx-dvb\n");
 
 ret:
         cx231xx_set_mode(dev, CX231XX_SUSPEND);
diff --git a/drivers/media/usb/cx231xx/cx231xx-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c
index 7c0f797f1057..a29c345b027d 100644
--- a/drivers/media/usb/cx231xx/cx231xx-i2c.c
+++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c
@@ -20,14 +20,14 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/usb.h>
 #include <linux/i2c.h>
+#include <linux/i2c-mux.h>
 #include <media/v4l2-common.h>
 #include <media/tuner.h>
 
-#include "cx231xx.h"
 
 /* ----------------------------------------------------------- */
 
@@ -54,10 +54,19 @@ do {							\
       }                                                 \
 } while (0)
 
+static inline int get_real_i2c_port(struct cx231xx *dev, int bus_nr)
+{
+        if (bus_nr == 1)
+                return dev->port_3_switch_enabled ? I2C_1_MUX_3 : I2C_1_MUX_1;
+        return bus_nr;
+}
+
 static inline bool is_tuner(struct cx231xx *dev, struct cx231xx_i2c *bus,
                         const struct i2c_msg *msg, int tuner_type)
 {
-        if (bus->nr != dev->board.tuner_i2c_master)
+        int i2c_port = get_real_i2c_port(dev, bus->nr);
+
+        if (i2c_port != dev->board.tuner_i2c_master)
                 return false;
 
         if (msg->addr != dev->board.tuner_addr)
@@ -340,14 +349,15 @@ static int cx231xx_i2c_check_for_device(struct i2c_adapter *i2c_adap,
         struct cx231xx *dev = bus->dev;
         struct cx231xx_i2c_xfer_data req_data;
         int status = 0;
+        u8 buf[1];
 
         /* prepare xfer_data struct */
         req_data.dev_addr = msg->addr;
-        req_data.direction = msg->flags;
+        req_data.direction = I2C_M_RD;
         req_data.saddr_len = 0;
         req_data.saddr_dat = 0;
-        req_data.buf_size = 0;
-        req_data.p_buffer = NULL;
+        req_data.buf_size = 1;
+        req_data.p_buffer = buf;
 
         /* usb send command */
         status = dev->cx231xx_send_usb_command(bus, &req_data);
@@ -455,17 +465,14 @@ static struct i2c_adapter cx231xx_adap_template = {
         .algo = &cx231xx_algo,
 };
 
-static struct i2c_client cx231xx_client_template = {
-        .name = "cx231xx internal",
-};
-
 /* ----------------------------------------------------------- */
 
 /*
  * i2c_devs
  * incomplete list of known devices
  */
-static char *i2c_devs[128] = {
+static const char *i2c_devs[128] = {
+        [0x20 >> 1] = "demod",
         [0x60 >> 1] = "colibri",
         [0x88 >> 1] = "hammerhead",
         [0x8e >> 1] = "CIR",
@@ -480,22 +487,34 @@ static char *i2c_devs[128] = {
  * cx231xx_do_i2c_scan()
  * check i2c address range for devices
  */
-void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c)
+void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port)
 {
         unsigned char buf;
         int i, rc;
+        struct i2c_client client;
+
+        if (!i2c_scan)
+                return;
+
+        /* Don't generate I2C errors during scan */
+        dev->i2c_scan_running = true;
+
+        memset(&client, 0, sizeof(client));
+        client.adapter = cx231xx_get_i2c_adap(dev, i2c_port);
 
-        cx231xx_info(": Checking for I2C devices ..\n");
         for (i = 0; i < 128; i++) {
-                c->addr = i;
-                rc = i2c_master_recv(c, &buf, 0);
+                client.addr = i;
+                rc = i2c_master_recv(&client, &buf, 0);
                 if (rc < 0)
                         continue;
-                cx231xx_info("%s: i2c scan: found device @ 0x%x  [%s]\n",
-                             dev->name, i << 1,
-                             i2c_devs[i] ? i2c_devs[i] : "???");
+                dev_info(dev->dev,
+                         "i2c scan: found device @ port %d addr 0x%x  [%s]\n",
+                         i2c_port,
+                         i << 1,
+                         i2c_devs[i] ? i2c_devs[i] : "???");
         }
-        cx231xx_info(": Completed Checking for I2C devices.\n");
+
+        dev->i2c_scan_running = false;
 }
 
 /*
@@ -509,23 +528,17 @@ int cx231xx_i2c_register(struct cx231xx_i2c *bus)
         BUG_ON(!dev->cx231xx_send_usb_command);
 
         bus->i2c_adap = cx231xx_adap_template;
-        bus->i2c_client = cx231xx_client_template;
-        bus->i2c_adap.dev.parent = &dev->udev->dev;
+        bus->i2c_adap.dev.parent = dev->dev;
 
-        strlcpy(bus->i2c_adap.name, bus->dev->name, sizeof(bus->i2c_adap.name));
+        snprintf(bus->i2c_adap.name, sizeof(bus->i2c_adap.name), "%s-%d", bus->dev->name, bus->nr);
 
         bus->i2c_adap.algo_data = bus;
         i2c_set_adapdata(&bus->i2c_adap, &dev->v4l2_dev);
         i2c_add_adapter(&bus->i2c_adap);
 
-        bus->i2c_client.adapter = &bus->i2c_adap;
-
-        if (0 == bus->i2c_rc) {
-                if (i2c_scan)
-                        cx231xx_do_i2c_scan(dev, &bus->i2c_client);
-        } else
-                cx231xx_warn("%s: i2c bus %d register FAILED\n",
-                             dev->name, bus->nr);
+        if (0 != bus->i2c_rc)
+                dev_warn(dev->dev,
+                         "i2c bus %d register FAILED\n", bus->nr);
 
         return bus->i2c_rc;
 }
@@ -539,3 +552,62 @@ int cx231xx_i2c_unregister(struct cx231xx_i2c *bus)
         i2c_del_adapter(&bus->i2c_adap);
         return 0;
 }
+
+/*
+ * cx231xx_i2c_mux_select()
+ * switch i2c master number 1 between port1 and port3
+ */
+static int cx231xx_i2c_mux_select(struct i2c_adapter *adap,
+                        void *mux_priv, u32 chan_id)
+{
+        struct cx231xx *dev = mux_priv;
+
+        return cx231xx_enable_i2c_port_3(dev, chan_id);
+}
+
+int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no)
+{
+        struct i2c_adapter *i2c_parent = &dev->i2c_bus[1].i2c_adap;
+        /* what is the correct mux_dev? */
+        struct device *mux_dev = dev->dev;
+
+        dev->i2c_mux_adap[mux_no] = i2c_add_mux_adapter(i2c_parent,
+                                mux_dev,
+                                dev /* mux_priv */,
+                                0,
+                                mux_no /* chan_id */,
+                                0 /* class */,
+                                &cx231xx_i2c_mux_select,
+                                NULL);
+
+        if (!dev->i2c_mux_adap[mux_no])
+                dev_warn(dev->dev,
+                         "i2c mux %d register FAILED\n", mux_no);
+
+        return 0;
+}
+
+void cx231xx_i2c_mux_unregister(struct cx231xx *dev, int mux_no)
+{
+        i2c_del_mux_adapter(dev->i2c_mux_adap[mux_no]);
+        dev->i2c_mux_adap[mux_no] = NULL;
+}
+
+struct i2c_adapter *cx231xx_get_i2c_adap(struct cx231xx *dev, int i2c_port)
+{
+        switch (i2c_port) {
+        case I2C_0:
+                return &dev->i2c_bus[0].i2c_adap;
+        case I2C_1:
+                return &dev->i2c_bus[1].i2c_adap;
+        case I2C_2:
+                return &dev->i2c_bus[2].i2c_adap;
+        case I2C_1_MUX_1:
+                return dev->i2c_mux_adap[0];
+        case I2C_1_MUX_3:
+                return dev->i2c_mux_adap[1];
+        default:
+                return NULL;
+        }
+}
+EXPORT_SYMBOL_GPL(cx231xx_get_i2c_adap);
diff --git a/drivers/media/usb/cx231xx/cx231xx-input.c b/drivers/media/usb/cx231xx/cx231xx-input.c
index 05f0434919d4..15d8d1b5f05c 100644
--- a/drivers/media/usb/cx231xx/cx231xx-input.c
+++ b/drivers/media/usb/cx231xx/cx231xx-input.c
@@ -19,7 +19,6 @@
  */
 
 #include "cx231xx.h"
-#include <linux/usb.h>
 #include <linux/slab.h>
 #include <linux/bitrev.h>
 
@@ -63,7 +62,7 @@ int cx231xx_ir_init(struct cx231xx *dev)
         struct i2c_board_info info;
         u8 ir_i2c_bus;
 
-        dev_dbg(&dev->udev->dev, "%s\n", __func__);
+        dev_dbg(dev->dev, "%s\n", __func__);
 
         /* Only initialize if a rc keycode map is defined */
         if (!cx231xx_boards[dev->model].rc_map_name)
@@ -98,9 +97,10 @@ int cx231xx_ir_init(struct cx231xx *dev)
 
         /* Load and bind ir-kbd-i2c */
         ir_i2c_bus = cx231xx_boards[dev->model].ir_i2c_master;
-        dev_dbg(&dev->udev->dev, "Trying to bind ir at bus %d, addr 0x%02x\n",
+        dev_dbg(dev->dev, "Trying to bind ir at bus %d, addr 0x%02x\n",
                 ir_i2c_bus, info.addr);
-        dev->ir_i2c_client = i2c_new_device(&dev->i2c_bus[ir_i2c_bus].i2c_adap, &info);
+        dev->ir_i2c_client = i2c_new_device(
+                cx231xx_get_i2c_adap(dev, ir_i2c_bus), &info);
 
         return 0;
 }
diff --git a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
index 3052c4c20229..5bc74149fcb9 100644
--- a/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
+++ b/drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c
@@ -703,9 +703,9 @@ int initialize_cx231xx(struct cx231xx *dev)
                         _current_scenario_idx = INDEX_BUSPOWER_DIF_ONLY;
                         break;
                 default:
-                        cx231xx_info("bad config in buspower!!!!\n");
-                        cx231xx_info("config_info=%x\n",
-                                     (config_info & BUSPOWER_MASK));
+                        dev_err(dev->dev,
+                                "bad config in buspower!!!!\nconfig_info=%x\n",
+                                config_info & BUSPOWER_MASK);
                         return 1;
                 }
         } else {                /* self-power */
@@ -768,9 +768,9 @@ int initialize_cx231xx(struct cx231xx *dev)
                         _current_scenario_idx = INDEX_SELFPOWER_COMPRESSOR;
                         break;
                 default:
-                        cx231xx_info("bad senario!!!!!\n");
-                        cx231xx_info("config_info=%x\n",
-                                     (config_info & SELFPOWER_MASK));
+                        dev_err(dev->dev,
+                                "bad senario!!!!!\nconfig_info=%x\n",
+                                config_info & SELFPOWER_MASK);
                         return -ENODEV;
                 }
         }
@@ -781,18 +781,29 @@ int initialize_cx231xx(struct cx231xx *dev)
                    sizeof(struct pcb_config));
 
         if (pcb_debug) {
-                cx231xx_info("SC(0x00) register = 0x%x\n", config_info);
-                cx231xx_info("scenario %d\n",
-                            (dev->current_pcb_config.index) + 1);
-                cx231xx_info("type=%x\n", dev->current_pcb_config.type);
-                cx231xx_info("mode=%x\n", dev->current_pcb_config.mode);
-                cx231xx_info("speed=%x\n", dev->current_pcb_config.speed);
-                cx231xx_info("ts1_source=%x\n",
-                             dev->current_pcb_config.ts1_source);
-                cx231xx_info("ts2_source=%x\n",
-                             dev->current_pcb_config.ts2_source);
-                cx231xx_info("analog_source=%x\n",
-                             dev->current_pcb_config.analog_source);
+                dev_info(dev->dev,
+                         "SC(0x00) register = 0x%x\n", config_info);
+                dev_info(dev->dev,
+                         "scenario %d\n",
+                         (dev->current_pcb_config.index) + 1);
+                dev_info(dev->dev,
+                        "type=%x\n",
+                         dev->current_pcb_config.type);
+                dev_info(dev->dev,
+                         "mode=%x\n",
+                         dev->current_pcb_config.mode);
+                dev_info(dev->dev,
+                         "speed=%x\n",
+                         dev->current_pcb_config.speed);
+                dev_info(dev->dev,
+                         "ts1_source=%x\n",
+                         dev->current_pcb_config.ts1_source);
+                dev_info(dev->dev,
+                         "ts2_source=%x\n",
+                         dev->current_pcb_config.ts2_source);
+                dev_info(dev->dev,
+                         "analog_source=%x\n",
+                         dev->current_pcb_config.analog_source);
         }
 
         return 0;
diff --git a/drivers/media/usb/cx231xx/cx231xx-vbi.c b/drivers/media/usb/cx231xx/cx231xx-vbi.c
index c02794274f51..80261ac40208 100644
--- a/drivers/media/usb/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/usb/cx231xx/cx231xx-vbi.c
@@ -19,12 +19,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/bitmap.h>
-#include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
@@ -35,7 +35,6 @@
 #include <media/msp3400.h>
 #include <media/tuner.h>
 
-#include "cx231xx.h"
 #include "cx231xx-vbi.h"
 
 static inline void print_err_status(struct cx231xx *dev, int packet, int status)
@@ -69,11 +68,12 @@ static inline void print_err_status(struct cx231xx *dev, int packet, int status)
                 break;
         }
         if (packet < 0) {
-                cx231xx_err("URB status %d [%s].\n", status,
-                            errmsg);
+                dev_err(dev->dev,
+                        "URB status %d [%s].\n", status, errmsg);
         } else {
-                cx231xx_err("URB packet %d, status %d [%s].\n",
-                            packet, status, errmsg);
+                dev_err(dev->dev,
+                        "URB packet %d, status %d [%s].\n",
+                        packet, status, errmsg);
         }
 }
 
@@ -316,8 +316,8 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
         case -ESHUTDOWN:
                 return;
         default:                /* error */
-                cx231xx_err("urb completition error %d.\n",
-                            urb->status);
+                dev_err(dev->dev,
+                        "urb completition error %d.\n", urb->status);
                 break;
         }
 
@@ -331,8 +331,8 @@ static void cx231xx_irq_vbi_callback(struct urb *urb)
 
         urb->status = usb_submit_urb(urb, GFP_ATOMIC);
         if (urb->status) {
-                cx231xx_err("urb resubmit failed (error=%i)\n",
-                            urb->status);
+                dev_err(dev->dev, "urb resubmit failed (error=%i)\n",
+                        urb->status);
         }
 }
 
@@ -344,7 +344,7 @@ void cx231xx_uninit_vbi_isoc(struct cx231xx *dev)
         struct urb *urb;
         int i;
 
-        cx231xx_info("called cx231xx_uninit_vbi_isoc\n");
+        dev_dbg(dev->dev, "called cx231xx_uninit_vbi_isoc\n");
 
         dev->vbi_mode.bulk_ctl.nfields = -1;
         for (i = 0; i < dev->vbi_mode.bulk_ctl.num_bufs; i++) {
@@ -393,7 +393,7 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
         struct urb *urb;
         int rc;
 
-        cx231xx_info("called cx231xx_vbi_isoc\n");
+        dev_dbg(dev->dev, "called cx231xx_vbi_isoc\n");
 
         /* De-allocates all pending stuff */
         cx231xx_uninit_vbi_isoc(dev);
@@ -419,14 +419,16 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
         dev->vbi_mode.bulk_ctl.urb = kzalloc(sizeof(void *) * num_bufs,
                                              GFP_KERNEL);
         if (!dev->vbi_mode.bulk_ctl.urb) {
-                cx231xx_errdev("cannot alloc memory for usb buffers\n");
+                dev_err(dev->dev,
+                        "cannot alloc memory for usb buffers\n");
                 return -ENOMEM;
         }
 
         dev->vbi_mode.bulk_ctl.transfer_buffer =
             kzalloc(sizeof(void *) * num_bufs, GFP_KERNEL);
         if (!dev->vbi_mode.bulk_ctl.transfer_buffer) {
-                cx231xx_errdev("cannot allocate memory for usbtransfer\n");
+                dev_err(dev->dev,
+                        "cannot allocate memory for usbtransfer\n");
                 kfree(dev->vbi_mode.bulk_ctl.urb);
                 return -ENOMEM;
         }
@@ -441,7 +443,8 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
 
                 urb = usb_alloc_urb(0, GFP_KERNEL);
                 if (!urb) {
-                        cx231xx_err("cannot alloc bulk_ctl.urb %i\n", i);
+                        dev_err(dev->dev,
+                                "cannot alloc bulk_ctl.urb %i\n", i);
                         cx231xx_uninit_vbi_isoc(dev);
                         return -ENOMEM;
                 }
@@ -451,9 +454,10 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
                 dev->vbi_mode.bulk_ctl.transfer_buffer[i] =
                     kzalloc(sb_size, GFP_KERNEL);
                 if (!dev->vbi_mode.bulk_ctl.transfer_buffer[i]) {
-                        cx231xx_err("unable to allocate %i bytes for transfer"
-                                    " buffer %i%s\n", sb_size, i,
-                                    in_interrupt() ? " while in int" : "");
+                        dev_err(dev->dev,
+                                "unable to allocate %i bytes for transfer buffer %i%s\n",
+                                sb_size, i,
+                                in_interrupt() ? " while in int" : "");
                         cx231xx_uninit_vbi_isoc(dev);
                         return -ENOMEM;
                 }
@@ -470,8 +474,8 @@ int cx231xx_init_vbi_isoc(struct cx231xx *dev, int max_packets,
         for (i = 0; i < dev->vbi_mode.bulk_ctl.num_bufs; i++) {
                 rc = usb_submit_urb(dev->vbi_mode.bulk_ctl.urb[i], GFP_ATOMIC);
                 if (rc) {
-                        cx231xx_err("submit of urb %i failed (error=%i)\n", i,
-                                    rc);
+                        dev_err(dev->dev,
+                                "submit of urb %i failed (error=%i)\n", i, rc);
                         cx231xx_uninit_vbi_isoc(dev);
                         return rc;
                 }
@@ -522,7 +526,7 @@ static inline void vbi_buffer_filled(struct cx231xx *dev,
                                      struct cx231xx_buffer *buf)
 {
         /* Advice that buffer was filled */
-        /* cx231xx_info("[%p/%d] wakeup\n", buf, buf->vb.i); */
+        /* dev_dbg(dev->dev, "[%p/%d] wakeup\n", buf, buf->vb.i); */
 
         buf->vb.state = VIDEOBUF_DONE;
         buf->vb.field_count++;
@@ -614,7 +618,7 @@ static inline void get_next_vbi_buf(struct cx231xx_dmaqueue *dma_q,
         char *outp;
 
         if (list_empty(&dma_q->active)) {
-                cx231xx_err("No active queue to serve\n");
+                dev_err(dev->dev, "No active queue to serve\n");
                 dev->vbi_mode.bulk_ctl.buf = NULL;
                 *buf = NULL;
                 return;
diff --git a/drivers/media/usb/cx231xx/cx231xx-video.c b/drivers/media/usb/cx231xx/cx231xx-video.c
index 3b3ada6562ca..53ca12c1ff69 100644
--- a/drivers/media/usb/cx231xx/cx231xx-video.c
+++ b/drivers/media/usb/cx231xx/cx231xx-video.c
@@ -22,12 +22,12 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "cx231xx.h"
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/bitmap.h>
-#include <linux/usb.h>
 #include <linux/i2c.h>
 #include <linux/mm.h>
 #include <linux/mutex.h>
@@ -41,10 +41,9 @@
 
 #include "dvb_frontend.h"
 
-#include "cx231xx.h"
 #include "cx231xx-vbi.h"
 
-#define CX231XX_VERSION "0.0.2"
+#define CX231XX_VERSION "0.0.3"
 
 #define DRIVER_AUTHOR   "Srinivasa Deevi <srinivasa.deevi@conexant.com>"
 #define DRIVER_DESC     "Conexant cx231xx based USB video device driver"
@@ -737,8 +736,9 @@ buffer_prepare(struct videobuf_queue *vq, struct videobuf_buffer *vb,
                 if (!dev->video_mode.bulk_ctl.num_bufs)
                         urb_init = 1;
         }
-        /*cx231xx_info("urb_init=%d dev->video_mode.max_pkt_size=%d\n",
-                urb_init, dev->video_mode.max_pkt_size);*/
+        dev_dbg(dev->dev,
+                "urb_init=%d dev->video_mode.max_pkt_size=%d\n",
+                urb_init, dev->video_mode.max_pkt_size);
         if (urb_init) {
                 dev->mode_tv = 0;
                 if (dev->USE_ISO)
@@ -809,7 +809,7 @@ void video_mux(struct cx231xx *dev, int index)
 
         cx231xx_set_audio_input(dev, dev->ctl_ainput);
 
-        cx231xx_info("video_mux : %d\n", index);
+        dev_dbg(dev->dev, "video_mux : %d\n", index);
 
         /* do mode control overrides if required */
         cx231xx_do_mode_ctrl_overrides(dev);
@@ -861,7 +861,7 @@ static void res_free(struct cx231xx_fh *fh)
 static int check_dev(struct cx231xx *dev)
 {
         if (dev->state & DEV_DISCONNECTED) {
-                cx231xx_errdev("v4l2 ioctl: device not present\n");
+                dev_err(dev->dev, "v4l2 ioctl: device not present\n");
                 return -ENODEV;
         }
         return 0;
@@ -953,12 +953,13 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                 return -EINVAL;
 
         if (videobuf_queue_is_busy(&fh->vb_vidq)) {
-                cx231xx_errdev("%s queue busy\n", __func__);
+                dev_err(dev->dev, "%s: queue busy\n", __func__);
                 return -EBUSY;
         }
 
         if (dev->stream_on && !fh->stream_on) {
-                cx231xx_errdev("%s device in use by another fh\n", __func__);
+                dev_err(dev->dev,
+                        "%s: device in use by another fh\n", __func__);
                 return -EBUSY;
         }
 
@@ -967,7 +968,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
         dev->height = f->fmt.pix.height;
         dev->format = fmt;
 
-        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, V4L2_MBUS_FMT_FIXED);
+        v4l2_fill_mbus_format(&mbus_fmt, &f->fmt.pix, MEDIA_BUS_FMT_FIXED);
         call_all(dev, video, s_mbus_fmt, &mbus_fmt);
         v4l2_fill_pix_format(&f->fmt.pix, &mbus_fmt);
 
@@ -1012,7 +1013,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)
            resolution (since a standard change effects things like the number
            of lines in VACT, etc) */
         memset(&mbus_fmt, 0, sizeof(mbus_fmt));
-        mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+        mbus_fmt.code = MEDIA_BUS_FMT_FIXED;
         mbus_fmt.width = dev->width;
         mbus_fmt.height = dev->height;
         call_all(dev, video, s_mbus_fmt, &mbus_fmt);
@@ -1176,9 +1177,9 @@ int cx231xx_s_frequency(struct file *file, void *priv,
         int rc;
         u32 if_frequency = 5400000;
 
-        cx231xx_info("Enter vidioc_s_frequency()f->frequency=%d;f->type=%d\n",
-                 f->frequency, f->type);
-        /*cx231xx_info("f->type:  1-radio 2-analogTV 3-digitalTV\n");*/
+        dev_dbg(dev->dev,
+                "Enter vidioc_s_frequency()f->frequency=%d;f->type=%d\n",
+                f->frequency, f->type);
 
         rc = check_dev(dev);
         if (rc < 0)
@@ -1213,13 +1214,14 @@ int cx231xx_s_frequency(struct file *file, void *priv,
                 else if (dev->norm & V4L2_STD_SECAM_LC)
                         if_frequency = 1250000;  /*1.25MHz      */
 
-                cx231xx_info("if_frequency is set to %d\n", if_frequency);
+                dev_dbg(dev->dev,
+                        "if_frequency is set to %d\n", if_frequency);
                 cx231xx_set_Colibri_For_LowIF(dev, if_frequency, 1, 1);
 
                 update_HH_register_after_set_DIF(dev);
         }
 
-        cx231xx_info("Set New FREQUENCY to %d\n", f->frequency);
+        dev_dbg(dev->dev, "Set New FREQUENCY to %d\n", f->frequency);
 
         return rc;
 }
@@ -1523,7 +1525,8 @@ static int vidioc_s_fmt_vbi_cap(struct file *file, void *priv,
         struct cx231xx *dev = fh->dev;
 
         if (dev->vbi_stream_on && !fh->stream_on) {
-                cx231xx_errdev("%s device in use by another fh\n", __func__);
+                dev_err(dev->dev,
+                        "%s device in use by another fh\n", __func__);
                 return -EBUSY;
         }
         return vidioc_try_fmt_vbi_cap(file, priv, f);
@@ -1642,17 +1645,15 @@ static int cx231xx_v4l2_open(struct file *filp)
 #if 0
         errCode = cx231xx_set_mode(dev, CX231XX_ANALOG_MODE);
         if (errCode < 0) {
-                cx231xx_errdev
-                    ("Device locked on digital mode. Can't open analog\n");
+                dev_err(dev->dev,
+                        "Device locked on digital mode. Can't open analog\n");
                 return -EBUSY;
         }
 #endif
 
         fh = kzalloc(sizeof(struct cx231xx_fh), GFP_KERNEL);
-        if (!fh) {
-                cx231xx_errdev("cx231xx-video.c: Out of memory?!\n");
+        if (!fh)
                 return -ENOMEM;
-        }
         if (mutex_lock_interruptible(&dev->lock)) {
                 kfree(fh);
                 return -ERESTARTSYS;
@@ -1736,8 +1737,8 @@ void cx231xx_release_analog_resources(struct cx231xx *dev)
                 dev->radio_dev = NULL;
         }
         if (dev->vbi_dev) {
-                cx231xx_info("V4L2 device %s deregistered\n",
-                             video_device_node_name(dev->vbi_dev));
+                dev_info(dev->dev, "V4L2 device %s deregistered\n",
+                        video_device_node_name(dev->vbi_dev));
                 if (video_is_registered(dev->vbi_dev))
                         video_unregister_device(dev->vbi_dev);
                 else
@@ -1745,8 +1746,8 @@ void cx231xx_release_analog_resources(struct cx231xx *dev)
                 dev->vbi_dev = NULL;
         }
         if (dev->vdev) {
-                cx231xx_info("V4L2 device %s deregistered\n",
-                             video_device_node_name(dev->vdev));
+                dev_info(dev->dev, "V4L2 device %s deregistered\n",
+                        video_device_node_name(dev->vdev));
 
                 if (dev->board.has_417)
                         cx231xx_417_unregister(dev);
@@ -2080,8 +2081,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
 {
         int ret;
 
-        cx231xx_info("%s: v4l2 driver version %s\n",
-                     dev->name, CX231XX_VERSION);
+        dev_info(dev->dev, "v4l2 driver version %s\n", CX231XX_VERSION);
 
         /* set default norm */
         dev->norm = V4L2_STD_PAL;
@@ -2119,7 +2119,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
         /* allocate and fill video video_device struct */
         dev->vdev = cx231xx_vdev_init(dev, &cx231xx_video_template, "video");
         if (!dev->vdev) {
-                cx231xx_errdev("cannot allocate video_device.\n");
+                dev_err(dev->dev, "cannot allocate video_device.\n");
                 return -ENODEV;
         }
 
@@ -2128,13 +2128,14 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
         ret = video_register_device(dev->vdev, VFL_TYPE_GRABBER,
                                     video_nr[dev->devno]);
         if (ret) {
-                cx231xx_errdev("unable to register video device (error=%i).\n",
-                               ret);
+                dev_err(dev->dev,
+                        "unable to register video device (error=%i).\n",
+                        ret);
                 return ret;
         }
 
-        cx231xx_info("%s/0: registered device %s [v4l2]\n",
-                     dev->name, video_device_node_name(dev->vdev));
+        dev_info(dev->dev, "Registered video device %s [v4l2]\n",
+                video_device_node_name(dev->vdev));
 
         /* Initialize VBI template */
         cx231xx_vbi_template = cx231xx_video_template;
@@ -2144,7 +2145,7 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
         dev->vbi_dev = cx231xx_vdev_init(dev, &cx231xx_vbi_template, "vbi");
 
         if (!dev->vbi_dev) {
-                cx231xx_errdev("cannot allocate video_device.\n");
+                dev_err(dev->dev, "cannot allocate video_device.\n");
                 return -ENODEV;
         }
         dev->vbi_dev->ctrl_handler = &dev->ctrl_handler;
@@ -2152,34 +2153,32 @@ int cx231xx_register_analog_devices(struct cx231xx *dev)
         ret = video_register_device(dev->vbi_dev, VFL_TYPE_VBI,
                                     vbi_nr[dev->devno]);
         if (ret < 0) {
-                cx231xx_errdev("unable to register vbi device\n");
+                dev_err(dev->dev, "unable to register vbi device\n");
                 return ret;
         }
 
-        cx231xx_info("%s/0: registered device %s\n",
-                     dev->name, video_device_node_name(dev->vbi_dev));
+        dev_info(dev->dev, "Registered VBI device %s\n",
+                video_device_node_name(dev->vbi_dev));
 
         if (cx231xx_boards[dev->model].radio.type == CX231XX_RADIO) {
                 dev->radio_dev = cx231xx_vdev_init(dev, &cx231xx_radio_template,
                                                    "radio");
                 if (!dev->radio_dev) {
-                        cx231xx_errdev("cannot allocate video_device.\n");
+                        dev_err(dev->dev,
+                                "cannot allocate video_device.\n");
                         return -ENODEV;
                 }
                 dev->radio_dev->ctrl_handler = &dev->radio_ctrl_handler;
                 ret = video_register_device(dev->radio_dev, VFL_TYPE_RADIO,
                                             radio_nr[dev->devno]);
                 if (ret < 0) {
-                        cx231xx_errdev("can't register radio device\n");
+                        dev_err(dev->dev,
+                                "can't register radio device\n");
                         return ret;
                 }
-                cx231xx_info("Registered radio device as %s\n",
-                             video_device_node_name(dev->radio_dev));
+                dev_info(dev->dev, "Registered radio device as %s\n",
+                        video_device_node_name(dev->radio_dev));
         }
 
-        cx231xx_info("V4L2 device registered as %s and %s\n",
-                     video_device_node_name(dev->vdev),
-                     video_device_node_name(dev->vbi_dev));
-
         return 0;
 }
diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index aeb1bf42b88d..f9e262eb0db9 100644
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -28,6 +28,7 @@
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <linux/mutex.h>
+#include <linux/usb.h>
 
 #include <media/cx2341x.h>
 
@@ -322,10 +323,11 @@ enum cx231xx_decoder {
 };
 
 enum CX231XX_I2C_MASTER_PORT {
-        I2C_0 = 0,
-        I2C_1 = 1,
-        I2C_2 = 2,
-        I2C_3 = 3
+        I2C_0 = 0,       /* master 0 - internal connection */
+        I2C_1 = 1,       /* master 1 - used with mux */
+        I2C_2 = 2,       /* master 2 */
+        I2C_1_MUX_1 = 3, /* master 1 - port 1 (I2C_DEMOD_EN = 0) */
+        I2C_1_MUX_3 = 4  /* master 1 - port 3 (I2C_DEMOD_EN = 1) */
 };
 
 struct cx231xx_board {
@@ -367,7 +369,6 @@ struct cx231xx_board {
         unsigned int valid:1;
         unsigned int no_alt_vanc:1;
         unsigned int external_av:1;
-        unsigned int dont_use_port_3:1;
 
         unsigned char xclk, i2c_speed;
 
@@ -472,7 +473,6 @@ struct cx231xx_i2c {
 
         /* i2c i/o */
         struct i2c_adapter i2c_adap;
-        struct i2c_client i2c_client;
         u32 i2c_rc;
 
         /* different settings for each bus */
@@ -597,6 +597,7 @@ struct cx231xx {
         char name[30];          /* name (including minor) of the device */
         int model;              /* index in the device_data struct */
         int devno;              /* marks the number of this device */
+        struct device *dev;     /* pointer to USB interface's dev */
 
         struct cx231xx_board board;
 
@@ -609,6 +610,8 @@ struct cx231xx {
         unsigned int has_audio_class:1;
         unsigned int has_alsa_audio:1;
 
+        unsigned int i2c_scan_running:1; /* true only during i2c_scan */
+
         struct cx231xx_fmt *format;
 
         struct v4l2_device v4l2_dev;
@@ -628,7 +631,10 @@ struct cx231xx {
 
         /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
         struct cx231xx_i2c i2c_bus[3];
+        struct i2c_adapter *i2c_mux_adap[2];
+
         unsigned int xc_fw_load_done:1;
+        unsigned int port_3_switch_enabled:1;
         /* locks */
         struct mutex gpio_i2c_lock;
         struct mutex i2c_lock;
@@ -751,9 +757,12 @@ int cx231xx_set_analog_freq(struct cx231xx *dev, u32 freq);
 int cx231xx_reset_analog_tuner(struct cx231xx *dev);
 
 /* Provided by cx231xx-i2c.c */
-void cx231xx_do_i2c_scan(struct cx231xx *dev, struct i2c_client *c);
+void cx231xx_do_i2c_scan(struct cx231xx *dev, int i2c_port);
 int cx231xx_i2c_register(struct cx231xx_i2c *bus);
 int cx231xx_i2c_unregister(struct cx231xx_i2c *bus);
+int cx231xx_i2c_mux_register(struct cx231xx *dev, int mux_no);
+void cx231xx_i2c_mux_unregister(struct cx231xx *dev, int mux_no);
+struct i2c_adapter *cx231xx_get_i2c_adap(struct cx231xx *dev, int i2c_port);
 
 /* Internal block control functions */
 int cx231xx_read_i2c_master(struct cx231xx *dev, u8 dev_addr, u16 saddr,
@@ -802,7 +811,6 @@ void cx231xx_Setup_AFE_for_LowIF(struct cx231xx *dev);
 void reset_s5h1432_demod(struct cx231xx *dev);
 void cx231xx_dump_HH_reg(struct cx231xx *dev);
 void update_HH_register_after_set_DIF(struct cx231xx *dev);
-void cx231xx_dump_SC_reg(struct cx231xx *dev);
 
 
 
@@ -976,23 +984,6 @@ void cx231xx_ir_exit(struct cx231xx *dev);
 #define cx231xx_ir_exit(dev)    (0)
 #endif
 
-
-/* printk macros */
-
-#define cx231xx_err(fmt, arg...) do {\
-        printk(KERN_ERR fmt , ##arg); } while (0)
-
-#define cx231xx_errdev(fmt, arg...) do {\
-        printk(KERN_ERR "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
-
-#define cx231xx_info(fmt, arg...) do {\
-        printk(KERN_INFO "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
-#define cx231xx_warn(fmt, arg...) do {\
-        printk(KERN_WARNING "%s: "fmt,\
-                        dev->name , ##arg); } while (0)
-
 static inline unsigned int norm_maxw(struct cx231xx *dev)
 {
         if (dev->board.max_range_640_480)
diff --git a/drivers/media/usb/dvb-usb-v2/Kconfig b/drivers/media/usb/dvb-usb-v2/Kconfig
index 5b34323ad207..0982e734fab5 100644
--- a/drivers/media/usb/dvb-usb-v2/Kconfig
+++ b/drivers/media/usb/dvb-usb-v2/Kconfig
@@ -145,6 +145,9 @@ config DVB_USB_DVBSKY
         tristate "DVBSky USB support"
         depends on DVB_USB_V2
         select DVB_M88DS3103 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT
         select MEDIA_TUNER_M88TS2022 if MEDIA_SUBDRV_AUTOSELECT
+        select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
+        select DVB_SP2 if MEDIA_SUBDRV_AUTOSELECT
         help
           Say Y here to support the USB receivers from DVBSky.
diff --git a/drivers/media/usb/dvb-usb-v2/af9035.c b/drivers/media/usb/dvb-usb-v2/af9035.c
index 1896ab218b11..80a29f5377ea 100644
--- a/drivers/media/usb/dvb-usb-v2/af9035.c
+++ b/drivers/media/usb/dvb-usb-v2/af9035.c
@@ -1171,6 +1171,7 @@ static int it930x_frontend_attach(struct dvb_usb_adapter *adap)
 
         dev_dbg(&d->udev->dev, "adap->id=%d\n", adap->id);
 
+        memset(&si2168_config, 0, sizeof(si2168_config));
         si2168_config.i2c_adapter = &adapter;
         si2168_config.fe = &adap->fe[0];
         si2168_config.ts_mode = SI2168_TS_SERIAL;
diff --git a/drivers/media/usb/dvb-usb-v2/dvbsky.c b/drivers/media/usb/dvb-usb-v2/dvbsky.c
index 34688c89df11..9b5add4499e3 100644
--- a/drivers/media/usb/dvb-usb-v2/dvbsky.c
+++ b/drivers/media/usb/dvb-usb-v2/dvbsky.c
@@ -21,10 +21,17 @@
 #include "dvb_usb.h"
 #include "m88ds3103.h"
 #include "m88ts2022.h"
+#include "sp2.h"
+#include "si2168.h"
+#include "si2157.h"
 
 #define DVBSKY_MSG_DELAY        0/*2000*/
 #define DVBSKY_BUF_LEN  64
 
+static int dvb_usb_dvbsky_disable_rc;
+module_param_named(disable_rc, dvb_usb_dvbsky_disable_rc, int, 0644);
+MODULE_PARM_DESC(disable_rc, "Disable inbuilt IR receiver.");
+
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 struct dvbsky_state {
@@ -32,7 +39,9 @@ struct dvbsky_state {
         u8 ibuf[DVBSKY_BUF_LEN];
         u8 obuf[DVBSKY_BUF_LEN];
         u8 last_lock;
+        struct i2c_client *i2c_client_demod;
         struct i2c_client *i2c_client_tuner;
+        struct i2c_client *i2c_client_ci;
 
         /* fe hook functions*/
         int (*fe_set_voltage)(struct dvb_frontend *fe,
@@ -96,8 +105,7 @@ static int dvbsky_gpio_ctrl(struct dvb_usb_device *d, u8 gport, u8 value)
         obuf[2] = value;
         ret = dvbsky_usb_generic_rw(d, obuf, 3, ibuf, 1);
         if (ret)
-                dev_err(&d->udev->dev, "%s: %s() failed=%d\n",
-                        KBUILD_MODNAME, __func__, ret);
+                dev_err(&d->udev->dev, "failed=%d\n", ret);
         return ret;
 }
 
@@ -114,7 +122,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
 
         if (num > 2) {
                 dev_err(&d->udev->dev,
-                "dvbsky_usb: too many i2c messages[%d] than 2.", num);
+                "too many i2c messages[%d], max 2.", num);
                 ret = -EOPNOTSUPP;
                 goto i2c_error;
         }
@@ -122,7 +130,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
         if (num == 1) {
                 if (msg[0].len > 60) {
                         dev_err(&d->udev->dev,
-                        "dvbsky_usb: too many i2c bytes[%d] than 60.",
+                        "too many i2c bytes[%d], max 60.",
                         msg[0].len);
                         ret = -EOPNOTSUPP;
                         goto i2c_error;
@@ -136,8 +144,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                         ret = dvbsky_usb_generic_rw(d, obuf, 4,
                                         ibuf, msg[0].len + 1);
                         if (ret)
-                                dev_err(&d->udev->dev, "%s: %s() failed=%d\n",
-                                        KBUILD_MODNAME, __func__, ret);
+                                dev_err(&d->udev->dev, "failed=%d\n", ret);
                         if (!ret)
                                 memcpy(msg[0].buf, &ibuf[1], msg[0].len);
                 } else {
@@ -149,13 +156,12 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                         ret = dvbsky_usb_generic_rw(d, obuf,
                                         msg[0].len + 3, ibuf, 1);
                         if (ret)
-                                dev_err(&d->udev->dev, "%s: %s() failed=%d\n",
-                                        KBUILD_MODNAME, __func__, ret);
+                                dev_err(&d->udev->dev, "failed=%d\n", ret);
                 }
         } else {
                 if ((msg[0].len > 60) || (msg[1].len > 60)) {
                         dev_err(&d->udev->dev,
-                        "dvbsky_usb: too many i2c bytes[w-%d][r-%d] than 60.",
+                        "too many i2c bytes[w-%d][r-%d], max 60.",
                         msg[0].len, msg[1].len);
                         ret = -EOPNOTSUPP;
                         goto i2c_error;
@@ -169,8 +175,7 @@ static int dvbsky_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                 ret = dvbsky_usb_generic_rw(d, obuf,
                         msg[0].len + 4, ibuf, msg[1].len + 1);
                 if (ret)
-                        dev_err(&d->udev->dev, "%s: %s() failed=%d\n",
-                                KBUILD_MODNAME, __func__, ret);
+                        dev_err(&d->udev->dev, "failed=%d\n", ret);
 
                 if (!ret)
                         memcpy(msg[1].buf, &ibuf[1], msg[1].len);
@@ -201,8 +206,7 @@ static int dvbsky_rc_query(struct dvb_usb_device *d)
         obuf[0] = 0x10;
         ret = dvbsky_usb_generic_rw(d, obuf, 1, ibuf, 2);
         if (ret)
-                dev_err(&d->udev->dev, "%s: %s() failed=%d\n",
-                        KBUILD_MODNAME, __func__, ret);
+                dev_err(&d->udev->dev, "failed=%d\n", ret);
         if (ret == 0)
                 code = (ibuf[0] << 8) | ibuf[1];
         if (code != 0xffff) {
@@ -218,6 +222,11 @@ static int dvbsky_rc_query(struct dvb_usb_device *d)
 
 static int dvbsky_get_rc_config(struct dvb_usb_device *d, struct dvb_usb_rc *rc)
 {
+        if (dvb_usb_dvbsky_disable_rc) {
+                rc->map_name = NULL;
+                return 0;
+        }
+
         rc->allowed_protos = RC_BIT_RC5;
         rc->query          = dvbsky_rc_query;
         rc->interval       = 300;
@@ -265,8 +274,6 @@ static int dvbsky_read_mac_addr(struct dvb_usb_adapter *adap, u8 mac[6])
         if (i2c_transfer(&d->i2c_adap, msg, 2) == 2)
                 memcpy(mac, ibuf, 6);
 
-        dev_info(&d->udev->dev, "dvbsky_usb MAC address=%pM\n", mac);
-
         return 0;
 }
 
@@ -362,6 +369,300 @@ fail_attach:
         return ret;
 }
 
+static int dvbsky_usb_ci_set_voltage(struct dvb_frontend *fe,
+        fe_sec_voltage_t voltage)
+{
+        struct dvb_usb_device *d = fe_to_d(fe);
+        struct dvbsky_state *state = d_to_priv(d);
+        u8 value;
+
+        if (voltage == SEC_VOLTAGE_OFF)
+                value = 0;
+        else
+                value = 1;
+        dvbsky_gpio_ctrl(d, 0x00, value);
+
+        return state->fe_set_voltage(fe, voltage);
+}
+
+static int dvbsky_ci_ctrl(void *priv, u8 read, int addr,
+                                        u8 data, int *mem)
+{
+        struct dvb_usb_device *d = priv;
+        int ret = 0;
+        u8 command[4], respond[2], command_size, respond_size;
+
+        command[1] = (u8)((addr >> 8) & 0xff); /*high part of address*/
+        command[2] = (u8)(addr & 0xff); /*low part of address*/
+        if (read) {
+                command[0] = 0x71;
+                command_size = 3;
+                respond_size = 2;
+        } else {
+                command[0] = 0x70;
+                command[3] = data;
+                command_size = 4;
+                respond_size = 1;
+        }
+        ret = dvbsky_usb_generic_rw(d, command, command_size,
+                        respond, respond_size);
+        if (ret)
+                goto err;
+        if (read)
+                *mem = respond[1];
+        return ret;
+err:
+        dev_err(&d->udev->dev, "ci control failed=%d\n", ret);
+        return ret;
+}
+
+static const struct m88ds3103_config dvbsky_s960c_m88ds3103_config = {
+        .i2c_addr = 0x68,
+        .clock = 27000000,
+        .i2c_wr_max = 33,
+        .clock_out = 0,
+        .ts_mode = M88DS3103_TS_CI,
+        .ts_clk = 10000,
+        .ts_clk_pol = 1,
+        .agc = 0x99,
+        .lnb_hv_pol = 0,
+        .lnb_en_pol = 1,
+};
+
+static int dvbsky_s960c_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvbsky_state *state = adap_to_priv(adap);
+        struct dvb_usb_device *d = adap_to_d(adap);
+        int ret = 0;
+        /* demod I2C adapter */
+        struct i2c_adapter *i2c_adapter;
+        struct i2c_client *client_tuner, *client_ci;
+        struct i2c_board_info info;
+        struct sp2_config sp2_config;
+        struct m88ts2022_config m88ts2022_config = {
+                        .clock = 27000000,
+                };
+        memset(&info, 0, sizeof(struct i2c_board_info));
+
+        /* attach demod */
+        adap->fe[0] = dvb_attach(m88ds3103_attach,
+                        &dvbsky_s960c_m88ds3103_config,
+                        &d->i2c_adap,
+                        &i2c_adapter);
+        if (!adap->fe[0]) {
+                dev_err(&d->udev->dev, "dvbsky_s960ci_attach fail.\n");
+                ret = -ENODEV;
+                goto fail_attach;
+        }
+
+        /* attach tuner */
+        m88ts2022_config.fe = adap->fe[0];
+        strlcpy(info.type, "m88ts2022", I2C_NAME_SIZE);
+        info.addr = 0x60;
+        info.platform_data = &m88ts2022_config;
+        request_module("m88ts2022");
+        client_tuner = i2c_new_device(i2c_adapter, &info);
+        if (client_tuner == NULL || client_tuner->dev.driver == NULL) {
+                ret = -ENODEV;
+                goto fail_tuner_device;
+        }
+
+        if (!try_module_get(client_tuner->dev.driver->owner)) {
+                ret = -ENODEV;
+                goto fail_tuner_module;
+        }
+
+        /* attach ci controller */
+        memset(&sp2_config, 0, sizeof(sp2_config));
+        sp2_config.dvb_adap = &adap->dvb_adap;
+        sp2_config.priv = d;
+        sp2_config.ci_control = dvbsky_ci_ctrl;
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "sp2", I2C_NAME_SIZE);
+        info.addr = 0x40;
+        info.platform_data = &sp2_config;
+        request_module("sp2");
+        client_ci = i2c_new_device(&d->i2c_adap, &info);
+        if (client_ci == NULL || client_ci->dev.driver == NULL) {
+                ret = -ENODEV;
+                goto fail_ci_device;
+        }
+
+        if (!try_module_get(client_ci->dev.driver->owner)) {
+                ret = -ENODEV;
+                goto fail_ci_module;
+        }
+
+        /* delegate signal strength measurement to tuner */
+        adap->fe[0]->ops.read_signal_strength =
+                        adap->fe[0]->ops.tuner_ops.get_rf_strength;
+
+        /* hook fe: need to resync the slave fifo when signal locks. */
+        state->fe_read_status = adap->fe[0]->ops.read_status;
+        adap->fe[0]->ops.read_status = dvbsky_usb_read_status;
+
+        /* hook fe: LNB off/on is control by Cypress usb chip. */
+        state->fe_set_voltage = adap->fe[0]->ops.set_voltage;
+        adap->fe[0]->ops.set_voltage = dvbsky_usb_ci_set_voltage;
+
+        state->i2c_client_tuner = client_tuner;
+        state->i2c_client_ci = client_ci;
+        return ret;
+fail_ci_module:
+        i2c_unregister_device(client_ci);
+fail_ci_device:
+        module_put(client_tuner->dev.driver->owner);
+fail_tuner_module:
+        i2c_unregister_device(client_tuner);
+fail_tuner_device:
+        dvb_frontend_detach(adap->fe[0]);
+fail_attach:
+        return ret;
+}
+
+static int dvbsky_t680c_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvbsky_state *state = adap_to_priv(adap);
+        struct dvb_usb_device *d = adap_to_d(adap);
+        int ret = 0;
+        struct i2c_adapter *i2c_adapter;
+        struct i2c_client *client_demod, *client_tuner, *client_ci;
+        struct i2c_board_info info;
+        struct si2168_config si2168_config;
+        struct si2157_config si2157_config;
+        struct sp2_config sp2_config;
+
+        /* attach demod */
+        memset(&si2168_config, 0, sizeof(si2168_config));
+        si2168_config.i2c_adapter = &i2c_adapter;
+        si2168_config.fe = &adap->fe[0];
+        si2168_config.ts_mode = SI2168_TS_PARALLEL;
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+        info.addr = 0x64;
+        info.platform_data = &si2168_config;
+
+        request_module(info.type);
+        client_demod = i2c_new_device(&d->i2c_adap, &info);
+        if (client_demod == NULL ||
+                        client_demod->dev.driver == NULL)
+                goto fail_demod_device;
+        if (!try_module_get(client_demod->dev.driver->owner))
+                goto fail_demod_module;
+
+        /* attach tuner */
+        memset(&si2157_config, 0, sizeof(si2157_config));
+        si2157_config.fe = adap->fe[0];
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+        info.addr = 0x60;
+        info.platform_data = &si2157_config;
+
+        request_module(info.type);
+        client_tuner = i2c_new_device(i2c_adapter, &info);
+        if (client_tuner == NULL ||
+                        client_tuner->dev.driver == NULL)
+                goto fail_tuner_device;
+        if (!try_module_get(client_tuner->dev.driver->owner))
+                goto fail_tuner_module;
+
+        /* attach ci controller */
+        memset(&sp2_config, 0, sizeof(sp2_config));
+        sp2_config.dvb_adap = &adap->dvb_adap;
+        sp2_config.priv = d;
+        sp2_config.ci_control = dvbsky_ci_ctrl;
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "sp2", I2C_NAME_SIZE);
+        info.addr = 0x40;
+        info.platform_data = &sp2_config;
+
+        request_module(info.type);
+        client_ci = i2c_new_device(&d->i2c_adap, &info);
+
+        if (client_ci == NULL || client_ci->dev.driver == NULL)
+                goto fail_ci_device;
+
+        if (!try_module_get(client_ci->dev.driver->owner))
+                goto fail_ci_module;
+
+        state->i2c_client_demod = client_demod;
+        state->i2c_client_tuner = client_tuner;
+        state->i2c_client_ci = client_ci;
+        return ret;
+fail_ci_module:
+        i2c_unregister_device(client_ci);
+fail_ci_device:
+        module_put(client_tuner->dev.driver->owner);
+fail_tuner_module:
+        i2c_unregister_device(client_tuner);
+fail_tuner_device:
+        module_put(client_demod->dev.driver->owner);
+fail_demod_module:
+        i2c_unregister_device(client_demod);
+fail_demod_device:
+        ret = -ENODEV;
+        return ret;
+}
+
+static int dvbsky_t330_attach(struct dvb_usb_adapter *adap)
+{
+        struct dvbsky_state *state = adap_to_priv(adap);
+        struct dvb_usb_device *d = adap_to_d(adap);
+        int ret = 0;
+        struct i2c_adapter *i2c_adapter;
+        struct i2c_client *client_demod, *client_tuner;
+        struct i2c_board_info info;
+        struct si2168_config si2168_config;
+        struct si2157_config si2157_config;
+
+        /* attach demod */
+        memset(&si2168_config, 0, sizeof(si2168_config));
+        si2168_config.i2c_adapter = &i2c_adapter;
+        si2168_config.fe = &adap->fe[0];
+        si2168_config.ts_mode = SI2168_TS_PARALLEL | 0x40;
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+        info.addr = 0x64;
+        info.platform_data = &si2168_config;
+
+        request_module(info.type);
+        client_demod = i2c_new_device(&d->i2c_adap, &info);
+        if (client_demod == NULL ||
+                        client_demod->dev.driver == NULL)
+                goto fail_demod_device;
+        if (!try_module_get(client_demod->dev.driver->owner))
+                goto fail_demod_module;
+
+        /* attach tuner */
+        memset(&si2157_config, 0, sizeof(si2157_config));
+        si2157_config.fe = adap->fe[0];
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        strlcpy(info.type, "si2157", I2C_NAME_SIZE);
+        info.addr = 0x60;
+        info.platform_data = &si2157_config;
+
+        request_module(info.type);
+        client_tuner = i2c_new_device(i2c_adapter, &info);
+        if (client_tuner == NULL ||
+                        client_tuner->dev.driver == NULL)
+                goto fail_tuner_device;
+        if (!try_module_get(client_tuner->dev.driver->owner))
+                goto fail_tuner_module;
+
+        state->i2c_client_demod = client_demod;
+        state->i2c_client_tuner = client_tuner;
+        return ret;
+fail_tuner_module:
+        i2c_unregister_device(client_tuner);
+fail_tuner_device:
+        module_put(client_demod->dev.driver->owner);
+fail_demod_module:
+        i2c_unregister_device(client_demod);
+fail_demod_device:
+        ret = -ENODEV;
+        return ret;
+}
+
 static int dvbsky_identify_state(struct dvb_usb_device *d, const char **name)
 {
         dvbsky_gpio_ctrl(d, 0x04, 1);
@@ -404,6 +705,18 @@ static void dvbsky_exit(struct dvb_usb_device *d)
                 module_put(client->dev.driver->owner);
                 i2c_unregister_device(client);
         }
+        client = state->i2c_client_demod;
+        /* remove I2C demod */
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
+        client = state->i2c_client_ci;
+        /* remove I2C ci */
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
 }
 
 /* DVB USB Driver stuff */
@@ -434,9 +747,104 @@ static struct dvb_usb_device_properties dvbsky_s960_props = {
         }
 };
 
+static struct dvb_usb_device_properties dvbsky_s960c_props = {
+        .driver_name = KBUILD_MODNAME,
+        .owner = THIS_MODULE,
+        .adapter_nr = adapter_nr,
+        .size_of_priv = sizeof(struct dvbsky_state),
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        .generic_bulk_ctrl_endpoint_response = 0x81,
+        .generic_bulk_ctrl_delay = DVBSKY_MSG_DELAY,
+
+        .i2c_algo         = &dvbsky_i2c_algo,
+        .frontend_attach  = dvbsky_s960c_attach,
+        .init             = dvbsky_init,
+        .get_rc_config    = dvbsky_get_rc_config,
+        .streaming_ctrl   = dvbsky_streaming_ctrl,
+        .identify_state   = dvbsky_identify_state,
+        .exit             = dvbsky_exit,
+        .read_mac_address = dvbsky_read_mac_addr,
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
+                }
+        }
+};
+
+static struct dvb_usb_device_properties dvbsky_t680c_props = {
+        .driver_name = KBUILD_MODNAME,
+        .owner = THIS_MODULE,
+        .adapter_nr = adapter_nr,
+        .size_of_priv = sizeof(struct dvbsky_state),
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        .generic_bulk_ctrl_endpoint_response = 0x81,
+        .generic_bulk_ctrl_delay = DVBSKY_MSG_DELAY,
+
+        .i2c_algo         = &dvbsky_i2c_algo,
+        .frontend_attach  = dvbsky_t680c_attach,
+        .init             = dvbsky_init,
+        .get_rc_config    = dvbsky_get_rc_config,
+        .streaming_ctrl   = dvbsky_streaming_ctrl,
+        .identify_state   = dvbsky_identify_state,
+        .exit             = dvbsky_exit,
+        .read_mac_address = dvbsky_read_mac_addr,
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
+                }
+        }
+};
+
+static struct dvb_usb_device_properties dvbsky_t330_props = {
+        .driver_name = KBUILD_MODNAME,
+        .owner = THIS_MODULE,
+        .adapter_nr = adapter_nr,
+        .size_of_priv = sizeof(struct dvbsky_state),
+
+        .generic_bulk_ctrl_endpoint = 0x01,
+        .generic_bulk_ctrl_endpoint_response = 0x81,
+        .generic_bulk_ctrl_delay = DVBSKY_MSG_DELAY,
+
+        .i2c_algo         = &dvbsky_i2c_algo,
+        .frontend_attach  = dvbsky_t330_attach,
+        .init             = dvbsky_init,
+        .get_rc_config    = dvbsky_get_rc_config,
+        .streaming_ctrl   = dvbsky_streaming_ctrl,
+        .identify_state   = dvbsky_identify_state,
+        .exit             = dvbsky_exit,
+        .read_mac_address = dvbsky_read_mac_addr,
+
+        .num_adapters = 1,
+        .adapter = {
+                {
+                        .stream = DVB_USB_STREAM_BULK(0x82, 8, 4096),
+                }
+        }
+};
+
 static const struct usb_device_id dvbsky_id_table[] = {
         { DVB_USB_DEVICE(0x0572, 0x6831,
                 &dvbsky_s960_props, "DVBSky S960/S860", RC_MAP_DVBSKY) },
+        { DVB_USB_DEVICE(0x0572, 0x960c,
+                &dvbsky_s960c_props, "DVBSky S960CI", RC_MAP_DVBSKY) },
+        { DVB_USB_DEVICE(0x0572, 0x680c,
+                &dvbsky_t680c_props, "DVBSky T680CI", RC_MAP_DVBSKY) },
+        { DVB_USB_DEVICE(0x0572, 0x0320,
+                &dvbsky_t330_props, "DVBSky T330", RC_MAP_DVBSKY) },
+        { DVB_USB_DEVICE(USB_VID_TECHNOTREND,
+                USB_PID_TECHNOTREND_TVSTICK_CT2_4400,
+                &dvbsky_t330_props, "TechnoTrend TVStick CT2-4400",
+                RC_MAP_TT_1500) },
+        { DVB_USB_DEVICE(USB_VID_TECHNOTREND,
+                USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI,
+                &dvbsky_t680c_props, "TechnoTrend TT-connect CT2-4650 CI",
+                RC_MAP_TT_1500) },
         { }
 };
 MODULE_DEVICE_TABLE(usb, dvbsky_id_table);
diff --git a/drivers/media/usb/dvb-usb-v2/lmedm04.c b/drivers/media/usb/dvb-usb-v2/lmedm04.c
index 9f2c5459b73a..994de53a574b 100644
--- a/drivers/media/usb/dvb-usb-v2/lmedm04.c
+++ b/drivers/media/usb/dvb-usb-v2/lmedm04.c
@@ -817,20 +817,22 @@ static const char *lme_firmware_switch(struct dvb_usb_device *d, int cold)
         case 0x1122:
                 switch (st->dvb_usb_lme2510_firmware) {
                 default:
-                        st->dvb_usb_lme2510_firmware = TUNER_S0194;
                 case TUNER_S0194:
                         fw_lme = fw_s0194;
                         ret = request_firmware(&fw, fw_lme, &udev->dev);
                         if (ret == 0) {
+                                st->dvb_usb_lme2510_firmware = TUNER_S0194;
                                 cold = 0;
                                 break;
                         }
-                        st->dvb_usb_lme2510_firmware = TUNER_LG;
+                        /* fall through */
                 case TUNER_LG:
                         fw_lme = fw_lg;
                         ret = request_firmware(&fw, fw_lme, &udev->dev);
-                        if (ret == 0)
+                        if (ret == 0) {
+                                st->dvb_usb_lme2510_firmware = TUNER_LG;
                                 break;
+                        }
                         st->dvb_usb_lme2510_firmware = TUNER_DEFAULT;
                         break;
                 }
@@ -838,26 +840,30 @@ static const char *lme_firmware_switch(struct dvb_usb_device *d, int cold)
         case 0x1120:
                 switch (st->dvb_usb_lme2510_firmware) {
                 default:
-                        st->dvb_usb_lme2510_firmware = TUNER_S7395;
                 case TUNER_S7395:
                         fw_lme = fw_c_s7395;
                         ret = request_firmware(&fw, fw_lme, &udev->dev);
                         if (ret == 0) {
+                                st->dvb_usb_lme2510_firmware = TUNER_S7395;
                                 cold = 0;
                                 break;
                         }
-                        st->dvb_usb_lme2510_firmware = TUNER_LG;
+                        /* fall through */
                 case TUNER_LG:
                         fw_lme = fw_c_lg;
                         ret = request_firmware(&fw, fw_lme, &udev->dev);
-                        if (ret == 0)
+                        if (ret == 0) {
+                                st->dvb_usb_lme2510_firmware = TUNER_LG;
                                 break;
-                        st->dvb_usb_lme2510_firmware = TUNER_S0194;
+                        }
+                        /* fall through */
                 case TUNER_S0194:
                         fw_lme = fw_c_s0194;
                         ret = request_firmware(&fw, fw_lme, &udev->dev);
-                        if (ret == 0)
+                        if (ret == 0) {
+                                st->dvb_usb_lme2510_firmware = TUNER_S0194;
                                 break;
+                        }
                         st->dvb_usb_lme2510_firmware = TUNER_DEFAULT;
                         cold = 0;
                         break;
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
index 27b1e0397e71..896a225ee011 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.c
@@ -24,6 +24,9 @@
 
 #include "rtl2830.h"
 #include "rtl2832.h"
+#include "rtl2832_sdr.h"
+#include "mn88472.h"
+#include "mn88473.h"
 
 #include "qt1010.h"
 #include "mt2060.h"
@@ -35,25 +38,6 @@
 #include "tua9001.h"
 #include "r820t.h"
 
-/*
- * RTL2832_SDR module is in staging. That logic is added in order to avoid any
- * hard dependency to drivers/staging/ directory as we want compile mainline
- * driver even whole staging directory is missing.
- */
-#include <media/v4l2-subdev.h>
-
-#if IS_ENABLED(CONFIG_DVB_RTL2832_SDR)
-struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
-        struct i2c_adapter *i2c, const struct rtl2832_config *cfg,
-        struct v4l2_subdev *sd);
-#else
-static inline struct dvb_frontend *rtl2832_sdr_attach(struct dvb_frontend *fe,
-        struct i2c_adapter *i2c, const struct rtl2832_config *cfg,
-        struct v4l2_subdev *sd)
-{
-        return NULL;
-}
-#endif
 
 #ifdef CONFIG_MEDIA_ATTACH
 #define dvb_attach_sdr(FUNCTION, ARGS...) ({ \
@@ -420,6 +404,8 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         struct rtl28xxu_req req_tda18272 = {0x00c0, CMD_I2C_RD, 2, buf};
         struct rtl28xxu_req req_r820t = {0x0034, CMD_I2C_RD, 1, buf};
         struct rtl28xxu_req req_r828d = {0x0074, CMD_I2C_RD, 1, buf};
+        struct rtl28xxu_req req_mn88472 = {0xff38, CMD_I2C_RD, 1, buf};
+        struct rtl28xxu_req req_mn88473 = {0xff38, CMD_I2C_RD, 1, buf};
 
         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
@@ -449,7 +435,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0xa1) {
                 priv->tuner = TUNER_RTL2832_FC0012;
                 priv->tuner_name = "FC0012";
-                goto found;
+                goto tuner_found;
         }
 
         /* check FC0013 ID register; reg=00 val=a3 */
@@ -457,7 +443,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0xa3) {
                 priv->tuner = TUNER_RTL2832_FC0013;
                 priv->tuner_name = "FC0013";
-                goto found;
+                goto tuner_found;
         }
 
         /* check MT2266 ID register; reg=00 val=85 */
@@ -465,7 +451,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x85) {
                 priv->tuner = TUNER_RTL2832_MT2266;
                 priv->tuner_name = "MT2266";
-                goto found;
+                goto tuner_found;
         }
 
         /* check FC2580 ID register; reg=01 val=56 */
@@ -473,7 +459,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x56) {
                 priv->tuner = TUNER_RTL2832_FC2580;
                 priv->tuner_name = "FC2580";
-                goto found;
+                goto tuner_found;
         }
 
         /* check MT2063 ID register; reg=00 val=9e || 9c */
@@ -481,7 +467,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && (buf[0] == 0x9e || buf[0] == 0x9c)) {
                 priv->tuner = TUNER_RTL2832_MT2063;
                 priv->tuner_name = "MT2063";
-                goto found;
+                goto tuner_found;
         }
 
         /* check MAX3543 ID register; reg=00 val=38 */
@@ -489,7 +475,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x38) {
                 priv->tuner = TUNER_RTL2832_MAX3543;
                 priv->tuner_name = "MAX3543";
-                goto found;
+                goto tuner_found;
         }
 
         /* check TUA9001 ID register; reg=7e val=2328 */
@@ -497,7 +483,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x23 && buf[1] == 0x28) {
                 priv->tuner = TUNER_RTL2832_TUA9001;
                 priv->tuner_name = "TUA9001";
-                goto found;
+                goto tuner_found;
         }
 
         /* check MXL5007R ID register; reg=d9 val=14 */
@@ -505,7 +491,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x14) {
                 priv->tuner = TUNER_RTL2832_MXL5007T;
                 priv->tuner_name = "MXL5007T";
-                goto found;
+                goto tuner_found;
         }
 
         /* check E4000 ID register; reg=02 val=40 */
@@ -513,7 +499,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x40) {
                 priv->tuner = TUNER_RTL2832_E4000;
                 priv->tuner_name = "E4000";
-                goto found;
+                goto tuner_found;
         }
 
         /* check TDA18272 ID register; reg=00 val=c760  */
@@ -521,7 +507,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && (buf[0] == 0xc7 || buf[1] == 0x60)) {
                 priv->tuner = TUNER_RTL2832_TDA18272;
                 priv->tuner_name = "TDA18272";
-                goto found;
+                goto tuner_found;
         }
 
         /* check R820T ID register; reg=00 val=69 */
@@ -529,7 +515,7 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x69) {
                 priv->tuner = TUNER_RTL2832_R820T;
                 priv->tuner_name = "R820T";
-                goto found;
+                goto tuner_found;
         }
 
         /* check R828D ID register; reg=00 val=69 */
@@ -537,13 +523,44 @@ static int rtl2832u_read_config(struct dvb_usb_device *d)
         if (ret == 0 && buf[0] == 0x69) {
                 priv->tuner = TUNER_RTL2832_R828D;
                 priv->tuner_name = "R828D";
-                goto found;
+                goto tuner_found;
         }
 
-
-found:
+tuner_found:
         dev_dbg(&d->udev->dev, "%s: tuner=%s\n", __func__, priv->tuner_name);
 
+        /* probe slave demod */
+        if (priv->tuner == TUNER_RTL2832_R828D) {
+                /* power on MN88472 demod on GPIO0 */
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_VAL, 0x01, 0x01);
+                if (ret)
+                        goto err;
+
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_DIR, 0x00, 0x01);
+                if (ret)
+                        goto err;
+
+                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_EN, 0x01, 0x01);
+                if (ret)
+                        goto err;
+
+                /* check MN88472 answers */
+                ret = rtl28xxu_ctrl_msg(d, &req_mn88472);
+                if (ret == 0 && buf[0] == 0x02) {
+                        dev_dbg(&d->udev->dev, "%s: MN88472 found\n", __func__);
+                        priv->slave_demod = SLAVE_DEMOD_MN88472;
+                        goto demod_found;
+                }
+
+                ret = rtl28xxu_ctrl_msg(d, &req_mn88473);
+                if (ret == 0 && buf[0] == 0x03) {
+                        dev_dbg(&d->udev->dev, "%s: MN88473 found\n", __func__);
+                        priv->slave_demod = SLAVE_DEMOD_MN88473;
+                        goto demod_found;
+                }
+        }
+
+demod_found:
         /* close demod I2C gate */
         ret = rtl28xxu_ctrl_msg(d, &req_gate_close);
         if (ret < 0)
@@ -818,7 +835,66 @@ static int rtl2832u_frontend_attach(struct dvb_usb_adapter *adap)
         /* set fe callback */
         adap->fe[0]->callback = rtl2832u_frontend_callback;
 
+        if (priv->slave_demod) {
+                struct i2c_board_info info = {};
+                struct i2c_client *client;
+
+                /*
+                 * We continue on reduced mode, without DVB-T2/C, using master
+                 * demod, when slave demod fails.
+                 */
+                ret = 0;
+
+                /* attach slave demodulator */
+                if (priv->slave_demod == SLAVE_DEMOD_MN88472) {
+                        struct mn88472_config mn88472_config = {};
+
+                        mn88472_config.fe = &adap->fe[1];
+                        mn88472_config.i2c_wr_max = 22,
+                        strlcpy(info.type, "mn88472", I2C_NAME_SIZE);
+                        info.addr = 0x18;
+                        info.platform_data = &mn88472_config;
+                        request_module(info.type);
+                        client = i2c_new_device(priv->demod_i2c_adapter, &info);
+                        if (client == NULL || client->dev.driver == NULL) {
+                                priv->slave_demod = SLAVE_DEMOD_NONE;
+                                goto err_slave_demod_failed;
+                        }
+
+                        if (!try_module_get(client->dev.driver->owner)) {
+                                i2c_unregister_device(client);
+                                priv->slave_demod = SLAVE_DEMOD_NONE;
+                                goto err_slave_demod_failed;
+                        }
+
+                        priv->i2c_client_slave_demod = client;
+                } else {
+                        struct mn88473_config mn88473_config = {};
+
+                        mn88473_config.fe = &adap->fe[1];
+                        mn88473_config.i2c_wr_max = 22,
+                        strlcpy(info.type, "mn88473", I2C_NAME_SIZE);
+                        info.addr = 0x18;
+                        info.platform_data = &mn88473_config;
+                        request_module(info.type);
+                        client = i2c_new_device(priv->demod_i2c_adapter, &info);
+                        if (client == NULL || client->dev.driver == NULL) {
+                                priv->slave_demod = SLAVE_DEMOD_NONE;
+                                goto err_slave_demod_failed;
+                        }
+
+                        if (!try_module_get(client->dev.driver->owner)) {
+                                i2c_unregister_device(client);
+                                priv->slave_demod = SLAVE_DEMOD_NONE;
+                                goto err_slave_demod_failed;
+                        }
+
+                        priv->i2c_client_slave_demod = client;
+                }
+        }
+
         return 0;
+err_slave_demod_failed:
 err:
         dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
         return ret;
@@ -984,7 +1060,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
                                 break;
                         }
 
-                        priv->client = client;
+                        priv->i2c_client_tuner = client;
                         sd = i2c_get_clientdata(client);
                         i2c_set_adapdata(i2c_adap_internal, d);
 
@@ -1024,32 +1100,30 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
                                 &rtl28xxu_rtl2832_r820t_config, NULL);
                 break;
         case TUNER_RTL2832_R828D:
-                /* power off mn88472 demod on GPIO0 */
-                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_VAL, 0x00, 0x01);
-                if (ret)
-                        goto err;
-
-                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_DIR, 0x00, 0x01);
-                if (ret)
-                        goto err;
-
-                ret = rtl28xx_wr_reg_mask(d, SYS_GPIO_OUT_EN, 0x01, 0x01);
-                if (ret)
-                        goto err;
-
-                fe = dvb_attach(r820t_attach, adap->fe[0], &d->i2c_adap,
+                fe = dvb_attach(r820t_attach, adap->fe[0],
+                                priv->demod_i2c_adapter,
                                 &rtl2832u_r828d_config);
-
-                /* Use tuner to get the signal strength */
                 adap->fe[0]->ops.read_signal_strength =
                                 adap->fe[0]->ops.tuner_ops.get_rf_strength;
+
+                if (adap->fe[1]) {
+                        fe = dvb_attach(r820t_attach, adap->fe[1],
+                                        priv->demod_i2c_adapter,
+                                        &rtl2832u_r828d_config);
+                        adap->fe[1]->ops.read_signal_strength =
+                                        adap->fe[1]->ops.tuner_ops.get_rf_strength;
+                }
+
+                /* attach SDR */
+                dvb_attach_sdr(rtl2832_sdr_attach, adap->fe[0], &d->i2c_adap,
+                                &rtl28xxu_rtl2832_r820t_config, NULL);
                 break;
         default:
                 dev_err(&d->udev->dev, "%s: unknown tuner=%d\n", KBUILD_MODNAME,
                                 priv->tuner);
         }
 
-        if (fe == NULL && priv->client == NULL) {
+        if (fe == NULL && priv->i2c_client_tuner == NULL) {
                 ret = -ENODEV;
                 goto err;
         }
@@ -1097,11 +1171,19 @@ err:
 static void rtl28xxu_exit(struct dvb_usb_device *d)
 {
         struct rtl28xxu_priv *priv = d->priv;
-        struct i2c_client *client = priv->client;
+        struct i2c_client *client;
 
         dev_dbg(&d->udev->dev, "%s:\n", __func__);
 
         /* remove I2C tuner */
+        client = priv->i2c_client_tuner;
+        if (client) {
+                module_put(client->dev.driver->owner);
+                i2c_unregister_device(client);
+        }
+
+        /* remove I2C slave demod */
+        client = priv->i2c_client_slave_demod;
         if (client) {
                 module_put(client->dev.driver->owner);
                 i2c_unregister_device(client);
@@ -1201,13 +1283,6 @@ static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
                 if (ret)
                         goto err;
 
-                mdelay(5);
-
-                /* enable ADC */
-                ret = rtl28xx_wr_reg_mask(d, SYS_DEMOD_CTL, 0x48, 0x48);
-                if (ret)
-                        goto err;
-
                 /* streaming EP: clear stall & reset */
                 ret = rtl28xx_wr_regs(d, USB_EPA_CTL, "\x00\x00", 2);
                 if (ret)
@@ -1222,11 +1297,6 @@ static int rtl2832u_power_ctrl(struct dvb_usb_device *d, int onoff)
                 if (ret)
                         goto err;
 
-                /* disable ADC */
-                ret = rtl28xx_wr_reg_mask(d, SYS_DEMOD_CTL, 0x00, 0x48);
-                if (ret)
-                        goto err;
-
                 /* disable PLL */
                 ret = rtl28xx_wr_reg_mask(d, SYS_DEMOD_CTL, 0x00, 0x80);
                 if (ret)
@@ -1244,6 +1314,38 @@ err:
         return ret;
 }
 
+static int rtl2832u_frontend_ctrl(struct dvb_frontend *fe, int onoff)
+{
+        struct dvb_usb_device *d = fe_to_d(fe);
+        struct dvb_usb_adapter *adap = fe_to_adap(fe);
+        int ret;
+        u8 val;
+
+        dev_dbg(&d->udev->dev, "%s: fe=%d onoff=%d\n", __func__, fe->id, onoff);
+
+        /* control internal demod ADC */
+        if (fe->id == 0 && onoff)
+                val = 0x48; /* enable ADC */
+        else
+                val = 0x00; /* disable ADC */
+
+        ret = rtl28xx_wr_reg_mask(d, SYS_DEMOD_CTL, val, 0x48);
+        if (ret)
+                goto err;
+
+        /* bypass slave demod TS through master demod */
+        if (fe->id == 1 && onoff) {
+                ret = rtl2832_enable_external_ts_if(adap->fe[0]);
+                if (ret)
+                        goto err;
+        }
+
+        return 0;
+err:
+        dev_dbg(&d->udev->dev, "%s: failed=%d\n", __func__, ret);
+        return ret;
+}
+
 #if IS_ENABLED(CONFIG_RC_CORE)
 static int rtl2831u_rc_query(struct dvb_usb_device *d)
 {
@@ -1467,6 +1569,7 @@ static const struct dvb_usb_device_properties rtl2832u_props = {
         .size_of_priv = sizeof(struct rtl28xxu_priv),
 
         .power_ctrl = rtl2832u_power_ctrl,
+        .frontend_ctrl = rtl2832u_frontend_ctrl,
         .i2c_algo = &rtl28xxu_i2c_algo,
         .read_config = rtl2832u_read_config,
         .frontend_attach = rtl2832u_frontend_attach,
diff --git a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
index a26cab10f382..3e3ea9d64a38 100644
--- a/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
+++ b/drivers/media/usb/dvb-usb-v2/rtl28xxu.h
@@ -57,7 +57,12 @@ struct rtl28xxu_priv {
         u8 page; /* integrated demod active register page */
         struct i2c_adapter *demod_i2c_adapter;
         bool rc_active;
-        struct i2c_client *client;
+        struct i2c_client *i2c_client_tuner;
+        struct i2c_client *i2c_client_slave_demod;
+        #define SLAVE_DEMOD_NONE           0
+        #define SLAVE_DEMOD_MN88472        1
+        #define SLAVE_DEMOD_MN88473        2
+        unsigned int slave_demod:2;
 };
 
 enum rtl28xxu_chip_id {
diff --git a/drivers/media/usb/dvb-usb/Kconfig b/drivers/media/usb/dvb-usb/Kconfig
index 41d3eb922a00..3364200db093 100644
--- a/drivers/media/usb/dvb-usb/Kconfig
+++ b/drivers/media/usb/dvb-usb/Kconfig
@@ -130,7 +130,6 @@ config DVB_USB_CXUSB
 
           Medion MD95700 hybrid USB2.0 device.
           DViCO FusionHDTV (Bluebird) USB2.0 devices
-          TechnoTrend TVStick CT2-4400 and CT2-4650 CI devices
 
 config DVB_USB_M920X
         tristate "Uli m920x DVB-T USB2.0 support"
diff --git a/drivers/media/usb/dvb-usb/af9005.c b/drivers/media/usb/dvb-usb/af9005.c
index 3f4361e48a32..efa782ed6e2d 100644
--- a/drivers/media/usb/dvb-usb/af9005.c
+++ b/drivers/media/usb/dvb-usb/af9005.c
@@ -1081,9 +1081,12 @@ static int __init af9005_usb_module_init(void)
                 err("usb_register failed. (%d)", result);
                 return result;
         }
+#if IS_MODULE(CONFIG_DVB_USB_AF9005) || defined(CONFIG_DVB_USB_AF9005_REMOTE)
+        /* FIXME: convert to todays kernel IR infrastructure */
         rc_decode = symbol_request(af9005_rc_decode);
         rc_keys = symbol_request(rc_map_af9005_table);
         rc_keys_size = symbol_request(rc_map_af9005_table_size);
+#endif
         if (rc_decode == NULL || rc_keys == NULL || rc_keys_size == NULL) {
                 err("af9005_rc_decode function not found, disabling remote");
                 af9005_properties.rc.legacy.rc_query = NULL;
diff --git a/drivers/media/usb/dvb-usb/cxusb.c b/drivers/media/usb/dvb-usb/cxusb.c
index 356abb369c20..0f345b1f9014 100644
--- a/drivers/media/usb/dvb-usb/cxusb.c
+++ b/drivers/media/usb/dvb-usb/cxusb.c
@@ -44,7 +44,6 @@
 #include "atbm8830.h"
 #include "si2168.h"
 #include "si2157.h"
-#include "sp2.h"
 
 /* Max transfer size done by I2C transfer functions */
 #define MAX_XFER_SIZE  80
@@ -147,22 +146,6 @@ static int cxusb_d680_dmb_gpio_tuner(struct dvb_usb_device *d,
         }
 }
 
-static int cxusb_tt_ct2_4400_gpio_tuner(struct dvb_usb_device *d, int onoff)
-{
-        u8 o[2], i;
-        int rc;
-
-        o[0] = 0x83;
-        o[1] = onoff;
-        rc = cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
-
-        if (rc) {
-                deb_info("gpio_write failed.\n");
-                return -EIO;
-        }
-        return 0;
-}
-
 /* I2C */
 static int cxusb_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[],
                           int num)
@@ -524,30 +507,6 @@ static int cxusb_d680_dmb_rc_query(struct dvb_usb_device *d, u32 *event,
         return 0;
 }
 
-static int cxusb_tt_ct2_4400_rc_query(struct dvb_usb_device *d)
-{
-        u8 i[2];
-        int ret;
-        u32 cmd, keycode;
-        u8 rc5_cmd, rc5_addr, rc5_toggle;
-
-        ret = cxusb_ctrl_msg(d, 0x10, NULL, 0, i, 2);
-        if (ret)
-                return ret;
-
-        cmd = (i[0] << 8) | i[1];
-
-        if (cmd != 0xffff) {
-                rc5_cmd = cmd & 0x3F; /* bits 1-6 for command */
-                rc5_addr = (cmd & 0x07C0) >> 6; /* bits 7-11 for address */
-                rc5_toggle = (cmd & 0x0800) >> 11; /* bit 12 for toggle */
-                keycode = (rc5_addr << 8) | rc5_cmd;
-                rc_keydown(d->rc_dev, RC_BIT_RC5, keycode, rc5_toggle);
-        }
-
-        return 0;
-}
-
 static struct rc_map_table rc_map_dvico_mce_table[] = {
         { 0xfe02, KEY_TV },
         { 0xfe0e, KEY_MP3 },
@@ -673,70 +632,6 @@ static struct rc_map_table rc_map_d680_dmb_table[] = {
         { 0x0025, KEY_POWER },
 };
 
-static int cxusb_tt_ct2_4400_read_mac_address(struct dvb_usb_device *d, u8 mac[6])
-{
-        u8 wbuf[2];
-        u8 rbuf[6];
-        int ret;
-        struct i2c_msg msg[] = {
-                {
-                        .addr = 0x51,
-                        .flags = 0,
-                        .buf = wbuf,
-                        .len = 2,
-                }, {
-                        .addr = 0x51,
-                        .flags = I2C_M_RD,
-                        .buf = rbuf,
-                        .len = 6,
-                }
-        };
-
-        wbuf[0] = 0x1e;
-        wbuf[1] = 0x00;
-        ret = cxusb_i2c_xfer(&d->i2c_adap, msg, 2);
-
-        if (ret == 2) {
-                memcpy(mac, rbuf, 6);
-                return 0;
-        } else {
-                if (ret < 0)
-                        return ret;
-                return -EIO;
-        }
-}
-
-static int cxusb_tt_ct2_4650_ci_ctrl(void *priv, u8 read, int addr,
-                                        u8 data, int *mem)
-{
-        struct dvb_usb_device *d = priv;
-        u8 wbuf[3];
-        u8 rbuf[2];
-        int ret;
-
-        wbuf[0] = (addr >> 8) & 0xff;
-        wbuf[1] = addr & 0xff;
-
-        if (read) {
-                ret = cxusb_ctrl_msg(d, CMD_SP2_CI_READ, wbuf, 2, rbuf, 2);
-        } else {
-                wbuf[2] = data;
-                ret = cxusb_ctrl_msg(d, CMD_SP2_CI_WRITE, wbuf, 3, rbuf, 1);
-        }
-
-        if (ret)
-                goto err;
-
-        if (read)
-                *mem = rbuf[1];
-
-        return 0;
-err:
-        deb_info("%s: ci usb write returned %d\n", __func__, ret);
-        return ret;
-
-}
-
 static int cxusb_dee1601_demod_init(struct dvb_frontend* fe)
 {
         static u8 clock_config []  = { CLOCK_CTL,  0x38, 0x28 };
@@ -1408,36 +1303,34 @@ static int cxusb_mygica_d689_frontend_attach(struct dvb_usb_adapter *adap)
         return 0;
 }
 
-static int cxusb_tt_ct2_4400_attach(struct dvb_usb_adapter *adap)
+static int cxusb_mygica_t230_frontend_attach(struct dvb_usb_adapter *adap)
 {
         struct dvb_usb_device *d = adap->dev;
         struct cxusb_state *st = d->priv;
         struct i2c_adapter *adapter;
         struct i2c_client *client_demod;
         struct i2c_client *client_tuner;
-        struct i2c_client *client_ci;
         struct i2c_board_info info;
         struct si2168_config si2168_config;
         struct si2157_config si2157_config;
-        struct sp2_config sp2_config;
-        u8 o[2], i;
 
-        /* reset the tuner */
-        if (cxusb_tt_ct2_4400_gpio_tuner(d, 0) < 0) {
-                err("clear tuner gpio failed");
-                return -EIO;
-        }
-        msleep(100);
-        if (cxusb_tt_ct2_4400_gpio_tuner(d, 1) < 0) {
-                err("set tuner gpio failed");
-                return -EIO;
-        }
-        msleep(100);
+        /* Select required USB configuration */
+        if (usb_set_interface(d->udev, 0, 0) < 0)
+                err("set interface failed");
+
+        /* Unblock all USB pipes */
+        usb_clear_halt(d->udev,
+                usb_sndbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.generic_bulk_ctrl_endpoint));
+        usb_clear_halt(d->udev,
+                usb_rcvbulkpipe(d->udev, d->props.adapter[0].fe[0].stream.endpoint));
 
         /* attach frontend */
         si2168_config.i2c_adapter = &adapter;
         si2168_config.fe = &adap->fe_adap[0].fe;
         si2168_config.ts_mode = SI2168_TS_PARALLEL;
+        si2168_config.ts_clock_inv = 1;
         memset(&info, 0, sizeof(struct i2c_board_info));
         strlcpy(info.type, "si2168", I2C_NAME_SIZE);
         info.addr = 0x64;
@@ -1477,48 +1370,6 @@ static int cxusb_tt_ct2_4400_attach(struct dvb_usb_adapter *adap)
 
         st->i2c_client_tuner = client_tuner;
 
-        /* initialize CI */
-        if (d->udev->descriptor.idProduct ==
-                USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI) {
-
-                memcpy(o, "\xc0\x01", 2);
-                cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
-                msleep(100);
-
-                memcpy(o, "\xc0\x00", 2);
-                cxusb_ctrl_msg(d, CMD_GPIO_WRITE, o, 2, &i, 1);
-                msleep(100);
-
-                memset(&sp2_config, 0, sizeof(sp2_config));
-                sp2_config.dvb_adap = &adap->dvb_adap;
-                sp2_config.priv = d;
-                sp2_config.ci_control = cxusb_tt_ct2_4650_ci_ctrl;
-                memset(&info, 0, sizeof(struct i2c_board_info));
-                strlcpy(info.type, "sp2", I2C_NAME_SIZE);
-                info.addr = 0x40;
-                info.platform_data = &sp2_config;
-                request_module(info.type);
-                client_ci = i2c_new_device(&d->i2c_adap, &info);
-                if (client_ci == NULL || client_ci->dev.driver == NULL) {
-                        module_put(client_tuner->dev.driver->owner);
-                        i2c_unregister_device(client_tuner);
-                        module_put(client_demod->dev.driver->owner);
-                        i2c_unregister_device(client_demod);
-                        return -ENODEV;
-                }
-                if (!try_module_get(client_ci->dev.driver->owner)) {
-                        i2c_unregister_device(client_ci);
-                        module_put(client_tuner->dev.driver->owner);
-                        i2c_unregister_device(client_tuner);
-                        module_put(client_demod->dev.driver->owner);
-                        i2c_unregister_device(client_demod);
-                        return -ENODEV;
-                }
-
-                st->i2c_client_ci = client_ci;
-
-        }
-
         return 0;
 }
 
@@ -1603,7 +1454,7 @@ static struct dvb_usb_device_properties cxusb_bluebird_nano2_needsfirmware_prope
 static struct dvb_usb_device_properties cxusb_aver_a868r_properties;
 static struct dvb_usb_device_properties cxusb_d680_dmb_properties;
 static struct dvb_usb_device_properties cxusb_mygica_d689_properties;
-static struct dvb_usb_device_properties cxusb_tt_ct2_4400_properties;
+static struct dvb_usb_device_properties cxusb_mygica_t230_properties;
 
 static int cxusb_probe(struct usb_interface *intf,
                        const struct usb_device_id *id)
@@ -1634,7 +1485,7 @@ static int cxusb_probe(struct usb_interface *intf,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0 == dvb_usb_device_init(intf, &cxusb_mygica_d689_properties,
                                      THIS_MODULE, NULL, adapter_nr) ||
-            0 == dvb_usb_device_init(intf, &cxusb_tt_ct2_4400_properties,
+            0 == dvb_usb_device_init(intf, &cxusb_mygica_t230_properties,
                                      THIS_MODULE, NULL, adapter_nr) ||
             0)
                 return 0;
@@ -1648,13 +1499,6 @@ static void cxusb_disconnect(struct usb_interface *intf)
         struct cxusb_state *st = d->priv;
         struct i2c_client *client;
 
-        /* remove I2C client for CI */
-        client = st->i2c_client_ci;
-        if (client) {
-                module_put(client->dev.driver->owner);
-                i2c_unregister_device(client);
-        }
-
         /* remove I2C client for tuner */
         client = st->i2c_client_tuner;
         if (client) {
@@ -1693,8 +1537,7 @@ static struct usb_device_id cxusb_table [] = {
         { USB_DEVICE(USB_VID_DVICO, USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2) },
         { USB_DEVICE(USB_VID_CONEXANT, USB_PID_CONEXANT_D680_DMB) },
         { USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_D689) },
-        { USB_DEVICE(USB_VID_TECHNOTREND, USB_PID_TECHNOTREND_TVSTICK_CT2_4400) },
-        { USB_DEVICE(USB_VID_TECHNOTREND, USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI) },
+        { USB_DEVICE(USB_VID_CONEXANT, USB_PID_MYGICA_T230) },
         {}              /* Terminating entry */
 };
 MODULE_DEVICE_TABLE (usb, cxusb_table);
@@ -2341,7 +2184,7 @@ static struct dvb_usb_device_properties cxusb_mygica_d689_properties = {
         }
 };
 
-static struct dvb_usb_device_properties cxusb_tt_ct2_4400_properties = {
+static struct dvb_usb_device_properties cxusb_mygica_t230_properties = {
         .caps = DVB_USB_IS_AN_I2C_ADAPTER,
 
         .usb_ctrl         = CYPRESS_FX2,
@@ -2349,25 +2192,21 @@ static struct dvb_usb_device_properties cxusb_tt_ct2_4400_properties = {
         .size_of_priv     = sizeof(struct cxusb_state),
 
         .num_adapters = 1,
-        .read_mac_address = cxusb_tt_ct2_4400_read_mac_address,
-
         .adapter = {
                 {
                 .num_frontends = 1,
                 .fe = {{
                         .streaming_ctrl   = cxusb_streaming_ctrl,
-                        /* both frontend and tuner attached in the
-                           same function */
-                        .frontend_attach  = cxusb_tt_ct2_4400_attach,
+                        .frontend_attach  = cxusb_mygica_t230_frontend_attach,
 
                         /* parameter for the MPEG2-data transfer */
                         .stream = {
                                 .type = USB_BULK,
-                                .count = 8,
-                                .endpoint = 0x82,
+                                .count = 5,
+                                .endpoint = 0x02,
                                 .u = {
                                         .bulk = {
-                                                .buffersize = 4096,
+                                                .buffersize = 8192,
                                         }
                                 }
                         },
@@ -2375,28 +2214,25 @@ static struct dvb_usb_device_properties cxusb_tt_ct2_4400_properties = {
                 },
         },
 
-        .i2c_algo = &cxusb_i2c_algo,
+        .power_ctrl       = cxusb_d680_dmb_power_ctrl,
+
+        .i2c_algo         = &cxusb_i2c_algo,
+
         .generic_bulk_ctrl_endpoint = 0x01,
-        .generic_bulk_ctrl_endpoint_response = 0x81,
 
-        .rc.core = {
-                .rc_codes       = RC_MAP_TT_1500,
-                .allowed_protos = RC_BIT_RC5,
-                .rc_query       = cxusb_tt_ct2_4400_rc_query,
-                .rc_interval    = 150,
+        .rc.legacy = {
+                .rc_interval      = 100,
+                .rc_map_table     = rc_map_d680_dmb_table,
+                .rc_map_size      = ARRAY_SIZE(rc_map_d680_dmb_table),
+                .rc_query         = cxusb_d680_dmb_rc_query,
         },
 
-        .num_device_descs = 2,
+        .num_device_descs = 1,
         .devices = {
                 {
-                        "TechnoTrend TVStick CT2-4400",
-                        { NULL },
-                        { &cxusb_table[20], NULL },
-                },
-                {
-                        "TechnoTrend TT-connect CT2-4650 CI",
+                        "Mygica T230 DVB-T/T2/C",
                         { NULL },
-                        { &cxusb_table[21], NULL },
+                        { &cxusb_table[22], NULL },
                 },
         }
 };
diff --git a/drivers/media/usb/dvb-usb/cxusb.h b/drivers/media/usb/dvb-usb/cxusb.h
index 29f3e2ea2476..527ff7905e15 100644
--- a/drivers/media/usb/dvb-usb/cxusb.h
+++ b/drivers/media/usb/dvb-usb/cxusb.h
@@ -28,14 +28,10 @@
 #define CMD_ANALOG        0x50
 #define CMD_DIGITAL       0x51
 
-#define CMD_SP2_CI_WRITE  0x70
-#define CMD_SP2_CI_READ   0x71
-
 struct cxusb_state {
         u8 gpio_write_state[3];
         struct i2c_client *i2c_client_demod;
         struct i2c_client *i2c_client_tuner;
-        struct i2c_client *i2c_client_ci;
 };
 
 #endif
diff --git a/drivers/media/usb/dvb-usb/technisat-usb2.c b/drivers/media/usb/dvb-usb/technisat-usb2.c
index 6b0b8b6b9e2a..5801ae7f672a 100644
--- a/drivers/media/usb/dvb-usb/technisat-usb2.c
+++ b/drivers/media/usb/dvb-usb/technisat-usb2.c
@@ -449,6 +449,8 @@ static int technisat_usb2_read_mac_address(struct dvb_usb_device *d,
         return 0;
 }
 
+static struct stv090x_config technisat_usb2_stv090x_config;
+
 /* frontend attach */
 static int technisat_usb2_set_voltage(struct dvb_frontend *fe,
                 fe_sec_voltage_t voltage)
@@ -472,7 +474,8 @@ static int technisat_usb2_set_voltage(struct dvb_frontend *fe,
         }
 
         for (i = 0; i < 3; i++)
-                if (stv090x_set_gpio(fe, i+2, 0, gpio[i], 0) != 0)
+                if (technisat_usb2_stv090x_config.set_gpio(fe, i+2, 0,
+                                                           gpio[i], 0) != 0)
                         return -EREMOTEIO;
         return 0;
 }
diff --git a/drivers/media/usb/em28xx/em28xx-audio.c b/drivers/media/usb/em28xx/em28xx-audio.c
index 957c7ae30efe..44ae1e0661e6 100644
--- a/drivers/media/usb/em28xx/em28xx-audio.c
+++ b/drivers/media/usb/em28xx/em28xx-audio.c
@@ -56,7 +56,7 @@ MODULE_PARM_DESC(debug, "activates debug info");
 #define dprintk(fmt, arg...) do {                                       \
             if (debug)                                                  \
                 printk(KERN_INFO "em28xx-audio %s: " fmt,               \
-                                  __func__, ##arg);             \
+                                  __func__, ##arg);             \
         } while (0)
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
@@ -232,7 +232,6 @@ static struct snd_pcm_hardware snd_em28xx_hw_capture = {
         .channels_max = 2,
         .buffer_bytes_max = 62720 * 8,  /* just about the value in usbaudio.c */
 
-
         /*
          * The period is 12.288 bytes. Allow a 10% of variation along its
          * value, in order to avoid overruns/underruns due to some clock
@@ -361,7 +360,7 @@ static int snd_em28xx_hw_capture_params(struct snd_pcm_substream *substream,
         dprintk("Setting capture parameters\n");
 
         ret = snd_pcm_alloc_vmalloc_buffer(substream,
-                                params_buffer_bytes(hw_params));
+                                           params_buffer_bytes(hw_params));
         if (ret < 0)
                 return ret;
 #if 0
@@ -478,7 +477,7 @@ static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
  * AC97 volume control support
  */
 static int em28xx_vol_info(struct snd_kcontrol *kcontrol,
-                                struct snd_ctl_elem_info *info)
+                           struct snd_ctl_elem_info *info)
 {
         struct em28xx *dev = snd_kcontrol_chip(kcontrol);
 
@@ -494,7 +493,7 @@ static int em28xx_vol_info(struct snd_kcontrol *kcontrol,
 }
 
 static int em28xx_vol_put(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *value)
+                          struct snd_ctl_elem_value *value)
 {
         struct em28xx *dev = snd_kcontrol_chip(kcontrol);
         struct snd_pcm_substream *substream = dev->adev.capture_pcm_substream;
@@ -534,7 +533,7 @@ err:
 }
 
 static int em28xx_vol_get(struct snd_kcontrol *kcontrol,
-                               struct snd_ctl_elem_value *value)
+                          struct snd_ctl_elem_value *value)
 {
         struct em28xx *dev = snd_kcontrol_chip(kcontrol);
         struct snd_pcm_substream *substream = dev->adev.capture_pcm_substream;
@@ -655,7 +654,7 @@ static int em28xx_cvol_new(struct snd_card *card, struct em28xx *dev,
         struct snd_kcontrol *kctl;
         struct snd_kcontrol_new tmp;
 
-        memset (&tmp, 0, sizeof(tmp));
+        memset(&tmp, 0, sizeof(tmp));
         tmp.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         tmp.private_value = id,
         tmp.name  = ctl_name,
@@ -672,7 +671,7 @@ static int em28xx_cvol_new(struct snd_card *card, struct em28xx *dev,
         dprintk("Added control %s for ac97 volume control 0x%04x\n",
                 ctl_name, id);
 
-        memset (&tmp, 0, sizeof(tmp));
+        memset(&tmp, 0, sizeof(tmp));
         tmp.iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         tmp.private_value = id,
         tmp.name  = ctl_name,
@@ -731,7 +730,7 @@ static void em28xx_audio_free_urb(struct em28xx *dev)
 
 /* high bandwidth multiplier, as encoded in highspeed endpoint descriptors */
 static int em28xx_audio_ep_packet_size(struct usb_device *udev,
-                                        struct usb_endpoint_descriptor *e)
+                                       struct usb_endpoint_descriptor *e)
 {
         int size = le16_to_cpu(e->wMaxPacketSize);
 
@@ -781,7 +780,7 @@ static int em28xx_audio_urb_init(struct em28xx *dev)
         interval = 1 << (ep->bInterval - 1);
 
         em28xx_info("Endpoint 0x%02x %s on intf %d alt %d interval = %d, size %d\n",
-                     EM28XX_EP_AUDIO, usb_speed_string(dev->udev->speed),
+                    EM28XX_EP_AUDIO, usb_speed_string(dev->udev->speed),
                      dev->ifnum, alt,
                      interval,
                      ep_size);
diff --git a/drivers/media/usb/em28xx/em28xx-camera.c b/drivers/media/usb/em28xx/em28xx-camera.c
index 6d2ea9afd57b..7be661f73930 100644
--- a/drivers/media/usb/em28xx/em28xx-camera.c
+++ b/drivers/media/usb/em28xx/em28xx-camera.c
@@ -27,7 +27,6 @@
 
 #include "em28xx.h"
 
-
 /* Possible i2c addresses of Micron sensors */
 static unsigned short micron_sensor_addrs[] = {
         0xb8 >> 1,   /* MT9V111, MT9V403 */
@@ -43,7 +42,6 @@ static unsigned short omnivision_sensor_addrs[] = {
         I2C_CLIENT_END
 };
 
-
 static struct soc_camera_link camlink = {
         .bus_id = 0,
         .flags = 0,
@@ -51,7 +49,6 @@ static struct soc_camera_link camlink = {
         .unbalanced_power = true,
 };
 
-
 /* FIXME: Should be replaced by a proper mt9m111 driver */
 static int em28xx_initialize_mt9m111(struct em28xx *dev)
 {
@@ -70,7 +67,6 @@ static int em28xx_initialize_mt9m111(struct em28xx *dev)
         return 0;
 }
 
-
 /* FIXME: Should be replaced by a proper mt9m001 driver */
 static int em28xx_initialize_mt9m001(struct em28xx *dev)
 {
@@ -98,7 +94,6 @@ static int em28xx_initialize_mt9m001(struct em28xx *dev)
         return 0;
 }
 
-
 /*
  * Probes Micron sensors with 8 bit address and 16 bit register width
  */
@@ -430,7 +425,7 @@ int em28xx_init_camera(struct em28xx *dev)
                         break;
                 }
 
-                fmt.code = V4L2_MBUS_FMT_YUYV8_2X8;
+                fmt.code = MEDIA_BUS_FMT_YUYV8_2X8;
                 fmt.width = 640;
                 fmt.height = 480;
                 v4l2_subdev_call(subdev, video, s_mbus_fmt, &fmt);
diff --git a/drivers/media/usb/em28xx/em28xx-cards.c b/drivers/media/usb/em28xx/em28xx-cards.c
index 71fa51e7984e..d9704e66b8c9 100644
--- a/drivers/media/usb/em28xx/em28xx-cards.c
+++ b/drivers/media/usb/em28xx/em28xx-cards.c
@@ -64,7 +64,6 @@ module_param(usb_xfer_mode, int, 0444);
 MODULE_PARM_DESC(usb_xfer_mode,
                  "USB transfer mode for frame data (-1 = auto, 0 = prefer isoc, 1 = prefer bulk)");
 
-
 /* Bitmask marking allocated devices from 0 to EM28XX_MAXBOARDS - 1 */
 static DECLARE_BITMAP(em28xx_devused, EM28XX_MAXBOARDS);
 
@@ -190,8 +189,8 @@ static struct em28xx_reg_seq kworld_a340_digital[] = {
 };
 
 static struct em28xx_reg_seq kworld_ub435q_v3_digital[] = {
-        {EM2874_R80_GPIO_P0_CTRL,       0xff,   0xff,   100},
-        {EM2874_R80_GPIO_P0_CTRL,       0xfe,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0xff,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0xfe,   0xff,   100},
         {EM2874_R80_GPIO_P0_CTRL,       0xbe,   0xff,   100},
         {EM2874_R80_GPIO_P0_CTRL,       0xfe,   0xff,   100},
         {       -1,                     -1,     -1,     -1},
@@ -301,7 +300,6 @@ static struct em28xx_reg_seq dikom_dk300_digital[] = {
         {       -1,             -1,     -1,             -1},
 };
 
-
 /* Reset for the most [digital] boards */
 static struct em28xx_reg_seq leadership_digital[] = {
         {EM2874_R80_GPIO_P0_CTRL,       0x70,   0xff,   10},
@@ -479,6 +477,20 @@ static struct em28xx_reg_seq pctv_292e[] = {
         {-1,                             -1,   -1,     -1},
 };
 
+static struct em28xx_reg_seq terratec_t2_stick_hd[] = {
+        {EM2874_R80_GPIO_P0_CTRL,       0xff,   0xff,   0},
+        {0x0d,                          0xff,   0xff,   600},
+        {EM2874_R80_GPIO_P0_CTRL,       0xfc,   0xff,   10},
+        {EM2874_R80_GPIO_P0_CTRL,       0xbc,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0xfc,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0x00,   0xff,   300},
+        {EM2874_R80_GPIO_P0_CTRL,       0xf8,   0xff,   100},
+        {EM2874_R80_GPIO_P0_CTRL,       0xfc,   0xff,   300},
+        {0x0d,                          0x42,   0xff,   1000},
+        {EM2874_R5F_TS_ENABLE,          0x85,   0xff,   0},
+        {-1,                             -1,   -1,     -1},
+};
+
 /*
  *  Button definitions
  */
@@ -548,7 +560,6 @@ static struct em28xx_led pctv_80e_leds[] = {
         {-1, 0, 0, 0},
 };
 
-
 /*
  *  Board definitions
  */
@@ -1514,7 +1525,7 @@ struct em28xx_board em28xx_boards[] = {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
-                        .aout     = EM28XX_AOUT_MONO |  /* I2S */
+                        .aout     = EM28XX_AOUT_MONO |  /* I2S */
                                     EM28XX_AOUT_MASTER, /* Line out pin */
                 }, {
                         .type     = EM28XX_VMUX_COMPOSITE1,
@@ -1536,7 +1547,7 @@ struct em28xx_board em28xx_boards[] = {
                         .type     = EM28XX_VMUX_TELEVISION,
                         .vmux     = SAA7115_COMPOSITE2,
                         .amux     = EM28XX_AMUX_VIDEO,
-                        .aout     = EM28XX_AOUT_MONO |  /* I2S */
+                        .aout     = EM28XX_AOUT_MONO |  /* I2S */
                                     EM28XX_AOUT_MASTER, /* Line out pin */
                 }, {
                         .type     = EM28XX_VMUX_COMPOSITE1,
@@ -2243,6 +2254,31 @@ struct em28xx_board em28xx_boards[] = {
                 .has_dvb       = 1,
                 .ir_codes      = RC_MAP_PINNACLE_PCTV_HD,
         },
+        [EM2861_BOARD_LEADTEK_VC100] = {
+                .name          = "Leadtek VC100",
+                .tuner_type    = TUNER_ABSENT,  /* Capture only device */
+                .decoder       = EM28XX_TVP5150,
+                .input         = { {
+                        .type     = EM28XX_VMUX_COMPOSITE1,
+                        .vmux     = TVP5150_COMPOSITE1,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                }, {
+                        .type     = EM28XX_VMUX_SVIDEO,
+                        .vmux     = TVP5150_SVIDEO,
+                        .amux     = EM28XX_AMUX_LINE_IN,
+                } },
+        },
+        /* eb1a:8179 Terratec Cinergy T2 Stick HD.
+         * Empia EM28178, Silicon Labs Si2168, Silicon Labs Si2146 */
+        [EM28178_BOARD_TERRATEC_T2_STICK_HD] = {
+                .name          = "Terratec Cinergy T2 Stick HD",
+                .def_i2c_bus   = 1,
+                .i2c_speed     = EM28XX_I2C_CLK_WAIT_ENABLE | EM28XX_I2C_FREQ_400_KHZ,
+                .tuner_type    = TUNER_ABSENT,
+                .tuner_gpio    = terratec_t2_stick_hd,
+                .has_dvb       = 1,
+                .ir_codes      = RC_MAP_TERRATEC_SLIM_2,
+        },
 };
 EXPORT_SYMBOL_GPL(em28xx_boards);
 
@@ -2424,6 +2460,10 @@ struct usb_device_id em28xx_id_table[] = {
                         .driver_info = EM28178_BOARD_PCTV_461E },
         { USB_DEVICE(0x2013, 0x025f),
                         .driver_info = EM28178_BOARD_PCTV_292E },
+        { USB_DEVICE(0x0413, 0x6f07),
+                        .driver_info = EM2861_BOARD_LEADTEK_VC100 },
+        { USB_DEVICE(0xeb1a, 0x8179),
+                        .driver_info = EM28178_BOARD_TERRATEC_T2_STICK_HD },
         { },
 };
 MODULE_DEVICE_TABLE(usb, em28xx_id_table);
@@ -2453,6 +2493,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
         {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
         {0x6b800080, EM2874_BOARD_LEADERSHIP_ISDBT, TUNER_ABSENT},
 };
+
 /* NOTE: introduce a separate hash table for devices with 16 bit eeproms */
 
 int em28xx_tuner_callback(void *ptr, int component, int command, int arg)
@@ -2695,7 +2736,7 @@ static int em28xx_hint_board(struct em28xx *dev)
                       " insmod option:\n");
         for (i = 0; i < em28xx_bcount; i++) {
                 em28xx_errdev("    card=%d -> %s\n",
-                                i, em28xx_boards[i].name);
+                              i, em28xx_boards[i].name);
         }
         return -1;
 }
@@ -3051,6 +3092,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
                         if (le16_to_cpu(dev->udev->descriptor.idVendor)
                                                                     == 0xeb1a) {
                                 __le16 idProd = dev->udev->descriptor.idProduct;
+
                                 if (le16_to_cpu(idProd) == 0x2710)
                                         chip_name = "em2710";
                                 else if (le16_to_cpu(idProd) == 0x2820)
@@ -3139,7 +3181,7 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
                 retval = em28xx_i2c_register(dev, 0, EM28XX_I2C_ALGO_EM28XX);
         if (retval < 0) {
                 em28xx_errdev("%s: em28xx_i2c_register bus 0 - error [%d]!\n",
-                        __func__, retval);
+                              __func__, retval);
                 return retval;
         }
 
@@ -3147,13 +3189,13 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
         if (dev->def_i2c_bus) {
                 if (dev->is_em25xx)
                         retval = em28xx_i2c_register(dev, 1,
-                                                  EM28XX_I2C_ALGO_EM25XX_BUS_B);
+                                                     EM28XX_I2C_ALGO_EM25XX_BUS_B);
                 else
                         retval = em28xx_i2c_register(dev, 1,
-                                                        EM28XX_I2C_ALGO_EM28XX);
+                                                     EM28XX_I2C_ALGO_EM28XX);
                 if (retval < 0) {
                         em28xx_errdev("%s: em28xx_i2c_register bus 1 - error [%d]!\n",
-                                __func__, retval);
+                                      __func__, retval);
 
                         em28xx_i2c_unregister(dev, 0);
 
@@ -3193,7 +3235,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
                 if (nr >= EM28XX_MAXBOARDS) {
                         /* No free device slots */
                         printk(DRIVER_NAME ": Supports only %i em28xx boards.\n",
-                                        EM28XX_MAXBOARDS);
+                               EM28XX_MAXBOARDS);
                         retval = -ENOMEM;
                         goto err_no_slot;
                 }
@@ -3377,6 +3419,7 @@ static int em28xx_usb_probe(struct usb_interface *interface,
         /* Checks if audio is provided by a USB Audio Class interface */
         for (i = 0; i < udev->config->desc.bNumInterfaces; i++) {
                 struct usb_interface *uif = udev->config->interface[i];
+
                 if (uif->altsetting[0].desc.bInterfaceClass == USB_CLASS_AUDIO) {
                         if (has_vendor_audio)
                                 em28xx_err("em28xx: device seems to have vendor AND usb audio class interfaces !\n"
@@ -3487,7 +3530,7 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
 }
 
 static int em28xx_usb_suspend(struct usb_interface *interface,
-                                pm_message_t message)
+                              pm_message_t message)
 {
         struct em28xx *dev;
 
diff --git a/drivers/media/usb/em28xx/em28xx-core.c b/drivers/media/usb/em28xx/em28xx-core.c
index 901cf2b952d7..86461a708abe 100644
--- a/drivers/media/usb/em28xx/em28xx-core.c
+++ b/drivers/media/usb/em28xx/em28xx-core.c
@@ -75,7 +75,7 @@ MODULE_PARM_DESC(reg_debug, "enable debug messages [URB reg]");
  * reads data from the usb device specifying bRequest
  */
 int em28xx_read_reg_req_len(struct em28xx *dev, u8 req, u16 reg,
-                                   char *buf, int len)
+                            char *buf, int len)
 {
         int ret;
         int pipe = usb_rcvctrlpipe(dev->udev, 0);
@@ -151,7 +151,7 @@ EXPORT_SYMBOL_GPL(em28xx_read_reg);
  * sends data to the usb device, specifying bRequest
  */
 int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
-                                 int len)
+                          int len)
 {
         int ret;
         int pipe = usb_sndctrlpipe(dev->udev, 0);
@@ -213,7 +213,7 @@ EXPORT_SYMBOL_GPL(em28xx_write_reg);
  * the actual value
  */
 int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
-                                 u8 bitmask)
+                          u8 bitmask)
 {
         int oldval;
         u8 newval;
@@ -222,7 +222,7 @@ int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
         if (oldval < 0)
                 return oldval;
 
-        newval = (((u8) oldval) & ~bitmask) | (val & bitmask);
+        newval = (((u8)oldval) & ~bitmask) | (val & bitmask);
 
         return em28xx_write_regs(dev, reg, &newval, 1);
 }
@@ -314,7 +314,7 @@ int em28xx_write_ac97(struct em28xx *dev, u8 reg, u16 val)
         if (ret < 0)
                 return ret;
 
-        ret = em28xx_write_regs(dev, EM28XX_R40_AC97LSB, (u8 *) &value, 2);
+        ret = em28xx_write_regs(dev, EM28XX_R40_AC97LSB, (u8 *)&value, 2);
         if (ret < 0)
                 return ret;
 
@@ -361,7 +361,7 @@ static int set_ac97_input(struct em28xx *dev)
 
                 if (ret < 0)
                         em28xx_warn("couldn't setup AC97 register %d\n",
-                                     inputs[i].reg);
+                                    inputs[i].reg);
         }
         return 0;
 }
@@ -445,7 +445,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
                         ret = em28xx_write_ac97(dev, outputs[i].reg, 0x8000);
                         if (ret < 0)
                                 em28xx_warn("couldn't setup AC97 register %d\n",
-                                     outputs[i].reg);
+                                            outputs[i].reg);
                 }
         }
 
@@ -483,7 +483,7 @@ int em28xx_audio_analog_set(struct em28xx *dev)
                                                         vol);
                         if (ret < 0)
                                 em28xx_warn("couldn't setup AC97 register %d\n",
-                                     outputs[i].reg);
+                                            outputs[i].reg);
                 }
 
                 if (dev->ctl_aoutput & EM28XX_AOUT_PCM_IN) {
@@ -531,7 +531,7 @@ int em28xx_audio_setup(struct em28xx *dev)
         } else if ((cfg & EM28XX_CHIPCFG_AUDIOMASK) != EM28XX_CHIPCFG_AC97) {
                 dev->int_audio_type = EM28XX_INT_AUDIO_I2S;
                 if (dev->chip_id < CHIP_ID_EM2860 &&
-                    (cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
+                    (cfg & EM28XX_CHIPCFG_AUDIOMASK) ==
                     EM2820_CHIPCFG_I2S_1_SAMPRATE)
                         i2s_samplerates = 1;
                 else if (dev->chip_id >= CHIP_ID_EM2860 &&
@@ -541,7 +541,7 @@ int em28xx_audio_setup(struct em28xx *dev)
                 else
                         i2s_samplerates = 3;
                 em28xx_info("I2S Audio (%d sample rate(s))\n",
-                                               i2s_samplerates);
+                            i2s_samplerates);
                 /* Skip the code that does AC97 vendor detection */
                 dev->audio_mode.ac97 = EM28XX_NO_AC97;
                 goto init_audio;
@@ -614,8 +614,9 @@ const struct em28xx_led *em28xx_find_led(struct em28xx *dev,
 {
         if (dev->board.leds) {
                 u8 k = 0;
+
                 while (dev->board.leds[k].role >= 0 &&
-                               dev->board.leds[k].role < EM28XX_NUM_LED_ROLES) {
+                       dev->board.leds[k].role < EM28XX_NUM_LED_ROLES) {
                         if (dev->board.leds[k].role == role)
                                 return &dev->board.leds[k];
                         k++;
@@ -658,10 +659,12 @@ int em28xx_capture_start(struct em28xx *dev, int start)
 
                         if (dev->mode == EM28XX_ANALOG_MODE)
                                 rc = em28xx_write_reg(dev,
-                                                    EM28XX_R12_VINENABLE, 0x67);
+                                                      EM28XX_R12_VINENABLE,
+                                                      0x67);
                         else
                                 rc = em28xx_write_reg(dev,
-                                                    EM28XX_R12_VINENABLE, 0x37);
+                                                      EM28XX_R12_VINENABLE,
+                                                      0x37);
                         if (rc < 0)
                                 return rc;
 
@@ -815,9 +818,9 @@ void em28xx_uninit_usb_xfer(struct em28xx *dev, enum em28xx_mode mode)
 
                         if (usb_bufs->transfer_buffer[i]) {
                                 usb_free_coherent(dev->udev,
-                                        urb->transfer_buffer_length,
-                                        usb_bufs->transfer_buffer[i],
-                                        urb->transfer_dma);
+                                                  urb->transfer_buffer_length,
+                                                  usb_bufs->transfer_buffer[i],
+                                                  urb->transfer_dma);
                         }
                         usb_free_urb(urb);
                         usb_bufs->urb[i] = NULL;
@@ -889,7 +892,7 @@ int em28xx_alloc_urbs(struct em28xx *dev, enum em28xx_mode mode, int xfer_bulk,
                 if ((xfer_bulk && !dev->analog_ep_bulk) ||
                     (!xfer_bulk && !dev->analog_ep_isoc)) {
                         em28xx_errdev("no endpoint for analog mode and transfer type %d\n",
-                                       xfer_bulk > 0);
+                                      xfer_bulk > 0);
                         return -EINVAL;
                 }
                 usb_bufs = &dev->usb_ctl.analog_bufs;
@@ -988,9 +991,9 @@ EXPORT_SYMBOL_GPL(em28xx_alloc_urbs);
  * Allocate URBs and start IRQ
  */
 int em28xx_init_usb_xfer(struct em28xx *dev, enum em28xx_mode mode,
-                    int xfer_bulk, int num_bufs, int max_pkt_size,
+                         int xfer_bulk, int num_bufs, int max_pkt_size,
                     int packet_multiplier,
-                    int (*urb_data_copy) (struct em28xx *dev, struct urb *urb))
+                    int (*urb_data_copy)(struct em28xx *dev, struct urb *urb))
 {
         struct em28xx_dmaqueue *dma_q = &dev->vidq;
         struct em28xx_dmaqueue *vbi_dma_q = &dev->vbiq;
diff --git a/drivers/media/usb/em28xx/em28xx-dvb.c b/drivers/media/usb/em28xx/em28xx-dvb.c
index 9682c52d67d1..9877b699c6bc 100644
--- a/drivers/media/usb/em28xx/em28xx-dvb.c
+++ b/drivers/media/usb/em28xx/em28xx-dvb.c
@@ -63,7 +63,6 @@ MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION(DRIVER_DESC " - digital TV interface");
 MODULE_VERSION(EM28XX_VERSION);
 
-
 static unsigned int debug;
 module_param(debug, int, 0644);
 MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
@@ -71,7 +70,7 @@ MODULE_PARM_DESC(debug, "enable debug messages [dvb]");
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
 #define dprintk(level, fmt, arg...) do {                        \
-if (debug >= level)                                             \
+if (debug >= level)                                             \
         printk(KERN_DEBUG "%s/2-dvb: " fmt, dev->name, ## arg); \
 } while (0)
 
@@ -99,9 +98,8 @@ struct em28xx_dvb {
         struct i2c_client       *i2c_client_tuner;
 };
 
-
 static inline void print_err_status(struct em28xx *dev,
-                                     int packet, int status)
+                                    int packet, int status)
 {
         char *errmsg = "Unknown";
 
@@ -169,7 +167,7 @@ static inline int em28xx_dvb_urb_data_copy(struct em28xx *dev, struct urb *urb)
                         if (!urb->actual_length)
                                 continue;
                         dvb_dmx_swfilter(&dev->dvb->demux, urb->transfer_buffer,
-                                        urb->actual_length);
+                                         urb->actual_length);
                 } else {
                         if (urb->iso_frame_desc[i].status < 0) {
                                 print_err_status(dev, i,
@@ -280,7 +278,6 @@ static int em28xx_stop_feed(struct dvb_demux_feed *feed)
 }
 
 
-
 /* ------------------------------------------------------------------ */
 static int em28xx_dvb_bus_ctrl(struct dvb_frontend *fe, int acquire)
 {
@@ -740,7 +737,7 @@ static int em28xx_pctv_290e_set_lna(struct dvb_frontend *fe)
         return ret;
 #else
         dev_warn(&dev->udev->dev, "%s: LNA control is disabled (lna=%u)\n",
-                        KBUILD_MODNAME, c->lna);
+                 KBUILD_MODNAME, c->lna);
         return 0;
 #endif
 }
@@ -830,6 +827,7 @@ static struct zl10353_config em28xx_zl10353_no_i2c_gate_dev = {
         .no_tuner = 1,
         .parallel_ts = 1,
 };
+
 static struct qt1010_config em28xx_qt1010_config = {
         .i2c_address = 0x62
 };
@@ -861,7 +859,6 @@ static const struct m88ds3103_config pctv_461e_m88ds3103_config = {
         .agc = 0x99,
 };
 
-
 static struct tda18271_std_map drx_j_std_map = {
         .atsc_6   = { .if_freq = 5000, .agc_mode = 3, .std = 0, .if_lvl = 1,
                       .rfagc_top = 0x37, },
@@ -948,7 +945,7 @@ static int em28xx_register_dvb(struct em28xx_dvb *dvb, struct module *module,
                 result = dvb_register_frontend(&dvb->adapter, dvb->fe[1]);
                 if (result < 0) {
                         printk(KERN_WARNING "%s: 2nd dvb_register_frontend failed (errno = %d)\n",
-                                dev->name, result);
+                               dev->name, result);
                         goto fail_frontend1;
                 }
         }
@@ -1047,7 +1044,7 @@ static void em28xx_unregister_dvb(struct em28xx_dvb *dvb)
 
 static int em28xx_dvb_init(struct em28xx *dev)
 {
-        int result = 0, mfe_shared = 0;
+        int result = 0;
         struct em28xx_dvb *dvb;
 
         if (dev->is_audio_only) {
@@ -1182,7 +1179,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
                                            &dev->i2c_adap[dev->def_i2c_bus]);
                 if (dvb->fe[0] != NULL) {
                         if (!dvb_attach(simple_tuner_attach, dvb->fe[0],
-                                &dev->i2c_adap[dev->def_i2c_bus], 0x61, TUNER_THOMSON_DTT761X)) {
+                                        &dev->i2c_adap[dev->def_i2c_bus],
+                                        0x61, TUNER_THOMSON_DTT761X)) {
                                 result = -EINVAL;
                                 goto out_free;
                         }
@@ -1204,7 +1202,8 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         &dev->i2c_adap[dev->def_i2c_bus], 0x48);
                 if (dvb->fe[0]) {
                         if (!dvb_attach(simple_tuner_attach, dvb->fe[0],
-                                &dev->i2c_adap[dev->def_i2c_bus], 0x60, TUNER_PHILIPS_CU1216L)) {
+                                        &dev->i2c_adap[dev->def_i2c_bus],
+                                        0x60, TUNER_PHILIPS_CU1216L)) {
                                 result = -EINVAL;
                                 goto out_free;
                         }
@@ -1219,7 +1218,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         goto out_free;
                 }
                 if (!dvb_attach(tda18271_attach, dvb->fe[0], 0x60,
-                        &dev->i2c_adap[dev->def_i2c_bus],
+                                &dev->i2c_adap[dev->def_i2c_bus],
                         &kworld_a340_config)) {
                                 dvb_frontend_detach(dvb->fe[0]);
                                 result = -EINVAL;
@@ -1250,10 +1249,10 @@ static int em28xx_dvb_init(struct em28xx *dev)
 #ifdef CONFIG_GPIOLIB
                         /* enable LNA for DVB-T, DVB-T2 and DVB-C */
                         result = gpio_request_one(dvb->lna_gpio,
-                                        GPIOF_OUT_INIT_LOW, NULL);
+                                                  GPIOF_OUT_INIT_LOW, NULL);
                         if (result)
                                 em28xx_errdev("gpio request failed %d\n",
-                                                result);
+                                              result);
                         else
                                 gpio_free(dvb->lna_gpio);
 
@@ -1266,6 +1265,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
         case EM2884_BOARD_HAUPPAUGE_WINTV_HVR_930C:
         {
                 struct xc5000_config cfg;
+
                 hauppauge_hvr930c_init(dev);
 
                 dvb->fe[0] = dvb_attach(drxk_attach,
@@ -1339,7 +1339,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
                 /* attach SEC */
                 if (dvb->fe[0])
                         dvb_attach(a8293_attach, dvb->fe[0], &dev->i2c_adap[dev->def_i2c_bus],
-                                &em28xx_a8293_config);
+                                   &em28xx_a8293_config);
                 break;
         case EM2874_BOARD_DELOCK_61959:
         case EM2874_BOARD_MAXMEDIA_UB425_TC:
@@ -1553,6 +1553,7 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         struct si2157_config si2157_config;
 
                         /* attach demod */
+                        memset(&si2168_config, 0, sizeof(si2168_config));
                         si2168_config.i2c_adapter = &adapter;
                         si2168_config.fe = &dvb->fe[0];
                         si2168_config.ts_mode = SI2168_TS_PARALLEL;
@@ -1603,6 +1604,65 @@ static int em28xx_dvb_init(struct em28xx *dev)
                         dvb->fe[0]->ops.set_lna = em28xx_pctv_292e_set_lna;
                 }
                 break;
+        case EM28178_BOARD_TERRATEC_T2_STICK_HD:
+                {
+                        struct i2c_adapter *adapter;
+                        struct i2c_client *client;
+                        struct i2c_board_info info;
+                        struct si2168_config si2168_config;
+                        struct si2157_config si2157_config;
+
+                        /* attach demod */
+                        memset(&si2168_config, 0, sizeof(si2168_config));
+                        si2168_config.i2c_adapter = &adapter;
+                        si2168_config.fe = &dvb->fe[0];
+                        si2168_config.ts_mode = SI2168_TS_PARALLEL;
+                        memset(&info, 0, sizeof(struct i2c_board_info));
+                        strlcpy(info.type, "si2168", I2C_NAME_SIZE);
+                        info.addr = 0x64;
+                        info.platform_data = &si2168_config;
+                        request_module(info.type);
+                        client = i2c_new_device(&dev->i2c_adap[dev->def_i2c_bus], &info);
+                        if (client == NULL || client->dev.driver == NULL) {
+                                result = -ENODEV;
+                                goto out_free;
+                        }
+
+                        if (!try_module_get(client->dev.driver->owner)) {
+                                i2c_unregister_device(client);
+                                result = -ENODEV;
+                                goto out_free;
+                        }
+
+                        dvb->i2c_client_demod = client;
+
+                        /* attach tuner */
+                        memset(&si2157_config, 0, sizeof(si2157_config));
+                        si2157_config.fe = dvb->fe[0];
+                        memset(&info, 0, sizeof(struct i2c_board_info));
+                        strlcpy(info.type, "si2146", I2C_NAME_SIZE);
+                        info.addr = 0x60;
+                        info.platform_data = &si2157_config;
+                        request_module("si2157");
+                        client = i2c_new_device(adapter, &info);
+                        if (client == NULL || client->dev.driver == NULL) {
+                                module_put(dvb->i2c_client_demod->dev.driver->owner);
+                                i2c_unregister_device(dvb->i2c_client_demod);
+                                result = -ENODEV;
+                                goto out_free;
+                        }
+
+                        if (!try_module_get(client->dev.driver->owner)) {
+                                i2c_unregister_device(client);
+                                module_put(dvb->i2c_client_demod->dev.driver->owner);
+                                i2c_unregister_device(dvb->i2c_client_demod);
+                                result = -ENODEV;
+                                goto out_free;
+                        }
+
+                        dvb->i2c_client_tuner = client;
+                }
+                break;
         default:
                 em28xx_errdev("/2: The frontend of your DVB/ATSC card"
                                 " isn't supported yet\n");
@@ -1624,9 +1684,6 @@ static int em28xx_dvb_init(struct em28xx *dev)
         if (result < 0)
                 goto out_free;
 
-        /* MFE lock */
-        dvb->adapter.mfe_shared = mfe_shared;
-
         em28xx_info("DVB extension successfully initialized\n");
 
         kref_get(&dev->ref);
diff --git a/drivers/media/usb/em28xx/em28xx-i2c.c b/drivers/media/usb/em28xx/em28xx-i2c.c
index 1048c1a23fb6..a19b5c8b56ff 100644
--- a/drivers/media/usb/em28xx/em28xx-i2c.c
+++ b/drivers/media/usb/em28xx/em28xx-i2c.c
@@ -593,6 +593,7 @@ static inline unsigned long em28xx_hash_mem(char *buf, int length, int bits)
         unsigned long l = 0;
         int len = 0;
         unsigned char c;
+
         do {
                 if (len == length) {
                         c = (char)len;
@@ -877,6 +878,7 @@ static struct i2c_client em28xx_client_template = {
  * incomplete list of known devices
  */
 static char *i2c_devs[128] = {
+       [0x1c >> 1] = "lgdt330x",
         [0x3e >> 1] = "remote IR sensor",
         [0x4a >> 1] = "saa7113h",
         [0x52 >> 1] = "drxk",
@@ -949,7 +951,7 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus,
         retval = i2c_add_adapter(&dev->i2c_adap[bus]);
         if (retval < 0) {
                 em28xx_errdev("%s: i2c_add_adapter failed! retval [%d]\n",
-                        __func__, retval);
+                              __func__, retval);
                 return retval;
         }
 
@@ -961,7 +963,7 @@ int em28xx_i2c_register(struct em28xx *dev, unsigned bus,
                 retval = em28xx_i2c_eeprom(dev, bus, &dev->eedata, &dev->eedata_len);
                 if ((retval < 0) && (retval != -ENODEV)) {
                         em28xx_errdev("%s: em28xx_i2_eeprom failed! retval [%d]\n",
-                                __func__, retval);
+                                      __func__, retval);
 
                         return retval;
                 }
diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c
index 23f8f6afa2e0..d8dc03aadfbd 100644
--- a/drivers/media/usb/em28xx/em28xx-input.c
+++ b/drivers/media/usb/em28xx/em28xx-input.c
@@ -459,7 +459,7 @@ static int em28xx_ir_change_protocol(struct rc_dev *rc_dev, u64 *rc_type)
                 return em2874_ir_change_protocol(rc_dev, rc_type);
         default:
                 printk("Unrecognized em28xx chip id 0x%02x: IR not supported\n",
-                        dev->chip_id);
+                       dev->chip_id);
                 return -EINVAL;
         }
 }
@@ -505,7 +505,7 @@ static void em28xx_query_buttons(struct work_struct *work)
                 /* Check states of the buttons and act */
                 j = 0;
                 while (dev->board.buttons[j].role >= 0 &&
-                         dev->board.buttons[j].role < EM28XX_NUM_BUTTON_ROLES) {
+                       dev->board.buttons[j].role < EM28XX_NUM_BUTTON_ROLES) {
                         struct em28xx_button *button = &dev->board.buttons[j];
                         /* Check if button uses the current address */
                         if (button->reg_r != dev->button_polling_addresses[i]) {
@@ -607,7 +607,7 @@ static void em28xx_init_buttons(struct em28xx *dev)
 
         dev->button_polling_interval = EM28XX_BUTTONS_DEBOUNCED_QUERY_INTERVAL;
         while (dev->board.buttons[i].role >= 0 &&
-                         dev->board.buttons[i].role < EM28XX_NUM_BUTTON_ROLES) {
+               dev->board.buttons[i].role < EM28XX_NUM_BUTTON_ROLES) {
                 struct em28xx_button *button = &dev->board.buttons[i];
                 /* Check if polling address is already on the list */
                 addr_new = true;
@@ -653,11 +653,11 @@ next_button:
         /* Start polling */
         if (dev->num_button_polling_addresses) {
                 memset(dev->button_polling_last_values, 0,
-                                               EM28XX_NUM_BUTTON_ADDRESSES_MAX);
+                       EM28XX_NUM_BUTTON_ADDRESSES_MAX);
                 INIT_DELAYED_WORK(&dev->buttons_query_work,
-                                                          em28xx_query_buttons);
+                                  em28xx_query_buttons);
                 schedule_delayed_work(&dev->buttons_query_work,
-                               msecs_to_jiffies(dev->button_polling_interval));
+                                      msecs_to_jiffies(dev->button_polling_interval));
         }
 }
 
@@ -841,8 +841,7 @@ static int em28xx_ir_fini(struct em28xx *dev)
         if (!ir)
                 goto ref_put;
 
-        if (ir->rc)
-                rc_unregister_device(ir->rc);
+        rc_unregister_device(ir->rc);
 
         kfree(ir->i2c_client);
 
@@ -887,7 +886,7 @@ static int em28xx_ir_resume(struct em28xx *dev)
                 schedule_delayed_work(&ir->work, msecs_to_jiffies(ir->polling));
         if (dev->num_button_polling_addresses)
                 schedule_delayed_work(&dev->buttons_query_work,
-                               msecs_to_jiffies(dev->button_polling_interval));
+                                      msecs_to_jiffies(dev->button_polling_interval));
         return 0;
 }
 
diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h
index 311fb349dafa..13cbb7f3ea10 100644
--- a/drivers/media/usb/em28xx/em28xx-reg.h
+++ b/drivers/media/usb/em28xx/em28xx-reg.h
@@ -49,7 +49,6 @@
 #define EM28XX_CHIPCFG2_TS_PACKETSIZE_564       0x02
 #define EM28XX_CHIPCFG2_TS_PACKETSIZE_752       0x03
 
-
 /* GPIO/GPO registers */
 #define EM2880_R04_GPO          0x04    /* em2880-em2883 only */
 #define EM2820_R08_GPIO_CTRL    0x08    /* em2820-em2873/83 only */
@@ -68,7 +67,6 @@
 #define EM28XX_I2C_FREQ_400_KHZ         0x01
 #define EM28XX_I2C_FREQ_100_KHZ         0x00
 
-
 #define EM28XX_R0A_CHIPID       0x0a
 #define EM28XX_R0C_USBSUSP      0x0c
 #define   EM28XX_R0C_USBSUSP_SNAPSHOT   0x20 /* 1=button pressed, needs reset */
@@ -157,7 +155,6 @@
 #define EM28XX_OUTFMT_YUV422_Y1UY0V     0x15
 #define EM28XX_OUTFMT_YUV411            0x18
 
-
 #define EM28XX_R28_XMIN 0x28
 #define EM28XX_R29_XMAX 0x29
 #define EM28XX_R2A_YMIN 0x2a
diff --git a/drivers/media/usb/em28xx/em28xx-v4l.h b/drivers/media/usb/em28xx/em28xx-v4l.h
index 432862c20bbf..8dfcb56bf4b3 100644
--- a/drivers/media/usb/em28xx/em28xx-v4l.h
+++ b/drivers/media/usb/em28xx/em28xx-v4l.h
@@ -14,7 +14,6 @@
    GNU General Public License for more details.
  */
 
-
 int em28xx_start_analog_streaming(struct vb2_queue *vq, unsigned int count);
 void em28xx_stop_vbi_streaming(struct vb2_queue *vq);
 extern struct vb2_ops em28xx_vbi_qops;
diff --git a/drivers/media/usb/em28xx/em28xx-vbi.c b/drivers/media/usb/em28xx/em28xx-vbi.c
index 34ee1e03a732..744e7ed743e1 100644
--- a/drivers/media/usb/em28xx/em28xx-vbi.c
+++ b/drivers/media/usb/em28xx/em28xx-vbi.c
@@ -92,7 +92,6 @@ vbi_buffer_queue(struct vb2_buffer *vb)
         spin_unlock_irqrestore(&dev->slock, flags);
 }
 
-
 struct vb2_ops em28xx_vbi_qops = {
         .queue_setup    = vbi_queue_setup,
         .buf_prepare    = vbi_buffer_prepare,
diff --git a/drivers/media/usb/em28xx/em28xx-video.c b/drivers/media/usb/em28xx/em28xx-video.c
index 03d5ece0319c..cf7f58b76292 100644
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -81,7 +81,6 @@ MODULE_DESCRIPTION(DRIVER_DESC " - v4l2 interface");
 MODULE_LICENSE("GPL");
 MODULE_VERSION(EM28XX_VERSION);
 
-
 #define EM25XX_FRMDATAHDR_BYTE1                 0x02
 #define EM25XX_FRMDATAHDR_BYTE2_STILL_IMAGE     0x20
 #define EM25XX_FRMDATAHDR_BYTE2_FRAME_END       0x02
@@ -90,7 +89,6 @@ MODULE_VERSION(EM28XX_VERSION);
                                          EM25XX_FRMDATAHDR_BYTE2_FRAME_END |   \
                                          EM25XX_FRMDATAHDR_BYTE2_FRAME_ID)
 
-
 static unsigned int video_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
 static unsigned int vbi_nr[]   = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
 static unsigned int radio_nr[] = {[0 ... (EM28XX_MAXBOARDS - 1)] = -1U };
@@ -194,9 +192,10 @@ static int em28xx_vbi_supported(struct em28xx *dev)
 static void em28xx_wake_i2c(struct em28xx *dev)
 {
         struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;
+
         v4l2_device_call_all(v4l2_dev, 0, core,  reset, 0);
         v4l2_device_call_all(v4l2_dev, 0, video, s_routing,
-                        INPUT(dev->ctl_input)->vmux, 0, 0);
+                             INPUT(dev->ctl_input)->vmux, 0, 0);
         v4l2_device_call_all(v4l2_dev, 0, video, s_stream, 0);
 }
 
@@ -275,7 +274,7 @@ static int em28xx_accumulator_set(struct em28xx *dev, u8 xmin, u8 xmax,
 }
 
 static void em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
-                                   u16 width, u16 height)
+                                    u16 width, u16 height)
 {
         u8 cwidth = width >> 2;
         u8 cheight = height >> 2;
@@ -283,7 +282,7 @@ static void em28xx_capture_area_set(struct em28xx *dev, u8 hstart, u8 vstart,
         /* NOTE: size limit: 2047x1023 = 2MPix */
 
         em28xx_videodbg("capture area set to (%d,%d): %dx%d\n",
-                       hstart, vstart,
+                        hstart, vstart,
                        ((overflow & 2) << 9 | cwidth << 2),
                        ((overflow & 1) << 10 | cheight << 2));
 
@@ -406,13 +405,13 @@ set_alt:
                 dev->packet_multiplier = EM28XX_BULK_PACKET_MULTIPLIER;
         } else { /* isoc */
                 em28xx_videodbg("minimum isoc packet size: %u (alt=%d)\n",
-                               min_pkt_size, dev->alt);
+                                min_pkt_size, dev->alt);
                 dev->max_pkt_size =
                                   dev->alt_max_pkt_size_isoc[dev->alt];
                 dev->packet_multiplier = EM28XX_NUM_ISOC_PACKETS;
         }
         em28xx_videodbg("setting alternate %d with wMaxPacketSize=%u\n",
-                       dev->alt, dev->max_pkt_size);
+                        dev->alt, dev->max_pkt_size);
         errCode = usb_set_interface(dev->udev, dev->ifnum, dev->alt);
         if (errCode < 0) {
                 em28xx_errdev("cannot change alternate number to %d (error=%i)\n",
@@ -482,7 +481,7 @@ static void em28xx_copy_video(struct em28xx *dev,
 
         if ((char *)startwrite + lencopy > (char *)buf->vb_buf + buf->length) {
                 em28xx_isocdbg("Overflow of %zu bytes past buffer end (1)\n",
-                              ((char *)startwrite + lencopy) -
+                               ((char *)startwrite + lencopy) -
                               ((char *)buf->vb_buf + buf->length));
                 remain = (char *)buf->vb_buf + buf->length -
                          (char *)startwrite;
@@ -548,7 +547,7 @@ static void em28xx_copy_vbi(struct em28xx *dev,
 }
 
 static inline void print_err_status(struct em28xx *dev,
-                                     int packet, int status)
+                                    int packet, int status)
 {
         char *errmsg = "Unknown";
 
@@ -831,7 +830,6 @@ static inline int em28xx_urb_data_copy(struct em28xx *dev, struct urb *urb)
         return 1;
 }
 
-
 static int get_ressource(enum v4l2_buf_type f_type)
 {
         switch (f_type) {
@@ -1003,6 +1001,7 @@ static void em28xx_stop_streaming(struct vb2_queue *vq)
         }
         while (!list_empty(&vidq->active)) {
                 struct em28xx_buffer *buf;
+
                 buf = list_entry(vidq->active.next, struct em28xx_buffer, list);
                 list_del(&buf->list);
                 vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
@@ -1033,6 +1032,7 @@ void em28xx_stop_vbi_streaming(struct vb2_queue *vq)
         }
         while (!list_empty(&vbiq->active)) {
                 struct em28xx_buffer *buf;
+
                 buf = list_entry(vbiq->active.next, struct em28xx_buffer, list);
                 list_del(&buf->list);
                 vb2_buffer_done(&buf->vb, VB2_BUF_STATE_ERROR);
@@ -1109,6 +1109,7 @@ static int em28xx_vb2_setup(struct em28xx *dev)
 static void video_mux(struct em28xx *dev, int index)
 {
         struct v4l2_device *v4l2_dev = &dev->v4l2->v4l2_dev;
+
         dev->ctl_input = index;
         dev->ctl_ainput = INPUT(index)->amux;
         dev->ctl_aoutput = INPUT(index)->aout;
@@ -1117,21 +1118,22 @@ static void video_mux(struct em28xx *dev, int index)
                 dev->ctl_aoutput = EM28XX_AOUT_MASTER;
 
         v4l2_device_call_all(v4l2_dev, 0, video, s_routing,
-                        INPUT(index)->vmux, 0, 0);
+                             INPUT(index)->vmux, 0, 0);
 
         if (dev->board.has_msp34xx) {
                 if (dev->i2s_speed) {
                         v4l2_device_call_all(v4l2_dev, 0, audio,
-                                s_i2s_clock_freq, dev->i2s_speed);
+                                             s_i2s_clock_freq, dev->i2s_speed);
                 }
                 /* Note: this is msp3400 specific */
                 v4l2_device_call_all(v4l2_dev, 0, audio, s_routing,
-                         dev->ctl_ainput, MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
+                                     dev->ctl_ainput,
+                                     MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0);
         }
 
         if (dev->board.adecoder != EM28XX_NOADECODER) {
                 v4l2_device_call_all(v4l2_dev, 0, audio, s_routing,
-                        dev->ctl_ainput, dev->ctl_aoutput, 0);
+                                     dev->ctl_ainput, dev->ctl_aoutput, 0);
         }
 
         em28xx_audio_analog_set(dev);
@@ -1203,7 +1205,7 @@ static const struct v4l2_ctrl_ops em28xx_ctrl_ops = {
 };
 
 static void size_to_scale(struct em28xx *dev,
-                        unsigned int width, unsigned int height,
+                          unsigned int width, unsigned int height,
                         unsigned int *hscale, unsigned int *vscale)
 {
         unsigned int          maxw = norm_maxw(dev);
@@ -1234,7 +1236,7 @@ static void scale_to_size(struct em28xx *dev,
    ------------------------------------------------------------------*/
 
 static int vidioc_g_fmt_vid_cap(struct file *file, void *priv,
-                                        struct v4l2_format *f)
+                                struct v4l2_format *f)
 {
         struct em28xx         *dev = video_drvdata(file);
         struct em28xx_v4l2    *v4l2 = dev->v4l2;
@@ -1267,7 +1269,7 @@ static struct em28xx_fmt *format_by_fourcc(unsigned int fourcc)
 }
 
 static int vidioc_try_fmt_vid_cap(struct file *file, void *priv,
-                        struct v4l2_format *f)
+                                  struct v4l2_format *f)
 {
         struct em28xx         *dev   = video_drvdata(file);
         struct em28xx_v4l2    *v4l2  = dev->v4l2;
@@ -1338,7 +1340,7 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc,
 
         /* set new image size */
         size_to_scale(dev, v4l2->width, v4l2->height,
-                           &v4l2->hscale, &v4l2->vscale);
+                      &v4l2->hscale, &v4l2->vscale);
 
         em28xx_resolution_set(dev);
 
@@ -1346,7 +1348,7 @@ static int em28xx_set_video_format(struct em28xx *dev, unsigned int fourcc,
 }
 
 static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
-                        struct v4l2_format *f)
+                                struct v4l2_format *f)
 {
         struct em28xx *dev = video_drvdata(file);
         struct em28xx_v4l2 *v4l2 = dev->v4l2;
@@ -1401,7 +1403,7 @@ static int vidioc_s_std(struct file *file, void *priv, v4l2_std_id norm)
         v4l2->width = f.fmt.pix.width;
         v4l2->height = f.fmt.pix.height;
         size_to_scale(dev, v4l2->width, v4l2->height,
-                           &v4l2->hscale, &v4l2->vscale);
+                      &v4l2->hscale, &v4l2->vscale);
 
         em28xx_resolution_set(dev);
         v4l2_device_call_all(&v4l2->v4l2_dev, 0, video, s_std, v4l2->norm);
@@ -1422,7 +1424,7 @@ static int vidioc_g_parm(struct file *file, void *priv,
                                                 video, g_parm, p);
         else
                 v4l2_video_std_frame_period(v4l2->norm,
-                                                 &p->parm.capture.timeperframe);
+                                            &p->parm.capture.timeperframe);
 
         return rc;
 }
@@ -1450,7 +1452,7 @@ static const char *iname[] = {
 };
 
 static int vidioc_enum_input(struct file *file, void *priv,
-                                struct v4l2_input *i)
+                             struct v4l2_input *i)
 {
         struct em28xx *dev = video_drvdata(file);
         unsigned int       n;
@@ -1467,7 +1469,7 @@ static int vidioc_enum_input(struct file *file, void *priv,
         strcpy(i->name, iname[INPUT(n)->type]);
 
         if ((EM28XX_VMUX_TELEVISION == INPUT(n)->type) ||
-                (EM28XX_VMUX_CABLE == INPUT(n)->type))
+            (EM28XX_VMUX_CABLE == INPUT(n)->type))
                 i->type = V4L2_INPUT_TYPE_TUNER;
 
         i->std = dev->v4l2->vdev->tvnorms;
@@ -1558,7 +1560,7 @@ static int vidioc_s_audio(struct file *file, void *priv, const struct v4l2_audio
 }
 
 static int vidioc_g_tuner(struct file *file, void *priv,
-                                struct v4l2_tuner *t)
+                          struct v4l2_tuner *t)
 {
         struct em28xx *dev = video_drvdata(file);
 
@@ -1572,7 +1574,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
 }
 
 static int vidioc_s_tuner(struct file *file, void *priv,
-                                const struct v4l2_tuner *t)
+                          const struct v4l2_tuner *t)
 {
         struct em28xx *dev = video_drvdata(file);
 
@@ -1584,7 +1586,7 @@ static int vidioc_s_tuner(struct file *file, void *priv,
 }
 
 static int vidioc_g_frequency(struct file *file, void *priv,
-                                struct v4l2_frequency *f)
+                              struct v4l2_frequency *f)
 {
         struct em28xx         *dev = video_drvdata(file);
         struct em28xx_v4l2    *v4l2 = dev->v4l2;
@@ -1597,7 +1599,7 @@ static int vidioc_g_frequency(struct file *file, void *priv,
 }
 
 static int vidioc_s_frequency(struct file *file, void *priv,
-                                const struct v4l2_frequency *f)
+                              const struct v4l2_frequency *f)
 {
         struct v4l2_frequency  new_freq = *f;
         struct em28xx             *dev  = video_drvdata(file);
@@ -1615,7 +1617,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
 
 #ifdef CONFIG_VIDEO_ADV_DEBUG
 static int vidioc_g_chip_info(struct file *file, void *priv,
-               struct v4l2_dbg_chip_info *chip)
+                              struct v4l2_dbg_chip_info *chip)
 {
         struct em28xx *dev = video_drvdata(file);
 
@@ -1670,6 +1672,7 @@ static int vidioc_g_register(struct file *file, void *priv,
                 reg->val = ret;
         } else {
                 __le16 val = 0;
+
                 ret = dev->em28xx_read_reg_req_len(dev, USB_REQ_GET_STATUS,
                                                    reg->reg, (char *)&val, 2);
                 if (ret < 0)
@@ -1700,9 +1703,8 @@ static int vidioc_s_register(struct file *file, void *priv,
 }
 #endif
 
-
 static int vidioc_querycap(struct file *file, void  *priv,
-                                        struct v4l2_capability *cap)
+                           struct v4l2_capability *cap)
 {
         struct video_device   *vdev = video_devdata(file);
         struct em28xx         *dev  = video_drvdata(file);
@@ -1736,7 +1738,7 @@ static int vidioc_querycap(struct file *file, void  *priv,
 }
 
 static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
-                                        struct v4l2_fmtdesc *f)
+                                   struct v4l2_fmtdesc *f)
 {
         if (unlikely(f->index >= ARRAY_SIZE(format)))
                 return -EINVAL;
@@ -2177,9 +2179,10 @@ static unsigned short msp3400_addrs[] = {
 
 /******************************** usb interface ******************************/
 
-static struct video_device *em28xx_vdev_init(struct em28xx *dev,
-                                        const struct video_device *template,
-                                        const char *type_name)
+static struct video_device
+*em28xx_vdev_init(struct em28xx *dev,
+                  const struct video_device *template,
+                  const char *type_name)
 {
         struct video_device *vfd;
 
@@ -2344,21 +2347,24 @@ static int em28xx_v4l2_init(struct em28xx *dev)
 
                 if (dev->board.radio.type)
                         v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
-                                          &dev->i2c_adap[dev->def_i2c_bus],
-                                          "tuner", dev->board.radio_addr, NULL);
+                                            &dev->i2c_adap[dev->def_i2c_bus],
+                                            "tuner", dev->board.radio_addr,
+                                            NULL);
 
                 if (has_demod)
                         v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
-                                &dev->i2c_adap[dev->def_i2c_bus], "tuner",
-                                0, v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
+                                            &dev->i2c_adap[dev->def_i2c_bus],
+                                            "tuner", 0,
+                                            v4l2_i2c_tuner_addrs(ADDRS_DEMOD));
                 if (tuner_addr == 0) {
                         enum v4l2_i2c_tuner_type type =
                                 has_demod ? ADDRS_TV_WITH_DEMOD : ADDRS_TV;
                         struct v4l2_subdev *sd;
 
                         sd = v4l2_i2c_new_subdev(&v4l2->v4l2_dev,
-                                &dev->i2c_adap[dev->def_i2c_bus], "tuner",
-                                0, v4l2_i2c_tuner_addrs(type));
+                                                 &dev->i2c_adap[dev->def_i2c_bus],
+                                                 "tuner", 0,
+                                                 v4l2_i2c_tuner_addrs(type));
 
                         if (sd)
                                 tuner_addr = v4l2_i2c_subdev_addr(sd);
@@ -2378,20 +2384,20 @@ static int em28xx_v4l2_init(struct em28xx *dev)
         ret = em28xx_audio_setup(dev);
         if (ret < 0) {
                 em28xx_errdev("%s: Error while setting audio - error [%d]!\n",
-                        __func__, ret);
+                              __func__, ret);
                 goto unregister_dev;
         }
         if (dev->audio_mode.ac97 != EM28XX_NO_AC97) {
                 v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
-                        V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
+                                  V4L2_CID_AUDIO_MUTE, 0, 1, 1, 1);
                 v4l2_ctrl_new_std(hdl, &em28xx_ctrl_ops,
-                        V4L2_CID_AUDIO_VOLUME, 0, 0x1f, 1, 0x1f);
+                                  V4L2_CID_AUDIO_VOLUME, 0, 0x1f, 1, 0x1f);
         } else {
                 /* install the em28xx notify callback */
                 v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_MUTE),
-                                em28xx_ctrl_notify, dev);
+                                 em28xx_ctrl_notify, dev);
                 v4l2_ctrl_notify(v4l2_ctrl_find(hdl, V4L2_CID_AUDIO_VOLUME),
-                                em28xx_ctrl_notify, dev);
+                                 em28xx_ctrl_notify, dev);
         }
 
         /* wake i2c devices */
@@ -2518,7 +2524,7 @@ static int em28xx_v4l2_init(struct em28xx *dev)
 
         /* register v4l2 video video_device */
         ret = video_register_device(v4l2->vdev, VFL_TYPE_GRABBER,
-                                       video_nr[dev->devno]);
+                                    video_nr[dev->devno]);
         if (ret) {
                 em28xx_errdev("unable to register video device (error=%i).\n",
                               ret);
diff --git a/drivers/media/usb/em28xx/em28xx.h b/drivers/media/usb/em28xx/em28xx.h
index a21a7463b557..9c7075344109 100644
--- a/drivers/media/usb/em28xx/em28xx.h
+++ b/drivers/media/usb/em28xx/em28xx.h
@@ -141,6 +141,8 @@
 #define EM28178_BOARD_PCTV_461E                   92
 #define EM2874_BOARD_KWORLD_UB435Q_V3             93
 #define EM28178_BOARD_PCTV_292E                   94
+#define EM2861_BOARD_LEADTEK_VC100                95
+#define EM28178_BOARD_TERRATEC_T2_STICK_HD        96
 
 /* Limits minimum and default number of buffers */
 #define EM28XX_MIN_BUF 4
@@ -215,7 +217,6 @@ enum em28xx_mode {
         EM28XX_DIGITAL_MODE,
 };
 
-
 struct em28xx;
 
 struct em28xx_usb_bufs {
@@ -243,11 +244,11 @@ struct em28xx_usb_ctl {
         struct em28xx_usb_bufs          digital_bufs;
 
                 /* Stores already requested buffers */
-        struct em28xx_buffer            *vid_buf;
-        struct em28xx_buffer            *vbi_buf;
+        struct em28xx_buffer    *vid_buf;
+        struct em28xx_buffer    *vbi_buf;
 
                 /* copy data from URB */
-        int (*urb_data_copy) (struct em28xx *dev, struct urb *urb);
+        int (*urb_data_copy)(struct em28xx *dev, struct urb *urb);
 
 };
 
@@ -695,14 +696,14 @@ struct em28xx {
         char urb_buf[URB_MAX_CTRL_SIZE];        /* urb control msg buffer */
 
         /* helper funcs that call usb_control_msg */
-        int (*em28xx_write_regs) (struct em28xx *dev, u16 reg,
-                                        char *buf, int len);
-        int (*em28xx_read_reg) (struct em28xx *dev, u16 reg);
-        int (*em28xx_read_reg_req_len) (struct em28xx *dev, u8 req, u16 reg,
-                                        char *buf, int len);
-        int (*em28xx_write_regs_req) (struct em28xx *dev, u8 req, u16 reg,
-                                      char *buf, int len);
-        int (*em28xx_read_reg_req) (struct em28xx *dev, u8 req, u16 reg);
+        int (*em28xx_write_regs)(struct em28xx *dev, u16 reg,
+                                 char *buf, int len);
+        int (*em28xx_read_reg)(struct em28xx *dev, u16 reg);
+        int (*em28xx_read_reg_req_len)(struct em28xx *dev, u8 req, u16 reg,
+                                       char *buf, int len);
+        int (*em28xx_write_regs_req)(struct em28xx *dev, u8 req, u16 reg,
+                                     char *buf, int len);
+        int (*em28xx_read_reg_req)(struct em28xx *dev, u8 req, u16 reg);
 
         enum em28xx_mode mode;
 
@@ -745,7 +746,7 @@ int em28xx_write_regs_req(struct em28xx *dev, u8 req, u16 reg, char *buf,
 int em28xx_write_regs(struct em28xx *dev, u16 reg, char *buf, int len);
 int em28xx_write_reg(struct em28xx *dev, u16 reg, u8 val);
 int em28xx_write_reg_bits(struct em28xx *dev, u16 reg, u8 val,
-                                 u8 bitmask);
+                          u8 bitmask);
 int em28xx_toggle_reg_bits(struct em28xx *dev, u16 reg, u8 bitmask);
 
 int em28xx_read_ac97(struct em28xx *dev, u8 reg);
diff --git a/drivers/media/usb/go7007/go7007-v4l2.c b/drivers/media/usb/go7007/go7007-v4l2.c
index ec799b4d88be..d6bf982efa42 100644
--- a/drivers/media/usb/go7007/go7007-v4l2.c
+++ b/drivers/media/usb/go7007/go7007-v4l2.c
@@ -252,7 +252,7 @@ static int set_capture_size(struct go7007 *go, struct v4l2_format *fmt, int try)
         if (go->board_info->sensor_flags & GO7007_SENSOR_SCALING) {
                 struct v4l2_mbus_framefmt mbus_fmt;
 
-                mbus_fmt.code = V4L2_MBUS_FMT_FIXED;
+                mbus_fmt.code = MEDIA_BUS_FMT_FIXED;
                 mbus_fmt.width = fmt ? fmt->fmt.pix.width : width;
                 mbus_fmt.height = height;
                 go->encoder_h_halve = 0;
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-context.c b/drivers/media/usb/pvrusb2/pvrusb2-context.c
index 7c19ff72e6b3..c8761c71c9d2 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-context.c
@@ -80,7 +80,7 @@ static void pvr2_context_set_notify(struct pvr2_context *mp, int fl)
 static void pvr2_context_destroy(struct pvr2_context *mp)
 {
         pvr2_trace(PVR2_TRACE_CTXT,"pvr2_context %p (destroy)",mp);
-        if (mp->hdw) pvr2_hdw_destroy(mp->hdw);
+        pvr2_hdw_destroy(mp->hdw);
         pvr2_context_set_notify(mp, 0);
         mutex_lock(&pvr2_context_mutex);
         if (mp->exist_next) {
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
index 9623b6218214..2fd9b5e0e2a9 100644
--- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
+++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -2966,7 +2966,7 @@ static void pvr2_subdev_update(struct pvr2_hdw *hdw)
                 memset(&fmt, 0, sizeof(fmt));
                 fmt.width = hdw->res_hor_val;
                 fmt.height = hdw->res_ver_val;
-                fmt.code = V4L2_MBUS_FMT_FIXED;
+                fmt.code = MEDIA_BUS_FMT_FIXED;
                 pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_size(%dx%d)",
                            fmt.width, fmt.height);
                 v4l2_device_call_all(&hdw->v4l2_dev, 0, video, s_mbus_fmt, &fmt);
diff --git a/drivers/media/usb/s2255/s2255drv.c b/drivers/media/usb/s2255/s2255drv.c
index 1c0dbf428a3a..de55e96fed15 100644
--- a/drivers/media/usb/s2255/s2255drv.c
+++ b/drivers/media/usb/s2255/s2255drv.c
@@ -558,27 +558,30 @@ static void s2255_fwchunk_complete(struct urb *urb)
 
 }
 
-static int s2255_got_frame(struct s2255_vc *vc, int jpgsize)
+static void s2255_got_frame(struct s2255_vc *vc, int jpgsize)
 {
         struct s2255_buffer *buf;
         struct s2255_dev *dev = to_s2255_dev(vc->vdev.v4l2_dev);
         unsigned long flags = 0;
-        int rc = 0;
+
         spin_lock_irqsave(&vc->qlock, flags);
         if (list_empty(&vc->buf_list)) {
                 dprintk(dev, 1, "No active queue to serve\n");
-                rc = -1;
-                goto unlock;
+                spin_unlock_irqrestore(&vc->qlock, flags);
+                return;
         }
         buf = list_entry(vc->buf_list.next,
                          struct s2255_buffer, list);
         list_del(&buf->list);
         v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
+        buf->vb.v4l2_buf.field = vc->field;
+        buf->vb.v4l2_buf.sequence = vc->frame_count;
+        spin_unlock_irqrestore(&vc->qlock, flags);
+
         s2255_fillbuff(vc, buf, jpgsize);
+        /* tell v4l buffer was filled */
+        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
         dprintk(dev, 2, "%s: [buf] [%p]\n", __func__, buf);
-unlock:
-        spin_unlock_irqrestore(&vc->qlock, flags);
-        return rc;
 }
 
 static const struct s2255_fmt *format_by_fourcc(int fourcc)
@@ -649,11 +652,6 @@ static void s2255_fillbuff(struct s2255_vc *vc,
         }
         dprintk(dev, 2, "s2255fill at : Buffer 0x%08lx size= %d\n",
                 (unsigned long)vbuf, pos);
-        /* tell v4l buffer was filled */
-        buf->vb.v4l2_buf.field = vc->field;
-        buf->vb.v4l2_buf.sequence = vc->frame_count;
-        v4l2_get_timestamp(&buf->vb.v4l2_buf.timestamp);
-        vb2_buffer_done(&buf->vb, VB2_BUF_STATE_DONE);
 }
 
 
@@ -1976,8 +1974,7 @@ static int s2255_release_sys_buffers(struct s2255_vc *vc)
 {
         unsigned long i;
         for (i = 0; i < SYS_FRAMES; i++) {
-                if (vc->buffer.frame[i].lpvbits)
-                        vfree(vc->buffer.frame[i].lpvbits);
+                vfree(vc->buffer.frame[i].lpvbits);
                 vc->buffer.frame[i].lpvbits = NULL;
         }
         return 0;
diff --git a/drivers/media/usb/stk1160/stk1160-v4l.c b/drivers/media/usb/stk1160/stk1160-v4l.c
index 233054311a62..a47629108c1b 100644
--- a/drivers/media/usb/stk1160/stk1160-v4l.c
+++ b/drivers/media/usb/stk1160/stk1160-v4l.c
@@ -475,7 +475,7 @@ static int vidioc_s_register(struct file *file, void *priv,
         struct stk1160 *dev = video_drvdata(file);
 
         /* Match host */
-        return stk1160_write_reg(dev, reg->reg, cpu_to_le16(reg->val));
+        return stk1160_write_reg(dev, reg->reg, reg->val);
 }
 #endif
 
diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index 9bfa041e3316..693d5f409138 100644
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -509,11 +509,12 @@ static int vidioc_querycap(struct file *file, void  *priv,
                 usbvision_device_data[usbvision->dev_model].model_string,
                 sizeof(vc->card));
         usb_make_path(usbvision->dev, vc->bus_info, sizeof(vc->bus_info));
-        vc->capabilities = V4L2_CAP_VIDEO_CAPTURE |
+        vc->device_caps = V4L2_CAP_VIDEO_CAPTURE |
                 V4L2_CAP_AUDIO |
                 V4L2_CAP_READWRITE |
                 V4L2_CAP_STREAMING |
                 (usbvision->have_tuner ? V4L2_CAP_TUNER : 0);
+        vc->capabilities = vc->device_caps | V4L2_CAP_DEVICE_CAPS;
         return 0;
 }
 
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c
index 7c8322d4fc63..6a4b0b8cd270 100644
--- a/drivers/media/usb/uvc/uvc_driver.c
+++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -331,6 +331,7 @@ static int uvc_parse_format(struct uvc_device *dev,
         struct uvc_format_desc *fmtdesc;
         struct uvc_frame *frame;
         const unsigned char *start = buffer;
+        unsigned int width_multiplier = 1;
         unsigned int interval;
         unsigned int i, n;
         __u8 ftype;
@@ -366,6 +367,20 @@ static int uvc_parse_format(struct uvc_device *dev,
                 }
 
                 format->bpp = buffer[21];
+
+                /* Some devices report a format that doesn't match what they
+                 * really send.
+                 */
+                if (dev->quirks & UVC_QUIRK_FORCE_Y8) {
+                        if (format->fcc == V4L2_PIX_FMT_YUYV) {
+                                strlcpy(format->name, "Greyscale 8-bit (Y8  )",
+                                        sizeof(format->name));
+                                format->fcc = V4L2_PIX_FMT_GREY;
+                                format->bpp = 8;
+                                width_multiplier = 2;
+                        }
+                }
+
                 if (buffer[2] == UVC_VS_FORMAT_UNCOMPRESSED) {
                         ftype = UVC_VS_FRAME_UNCOMPRESSED;
                 } else {
@@ -474,7 +489,8 @@ static int uvc_parse_format(struct uvc_device *dev,
 
                 frame->bFrameIndex = buffer[3];
                 frame->bmCapabilities = buffer[4];
-                frame->wWidth = get_unaligned_le16(&buffer[5]);
+                frame->wWidth = get_unaligned_le16(&buffer[5])
+                              * width_multiplier;
                 frame->wHeight = get_unaligned_le16(&buffer[7]);
                 frame->dwMinBitRate = get_unaligned_le32(&buffer[9]);
                 frame->dwMaxBitRate = get_unaligned_le32(&buffer[13]);
@@ -1623,12 +1639,12 @@ static void uvc_delete(struct uvc_device *dev)
 {
         struct list_head *p, *n;
 
-        usb_put_intf(dev->intf);
-        usb_put_dev(dev->udev);
-
         uvc_status_cleanup(dev);
         uvc_ctrl_cleanup_device(dev);
 
+        usb_put_intf(dev->intf);
+        usb_put_dev(dev->udev);
+
         if (dev->vdev.dev)
                 v4l2_device_unregister(&dev->vdev);
 #ifdef CONFIG_MEDIA_CONTROLLER
@@ -1718,6 +1734,11 @@ static int uvc_register_video(struct uvc_device *dev,
         struct video_device *vdev;
         int ret;
 
+        /* Initialize the video buffers queue. */
+        ret = uvc_queue_init(&stream->queue, stream->type, !uvc_no_drop_param);
+        if (ret)
+                return ret;
+
         /* Initialize the streaming interface with default streaming
          * parameters.
          */
@@ -1744,6 +1765,7 @@ static int uvc_register_video(struct uvc_device *dev,
          */
         vdev->v4l2_dev = &dev->vdev;
         vdev->fops = &uvc_fops;
+        vdev->ioctl_ops = &uvc_ioctl_ops;
         vdev->release = uvc_release;
         vdev->prio = &stream->chain->prio;
         if (stream->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)
@@ -1991,14 +2013,13 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
 {
         struct uvc_device *dev = usb_get_intfdata(intf);
         struct uvc_streaming *stream;
+        int ret = 0;
 
         uvc_trace(UVC_TRACE_SUSPEND, "Resuming interface %u\n",
                 intf->cur_altsetting->desc.bInterfaceNumber);
 
         if (intf->cur_altsetting->desc.bInterfaceSubClass ==
             UVC_SC_VIDEOCONTROL) {
-                int ret = 0;
-
                 if (reset) {
                         ret = uvc_ctrl_restore_values(dev);
                         if (ret < 0)
@@ -2014,8 +2035,13 @@ static int __uvc_resume(struct usb_interface *intf, int reset)
         }
 
         list_for_each_entry(stream, &dev->streams, list) {
-                if (stream->intf == intf)
-                        return uvc_video_resume(stream, reset);
+                if (stream->intf == intf) {
+                        ret = uvc_video_resume(stream, reset);
+                        if (ret < 0)
+                                uvc_queue_streamoff(&stream->queue,
+                                                    stream->queue.queue.type);
+                        return ret;
+                }
         }
 
         uvc_trace(UVC_TRACE_SUSPEND, "Resume: video streaming USB interface "
@@ -2504,6 +2530,15 @@ static struct usb_device_id uvc_ids[] = {
           .bInterfaceProtocol   = 0,
           .driver_info          = UVC_QUIRK_PROBE_MINMAX
                                 | UVC_QUIRK_IGNORE_SELECTOR_UNIT },
+        /* Oculus VR Positional Tracker DK2 */
+        { .match_flags          = USB_DEVICE_ID_MATCH_DEVICE
+                                | USB_DEVICE_ID_MATCH_INT_INFO,
+          .idVendor             = 0x2833,
+          .idProduct            = 0x0201,
+          .bInterfaceClass      = USB_CLASS_VIDEO,
+          .bInterfaceSubClass   = 1,
+          .bInterfaceProtocol   = 0,
+          .driver_info          = UVC_QUIRK_FORCE_Y8 },
         /* Generic USB Video Class */
         { USB_INTERFACE_INFO(USB_CLASS_VIDEO, 1, 0) },
         {}
diff --git a/drivers/media/usb/uvc/uvc_queue.c b/drivers/media/usb/uvc/uvc_queue.c
index 6e92d2080255..cc960723b926 100644
--- a/drivers/media/usb/uvc/uvc_queue.c
+++ b/drivers/media/usb/uvc/uvc_queue.c
@@ -36,6 +36,34 @@
  * the driver.
  */
 
+static inline struct uvc_streaming *
+uvc_queue_to_stream(struct uvc_video_queue *queue)
+{
+        return container_of(queue, struct uvc_streaming, queue);
+}
+
+/*
+ * Return all queued buffers to videobuf2 in the requested state.
+ *
+ * This function must be called with the queue spinlock held.
+ */
+static void uvc_queue_return_buffers(struct uvc_video_queue *queue,
+                               enum uvc_buffer_state state)
+{
+        enum vb2_buffer_state vb2_state = state == UVC_BUF_STATE_ERROR
+                                        ? VB2_BUF_STATE_ERROR
+                                        : VB2_BUF_STATE_QUEUED;
+
+        while (!list_empty(&queue->irqqueue)) {
+                struct uvc_buffer *buf = list_first_entry(&queue->irqqueue,
+                                                          struct uvc_buffer,
+                                                          queue);
+                list_del(&buf->queue);
+                buf->state = state;
+                vb2_buffer_done(&buf->buf, vb2_state);
+        }
+}
+
 /* -----------------------------------------------------------------------------
  * videobuf2 queue operations
  */
@@ -45,8 +73,7 @@ static int uvc_queue_setup(struct vb2_queue *vq, const struct v4l2_format *fmt,
                            unsigned int sizes[], void *alloc_ctxs[])
 {
         struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
-        struct uvc_streaming *stream =
-                        container_of(queue, struct uvc_streaming, queue);
+        struct uvc_streaming *stream = uvc_queue_to_stream(queue);
 
         /* Make sure the image size is large enough. */
         if (fmt && fmt->fmt.pix.sizeimage < stream->ctrl.dwMaxVideoFrameSize)
@@ -109,8 +136,7 @@ static void uvc_buffer_queue(struct vb2_buffer *vb)
 static void uvc_buffer_finish(struct vb2_buffer *vb)
 {
         struct uvc_video_queue *queue = vb2_get_drv_priv(vb->vb2_queue);
-        struct uvc_streaming *stream =
-                        container_of(queue, struct uvc_streaming, queue);
+        struct uvc_streaming *stream = uvc_queue_to_stream(queue);
         struct uvc_buffer *buf = container_of(vb, struct uvc_buffer, buf);
 
         if (vb->state == VB2_BUF_STATE_DONE)
@@ -131,6 +157,39 @@ static void uvc_wait_finish(struct vb2_queue *vq)
         mutex_lock(&queue->mutex);
 }
 
+static int uvc_start_streaming(struct vb2_queue *vq, unsigned int count)
+{
+        struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
+        struct uvc_streaming *stream = uvc_queue_to_stream(queue);
+        unsigned long flags;
+        int ret;
+
+        queue->buf_used = 0;
+
+        ret = uvc_video_enable(stream, 1);
+        if (ret == 0)
+                return 0;
+
+        spin_lock_irqsave(&queue->irqlock, flags);
+        uvc_queue_return_buffers(queue, UVC_BUF_STATE_QUEUED);
+        spin_unlock_irqrestore(&queue->irqlock, flags);
+
+        return ret;
+}
+
+static void uvc_stop_streaming(struct vb2_queue *vq)
+{
+        struct uvc_video_queue *queue = vb2_get_drv_priv(vq);
+        struct uvc_streaming *stream = uvc_queue_to_stream(queue);
+        unsigned long flags;
+
+        uvc_video_enable(stream, 0);
+
+        spin_lock_irqsave(&queue->irqlock, flags);
+        uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR);
+        spin_unlock_irqrestore(&queue->irqlock, flags);
+}
+
 static struct vb2_ops uvc_queue_qops = {
         .queue_setup = uvc_queue_setup,
         .buf_prepare = uvc_buffer_prepare,
@@ -138,6 +197,8 @@ static struct vb2_ops uvc_queue_qops = {
         .buf_finish = uvc_buffer_finish,
         .wait_prepare = uvc_wait_prepare,
         .wait_finish = uvc_wait_finish,
+        .start_streaming = uvc_start_streaming,
+        .stop_streaming = uvc_stop_streaming,
 };
 
 int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
@@ -165,12 +226,19 @@ int uvc_queue_init(struct uvc_video_queue *queue, enum v4l2_buf_type type,
         return 0;
 }
 
+void uvc_queue_release(struct uvc_video_queue *queue)
+{
+        mutex_lock(&queue->mutex);
+        vb2_queue_release(&queue->queue);
+        mutex_unlock(&queue->mutex);
+}
+
 /* -----------------------------------------------------------------------------
  * V4L2 queue operations
  */
 
-int uvc_alloc_buffers(struct uvc_video_queue *queue,
-                      struct v4l2_requestbuffers *rb)
+int uvc_request_buffers(struct uvc_video_queue *queue,
+                        struct v4l2_requestbuffers *rb)
 {
         int ret;
 
@@ -181,13 +249,6 @@ int uvc_alloc_buffers(struct uvc_video_queue *queue,
         return ret ? ret : rb->count;
 }
 
-void uvc_free_buffers(struct uvc_video_queue *queue)
-{
-        mutex_lock(&queue->mutex);
-        vb2_queue_release(&queue->queue);
-        mutex_unlock(&queue->mutex);
-}
-
 int uvc_query_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf)
 {
         int ret;
@@ -234,6 +295,28 @@ int uvc_dequeue_buffer(struct uvc_video_queue *queue, struct v4l2_buffer *buf,
         return ret;
 }
 
+int uvc_queue_streamon(struct uvc_video_queue *queue, enum v4l2_buf_type type)
+{
+        int ret;
+
+        mutex_lock(&queue->mutex);
+        ret = vb2_streamon(&queue->queue, type);
+        mutex_unlock(&queue->mutex);
+
+        return ret;
+}
+
+int uvc_queue_streamoff(struct uvc_video_queue *queue, enum v4l2_buf_type type)
+{
+        int ret;
+
+        mutex_lock(&queue->mutex);
+        ret = vb2_streamoff(&queue->queue, type);
+        mutex_unlock(&queue->mutex);
+
+        return ret;
+}
+
 int uvc_queue_mmap(struct uvc_video_queue *queue, struct vm_area_struct *vma)
 {
         int ret;
@@ -289,49 +372,6 @@ int uvc_queue_allocated(struct uvc_video_queue *queue)
 }
 
 /*
- * Enable or disable the video buffers queue.
- *
- * The queue must be enabled before starting video acquisition and must be
- * disabled after stopping it. This ensures that the video buffers queue
- * state can be properly initialized before buffers are accessed from the
- * interrupt handler.
- *
- * Enabling the video queue returns -EBUSY if the queue is already enabled.
- *
- * Disabling the video queue cancels the queue and removes all buffers from
- * the main queue.
- *
- * This function can't be called from interrupt context. Use
- * uvc_queue_cancel() instead.
- */
-int uvc_queue_enable(struct uvc_video_queue *queue, int enable)
-{
-        unsigned long flags;
-        int ret;
-
-        mutex_lock(&queue->mutex);
-        if (enable) {
-                ret = vb2_streamon(&queue->queue, queue->queue.type);
-                if (ret < 0)
-                        goto done;
-
-                queue->buf_used = 0;
-        } else {
-                ret = vb2_streamoff(&queue->queue, queue->queue.type);
-                if (ret < 0)
-                        goto done;
-
-                spin_lock_irqsave(&queue->irqlock, flags);
-                INIT_LIST_HEAD(&queue->irqqueue);
-                spin_unlock_irqrestore(&queue->irqlock, flags);
-        }
-
-done:
-        mutex_unlock(&queue->mutex);
-        return ret;
-}
-
-/*
  * Cancel the video buffers queue.
  *
  * Cancelling the queue marks all buffers on the irq queue as erroneous,
@@ -345,17 +385,10 @@ done:
  */
 void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect)
 {
-        struct uvc_buffer *buf;
         unsigned long flags;
 
         spin_lock_irqsave(&queue->irqlock, flags);
-        while (!list_empty(&queue->irqqueue)) {
-                buf = list_first_entry(&queue->irqqueue, struct uvc_buffer,
-                                       queue);
-                list_del(&buf->queue);
-                buf->state = UVC_BUF_STATE_ERROR;
-                vb2_buffer_done(&buf->buf, VB2_BUF_STATE_ERROR);
-        }
+        uvc_queue_return_buffers(queue, UVC_BUF_STATE_ERROR);
         /* This must be protected by the irqlock spinlock to avoid race
          * conditions between uvc_buffer_queue and the disconnection event that
          * could result in an interruptible wait in uvc_dequeue_buffer. Do not
diff --git a/drivers/media/usb/uvc/uvc_v4l2.c b/drivers/media/usb/uvc/uvc_v4l2.c
index 378ae02e593b..9c5cbcf16529 100644
--- a/drivers/media/usb/uvc/uvc_v4l2.c
+++ b/drivers/media/usb/uvc/uvc_v4l2.c
@@ -530,10 +530,8 @@ static int uvc_v4l2_release(struct file *file)
         uvc_trace(UVC_TRACE_CALLS, "uvc_v4l2_release\n");
 
         /* Only free resources if this is a privileged handle. */
-        if (uvc_has_privileges(handle)) {
-                uvc_video_enable(stream, 0);
-                uvc_free_buffers(&stream->queue);
-        }
+        if (uvc_has_privileges(handle))
+                uvc_queue_release(&stream->queue);
 
         /* Release the file handle. */
         uvc_dismiss_privileges(handle);
@@ -551,553 +549,628 @@ static int uvc_v4l2_release(struct file *file)
         return 0;
 }
 
-static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
+static int uvc_ioctl_querycap(struct file *file, void *fh,
+                              struct v4l2_capability *cap)
 {
         struct video_device *vdev = video_devdata(file);
         struct uvc_fh *handle = file->private_data;
         struct uvc_video_chain *chain = handle->chain;
         struct uvc_streaming *stream = handle->stream;
-        long ret = 0;
 
-        switch (cmd) {
-        /* Query capabilities */
-        case VIDIOC_QUERYCAP:
-        {
-                struct v4l2_capability *cap = arg;
-
-                memset(cap, 0, sizeof *cap);
-                strlcpy(cap->driver, "uvcvideo", sizeof cap->driver);
-                strlcpy(cap->card, vdev->name, sizeof cap->card);
-                usb_make_path(stream->dev->udev,
-                              cap->bus_info, sizeof(cap->bus_info));
-                cap->version = LINUX_VERSION_CODE;
-                cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
-                                  | chain->caps;
-                if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
-                        cap->device_caps = V4L2_CAP_VIDEO_CAPTURE
-                                         | V4L2_CAP_STREAMING;
-                else
-                        cap->device_caps = V4L2_CAP_VIDEO_OUTPUT
-                                         | V4L2_CAP_STREAMING;
-                break;
-        }
+        strlcpy(cap->driver, "uvcvideo", sizeof(cap->driver));
+        strlcpy(cap->card, vdev->name, sizeof(cap->card));
+        usb_make_path(stream->dev->udev, cap->bus_info, sizeof(cap->bus_info));
+        cap->capabilities = V4L2_CAP_DEVICE_CAPS | V4L2_CAP_STREAMING
+                          | chain->caps;
+        if (stream->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)
+                cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;
+        else
+                cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;
 
-        /* Priority */
-        case VIDIOC_G_PRIORITY:
-                *(u32 *)arg = v4l2_prio_max(vdev->prio);
-                break;
+        return 0;
+}
 
-        case VIDIOC_S_PRIORITY:
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_enum_fmt(struct uvc_streaming *stream,
+                              struct v4l2_fmtdesc *fmt)
+{
+        struct uvc_format *format;
+        enum v4l2_buf_type type = fmt->type;
+        __u32 index = fmt->index;
 
-                return v4l2_prio_change(vdev->prio, &handle->vfh.prio,
-                                        *(u32 *)arg);
+        if (fmt->type != stream->type || fmt->index >= stream->nformats)
+                return -EINVAL;
 
-        /* Get, Set & Query control */
-        case VIDIOC_QUERYCTRL:
-                return uvc_query_v4l2_ctrl(chain, arg);
+        memset(fmt, 0, sizeof(*fmt));
+        fmt->index = index;
+        fmt->type = type;
+
+        format = &stream->format[fmt->index];
+        fmt->flags = 0;
+        if (format->flags & UVC_FMT_FLAG_COMPRESSED)
+                fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
+        strlcpy(fmt->description, format->name, sizeof(fmt->description));
+        fmt->description[sizeof(fmt->description) - 1] = 0;
+        fmt->pixelformat = format->fcc;
+        return 0;
+}
 
-        case VIDIOC_G_CTRL:
-        {
-                struct v4l2_control *ctrl = arg;
-                struct v4l2_ext_control xctrl;
+static int uvc_ioctl_enum_fmt_vid_cap(struct file *file, void *fh,
+                                      struct v4l2_fmtdesc *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                memset(&xctrl, 0, sizeof xctrl);
-                xctrl.id = ctrl->id;
+        return uvc_ioctl_enum_fmt(stream, fmt);
+}
 
-                ret = uvc_ctrl_begin(chain);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_enum_fmt_vid_out(struct file *file, void *fh,
+                                      struct v4l2_fmtdesc *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                ret = uvc_ctrl_get(chain, &xctrl);
-                uvc_ctrl_rollback(handle);
-                if (ret >= 0)
-                        ctrl->value = xctrl.value;
-                break;
-        }
+        return uvc_ioctl_enum_fmt(stream, fmt);
+}
 
-        case VIDIOC_S_CTRL:
-        {
-                struct v4l2_control *ctrl = arg;
-                struct v4l2_ext_control xctrl;
+static int uvc_ioctl_g_fmt_vid_cap(struct file *file, void *fh,
+                                   struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+        return uvc_v4l2_get_format(stream, fmt);
+}
 
-                memset(&xctrl, 0, sizeof xctrl);
-                xctrl.id = ctrl->id;
-                xctrl.value = ctrl->value;
+static int uvc_ioctl_g_fmt_vid_out(struct file *file, void *fh,
+                                   struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                ret = uvc_ctrl_begin(chain);
-                if (ret < 0)
-                        return ret;
+        return uvc_v4l2_get_format(stream, fmt);
+}
 
-                ret = uvc_ctrl_set(chain, &xctrl);
-                if (ret < 0) {
-                        uvc_ctrl_rollback(handle);
-                        return ret;
-                }
-                ret = uvc_ctrl_commit(handle, &xctrl, 1);
-                if (ret == 0)
-                        ctrl->value = xctrl.value;
-                break;
-        }
+static int uvc_ioctl_s_fmt_vid_cap(struct file *file, void *fh,
+                                   struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
 
-        case VIDIOC_QUERYMENU:
-                return uvc_query_v4l2_menu(chain, arg);
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
 
-        case VIDIOC_G_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *ctrls = arg;
-                struct v4l2_ext_control *ctrl = ctrls->controls;
-                unsigned int i;
+        return uvc_v4l2_set_format(stream, fmt);
+}
 
-                ret = uvc_ctrl_begin(chain);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_s_fmt_vid_out(struct file *file, void *fh,
+                                   struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
 
-                for (i = 0; i < ctrls->count; ++ctrl, ++i) {
-                        ret = uvc_ctrl_get(chain, ctrl);
-                        if (ret < 0) {
-                                uvc_ctrl_rollback(handle);
-                                ctrls->error_idx = i;
-                                return ret;
-                        }
-                }
-                ctrls->error_idx = 0;
-                ret = uvc_ctrl_rollback(handle);
-                break;
-        }
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
 
-        case VIDIOC_S_EXT_CTRLS:
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
-                /* Fall through */
-        case VIDIOC_TRY_EXT_CTRLS:
-        {
-                struct v4l2_ext_controls *ctrls = arg;
-                struct v4l2_ext_control *ctrl = ctrls->controls;
-                unsigned int i;
-
-                ret = uvc_ctrl_begin(chain);
-                if (ret < 0)
-                        return ret;
+        return uvc_v4l2_set_format(stream, fmt);
+}
 
-                for (i = 0; i < ctrls->count; ++ctrl, ++i) {
-                        ret = uvc_ctrl_set(chain, ctrl);
-                        if (ret < 0) {
-                                uvc_ctrl_rollback(handle);
-                                ctrls->error_idx = cmd == VIDIOC_S_EXT_CTRLS
-                                                 ? ctrls->count : i;
-                                return ret;
-                        }
-                }
+static int uvc_ioctl_try_fmt_vid_cap(struct file *file, void *fh,
+                                     struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        struct uvc_streaming_control probe;
 
-                ctrls->error_idx = 0;
+        return uvc_v4l2_try_format(stream, fmt, &probe, NULL, NULL);
+}
 
-                if (cmd == VIDIOC_S_EXT_CTRLS)
-                        ret = uvc_ctrl_commit(handle,
-                                              ctrls->controls, ctrls->count);
-                else
-                        ret = uvc_ctrl_rollback(handle);
-                break;
-        }
+static int uvc_ioctl_try_fmt_vid_out(struct file *file, void *fh,
+                                     struct v4l2_format *fmt)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        struct uvc_streaming_control probe;
 
-        /* Get, Set & Enum input */
-        case VIDIOC_ENUMINPUT:
-        {
-                const struct uvc_entity *selector = chain->selector;
-                struct v4l2_input *input = arg;
-                struct uvc_entity *iterm = NULL;
-                u32 index = input->index;
-                int pin = 0;
-
-                if (selector == NULL ||
-                    (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
-                        if (index != 0)
-                                return -EINVAL;
-                        list_for_each_entry(iterm, &chain->entities, chain) {
-                                if (UVC_ENTITY_IS_ITERM(iterm))
-                                        break;
-                        }
-                        pin = iterm->id;
-                } else if (index < selector->bNrInPins) {
-                        pin = selector->baSourceID[index];
-                        list_for_each_entry(iterm, &chain->entities, chain) {
-                                if (!UVC_ENTITY_IS_ITERM(iterm))
-                                        continue;
-                                if (iterm->id == pin)
-                                        break;
-                        }
-                }
+        return uvc_v4l2_try_format(stream, fmt, &probe, NULL, NULL);
+}
 
-                if (iterm == NULL || iterm->id != pin)
-                        return -EINVAL;
+static int uvc_ioctl_reqbufs(struct file *file, void *fh,
+                             struct v4l2_requestbuffers *rb)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
 
-                memset(input, 0, sizeof *input);
-                input->index = index;
-                strlcpy(input->name, iterm->name, sizeof input->name);
-                if (UVC_ENTITY_TYPE(iterm) == UVC_ITT_CAMERA)
-                        input->type = V4L2_INPUT_TYPE_CAMERA;
-                break;
-        }
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
 
-        case VIDIOC_G_INPUT:
-        {
-                u8 input;
+        mutex_lock(&stream->mutex);
+        ret = uvc_request_buffers(&stream->queue, rb);
+        mutex_unlock(&stream->mutex);
+        if (ret < 0)
+                return ret;
 
-                if (chain->selector == NULL ||
-                    (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
-                        *(int *)arg = 0;
-                        break;
-                }
+        if (ret == 0)
+                uvc_dismiss_privileges(handle);
 
-                ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR,
-                        chain->selector->id, chain->dev->intfnum,
-                        UVC_SU_INPUT_SELECT_CONTROL, &input, 1);
-                if (ret < 0)
-                        return ret;
+        return 0;
+}
 
-                *(int *)arg = input - 1;
-                break;
-        }
+static int uvc_ioctl_querybuf(struct file *file, void *fh,
+                              struct v4l2_buffer *buf)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-        case VIDIOC_S_INPUT:
-        {
-                u32 input = *(u32 *)arg + 1;
+        if (!uvc_has_privileges(handle))
+                return -EBUSY;
 
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+        return uvc_query_buffer(&stream->queue, buf);
+}
 
-                if ((ret = uvc_acquire_privileges(handle)) < 0)
-                        return ret;
+static int uvc_ioctl_qbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                if (chain->selector == NULL ||
-                    (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
-                        if (input != 1)
-                                return -EINVAL;
-                        break;
-                }
+        if (!uvc_has_privileges(handle))
+                return -EBUSY;
 
-                if (input == 0 || input > chain->selector->bNrInPins)
-                        return -EINVAL;
+        return uvc_queue_buffer(&stream->queue, buf);
+}
 
-                return uvc_query_ctrl(chain->dev, UVC_SET_CUR,
-                        chain->selector->id, chain->dev->intfnum,
-                        UVC_SU_INPUT_SELECT_CONTROL, &input, 1);
-        }
+static int uvc_ioctl_dqbuf(struct file *file, void *fh, struct v4l2_buffer *buf)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-        /* Try, Get, Set & Enum format */
-        case VIDIOC_ENUM_FMT:
-        {
-                struct v4l2_fmtdesc *fmt = arg;
-                struct uvc_format *format;
-                enum v4l2_buf_type type = fmt->type;
-                __u32 index = fmt->index;
+        if (!uvc_has_privileges(handle))
+                return -EBUSY;
 
-                if (fmt->type != stream->type ||
-                    fmt->index >= stream->nformats)
-                        return -EINVAL;
+        return uvc_dequeue_buffer(&stream->queue, buf,
+                                  file->f_flags & O_NONBLOCK);
+}
 
-                memset(fmt, 0, sizeof(*fmt));
-                fmt->index = index;
-                fmt->type = type;
-
-                format = &stream->format[fmt->index];
-                fmt->flags = 0;
-                if (format->flags & UVC_FMT_FLAG_COMPRESSED)
-                        fmt->flags |= V4L2_FMT_FLAG_COMPRESSED;
-                strlcpy(fmt->description, format->name,
-                        sizeof fmt->description);
-                fmt->description[sizeof fmt->description - 1] = 0;
-                fmt->pixelformat = format->fcc;
-                break;
-        }
+static int uvc_ioctl_create_bufs(struct file *file, void *fh,
+                                  struct v4l2_create_buffers *cb)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
 
-        case VIDIOC_TRY_FMT:
-        {
-                struct uvc_streaming_control probe;
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
 
-                return uvc_v4l2_try_format(stream, arg, &probe, NULL, NULL);
-        }
+        return uvc_create_buffers(&stream->queue, cb);
+}
 
-        case VIDIOC_S_FMT:
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_streamon(struct file *file, void *fh,
+                              enum v4l2_buf_type type)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
 
-                if ((ret = uvc_acquire_privileges(handle)) < 0)
-                        return ret;
+        if (!uvc_has_privileges(handle))
+                return -EBUSY;
 
-                return uvc_v4l2_set_format(stream, arg);
+        mutex_lock(&stream->mutex);
+        ret = uvc_queue_streamon(&stream->queue, type);
+        mutex_unlock(&stream->mutex);
 
-        case VIDIOC_G_FMT:
-                return uvc_v4l2_get_format(stream, arg);
+        return ret;
+}
 
-        /* Frame size enumeration */
-        case VIDIOC_ENUM_FRAMESIZES:
-        {
-                struct v4l2_frmsizeenum *fsize = arg;
-                struct uvc_format *format = NULL;
-                struct uvc_frame *frame;
-                int i;
+static int uvc_ioctl_streamoff(struct file *file, void *fh,
+                               enum v4l2_buf_type type)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
 
-                /* Look for the given pixel format */
-                for (i = 0; i < stream->nformats; i++) {
-                        if (stream->format[i].fcc ==
-                                        fsize->pixel_format) {
-                                format = &stream->format[i];
-                                break;
-                        }
-                }
-                if (format == NULL)
-                        return -EINVAL;
+        if (!uvc_has_privileges(handle))
+                return -EBUSY;
 
-                if (fsize->index >= format->nframes)
-                        return -EINVAL;
+        mutex_lock(&stream->mutex);
+        uvc_queue_streamoff(&stream->queue, type);
+        mutex_unlock(&stream->mutex);
 
-                frame = &format->frame[fsize->index];
-                fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
-                fsize->discrete.width = frame->wWidth;
-                fsize->discrete.height = frame->wHeight;
-                break;
-        }
+        return 0;
+}
 
-        /* Frame interval enumeration */
-        case VIDIOC_ENUM_FRAMEINTERVALS:
-        {
-                struct v4l2_frmivalenum *fival = arg;
-                struct uvc_format *format = NULL;
-                struct uvc_frame *frame = NULL;
-                int i;
-
-                /* Look for the given pixel format and frame size */
-                for (i = 0; i < stream->nformats; i++) {
-                        if (stream->format[i].fcc ==
-                                        fival->pixel_format) {
-                                format = &stream->format[i];
-                                break;
-                        }
-                }
-                if (format == NULL)
+static int uvc_ioctl_enum_input(struct file *file, void *fh,
+                                struct v4l2_input *input)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        const struct uvc_entity *selector = chain->selector;
+        struct uvc_entity *iterm = NULL;
+        u32 index = input->index;
+        int pin = 0;
+
+        if (selector == NULL ||
+            (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
+                if (index != 0)
                         return -EINVAL;
-
-                for (i = 0; i < format->nframes; i++) {
-                        if (format->frame[i].wWidth == fival->width &&
-                            format->frame[i].wHeight == fival->height) {
-                                frame = &format->frame[i];
+                list_for_each_entry(iterm, &chain->entities, chain) {
+                        if (UVC_ENTITY_IS_ITERM(iterm))
                                 break;
-                        }
                 }
-                if (frame == NULL)
-                        return -EINVAL;
-
-                if (frame->bFrameIntervalType) {
-                        if (fival->index >= frame->bFrameIntervalType)
-                                return -EINVAL;
-
-                        fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
-                        fival->discrete.numerator =
-                                frame->dwFrameInterval[fival->index];
-                        fival->discrete.denominator = 10000000;
-                        uvc_simplify_fraction(&fival->discrete.numerator,
-                                &fival->discrete.denominator, 8, 333);
-                } else {
-                        fival->type = V4L2_FRMIVAL_TYPE_STEPWISE;
-                        fival->stepwise.min.numerator =
-                                frame->dwFrameInterval[0];
-                        fival->stepwise.min.denominator = 10000000;
-                        fival->stepwise.max.numerator =
-                                frame->dwFrameInterval[1];
-                        fival->stepwise.max.denominator = 10000000;
-                        fival->stepwise.step.numerator =
-                                frame->dwFrameInterval[2];
-                        fival->stepwise.step.denominator = 10000000;
-                        uvc_simplify_fraction(&fival->stepwise.min.numerator,
-                                &fival->stepwise.min.denominator, 8, 333);
-                        uvc_simplify_fraction(&fival->stepwise.max.numerator,
-                                &fival->stepwise.max.denominator, 8, 333);
-                        uvc_simplify_fraction(&fival->stepwise.step.numerator,
-                                &fival->stepwise.step.denominator, 8, 333);
+                pin = iterm->id;
+        } else if (index < selector->bNrInPins) {
+                pin = selector->baSourceID[index];
+                list_for_each_entry(iterm, &chain->entities, chain) {
+                        if (!UVC_ENTITY_IS_ITERM(iterm))
+                                continue;
+                        if (iterm->id == pin)
+                                break;
                 }
-                break;
         }
 
-        /* Get & Set streaming parameters */
-        case VIDIOC_G_PARM:
-                return uvc_v4l2_get_streamparm(stream, arg);
+        if (iterm == NULL || iterm->id != pin)
+                return -EINVAL;
 
-        case VIDIOC_S_PARM:
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+        memset(input, 0, sizeof(*input));
+        input->index = index;
+        strlcpy(input->name, iterm->name, sizeof(input->name));
+        if (UVC_ENTITY_TYPE(iterm) == UVC_ITT_CAMERA)
+                input->type = V4L2_INPUT_TYPE_CAMERA;
 
-                if ((ret = uvc_acquire_privileges(handle)) < 0)
-                        return ret;
+        return 0;
+}
 
-                return uvc_v4l2_set_streamparm(stream, arg);
+static int uvc_ioctl_g_input(struct file *file, void *fh, unsigned int *input)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        int ret;
+        u8 i;
 
-        /* Cropping and scaling */
-        case VIDIOC_CROPCAP:
-        {
-                struct v4l2_cropcap *ccap = arg;
+        if (chain->selector == NULL ||
+            (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
+                *input = 0;
+                return 0;
+        }
 
-                if (ccap->type != stream->type)
-                        return -EINVAL;
+        ret = uvc_query_ctrl(chain->dev, UVC_GET_CUR, chain->selector->id,
+                             chain->dev->intfnum,  UVC_SU_INPUT_SELECT_CONTROL,
+                             &i, 1);
+        if (ret < 0)
+                return ret;
 
-                ccap->bounds.left = 0;
-                ccap->bounds.top = 0;
+        *input = i - 1;
+        return 0;
+}
 
-                mutex_lock(&stream->mutex);
-                ccap->bounds.width = stream->cur_frame->wWidth;
-                ccap->bounds.height = stream->cur_frame->wHeight;
-                mutex_unlock(&stream->mutex);
+static int uvc_ioctl_s_input(struct file *file, void *fh, unsigned int input)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        int ret;
+        u32 i;
 
-                ccap->defrect = ccap->bounds;
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
 
-                ccap->pixelaspect.numerator = 1;
-                ccap->pixelaspect.denominator = 1;
-                break;
+        if (chain->selector == NULL ||
+            (chain->dev->quirks & UVC_QUIRK_IGNORE_SELECTOR_UNIT)) {
+                if (input)
+                        return -EINVAL;
+                return 0;
         }
 
-        case VIDIOC_G_CROP:
-        case VIDIOC_S_CROP:
-                return -ENOTTY;
+        if (input >= chain->selector->bNrInPins)
+                return -EINVAL;
 
-        /* Buffers & streaming */
-        case VIDIOC_REQBUFS:
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+        i = input + 1;
+        return uvc_query_ctrl(chain->dev, UVC_SET_CUR, chain->selector->id,
+                              chain->dev->intfnum, UVC_SU_INPUT_SELECT_CONTROL,
+                              &i, 1);
+}
 
-                if ((ret = uvc_acquire_privileges(handle)) < 0)
-                        return ret;
+static int uvc_ioctl_queryctrl(struct file *file, void *fh,
+                               struct v4l2_queryctrl *qc)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
 
-                mutex_lock(&stream->mutex);
-                ret = uvc_alloc_buffers(&stream->queue, arg);
-                mutex_unlock(&stream->mutex);
-                if (ret < 0)
-                        return ret;
+        return uvc_query_v4l2_ctrl(chain, qc);
+}
 
-                if (ret == 0)
-                        uvc_dismiss_privileges(handle);
+static int uvc_ioctl_g_ctrl(struct file *file, void *fh,
+                            struct v4l2_control *ctrl)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        struct v4l2_ext_control xctrl;
+        int ret;
 
-                ret = 0;
-                break;
+        memset(&xctrl, 0, sizeof(xctrl));
+        xctrl.id = ctrl->id;
+
+        ret = uvc_ctrl_begin(chain);
+        if (ret < 0)
+                return ret;
 
-        case VIDIOC_QUERYBUF:
-        {
-                struct v4l2_buffer *buf = arg;
+        ret = uvc_ctrl_get(chain, &xctrl);
+        uvc_ctrl_rollback(handle);
+        if (ret < 0)
+                return ret;
 
-                if (!uvc_has_privileges(handle))
-                        return -EBUSY;
+        ctrl->value = xctrl.value;
+        return 0;
+}
 
-                return uvc_query_buffer(&stream->queue, buf);
-        }
+static int uvc_ioctl_s_ctrl(struct file *file, void *fh,
+                            struct v4l2_control *ctrl)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        struct v4l2_ext_control xctrl;
+        int ret;
 
-        case VIDIOC_CREATE_BUFS:
-        {
-                struct v4l2_create_buffers *cb = arg;
+        memset(&xctrl, 0, sizeof(xctrl));
+        xctrl.id = ctrl->id;
+        xctrl.value = ctrl->value;
 
-                ret = uvc_acquire_privileges(handle);
-                if (ret < 0)
-                        return ret;
+        ret = uvc_ctrl_begin(chain);
+        if (ret < 0)
+                return ret;
 
-                return uvc_create_buffers(&stream->queue, cb);
+        ret = uvc_ctrl_set(chain, &xctrl);
+        if (ret < 0) {
+                uvc_ctrl_rollback(handle);
+                return ret;
         }
 
-        case VIDIOC_QBUF:
-                if (!uvc_has_privileges(handle))
-                        return -EBUSY;
+        ret = uvc_ctrl_commit(handle, &xctrl, 1);
+        if (ret < 0)
+                return ret;
 
-                return uvc_queue_buffer(&stream->queue, arg);
+        ctrl->value = xctrl.value;
+        return 0;
+}
+
+static int uvc_ioctl_g_ext_ctrls(struct file *file, void *fh,
+                                 struct v4l2_ext_controls *ctrls)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+        struct v4l2_ext_control *ctrl = ctrls->controls;
+        unsigned int i;
+        int ret;
 
-        case VIDIOC_DQBUF:
-                if (!uvc_has_privileges(handle))
-                        return -EBUSY;
+        ret = uvc_ctrl_begin(chain);
+        if (ret < 0)
+                return ret;
 
-                return uvc_dequeue_buffer(&stream->queue, arg,
-                        file->f_flags & O_NONBLOCK);
+        for (i = 0; i < ctrls->count; ++ctrl, ++i) {
+                ret = uvc_ctrl_get(chain, ctrl);
+                if (ret < 0) {
+                        uvc_ctrl_rollback(handle);
+                        ctrls->error_idx = i;
+                        return ret;
+                }
+        }
 
-        case VIDIOC_STREAMON:
-        {
-                int *type = arg;
+        ctrls->error_idx = 0;
 
-                if (*type != stream->type)
-                        return -EINVAL;
+        return uvc_ctrl_rollback(handle);
+}
 
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_s_try_ext_ctrls(struct uvc_fh *handle,
+                                     struct v4l2_ext_controls *ctrls,
+                                     bool commit)
+{
+        struct v4l2_ext_control *ctrl = ctrls->controls;
+        struct uvc_video_chain *chain = handle->chain;
+        unsigned int i;
+        int ret;
 
-                if (!uvc_has_privileges(handle))
-                        return -EBUSY;
+        ret = uvc_ctrl_begin(chain);
+        if (ret < 0)
+                return ret;
 
-                mutex_lock(&stream->mutex);
-                ret = uvc_video_enable(stream, 1);
-                mutex_unlock(&stream->mutex);
-                if (ret < 0)
+        for (i = 0; i < ctrls->count; ++ctrl, ++i) {
+                ret = uvc_ctrl_set(chain, ctrl);
+                if (ret < 0) {
+                        uvc_ctrl_rollback(handle);
+                        ctrls->error_idx = commit ? ctrls->count : i;
                         return ret;
-                break;
+                }
         }
 
-        case VIDIOC_STREAMOFF:
-        {
-                int *type = arg;
+        ctrls->error_idx = 0;
 
-                if (*type != stream->type)
-                        return -EINVAL;
+        if (commit)
+                return uvc_ctrl_commit(handle, ctrls->controls, ctrls->count);
+        else
+                return uvc_ctrl_rollback(handle);
+}
 
-                ret = v4l2_prio_check(vdev->prio, handle->vfh.prio);
-                if (ret < 0)
-                        return ret;
+static int uvc_ioctl_s_ext_ctrls(struct file *file, void *fh,
+                                 struct v4l2_ext_controls *ctrls)
+{
+        struct uvc_fh *handle = fh;
+
+        return uvc_ioctl_s_try_ext_ctrls(handle, ctrls, true);
+}
 
-                if (!uvc_has_privileges(handle))
-                        return -EBUSY;
+static int uvc_ioctl_try_ext_ctrls(struct file *file, void *fh,
+                                   struct v4l2_ext_controls *ctrls)
+{
+        struct uvc_fh *handle = fh;
 
-                return uvc_video_enable(stream, 0);
+        return uvc_ioctl_s_try_ext_ctrls(handle, ctrls, false);
+}
+
+static int uvc_ioctl_querymenu(struct file *file, void *fh,
+                               struct v4l2_querymenu *qm)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
+
+        return uvc_query_v4l2_menu(chain, qm);
+}
+
+static int uvc_ioctl_cropcap(struct file *file, void *fh,
+                             struct v4l2_cropcap *ccap)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+
+        if (ccap->type != stream->type)
+                return -EINVAL;
+
+        ccap->bounds.left = 0;
+        ccap->bounds.top = 0;
+        mutex_lock(&stream->mutex);
+        ccap->bounds.width = stream->cur_frame->wWidth;
+        ccap->bounds.height = stream->cur_frame->wHeight;
+        mutex_unlock(&stream->mutex);
+
+        ccap->defrect = ccap->bounds;
+
+        ccap->pixelaspect.numerator = 1;
+        ccap->pixelaspect.denominator = 1;
+        return 0;
+}
+
+static int uvc_ioctl_g_parm(struct file *file, void *fh,
+                            struct v4l2_streamparm *parm)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+
+        return uvc_v4l2_get_streamparm(stream, parm);
+}
+
+static int uvc_ioctl_s_parm(struct file *file, void *fh,
+                            struct v4l2_streamparm *parm)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        int ret;
+
+        ret = uvc_acquire_privileges(handle);
+        if (ret < 0)
+                return ret;
+
+        return uvc_v4l2_set_streamparm(stream, parm);
+}
+
+static int uvc_ioctl_enum_framesizes(struct file *file, void *fh,
+                                     struct v4l2_frmsizeenum *fsize)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        struct uvc_format *format = NULL;
+        struct uvc_frame *frame;
+        int i;
+
+        /* Look for the given pixel format */
+        for (i = 0; i < stream->nformats; i++) {
+                if (stream->format[i].fcc == fsize->pixel_format) {
+                        format = &stream->format[i];
+                        break;
+                }
         }
+        if (format == NULL)
+                return -EINVAL;
 
-        case VIDIOC_SUBSCRIBE_EVENT:
-        {
-                struct v4l2_event_subscription *sub = arg;
+        if (fsize->index >= format->nframes)
+                return -EINVAL;
 
-                switch (sub->type) {
-                case V4L2_EVENT_CTRL:
-                        return v4l2_event_subscribe(&handle->vfh, sub, 0,
-                                                    &uvc_ctrl_sub_ev_ops);
-                default:
-                        return -EINVAL;
+        frame = &format->frame[fsize->index];
+        fsize->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+        fsize->discrete.width = frame->wWidth;
+        fsize->discrete.height = frame->wHeight;
+        return 0;
+}
+
+static int uvc_ioctl_enum_frameintervals(struct file *file, void *fh,
+                                         struct v4l2_frmivalenum *fival)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_streaming *stream = handle->stream;
+        struct uvc_format *format = NULL;
+        struct uvc_frame *frame = NULL;
+        int i;
+
+        /* Look for the given pixel format and frame size */
+        for (i = 0; i < stream->nformats; i++) {
+                if (stream->format[i].fcc == fival->pixel_format) {
+                        format = &stream->format[i];
+                        break;
                 }
         }
+        if (format == NULL)
+                return -EINVAL;
 
-        case VIDIOC_UNSUBSCRIBE_EVENT:
-                return v4l2_event_unsubscribe(&handle->vfh, arg);
+        for (i = 0; i < format->nframes; i++) {
+                if (format->frame[i].wWidth == fival->width &&
+                    format->frame[i].wHeight == fival->height) {
+                        frame = &format->frame[i];
+                        break;
+                }
+        }
+        if (frame == NULL)
+                return -EINVAL;
 
-        case VIDIOC_DQEVENT:
-                return v4l2_event_dequeue(&handle->vfh, arg,
-                                          file->f_flags & O_NONBLOCK);
+        if (frame->bFrameIntervalType) {
+                if (fival->index >= frame->bFrameIntervalType)
+                        return -EINVAL;
 
-        /* Analog video standards make no sense for digital cameras. */
-        case VIDIOC_ENUMSTD:
-        case VIDIOC_QUERYSTD:
-        case VIDIOC_G_STD:
-        case VIDIOC_S_STD:
+                fival->type = V4L2_FRMIVAL_TYPE_DISCRETE;
+                fival->discrete.numerator =
+                        frame->dwFrameInterval[fival->index];
+                fival->discrete.denominator = 10000000;
+                uvc_simplify_fraction(&fival->discrete.numerator,
+                        &fival->discrete.denominator, 8, 333);
+        } else {
+                fival->type = V4L2_FRMIVAL_TYPE_STEPWISE;
+                fival->stepwise.min.numerator = frame->dwFrameInterval[0];
+                fival->stepwise.min.denominator = 10000000;
+                fival->stepwise.max.numerator = frame->dwFrameInterval[1];
+                fival->stepwise.max.denominator = 10000000;
+                fival->stepwise.step.numerator = frame->dwFrameInterval[2];
+                fival->stepwise.step.denominator = 10000000;
+                uvc_simplify_fraction(&fival->stepwise.min.numerator,
+                        &fival->stepwise.min.denominator, 8, 333);
+                uvc_simplify_fraction(&fival->stepwise.max.numerator,
+                        &fival->stepwise.max.denominator, 8, 333);
+                uvc_simplify_fraction(&fival->stepwise.step.numerator,
+                        &fival->stepwise.step.denominator, 8, 333);
+        }
 
-        case VIDIOC_OVERLAY:
+        return 0;
+}
 
-        case VIDIOC_ENUMAUDIO:
-        case VIDIOC_ENUMAUDOUT:
+static int uvc_ioctl_subscribe_event(struct v4l2_fh *fh,
+                                     const struct v4l2_event_subscription *sub)
+{
+        switch (sub->type) {
+        case V4L2_EVENT_CTRL:
+                return v4l2_event_subscribe(fh, sub, 0, &uvc_ctrl_sub_ev_ops);
+        default:
+                return -EINVAL;
+        }
+}
 
-        case VIDIOC_ENUMOUTPUT:
-                uvc_trace(UVC_TRACE_IOCTL, "Unsupported ioctl 0x%08x\n", cmd);
-                return -ENOTTY;
+static long uvc_ioctl_default(struct file *file, void *fh, bool valid_prio,
+                              unsigned int cmd, void *arg)
+{
+        struct uvc_fh *handle = fh;
+        struct uvc_video_chain *chain = handle->chain;
 
+        switch (cmd) {
+        /* Dynamic controls. */
         case UVCIOC_CTRL_MAP:
                 return uvc_ioctl_ctrl_map(chain, arg);
 
@@ -1105,23 +1178,8 @@ static long uvc_v4l2_do_ioctl(struct file *file, unsigned int cmd, void *arg)
                 return uvc_xu_ctrl_query(chain, arg);
 
         default:
-                uvc_trace(UVC_TRACE_IOCTL, "Unknown ioctl 0x%08x\n", cmd);
                 return -ENOTTY;
         }
-
-        return ret;
-}
-
-static long uvc_v4l2_ioctl(struct file *file,
-                     unsigned int cmd, unsigned long arg)
-{
-        if (uvc_trace_param & UVC_TRACE_IOCTL) {
-                uvc_printk(KERN_DEBUG, "uvc_v4l2_ioctl(");
-                v4l_printk_ioctl(NULL, cmd);
-                printk(")\n");
-        }
-
-        return video_usercopy(file, cmd, arg, uvc_v4l2_do_ioctl);
 }
 
 #ifdef CONFIG_COMPAT
@@ -1304,7 +1362,7 @@ static long uvc_v4l2_compat_ioctl32(struct file *file,
 
         old_fs = get_fs();
         set_fs(KERNEL_DS);
-        ret = uvc_v4l2_ioctl(file, cmd, (unsigned long)&karg);
+        ret = video_ioctl2(file, cmd, (unsigned long)&karg);
         set_fs(old_fs);
 
         if (ret < 0)
@@ -1365,11 +1423,48 @@ static unsigned long uvc_v4l2_get_unmapped_area(struct file *file,
 }
 #endif
 
+const struct v4l2_ioctl_ops uvc_ioctl_ops = {
+        .vidioc_querycap = uvc_ioctl_querycap,
+        .vidioc_enum_fmt_vid_cap = uvc_ioctl_enum_fmt_vid_cap,
+        .vidioc_enum_fmt_vid_out = uvc_ioctl_enum_fmt_vid_out,
+        .vidioc_g_fmt_vid_cap = uvc_ioctl_g_fmt_vid_cap,
+        .vidioc_g_fmt_vid_out = uvc_ioctl_g_fmt_vid_out,
+        .vidioc_s_fmt_vid_cap = uvc_ioctl_s_fmt_vid_cap,
+        .vidioc_s_fmt_vid_out = uvc_ioctl_s_fmt_vid_out,
+        .vidioc_try_fmt_vid_cap = uvc_ioctl_try_fmt_vid_cap,
+        .vidioc_try_fmt_vid_out = uvc_ioctl_try_fmt_vid_out,
+        .vidioc_reqbufs = uvc_ioctl_reqbufs,
+        .vidioc_querybuf = uvc_ioctl_querybuf,
+        .vidioc_qbuf = uvc_ioctl_qbuf,
+        .vidioc_dqbuf = uvc_ioctl_dqbuf,
+        .vidioc_create_bufs = uvc_ioctl_create_bufs,
+        .vidioc_streamon = uvc_ioctl_streamon,
+        .vidioc_streamoff = uvc_ioctl_streamoff,
+        .vidioc_enum_input = uvc_ioctl_enum_input,
+        .vidioc_g_input = uvc_ioctl_g_input,
+        .vidioc_s_input = uvc_ioctl_s_input,
+        .vidioc_queryctrl = uvc_ioctl_queryctrl,
+        .vidioc_g_ctrl = uvc_ioctl_g_ctrl,
+        .vidioc_s_ctrl = uvc_ioctl_s_ctrl,
+        .vidioc_g_ext_ctrls = uvc_ioctl_g_ext_ctrls,
+        .vidioc_s_ext_ctrls = uvc_ioctl_s_ext_ctrls,
+        .vidioc_try_ext_ctrls = uvc_ioctl_try_ext_ctrls,
+        .vidioc_querymenu = uvc_ioctl_querymenu,
+        .vidioc_cropcap = uvc_ioctl_cropcap,
+        .vidioc_g_parm = uvc_ioctl_g_parm,
+        .vidioc_s_parm = uvc_ioctl_s_parm,
+        .vidioc_enum_framesizes = uvc_ioctl_enum_framesizes,
+        .vidioc_enum_frameintervals = uvc_ioctl_enum_frameintervals,
+        .vidioc_subscribe_event = uvc_ioctl_subscribe_event,
+        .vidioc_unsubscribe_event = v4l2_event_unsubscribe,
+        .vidioc_default = uvc_ioctl_default,
+};
+
 const struct v4l2_file_operations uvc_fops = {
         .owner          = THIS_MODULE,
         .open           = uvc_v4l2_open,
         .release        = uvc_v4l2_release,
-        .unlocked_ioctl = uvc_v4l2_ioctl,
+        .unlocked_ioctl = video_ioctl2,
 #ifdef CONFIG_COMPAT
         .compat_ioctl32 = uvc_v4l2_compat_ioctl32,
 #endif
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c
index df81b9c4faf1..9637e8b86949 100644
--- a/drivers/media/usb/uvc/uvc_video.c
+++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1021,6 +1021,7 @@ static int uvc_video_decode_start(struct uvc_streaming *stream,
 
                 uvc_video_get_ts(&ts);
 
+                buf->buf.v4l2_buf.field = V4L2_FIELD_NONE;
                 buf->buf.v4l2_buf.sequence = stream->sequence;
                 buf->buf.v4l2_buf.timestamp.tv_sec = ts.tv_sec;
                 buf->buf.v4l2_buf.timestamp.tv_usec =
@@ -1734,19 +1735,13 @@ int uvc_video_resume(struct uvc_streaming *stream, int reset)
         uvc_video_clock_reset(stream);
 
         ret = uvc_commit_video(stream, &stream->ctrl);
-        if (ret < 0) {
-                uvc_queue_enable(&stream->queue, 0);
+        if (ret < 0)
                 return ret;
-        }
 
         if (!uvc_queue_streaming(&stream->queue))
                 return 0;
 
-        ret = uvc_init_video(stream, GFP_NOIO);
-        if (ret < 0)
-                uvc_queue_enable(&stream->queue, 0);
-
-        return ret;
+        return uvc_init_video(stream, GFP_NOIO);
 }
 
 /* ------------------------------------------------------------------------
@@ -1778,11 +1773,6 @@ int uvc_video_init(struct uvc_streaming *stream)
 
         atomic_set(&stream->active, 0);
 
-        /* Initialize the video buffers queue. */
-        ret = uvc_queue_init(&stream->queue, stream->type, !uvc_no_drop_param);
-        if (ret)
-                return ret;
-
         /* Alternate setting 0 should be the default, yet the XBox Live Vision
          * Cam (and possibly other devices) crash or otherwise misbehave if
          * they don't receive a SET_INTERFACE request before any other video
@@ -1889,7 +1879,6 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
                         usb_clear_halt(stream->dev->udev, pipe);
                 }
 
-                uvc_queue_enable(&stream->queue, 0);
                 uvc_video_clock_cleanup(stream);
                 return 0;
         }
@@ -1898,10 +1887,6 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
         if (ret < 0)
                 return ret;
 
-        ret = uvc_queue_enable(&stream->queue, 1);
-        if (ret < 0)
-                goto error_queue;
-
         /* Commit the streaming parameters. */
         ret = uvc_commit_video(stream, &stream->ctrl);
         if (ret < 0)
@@ -1916,8 +1901,6 @@ int uvc_video_enable(struct uvc_streaming *stream, int enable)
 error_video:
         usb_set_interface(stream->dev->udev, stream->intfnum, 0);
 error_commit:
-        uvc_queue_enable(&stream->queue, 0);
-error_queue:
         uvc_video_clock_cleanup(stream);
 
         return ret;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 864ada740360..f0a04b532ede 100644
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -148,6 +148,7 @@
 #define UVC_QUIRK_PROBE_DEF             0x00000100
 #define UVC_QUIRK_RESTRICT_FRAME_RATE   0x00000200
 #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400
+#define UVC_QUIRK_FORCE_Y8              0x00000800
 
 /* Format flags */
 #define UVC_FMT_FLAG_COMPRESSED         0x00000001
@@ -579,7 +580,6 @@ struct uvc_driver {
 #define UVC_TRACE_FORMAT        (1 << 3)
 #define UVC_TRACE_CAPTURE       (1 << 4)
 #define UVC_TRACE_CALLS         (1 << 5)
-#define UVC_TRACE_IOCTL         (1 << 6)
 #define UVC_TRACE_FRAME         (1 << 7)
 #define UVC_TRACE_SUSPEND       (1 << 8)
 #define UVC_TRACE_STATUS        (1 << 9)
@@ -623,9 +623,9 @@ extern struct uvc_entity *uvc_entity_by_id(struct uvc_device *dev, int id);
 /* Video buffers queue management. */
 extern int uvc_queue_init(struct uvc_video_queue *queue,
                 enum v4l2_buf_type type, int drop_corrupted);
-extern int uvc_alloc_buffers(struct uvc_video_queue *queue,
+extern void uvc_queue_release(struct uvc_video_queue *queue);
+extern int uvc_request_buffers(struct uvc_video_queue *queue,
                 struct v4l2_requestbuffers *rb);
-extern void uvc_free_buffers(struct uvc_video_queue *queue);
 extern int uvc_query_buffer(struct uvc_video_queue *queue,
                 struct v4l2_buffer *v4l2_buf);
 extern int uvc_create_buffers(struct uvc_video_queue *queue,
@@ -634,7 +634,10 @@ extern int uvc_queue_buffer(struct uvc_video_queue *queue,
                 struct v4l2_buffer *v4l2_buf);
 extern int uvc_dequeue_buffer(struct uvc_video_queue *queue,
                 struct v4l2_buffer *v4l2_buf, int nonblocking);
-extern int uvc_queue_enable(struct uvc_video_queue *queue, int enable);
+extern int uvc_queue_streamon(struct uvc_video_queue *queue,
+                              enum v4l2_buf_type type);
+extern int uvc_queue_streamoff(struct uvc_video_queue *queue,
+                               enum v4l2_buf_type type);
 extern void uvc_queue_cancel(struct uvc_video_queue *queue, int disconnect);
 extern struct uvc_buffer *uvc_queue_next_buffer(struct uvc_video_queue *queue,
                 struct uvc_buffer *buf);
@@ -653,6 +656,7 @@ static inline int uvc_queue_streaming(struct uvc_video_queue *queue)
 }
 
 /* V4L2 interface */
+extern const struct v4l2_ioctl_ops uvc_ioctl_ops;
 extern const struct v4l2_file_operations uvc_fops;
 
 /* Media controller */
diff --git a/drivers/media/v4l2-core/v4l2-common.c b/drivers/media/v4l2-core/v4l2-common.c
index 2e9d81f4c1a5..5b808500e7e7 100644
--- a/drivers/media/v4l2-core/v4l2-common.c
+++ b/drivers/media/v4l2-core/v4l2-common.c
@@ -80,36 +80,6 @@ MODULE_LICENSE("GPL");
 
 /* Helper functions for control handling                             */
 
-/* Check for correctness of the ctrl's value based on the data from
-   struct v4l2_queryctrl and the available menu items. Note that
-   menu_items may be NULL, in that case it is ignored. */
-int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl,
-                const char * const *menu_items)
-{
-        if (qctrl->flags & V4L2_CTRL_FLAG_DISABLED)
-                return -EINVAL;
-        if (qctrl->flags & V4L2_CTRL_FLAG_GRABBED)
-                return -EBUSY;
-        if (qctrl->type == V4L2_CTRL_TYPE_STRING)
-                return 0;
-        if (qctrl->type == V4L2_CTRL_TYPE_BUTTON ||
-            qctrl->type == V4L2_CTRL_TYPE_INTEGER64 ||
-            qctrl->type == V4L2_CTRL_TYPE_CTRL_CLASS)
-                return 0;
-        if (ctrl->value < qctrl->minimum || ctrl->value > qctrl->maximum)
-                return -ERANGE;
-        if (qctrl->type == V4L2_CTRL_TYPE_MENU && menu_items != NULL) {
-                if (menu_items[ctrl->value] == NULL ||
-                    menu_items[ctrl->value][0] == '\0')
-                        return -EINVAL;
-        }
-        if (qctrl->type == V4L2_CTRL_TYPE_BITMASK &&
-                        (ctrl->value & ~qctrl->maximum))
-                return -ERANGE;
-        return 0;
-}
-EXPORT_SYMBOL(v4l2_ctrl_check);
-
 /* Fill in a struct v4l2_queryctrl */
 int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 _min, s32 _max, s32 _step, s32 _def)
 {
@@ -135,101 +105,6 @@ int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 _min, s32 _max, s32 _
 }
 EXPORT_SYMBOL(v4l2_ctrl_query_fill);
 
-/* Fill in a struct v4l2_querymenu based on the struct v4l2_queryctrl and
-   the menu. The qctrl pointer may be NULL, in which case it is ignored.
-   If menu_items is NULL, then the menu items are retrieved using
-   v4l2_ctrl_get_menu. */
-int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl,
-               const char * const *menu_items)
-{
-        int i;
-
-        qmenu->reserved = 0;
-        if (menu_items == NULL)
-                menu_items = v4l2_ctrl_get_menu(qmenu->id);
-        if (menu_items == NULL ||
-            (qctrl && (qmenu->index < qctrl->minimum || qmenu->index > qctrl->maximum)))
-                return -EINVAL;
-        for (i = 0; i < qmenu->index && menu_items[i]; i++) ;
-        if (menu_items[i] == NULL || menu_items[i][0] == '\0')
-                return -EINVAL;
-        strlcpy(qmenu->name, menu_items[qmenu->index], sizeof(qmenu->name));
-        return 0;
-}
-EXPORT_SYMBOL(v4l2_ctrl_query_menu);
-
-/* Fill in a struct v4l2_querymenu based on the specified array of valid
-   menu items (terminated by V4L2_CTRL_MENU_IDS_END).
-   Use this if there are 'holes' in the list of valid menu items. */
-int v4l2_ctrl_query_menu_valid_items(struct v4l2_querymenu *qmenu, const u32 *ids)
-{
-        const char * const *menu_items = v4l2_ctrl_get_menu(qmenu->id);
-
-        qmenu->reserved = 0;
-        if (menu_items == NULL || ids == NULL)
-                return -EINVAL;
-        while (*ids != V4L2_CTRL_MENU_IDS_END) {
-                if (*ids++ == qmenu->index) {
-                        strlcpy(qmenu->name, menu_items[qmenu->index],
-                                        sizeof(qmenu->name));
-                        return 0;
-                }
-        }
-        return -EINVAL;
-}
-EXPORT_SYMBOL(v4l2_ctrl_query_menu_valid_items);
-
-/* ctrl_classes points to an array of u32 pointers, the last element is
-   a NULL pointer. Each u32 array is a 0-terminated array of control IDs.
-   Each array must be sorted low to high and belong to the same control
-   class. The array of u32 pointers must also be sorted, from low class IDs
-   to high class IDs.
-
-   This function returns the first ID that follows after the given ID.
-   When no more controls are available 0 is returned. */
-u32 v4l2_ctrl_next(const u32 * const * ctrl_classes, u32 id)
-{
-        u32 ctrl_class = V4L2_CTRL_ID2CLASS(id);
-        const u32 *pctrl;
-
-        if (ctrl_classes == NULL)
-                return 0;
-
-        /* if no query is desired, then check if the ID is part of ctrl_classes */
-        if ((id & V4L2_CTRL_FLAG_NEXT_CTRL) == 0) {
-                /* find class */
-                while (*ctrl_classes && V4L2_CTRL_ID2CLASS(**ctrl_classes) != ctrl_class)
-                        ctrl_classes++;
-                if (*ctrl_classes == NULL)
-                        return 0;
-                pctrl = *ctrl_classes;
-                /* find control ID */
-                while (*pctrl && *pctrl != id) pctrl++;
-                return *pctrl ? id : 0;
-        }
-        id &= V4L2_CTRL_ID_MASK;
-        id++;   /* select next control */
-        /* find first class that matches (or is greater than) the class of
-           the ID */
-        while (*ctrl_classes && V4L2_CTRL_ID2CLASS(**ctrl_classes) < ctrl_class)
-                ctrl_classes++;
-        /* no more classes */
-        if (*ctrl_classes == NULL)
-                return 0;
-        pctrl = *ctrl_classes;
-        /* find first ctrl within the class that is >= ID */
-        while (*pctrl && *pctrl < id) pctrl++;
-        if (*pctrl)
-                return *pctrl;
-        /* we are at the end of the controls of the current class. */
-        /* continue with next class if available */
-        ctrl_classes++;
-        if (*ctrl_classes == NULL)
-                return 0;
-        return **ctrl_classes;
-}
-EXPORT_SYMBOL(v4l2_ctrl_next);
-
 /* I2C Helper functions */
 
 #if IS_ENABLED(CONFIG_I2C)
diff --git a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
index e502a5fb2994..af635430524e 100644
--- a/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
+++ b/drivers/media/v4l2-core/v4l2-compat-ioctl32.c
@@ -222,6 +222,9 @@ static int get_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_
 
 static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
 {
+        if (put_user(kp->type, &up->type))
+                return -EFAULT;
+
         switch (kp->type) {
         case V4L2_BUF_TYPE_VIDEO_CAPTURE:
         case V4L2_BUF_TYPE_VIDEO_OUTPUT:
@@ -248,8 +251,7 @@ static int __put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __us
 
 static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user *up)
 {
-        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_format32)) ||
-                put_user(kp->type, &up->type))
+        if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_format32)))
                 return -EFAULT;
         return __put_v4l2_format32(kp, up);
 }
@@ -257,8 +259,8 @@ static int put_v4l2_format32(struct v4l2_format *kp, struct v4l2_format32 __user
 static int put_v4l2_create32(struct v4l2_create_buffers *kp, struct v4l2_create_buffers32 __user *up)
 {
         if (!access_ok(VERIFY_WRITE, up, sizeof(struct v4l2_create_buffers32)) ||
-            copy_to_user(up, kp, offsetof(struct v4l2_create_buffers32, format.fmt)))
-                        return -EFAULT;
+            copy_to_user(up, kp, offsetof(struct v4l2_create_buffers32, format)))
+                return -EFAULT;
         return __put_v4l2_format32(&kp->format, &up->format);
 }
 
diff --git a/drivers/media/v4l2-core/v4l2-ctrls.c b/drivers/media/v4l2-core/v4l2-ctrls.c
index 86012140923f..45c5b4710601 100644
--- a/drivers/media/v4l2-core/v4l2-ctrls.c
+++ b/drivers/media/v4l2-core/v4l2-ctrls.c
@@ -1658,10 +1658,8 @@ static int check_range(enum v4l2_ctrl_type type,
 }
 
 /* Validate a new control */
-static int validate_new(const struct v4l2_ctrl *ctrl,
-                        struct v4l2_ext_control *c)
+static int validate_new(const struct v4l2_ctrl *ctrl, union v4l2_ctrl_ptr p_new)
 {
-        union v4l2_ctrl_ptr ptr;
         unsigned idx;
         int err = 0;
 
@@ -1674,19 +1672,14 @@ static int validate_new(const struct v4l2_ctrl *ctrl,
                 case V4L2_CTRL_TYPE_BOOLEAN:
                 case V4L2_CTRL_TYPE_BUTTON:
                 case V4L2_CTRL_TYPE_CTRL_CLASS:
-                        ptr.p_s32 = &c->value;
-                        return ctrl->type_ops->validate(ctrl, 0, ptr);
-
                 case V4L2_CTRL_TYPE_INTEGER64:
-                        ptr.p_s64 = &c->value64;
-                        return ctrl->type_ops->validate(ctrl, 0, ptr);
+                        return ctrl->type_ops->validate(ctrl, 0, p_new);
                 default:
                         break;
                 }
         }
-        ptr.p = c->ptr;
-        for (idx = 0; !err && idx < c->size / ctrl->elem_size; idx++)
-                err = ctrl->type_ops->validate(ctrl, idx, ptr);
+        for (idx = 0; !err && idx < ctrl->elems; idx++)
+                err = ctrl->type_ops->validate(ctrl, idx, p_new);
         return err;
 }
 
@@ -3012,6 +3005,7 @@ static int validate_ctrls(struct v4l2_ext_controls *cs,
         cs->error_idx = cs->count;
         for (i = 0; i < cs->count; i++) {
                 struct v4l2_ctrl *ctrl = helpers[i].ctrl;
+                union v4l2_ctrl_ptr p_new;
 
                 cs->error_idx = i;
 
@@ -3025,7 +3019,17 @@ static int validate_ctrls(struct v4l2_ext_controls *cs,
                    best-effort to avoid that. */
                 if (set && (ctrl->flags & V4L2_CTRL_FLAG_GRABBED))
                         return -EBUSY;
-                ret = validate_new(ctrl, &cs->controls[i]);
+                /*
+                 * Skip validation for now if the payload needs to be copied
+                 * from userspace into kernelspace. We'll validate those later.
+                 */
+                if (ctrl->is_ptr)
+                        continue;
+                if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64)
+                        p_new.p_s64 = &cs->controls[i].value64;
+                else
+                        p_new.p_s32 = &cs->controls[i].value;
+                ret = validate_new(ctrl, p_new);
                 if (ret)
                         return ret;
         }
@@ -3120,7 +3124,11 @@ static int try_set_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
                 /* Copy the new caller-supplied control values.
                    user_to_new() sets 'is_new' to 1. */
                 do {
-                        ret = user_to_new(cs->controls + idx, helpers[idx].ctrl);
+                        struct v4l2_ctrl *ctrl = helpers[idx].ctrl;
+
+                        ret = user_to_new(cs->controls + idx, ctrl);
+                        if (!ret && ctrl->is_ptr)
+                                ret = validate_new(ctrl, ctrl->p_new);
                         idx = helpers[idx].next;
                 } while (!ret && idx);
 
@@ -3170,10 +3178,10 @@ int v4l2_subdev_s_ext_ctrls(struct v4l2_subdev *sd, struct v4l2_ext_controls *cs
 EXPORT_SYMBOL(v4l2_subdev_s_ext_ctrls);
 
 /* Helper function for VIDIOC_S_CTRL compatibility */
-static int set_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl,
-                    struct v4l2_ext_control *c, u32 ch_flags)
+static int set_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl, u32 ch_flags)
 {
         struct v4l2_ctrl *master = ctrl->cluster[0];
+        int ret;
         int i;
 
         /* Reset the 'is_new' flags of the cluster */
@@ -3181,8 +3189,9 @@ static int set_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl,
                 if (master->cluster[i])
                         master->cluster[i]->is_new = 0;
 
-        if (c)
-                user_to_new(c, ctrl);
+        ret = validate_new(ctrl, ctrl->p_new);
+        if (ret)
+                return ret;
 
         /* For autoclusters with volatiles that are switched from auto to
            manual mode we have to update the current volatile values since
@@ -3199,15 +3208,14 @@ static int set_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl,
 static int set_ctrl_lock(struct v4l2_fh *fh, struct v4l2_ctrl *ctrl,
                          struct v4l2_ext_control *c)
 {
-        int ret = validate_new(ctrl, c);
+        int ret;
 
-        if (!ret) {
-                v4l2_ctrl_lock(ctrl);
-                ret = set_ctrl(fh, ctrl, c, 0);
-                if (!ret)
-                        cur_to_user(c, ctrl);
-                v4l2_ctrl_unlock(ctrl);
-        }
+        v4l2_ctrl_lock(ctrl);
+        user_to_new(c, ctrl);
+        ret = set_ctrl(fh, ctrl, 0);
+        if (!ret)
+                cur_to_user(c, ctrl);
+        v4l2_ctrl_unlock(ctrl);
         return ret;
 }
 
@@ -3215,7 +3223,7 @@ int v4l2_s_ctrl(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
                                         struct v4l2_control *control)
 {
         struct v4l2_ctrl *ctrl = v4l2_ctrl_find(hdl, control->id);
-        struct v4l2_ext_control c;
+        struct v4l2_ext_control c = { control->id };
         int ret;
 
         if (ctrl == NULL || !ctrl->is_int)
@@ -3244,7 +3252,7 @@ int __v4l2_ctrl_s_ctrl(struct v4l2_ctrl *ctrl, s32 val)
         /* It's a driver bug if this happens. */
         WARN_ON(!ctrl->is_int);
         ctrl->val = val;
-        return set_ctrl(NULL, ctrl, NULL, 0);
+        return set_ctrl(NULL, ctrl, 0);
 }
 EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl);
 
@@ -3255,7 +3263,7 @@ int __v4l2_ctrl_s_ctrl_int64(struct v4l2_ctrl *ctrl, s64 val)
         /* It's a driver bug if this happens. */
         WARN_ON(ctrl->is_ptr || ctrl->type != V4L2_CTRL_TYPE_INTEGER64);
         *ctrl->p_new.p_s64 = val;
-        return set_ctrl(NULL, ctrl, NULL, 0);
+        return set_ctrl(NULL, ctrl, 0);
 }
 EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_int64);
 
@@ -3266,7 +3274,7 @@ int __v4l2_ctrl_s_ctrl_string(struct v4l2_ctrl *ctrl, const char *s)
         /* It's a driver bug if this happens. */
         WARN_ON(ctrl->type != V4L2_CTRL_TYPE_STRING);
         strlcpy(ctrl->p_new.p_char, s, ctrl->maximum + 1);
-        return set_ctrl(NULL, ctrl, NULL, 0);
+        return set_ctrl(NULL, ctrl, 0);
 }
 EXPORT_SYMBOL(__v4l2_ctrl_s_ctrl_string);
 
@@ -3289,8 +3297,8 @@ EXPORT_SYMBOL(v4l2_ctrl_notify);
 int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
                         s64 min, s64 max, u64 step, s64 def)
 {
+        bool changed;
         int ret;
-        struct v4l2_ext_control c;
 
         lockdep_assert_held(ctrl->handler->lock);
 
@@ -3317,11 +3325,20 @@ int __v4l2_ctrl_modify_range(struct v4l2_ctrl *ctrl,
         ctrl->maximum = max;
         ctrl->step = step;
         ctrl->default_value = def;
-        c.value = *ctrl->p_cur.p_s32;
-        if (validate_new(ctrl, &c))
-                c.value = def;
-        if (c.value != *ctrl->p_cur.p_s32)
-                ret = set_ctrl(NULL, ctrl, &c, V4L2_EVENT_CTRL_CH_RANGE);
+        cur_to_new(ctrl);
+        if (validate_new(ctrl, ctrl->p_new)) {
+                if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64)
+                        *ctrl->p_new.p_s64 = def;
+                else
+                        *ctrl->p_new.p_s32 = def;
+        }
+
+        if (ctrl->type == V4L2_CTRL_TYPE_INTEGER64)
+                changed = *ctrl->p_new.p_s64 != *ctrl->p_cur.p_s64;
+        else
+                changed = *ctrl->p_new.p_s32 != *ctrl->p_cur.p_s32;
+        if (changed)
+                ret = set_ctrl(NULL, ctrl, V4L2_EVENT_CTRL_CH_RANGE);
         else
                 send_event(NULL, ctrl, V4L2_EVENT_CTRL_CH_RANGE);
         return ret;
diff --git a/drivers/media/v4l2-core/v4l2-dev.c b/drivers/media/v4l2-core/v4l2-dev.c
index 33617c365acc..9aa530a8bea9 100644
--- a/drivers/media/v4l2-core/v4l2-dev.c
+++ b/drivers/media/v4l2-core/v4l2-dev.c
@@ -194,7 +194,7 @@ static void v4l2_device_release(struct device *cd)
         mutex_unlock(&videodev_lock);
 
 #if defined(CONFIG_MEDIA_CONTROLLER)
-        if (v4l2_dev && v4l2_dev->mdev &&
+        if (v4l2_dev->mdev &&
             vdev->vfl_type != VFL_TYPE_SUBDEV)
                 media_device_unregister_entity(&vdev->entity);
 #endif
@@ -207,7 +207,7 @@ static void v4l2_device_release(struct device *cd)
          * TODO: In the long run all drivers that use v4l2_device should use the
          * v4l2_device release callback. This check will then be unnecessary.
          */
-        if (v4l2_dev && v4l2_dev->release == NULL)
+        if (v4l2_dev->release == NULL)
                 v4l2_dev = NULL;
 
         /* Release video_device and perform other
@@ -360,27 +360,22 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                  * hack but it will have to do for those drivers that are not
                  * yet converted to use unlocked_ioctl.
                  *
-                 * There are two options: if the driver implements struct
-                 * v4l2_device, then the lock defined there is used to
-                 * serialize the ioctls. Otherwise the v4l2 core lock defined
-                 * below is used. This lock is really bad since it serializes
-                 * completely independent devices.
+                 * All drivers implement struct v4l2_device, so we use the
+                 * lock defined there to serialize the ioctls.
                  *
-                 * Both variants suffer from the same problem: if the driver
-                 * sleeps, then it blocks all ioctls since the lock is still
-                 * held. This is very common for VIDIOC_DQBUF since that
-                 * normally waits for a frame to arrive. As a result any other
-                 * ioctl calls will proceed very, very slowly since each call
-                 * will have to wait for the VIDIOC_QBUF to finish. Things that
-                 * should take 0.01s may now take 10-20 seconds.
+                 * However, if the driver sleeps, then it blocks all ioctls
+                 * since the lock is still held. This is very common for
+                 * VIDIOC_DQBUF since that normally waits for a frame to arrive.
+                 * As a result any other ioctl calls will proceed very, very
+                 * slowly since each call will have to wait for the VIDIOC_QBUF
+                 * to finish. Things that should take 0.01s may now take 10-20
+                 * seconds.
                  *
                  * The workaround is to *not* take the lock for VIDIOC_DQBUF.
                  * This actually works OK for videobuf-based drivers, since
                  * videobuf will take its own internal lock.
                  */
-                static DEFINE_MUTEX(v4l2_ioctl_mutex);
-                struct mutex *m = vdev->v4l2_dev ?
-                        &vdev->v4l2_dev->ioctl_lock : &v4l2_ioctl_mutex;
+                struct mutex *m = &vdev->v4l2_dev->ioctl_lock;
 
                 if (cmd != VIDIOC_DQBUF && mutex_lock_interruptible(m))
                         return -ERESTARTSYS;
@@ -938,12 +933,11 @@ int __video_register_device(struct video_device *vdev, int type, int nr,
                         name_base, nr, video_device_node_name(vdev));
 
         /* Increase v4l2_device refcount */
-        if (vdev->v4l2_dev)
-                v4l2_device_get(vdev->v4l2_dev);
+        v4l2_device_get(vdev->v4l2_dev);
 
 #if defined(CONFIG_MEDIA_CONTROLLER)
         /* Part 5: Register the entity. */
-        if (vdev->v4l2_dev && vdev->v4l2_dev->mdev &&
+        if (vdev->v4l2_dev->mdev &&
             vdev->vfl_type != VFL_TYPE_SUBDEV) {
                 vdev->entity.type = MEDIA_ENT_T_DEVNODE_V4L;
                 vdev->entity.name = vdev->name;
diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 9ccb19a435ef..75658717961f 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -257,7 +257,7 @@ static void v4l_print_format(const void *arg, bool write_only)
                 pr_cont(", width=%u, height=%u, "
                         "pixelformat=%c%c%c%c, field=%s, "
                         "bytesperline=%u, sizeimage=%u, colorspace=%d, "
-                        "flags %u\n",
+                        "flags %x, ycbcr_enc=%u, quantization=%u\n",
                         pix->width, pix->height,
                         (pix->pixelformat & 0xff),
                         (pix->pixelformat >>  8) & 0xff,
@@ -265,21 +265,24 @@ static void v4l_print_format(const void *arg, bool write_only)
                         (pix->pixelformat >> 24) & 0xff,
                         prt_names(pix->field, v4l2_field_names),
                         pix->bytesperline, pix->sizeimage,
-                        pix->colorspace, pix->flags);
+                        pix->colorspace, pix->flags, pix->ycbcr_enc,
+                        pix->quantization);
                 break;
         case V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE:
         case V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE:
                 mp = &p->fmt.pix_mp;
                 pr_cont(", width=%u, height=%u, "
                         "format=%c%c%c%c, field=%s, "
-                        "colorspace=%d, num_planes=%u\n",
+                        "colorspace=%d, num_planes=%u, flags=%x, "
+                        "ycbcr_enc=%u, quantization=%u\n",
                         mp->width, mp->height,
                         (mp->pixelformat & 0xff),
                         (mp->pixelformat >>  8) & 0xff,
                         (mp->pixelformat >> 16) & 0xff,
                         (mp->pixelformat >> 24) & 0xff,
                         prt_names(mp->field, v4l2_field_names),
-                        mp->colorspace, mp->num_planes);
+                        mp->colorspace, mp->num_planes, mp->flags,
+                        mp->ycbcr_enc, mp->quantization);
                 for (i = 0; i < mp->num_planes; i++)
                         printk(KERN_DEBUG "plane %u: bytesperline=%u sizeimage=%u\n", i,
                                         mp->plane_fmt[i].bytesperline,
@@ -1040,7 +1043,7 @@ static int v4l_g_priority(const struct v4l2_ioctl_ops *ops,
         if (ops->vidioc_g_priority)
                 return ops->vidioc_g_priority(file, fh, arg);
         vfd = video_devdata(file);
-        *p = v4l2_prio_max(&vfd->v4l2_dev->prio);
+        *p = v4l2_prio_max(vfd->prio);
         return 0;
 }
 
@@ -1055,7 +1058,7 @@ static int v4l_s_priority(const struct v4l2_ioctl_ops *ops,
                 return ops->vidioc_s_priority(file, fh, *p);
         vfd = video_devdata(file);
         vfh = file->private_data;
-        return v4l2_prio_change(&vfd->v4l2_dev->prio, &vfh->prio, *p);
+        return v4l2_prio_change(vfd->prio, &vfh->prio, *p);
 }
 
 static int v4l_enuminput(const struct v4l2_ioctl_ops *ops,
diff --git a/drivers/media/v4l2-core/videobuf-core.c b/drivers/media/v4l2-core/videobuf-core.c
index b91a266d0b7e..926836d1813a 100644
--- a/drivers/media/v4l2-core/videobuf-core.c
+++ b/drivers/media/v4l2-core/videobuf-core.c
@@ -51,6 +51,8 @@ MODULE_LICENSE("GPL");
 
 #define CALL(q, f, arg...)                                              \
         ((q->int_ops->f) ? q->int_ops->f(arg) : 0)
+#define CALLPTR(q, f, arg...)                                           \
+        ((q->int_ops->f) ? q->int_ops->f(arg) : NULL)
 
 struct videobuf_buffer *videobuf_alloc_vb(struct videobuf_queue *q)
 {
@@ -831,7 +833,7 @@ static int __videobuf_copy_to_user(struct videobuf_queue *q,
                                    char __user *data, size_t count,
                                    int nonblocking)
 {
-        void *vaddr = CALL(q, vaddr, buf);
+        void *vaddr = CALLPTR(q, vaddr, buf);
 
         /* copy to userspace */
         if (count > buf->size - q->read_off)
@@ -848,7 +850,7 @@ static int __videobuf_copy_stream(struct videobuf_queue *q,
                                   char __user *data, size_t count, size_t pos,
                                   int vbihack, int nonblocking)
 {
-        unsigned int *fc = CALL(q, vaddr, buf);
+        unsigned int *fc = CALLPTR(q, vaddr, buf);
 
         if (vbihack) {
                 /* dirty, undocumented hack -- pass the frame counter
diff --git a/drivers/media/v4l2-core/videobuf2-core.c b/drivers/media/v4l2-core/videobuf2-core.c
index f2e43de3dd87..d09a8916e940 100644
--- a/drivers/media/v4l2-core/videobuf2-core.c
+++ b/drivers/media/v4l2-core/videobuf2-core.c
@@ -189,6 +189,8 @@ static void __vb2_queue_cancel(struct vb2_queue *q);
 static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)
 {
         struct vb2_queue *q = vb->vb2_queue;
+        enum dma_data_direction dma_dir =
+                V4L2_TYPE_IS_OUTPUT(q->type) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
         void *mem_priv;
         int plane;
 
@@ -200,7 +202,7 @@ static int __vb2_buf_mem_alloc(struct vb2_buffer *vb)
                 unsigned long size = PAGE_ALIGN(q->plane_sizes[plane]);
 
                 mem_priv = call_ptr_memop(vb, alloc, q->alloc_ctx[plane],
-                                      size, q->gfp_flags);
+                                      size, dma_dir, q->gfp_flags);
                 if (IS_ERR_OR_NULL(mem_priv))
                         goto free;
 
@@ -1358,7 +1360,8 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
         void *mem_priv;
         unsigned int plane;
         int ret;
-        int write = !V4L2_TYPE_IS_OUTPUT(q->type);
+        enum dma_data_direction dma_dir =
+                V4L2_TYPE_IS_OUTPUT(q->type) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
         bool reacquired = vb->planes[0].mem_priv == NULL;
 
         memset(planes, 0, sizeof(planes[0]) * vb->num_planes);
@@ -1400,7 +1403,7 @@ static int __qbuf_userptr(struct vb2_buffer *vb, const struct v4l2_buffer *b)
                 /* Acquire each plane's memory */
                 mem_priv = call_ptr_memop(vb, get_userptr, q->alloc_ctx[plane],
                                       planes[plane].m.userptr,
-                                      planes[plane].length, write);
+                                      planes[plane].length, dma_dir);
                 if (IS_ERR_OR_NULL(mem_priv)) {
                         dprintk(1, "failed acquiring userspace "
                                                 "memory for plane %d\n", plane);
@@ -1461,7 +1464,8 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
         void *mem_priv;
         unsigned int plane;
         int ret;
-        int write = !V4L2_TYPE_IS_OUTPUT(q->type);
+        enum dma_data_direction dma_dir =
+                V4L2_TYPE_IS_OUTPUT(q->type) ? DMA_TO_DEVICE : DMA_FROM_DEVICE;
         bool reacquired = vb->planes[0].mem_priv == NULL;
 
         memset(planes, 0, sizeof(planes[0]) * vb->num_planes);
@@ -1509,7 +1513,7 @@ static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b)
 
                 /* Acquire each plane's memory */
                 mem_priv = call_ptr_memop(vb, attach_dmabuf, q->alloc_ctx[plane],
-                        dbuf, planes[plane].length, write);
+                        dbuf, planes[plane].length, dma_dir);
                 if (IS_ERR(mem_priv)) {
                         dprintk(1, "failed to attach dmabuf\n");
                         ret = PTR_ERR(mem_priv);
@@ -3385,14 +3389,14 @@ int _vb2_fop_release(struct file *file, struct mutex *lock)
 {
         struct video_device *vdev = video_devdata(file);
 
+        if (lock)
+                mutex_lock(lock);
         if (file->private_data == vdev->queue->owner) {
-                if (lock)
-                        mutex_lock(lock);
                 vb2_queue_release(vdev->queue);
                 vdev->queue->owner = NULL;
-                if (lock)
-                        mutex_unlock(lock);
         }
+        if (lock)
+                mutex_unlock(lock);
         return v4l2_fh_release(file);
 }
 EXPORT_SYMBOL_GPL(_vb2_fop_release);
@@ -3455,27 +3459,16 @@ unsigned int vb2_fop_poll(struct file *file, poll_table *wait)
         struct video_device *vdev = video_devdata(file);
         struct vb2_queue *q = vdev->queue;
         struct mutex *lock = q->lock ? q->lock : vdev->lock;
-        unsigned long req_events = poll_requested_events(wait);
         unsigned res;
         void *fileio;
-        bool must_lock = false;
-
-        /* Try to be smart: only lock if polling might start fileio,
-           otherwise locking will only introduce unwanted delays. */
-        if (q->num_buffers == 0 && !vb2_fileio_is_active(q)) {
-                if (!V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_READ) &&
-                                (req_events & (POLLIN | POLLRDNORM)))
-                        must_lock = true;
-                else if (V4L2_TYPE_IS_OUTPUT(q->type) && (q->io_modes & VB2_WRITE) &&
-                                (req_events & (POLLOUT | POLLWRNORM)))
-                        must_lock = true;
-        }
 
-        /* If locking is needed, but this helper doesn't know how, then you
-           shouldn't be using this helper but you should write your own. */
-        WARN_ON(must_lock && !lock);
+        /*
+         * If this helper doesn't know how to lock, then you shouldn't be using
+         * it but you should write your own.
+         */
+        WARN_ON(!lock);
 
-        if (must_lock && lock && mutex_lock_interruptible(lock))
+        if (lock && mutex_lock_interruptible(lock))
                 return POLLERR;
 
         fileio = q->fileio;
@@ -3483,9 +3476,9 @@ unsigned int vb2_fop_poll(struct file *file, poll_table *wait)
         res = vb2_poll(vdev->queue, file, wait);
 
         /* If fileio was started, then we have a new queue owner. */
-        if (must_lock && !fileio && q->fileio)
+        if (!fileio && q->fileio)
                 q->owner = file->private_data;
-        if (must_lock && lock)
+        if (lock)
                 mutex_unlock(lock);
         return res;
 }
diff --git a/drivers/media/v4l2-core/videobuf2-dma-contig.c b/drivers/media/v4l2-core/videobuf2-dma-contig.c
index 4a02ade14b4f..b481d20c8372 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-contig.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-contig.c
@@ -155,7 +155,8 @@ static void vb2_dc_put(void *buf_priv)
         kfree(buf);
 }
 
-static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
+static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size,
+                          enum dma_data_direction dma_dir, gfp_t gfp_flags)
 {
         struct vb2_dc_conf *conf = alloc_ctx;
         struct device *dev = conf->dev;
@@ -176,6 +177,7 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
         /* Prevent the device from being released while the buffer is used */
         buf->dev = get_device(dev);
         buf->size = size;
+        buf->dma_dir = dma_dir;
 
         buf->handler.refcount = &buf->refcount;
         buf->handler.put = vb2_dc_put;
@@ -229,7 +231,7 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma)
 
 struct vb2_dc_attachment {
         struct sg_table sgt;
-        enum dma_data_direction dir;
+        enum dma_data_direction dma_dir;
 };
 
 static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev,
@@ -264,7 +266,7 @@ static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev,
                 wr = sg_next(wr);
         }
 
-        attach->dir = DMA_NONE;
+        attach->dma_dir = DMA_NONE;
         dbuf_attach->priv = attach;
 
         return 0;
@@ -282,16 +284,16 @@ static void vb2_dc_dmabuf_ops_detach(struct dma_buf *dbuf,
         sgt = &attach->sgt;
 
         /* release the scatterlist cache */
-        if (attach->dir != DMA_NONE)
+        if (attach->dma_dir != DMA_NONE)
                 dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
-                        attach->dir);
+                        attach->dma_dir);
         sg_free_table(sgt);
         kfree(attach);
         db_attach->priv = NULL;
 }
 
 static struct sg_table *vb2_dc_dmabuf_ops_map(
-        struct dma_buf_attachment *db_attach, enum dma_data_direction dir)
+        struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir)
 {
         struct vb2_dc_attachment *attach = db_attach->priv;
         /* stealing dmabuf mutex to serialize map/unmap operations */
@@ -303,27 +305,27 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
 
         sgt = &attach->sgt;
         /* return previously mapped sg table */
-        if (attach->dir == dir) {
+        if (attach->dma_dir == dma_dir) {
                 mutex_unlock(lock);
                 return sgt;
         }
 
         /* release any previous cache */
-        if (attach->dir != DMA_NONE) {
+        if (attach->dma_dir != DMA_NONE) {
                 dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
-                        attach->dir);
-                attach->dir = DMA_NONE;
+                        attach->dma_dir);
+                attach->dma_dir = DMA_NONE;
         }
 
         /* mapping to the client with new direction */
-        ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dir);
+        ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dma_dir);
         if (ret <= 0) {
                 pr_err("failed to map scatterlist\n");
                 mutex_unlock(lock);
                 return ERR_PTR(-EIO);
         }
 
-        attach->dir = dir;
+        attach->dma_dir = dma_dir;
 
         mutex_unlock(lock);
 
@@ -331,7 +333,7 @@ static struct sg_table *vb2_dc_dmabuf_ops_map(
 }
 
 static void vb2_dc_dmabuf_ops_unmap(struct dma_buf_attachment *db_attach,
-        struct sg_table *sgt, enum dma_data_direction dir)
+        struct sg_table *sgt, enum dma_data_direction dma_dir)
 {
         /* nothing to be done here */
 }
@@ -460,7 +462,8 @@ static int vb2_dc_get_user_pfn(unsigned long start, int n_pages,
 }
 
 static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
-        int n_pages, struct vm_area_struct *vma, int write)
+        int n_pages, struct vm_area_struct *vma,
+        enum dma_data_direction dma_dir)
 {
         if (vma_is_io(vma)) {
                 unsigned int i;
@@ -482,7 +485,7 @@ static int vb2_dc_get_user_pages(unsigned long start, struct page **pages,
                 int n;
 
                 n = get_user_pages(current, current->mm, start & PAGE_MASK,
-                        n_pages, write, 1, pages, NULL);
+                        n_pages, dma_dir == DMA_FROM_DEVICE, 1, pages, NULL);
                 /* negative error means that no page was pinned */
                 n = max(n, 0);
                 if (n != n_pages) {
@@ -508,7 +511,15 @@ static void vb2_dc_put_userptr(void *buf_priv)
         struct sg_table *sgt = buf->dma_sgt;
 
         if (sgt) {
-                dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
+                DEFINE_DMA_ATTRS(attrs);
+
+                dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
+                /*
+                 * No need to sync to CPU, it's already synced to the CPU
+                 * since the finish() memop will have been called before this.
+                 */
+                dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
+                                   buf->dma_dir, &attrs);
                 if (!vma_is_io(buf->vma))
                         vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page);
 
@@ -551,7 +562,7 @@ static inline dma_addr_t vb2_dc_pfn_to_dma(struct device *dev, unsigned long pfn
 #endif
 
 static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
-        unsigned long size, int write)
+        unsigned long size, enum dma_data_direction dma_dir)
 {
         struct vb2_dc_conf *conf = alloc_ctx;
         struct vb2_dc_buf *buf;
@@ -565,6 +576,9 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         struct sg_table *sgt;
         unsigned long contig_size;
         unsigned long dma_align = dma_get_cache_alignment();
+        DEFINE_DMA_ATTRS(attrs);
+
+        dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
 
         /* Only cache aligned DMA transfers are reliable */
         if (!IS_ALIGNED(vaddr | size, dma_align)) {
@@ -582,7 +596,7 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 return ERR_PTR(-ENOMEM);
 
         buf->dev = conf->dev;
-        buf->dma_dir = write ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+        buf->dma_dir = dma_dir;
 
         start = vaddr & PAGE_MASK;
         offset = vaddr & ~PAGE_MASK;
@@ -618,7 +632,8 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         }
 
         /* extract page list from userspace mapping */
-        ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write);
+        ret = vb2_dc_get_user_pages(start, pages, n_pages, vma,
+                                    dma_dir == DMA_FROM_DEVICE);
         if (ret) {
                 unsigned long pfn;
                 if (vb2_dc_get_user_pfn(start, n_pages, vma, &pfn) == 0) {
@@ -650,8 +665,12 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         kfree(pages);
         pages = NULL;
 
-        sgt->nents = dma_map_sg(buf->dev, sgt->sgl, sgt->orig_nents,
-                buf->dma_dir);
+        /*
+         * No need to sync to the device, this will happen later when the
+         * prepare() memop is called.
+         */
+        sgt->nents = dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
+                                      buf->dma_dir, &attrs);
         if (sgt->nents <= 0) {
                 pr_err("failed to map scatterlist\n");
                 ret = -EIO;
@@ -673,7 +692,8 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         return buf;
 
 fail_map_sg:
-        dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir);
+        dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->orig_nents,
+                           buf->dma_dir, &attrs);
 
 fail_sgt_init:
         if (!vma_is_io(buf->vma))
@@ -782,7 +802,7 @@ static void vb2_dc_detach_dmabuf(void *mem_priv)
 }
 
 static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
-        unsigned long size, int write)
+        unsigned long size, enum dma_data_direction dma_dir)
 {
         struct vb2_dc_conf *conf = alloc_ctx;
         struct vb2_dc_buf *buf;
@@ -804,7 +824,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
                 return dba;
         }
 
-        buf->dma_dir = write ? DMA_FROM_DEVICE : DMA_TO_DEVICE;
+        buf->dma_dir = dma_dir;
         buf->size = size;
         buf->db_attach = dba;
 
@@ -850,7 +870,8 @@ EXPORT_SYMBOL_GPL(vb2_dma_contig_init_ctx);
 
 void vb2_dma_contig_cleanup_ctx(void *alloc_ctx)
 {
-        kfree(alloc_ctx);
+        if (!IS_ERR_OR_NULL(alloc_ctx))
+                kfree(alloc_ctx);
 }
 EXPORT_SYMBOL_GPL(vb2_dma_contig_cleanup_ctx);
 
diff --git a/drivers/media/v4l2-core/videobuf2-dma-sg.c b/drivers/media/v4l2-core/videobuf2-dma-sg.c
index 9b163a440f89..b1838abb6d00 100644
--- a/drivers/media/v4l2-core/videobuf2-dma-sg.c
+++ b/drivers/media/v4l2-core/videobuf2-dma-sg.c
@@ -30,17 +30,30 @@ module_param(debug, int, 0644);
                         printk(KERN_DEBUG "vb2-dma-sg: " fmt, ## arg);  \
         } while (0)
 
+struct vb2_dma_sg_conf {
+        struct device           *dev;
+};
+
 struct vb2_dma_sg_buf {
+        struct device                   *dev;
         void                            *vaddr;
         struct page                     **pages;
-        int                             write;
         int                             offset;
+        enum dma_data_direction         dma_dir;
         struct sg_table                 sg_table;
+        /*
+         * This will point to sg_table when used with the MMAP or USERPTR
+         * memory model, and to the dma_buf sglist when used with the
+         * DMABUF memory model.
+         */
+        struct sg_table                 *dma_sgt;
         size_t                          size;
         unsigned int                    num_pages;
         atomic_t                        refcount;
         struct vb2_vmarea_handler       handler;
         struct vm_area_struct           *vma;
+
+        struct dma_buf_attachment       *db_attach;
 };
 
 static void vb2_dma_sg_put(void *buf_priv);
@@ -86,22 +99,31 @@ static int vb2_dma_sg_alloc_compacted(struct vb2_dma_sg_buf *buf,
         return 0;
 }
 
-static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
+static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size,
+                              enum dma_data_direction dma_dir, gfp_t gfp_flags)
 {
+        struct vb2_dma_sg_conf *conf = alloc_ctx;
         struct vb2_dma_sg_buf *buf;
+        struct sg_table *sgt;
         int ret;
         int num_pages;
+        DEFINE_DMA_ATTRS(attrs);
 
+        dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
+
+        if (WARN_ON(alloc_ctx == NULL))
+                return NULL;
         buf = kzalloc(sizeof *buf, GFP_KERNEL);
         if (!buf)
                 return NULL;
 
         buf->vaddr = NULL;
-        buf->write = 0;
+        buf->dma_dir = dma_dir;
         buf->offset = 0;
         buf->size = size;
         /* size is already page aligned */
         buf->num_pages = size >> PAGE_SHIFT;
+        buf->dma_sgt = &buf->sg_table;
 
         buf->pages = kzalloc(buf->num_pages * sizeof(struct page *),
                              GFP_KERNEL);
@@ -112,11 +134,23 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla
         if (ret)
                 goto fail_pages_alloc;
 
-        ret = sg_alloc_table_from_pages(&buf->sg_table, buf->pages,
+        ret = sg_alloc_table_from_pages(buf->dma_sgt, buf->pages,
                         buf->num_pages, 0, size, GFP_KERNEL);
         if (ret)
                 goto fail_table_alloc;
 
+        /* Prevent the device from being released while the buffer is used */
+        buf->dev = get_device(conf->dev);
+
+        sgt = &buf->sg_table;
+        /*
+         * No need to sync to the device, this will happen later when the
+         * prepare() memop is called.
+         */
+        if (dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->nents,
+                             buf->dma_dir, &attrs) == 0)
+                goto fail_map;
+
         buf->handler.refcount = &buf->refcount;
         buf->handler.put = vb2_dma_sg_put;
         buf->handler.arg = buf;
@@ -127,6 +161,9 @@ static void *vb2_dma_sg_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fla
                 __func__, buf->num_pages);
         return buf;
 
+fail_map:
+        put_device(buf->dev);
+        sg_free_table(buf->dma_sgt);
 fail_table_alloc:
         num_pages = buf->num_pages;
         while (num_pages--)
@@ -141,42 +178,81 @@ fail_pages_array_alloc:
 static void vb2_dma_sg_put(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
+        struct sg_table *sgt = &buf->sg_table;
         int i = buf->num_pages;
 
         if (atomic_dec_and_test(&buf->refcount)) {
+                DEFINE_DMA_ATTRS(attrs);
+
+                dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
                 dprintk(1, "%s: Freeing buffer of %d pages\n", __func__,
                         buf->num_pages);
+                dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->nents,
+                                   buf->dma_dir, &attrs);
                 if (buf->vaddr)
                         vm_unmap_ram(buf->vaddr, buf->num_pages);
-                sg_free_table(&buf->sg_table);
+                sg_free_table(buf->dma_sgt);
                 while (--i >= 0)
                         __free_page(buf->pages[i]);
                 kfree(buf->pages);
+                put_device(buf->dev);
                 kfree(buf);
         }
 }
 
+static void vb2_dma_sg_prepare(void *buf_priv)
+{
+        struct vb2_dma_sg_buf *buf = buf_priv;
+        struct sg_table *sgt = buf->dma_sgt;
+
+        /* DMABUF exporter will flush the cache for us */
+        if (buf->db_attach)
+                return;
+
+        dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+}
+
+static void vb2_dma_sg_finish(void *buf_priv)
+{
+        struct vb2_dma_sg_buf *buf = buf_priv;
+        struct sg_table *sgt = buf->dma_sgt;
+
+        /* DMABUF exporter will flush the cache for us */
+        if (buf->db_attach)
+                return;
+
+        dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir);
+}
+
 static inline int vma_is_io(struct vm_area_struct *vma)
 {
         return !!(vma->vm_flags & (VM_IO | VM_PFNMAP));
 }
 
 static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
-                                    unsigned long size, int write)
+                                    unsigned long size,
+                                    enum dma_data_direction dma_dir)
 {
+        struct vb2_dma_sg_conf *conf = alloc_ctx;
         struct vb2_dma_sg_buf *buf;
         unsigned long first, last;
         int num_pages_from_user;
         struct vm_area_struct *vma;
+        struct sg_table *sgt;
+        DEFINE_DMA_ATTRS(attrs);
+
+        dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
 
         buf = kzalloc(sizeof *buf, GFP_KERNEL);
         if (!buf)
                 return NULL;
 
         buf->vaddr = NULL;
-        buf->write = write;
+        buf->dev = conf->dev;
+        buf->dma_dir = dma_dir;
         buf->offset = vaddr & ~PAGE_MASK;
         buf->size = size;
+        buf->dma_sgt = &buf->sg_table;
 
         first = (vaddr           & PAGE_MASK) >> PAGE_SHIFT;
         last  = ((vaddr + size - 1) & PAGE_MASK) >> PAGE_SHIFT;
@@ -221,7 +297,7 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 num_pages_from_user = get_user_pages(current, current->mm,
                                              vaddr & PAGE_MASK,
                                              buf->num_pages,
-                                             write,
+                                             buf->dma_dir == DMA_FROM_DEVICE,
                                              1, /* force */
                                              buf->pages,
                                              NULL);
@@ -229,12 +305,22 @@ static void *vb2_dma_sg_get_userptr(void *alloc_ctx, unsigned long vaddr,
         if (num_pages_from_user != buf->num_pages)
                 goto userptr_fail_get_user_pages;
 
-        if (sg_alloc_table_from_pages(&buf->sg_table, buf->pages,
+        if (sg_alloc_table_from_pages(buf->dma_sgt, buf->pages,
                         buf->num_pages, buf->offset, size, 0))
                 goto userptr_fail_alloc_table_from_pages;
 
+        sgt = &buf->sg_table;
+        /*
+         * No need to sync to the device, this will happen later when the
+         * prepare() memop is called.
+         */
+        if (dma_map_sg_attrs(buf->dev, sgt->sgl, sgt->nents,
+                             buf->dma_dir, &attrs) == 0)
+                goto userptr_fail_map;
         return buf;
 
+userptr_fail_map:
+        sg_free_table(&buf->sg_table);
 userptr_fail_alloc_table_from_pages:
 userptr_fail_get_user_pages:
         dprintk(1, "get_user_pages requested/got: %d/%d]\n",
@@ -257,15 +343,20 @@ userptr_fail_alloc_pages:
 static void vb2_dma_sg_put_userptr(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
+        struct sg_table *sgt = &buf->sg_table;
         int i = buf->num_pages;
+        DEFINE_DMA_ATTRS(attrs);
+
+        dma_set_attr(DMA_ATTR_SKIP_CPU_SYNC, &attrs);
 
         dprintk(1, "%s: Releasing userspace buffer of %d pages\n",
                __func__, buf->num_pages);
+        dma_unmap_sg_attrs(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir, &attrs);
         if (buf->vaddr)
                 vm_unmap_ram(buf->vaddr, buf->num_pages);
-        sg_free_table(&buf->sg_table);
+        sg_free_table(buf->dma_sgt);
         while (--i >= 0) {
-                if (buf->write)
+                if (buf->dma_dir == DMA_FROM_DEVICE)
                         set_page_dirty_lock(buf->pages[i]);
                 if (!vma_is_io(buf->vma))
                         put_page(buf->pages[i]);
@@ -281,14 +372,16 @@ static void *vb2_dma_sg_vaddr(void *buf_priv)
 
         BUG_ON(!buf);
 
-        if (!buf->vaddr)
-                buf->vaddr = vm_map_ram(buf->pages,
-                                        buf->num_pages,
-                                        -1,
-                                        PAGE_KERNEL);
+        if (!buf->vaddr) {
+                if (buf->db_attach)
+                        buf->vaddr = dma_buf_vmap(buf->db_attach->dmabuf);
+                else
+                        buf->vaddr = vm_map_ram(buf->pages,
+                                        buf->num_pages, -1, PAGE_KERNEL);
+        }
 
         /* add offset in case userptr is not page-aligned */
-        return buf->vaddr + buf->offset;
+        return buf->vaddr ? buf->vaddr + buf->offset : NULL;
 }
 
 static unsigned int vb2_dma_sg_num_users(void *buf_priv)
@@ -335,11 +428,279 @@ static int vb2_dma_sg_mmap(void *buf_priv, struct vm_area_struct *vma)
         return 0;
 }
 
+/*********************************************/
+/*         DMABUF ops for exporters          */
+/*********************************************/
+
+struct vb2_dma_sg_attachment {
+        struct sg_table sgt;
+        enum dma_data_direction dma_dir;
+};
+
+static int vb2_dma_sg_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev,
+        struct dma_buf_attachment *dbuf_attach)
+{
+        struct vb2_dma_sg_attachment *attach;
+        unsigned int i;
+        struct scatterlist *rd, *wr;
+        struct sg_table *sgt;
+        struct vb2_dma_sg_buf *buf = dbuf->priv;
+        int ret;
+
+        attach = kzalloc(sizeof(*attach), GFP_KERNEL);
+        if (!attach)
+                return -ENOMEM;
+
+        sgt = &attach->sgt;
+        /* Copy the buf->base_sgt scatter list to the attachment, as we can't
+         * map the same scatter list to multiple attachments at the same time.
+         */
+        ret = sg_alloc_table(sgt, buf->dma_sgt->orig_nents, GFP_KERNEL);
+        if (ret) {
+                kfree(attach);
+                return -ENOMEM;
+        }
+
+        rd = buf->dma_sgt->sgl;
+        wr = sgt->sgl;
+        for (i = 0; i < sgt->orig_nents; ++i) {
+                sg_set_page(wr, sg_page(rd), rd->length, rd->offset);
+                rd = sg_next(rd);
+                wr = sg_next(wr);
+        }
+
+        attach->dma_dir = DMA_NONE;
+        dbuf_attach->priv = attach;
+
+        return 0;
+}
+
+static void vb2_dma_sg_dmabuf_ops_detach(struct dma_buf *dbuf,
+        struct dma_buf_attachment *db_attach)
+{
+        struct vb2_dma_sg_attachment *attach = db_attach->priv;
+        struct sg_table *sgt;
+
+        if (!attach)
+                return;
+
+        sgt = &attach->sgt;
+
+        /* release the scatterlist cache */
+        if (attach->dma_dir != DMA_NONE)
+                dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
+                        attach->dma_dir);
+        sg_free_table(sgt);
+        kfree(attach);
+        db_attach->priv = NULL;
+}
+
+static struct sg_table *vb2_dma_sg_dmabuf_ops_map(
+        struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir)
+{
+        struct vb2_dma_sg_attachment *attach = db_attach->priv;
+        /* stealing dmabuf mutex to serialize map/unmap operations */
+        struct mutex *lock = &db_attach->dmabuf->lock;
+        struct sg_table *sgt;
+        int ret;
+
+        mutex_lock(lock);
+
+        sgt = &attach->sgt;
+        /* return previously mapped sg table */
+        if (attach->dma_dir == dma_dir) {
+                mutex_unlock(lock);
+                return sgt;
+        }
+
+        /* release any previous cache */
+        if (attach->dma_dir != DMA_NONE) {
+                dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
+                        attach->dma_dir);
+                attach->dma_dir = DMA_NONE;
+        }
+
+        /* mapping to the client with new direction */
+        ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dma_dir);
+        if (ret <= 0) {
+                pr_err("failed to map scatterlist\n");
+                mutex_unlock(lock);
+                return ERR_PTR(-EIO);
+        }
+
+        attach->dma_dir = dma_dir;
+
+        mutex_unlock(lock);
+
+        return sgt;
+}
+
+static void vb2_dma_sg_dmabuf_ops_unmap(struct dma_buf_attachment *db_attach,
+        struct sg_table *sgt, enum dma_data_direction dma_dir)
+{
+        /* nothing to be done here */
+}
+
+static void vb2_dma_sg_dmabuf_ops_release(struct dma_buf *dbuf)
+{
+        /* drop reference obtained in vb2_dma_sg_get_dmabuf */
+        vb2_dma_sg_put(dbuf->priv);
+}
+
+static void *vb2_dma_sg_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum)
+{
+        struct vb2_dma_sg_buf *buf = dbuf->priv;
+
+        return buf->vaddr ? buf->vaddr + pgnum * PAGE_SIZE : NULL;
+}
+
+static void *vb2_dma_sg_dmabuf_ops_vmap(struct dma_buf *dbuf)
+{
+        struct vb2_dma_sg_buf *buf = dbuf->priv;
+
+        return vb2_dma_sg_vaddr(buf);
+}
+
+static int vb2_dma_sg_dmabuf_ops_mmap(struct dma_buf *dbuf,
+        struct vm_area_struct *vma)
+{
+        return vb2_dma_sg_mmap(dbuf->priv, vma);
+}
+
+static struct dma_buf_ops vb2_dma_sg_dmabuf_ops = {
+        .attach = vb2_dma_sg_dmabuf_ops_attach,
+        .detach = vb2_dma_sg_dmabuf_ops_detach,
+        .map_dma_buf = vb2_dma_sg_dmabuf_ops_map,
+        .unmap_dma_buf = vb2_dma_sg_dmabuf_ops_unmap,
+        .kmap = vb2_dma_sg_dmabuf_ops_kmap,
+        .kmap_atomic = vb2_dma_sg_dmabuf_ops_kmap,
+        .vmap = vb2_dma_sg_dmabuf_ops_vmap,
+        .mmap = vb2_dma_sg_dmabuf_ops_mmap,
+        .release = vb2_dma_sg_dmabuf_ops_release,
+};
+
+static struct dma_buf *vb2_dma_sg_get_dmabuf(void *buf_priv, unsigned long flags)
+{
+        struct vb2_dma_sg_buf *buf = buf_priv;
+        struct dma_buf *dbuf;
+
+        if (WARN_ON(!buf->dma_sgt))
+                return NULL;
+
+        dbuf = dma_buf_export(buf, &vb2_dma_sg_dmabuf_ops, buf->size, flags, NULL);
+        if (IS_ERR(dbuf))
+                return NULL;
+
+        /* dmabuf keeps reference to vb2 buffer */
+        atomic_inc(&buf->refcount);
+
+        return dbuf;
+}
+
+/*********************************************/
+/*       callbacks for DMABUF buffers        */
+/*********************************************/
+
+static int vb2_dma_sg_map_dmabuf(void *mem_priv)
+{
+        struct vb2_dma_sg_buf *buf = mem_priv;
+        struct sg_table *sgt;
+
+        if (WARN_ON(!buf->db_attach)) {
+                pr_err("trying to pin a non attached buffer\n");
+                return -EINVAL;
+        }
+
+        if (WARN_ON(buf->dma_sgt)) {
+                pr_err("dmabuf buffer is already pinned\n");
+                return 0;
+        }
+
+        /* get the associated scatterlist for this buffer */
+        sgt = dma_buf_map_attachment(buf->db_attach, buf->dma_dir);
+        if (IS_ERR(sgt)) {
+                pr_err("Error getting dmabuf scatterlist\n");
+                return -EINVAL;
+        }
+
+        buf->dma_sgt = sgt;
+        buf->vaddr = NULL;
+
+        return 0;
+}
+
+static void vb2_dma_sg_unmap_dmabuf(void *mem_priv)
+{
+        struct vb2_dma_sg_buf *buf = mem_priv;
+        struct sg_table *sgt = buf->dma_sgt;
+
+        if (WARN_ON(!buf->db_attach)) {
+                pr_err("trying to unpin a not attached buffer\n");
+                return;
+        }
+
+        if (WARN_ON(!sgt)) {
+                pr_err("dmabuf buffer is already unpinned\n");
+                return;
+        }
+
+        if (buf->vaddr) {
+                dma_buf_vunmap(buf->db_attach->dmabuf, buf->vaddr);
+                buf->vaddr = NULL;
+        }
+        dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir);
+
+        buf->dma_sgt = NULL;
+}
+
+static void vb2_dma_sg_detach_dmabuf(void *mem_priv)
+{
+        struct vb2_dma_sg_buf *buf = mem_priv;
+
+        /* if vb2 works correctly you should never detach mapped buffer */
+        if (WARN_ON(buf->dma_sgt))
+                vb2_dma_sg_unmap_dmabuf(buf);
+
+        /* detach this attachment */
+        dma_buf_detach(buf->db_attach->dmabuf, buf->db_attach);
+        kfree(buf);
+}
+
+static void *vb2_dma_sg_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
+        unsigned long size, enum dma_data_direction dma_dir)
+{
+        struct vb2_dma_sg_conf *conf = alloc_ctx;
+        struct vb2_dma_sg_buf *buf;
+        struct dma_buf_attachment *dba;
+
+        if (dbuf->size < size)
+                return ERR_PTR(-EFAULT);
+
+        buf = kzalloc(sizeof(*buf), GFP_KERNEL);
+        if (!buf)
+                return ERR_PTR(-ENOMEM);
+
+        buf->dev = conf->dev;
+        /* create attachment for the dmabuf with the user device */
+        dba = dma_buf_attach(dbuf, buf->dev);
+        if (IS_ERR(dba)) {
+                pr_err("failed to attach dmabuf\n");
+                kfree(buf);
+                return dba;
+        }
+
+        buf->dma_dir = dma_dir;
+        buf->size = size;
+        buf->db_attach = dba;
+
+        return buf;
+}
+
 static void *vb2_dma_sg_cookie(void *buf_priv)
 {
         struct vb2_dma_sg_buf *buf = buf_priv;
 
-        return &buf->sg_table;
+        return buf->dma_sgt;
 }
 
 const struct vb2_mem_ops vb2_dma_sg_memops = {
@@ -347,13 +708,41 @@ const struct vb2_mem_ops vb2_dma_sg_memops = {
         .put            = vb2_dma_sg_put,
         .get_userptr    = vb2_dma_sg_get_userptr,
         .put_userptr    = vb2_dma_sg_put_userptr,
+        .prepare        = vb2_dma_sg_prepare,
+        .finish         = vb2_dma_sg_finish,
         .vaddr          = vb2_dma_sg_vaddr,
         .mmap           = vb2_dma_sg_mmap,
         .num_users      = vb2_dma_sg_num_users,
+        .get_dmabuf     = vb2_dma_sg_get_dmabuf,
+        .map_dmabuf     = vb2_dma_sg_map_dmabuf,
+        .unmap_dmabuf   = vb2_dma_sg_unmap_dmabuf,
+        .attach_dmabuf  = vb2_dma_sg_attach_dmabuf,
+        .detach_dmabuf  = vb2_dma_sg_detach_dmabuf,
         .cookie         = vb2_dma_sg_cookie,
 };
 EXPORT_SYMBOL_GPL(vb2_dma_sg_memops);
 
+void *vb2_dma_sg_init_ctx(struct device *dev)
+{
+        struct vb2_dma_sg_conf *conf;
+
+        conf = kzalloc(sizeof(*conf), GFP_KERNEL);
+        if (!conf)
+                return ERR_PTR(-ENOMEM);
+
+        conf->dev = dev;
+
+        return conf;
+}
+EXPORT_SYMBOL_GPL(vb2_dma_sg_init_ctx);
+
+void vb2_dma_sg_cleanup_ctx(void *alloc_ctx)
+{
+        if (!IS_ERR_OR_NULL(alloc_ctx))
+                kfree(alloc_ctx);
+}
+EXPORT_SYMBOL_GPL(vb2_dma_sg_cleanup_ctx);
+
 MODULE_DESCRIPTION("dma scatter/gather memory handling routines for videobuf2");
 MODULE_AUTHOR("Andrzej Pietrasiewicz");
 MODULE_LICENSE("GPL");
diff --git a/drivers/media/v4l2-core/videobuf2-vmalloc.c b/drivers/media/v4l2-core/videobuf2-vmalloc.c
index 313d9771b2bc..fba944e50227 100644
--- a/drivers/media/v4l2-core/videobuf2-vmalloc.c
+++ b/drivers/media/v4l2-core/videobuf2-vmalloc.c
@@ -25,7 +25,7 @@ struct vb2_vmalloc_buf {
         void                            *vaddr;
         struct page                     **pages;
         struct vm_area_struct           *vma;
-        int                             write;
+        enum dma_data_direction         dma_dir;
         unsigned long                   size;
         unsigned int                    n_pages;
         atomic_t                        refcount;
@@ -35,7 +35,8 @@ struct vb2_vmalloc_buf {
 
 static void vb2_vmalloc_put(void *buf_priv);
 
-static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_flags)
+static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size,
+                               enum dma_data_direction dma_dir, gfp_t gfp_flags)
 {
         struct vb2_vmalloc_buf *buf;
 
@@ -45,6 +46,7 @@ static void *vb2_vmalloc_alloc(void *alloc_ctx, unsigned long size, gfp_t gfp_fl
 
         buf->size = size;
         buf->vaddr = vmalloc_user(buf->size);
+        buf->dma_dir = dma_dir;
         buf->handler.refcount = &buf->refcount;
         buf->handler.put = vb2_vmalloc_put;
         buf->handler.arg = buf;
@@ -70,7 +72,8 @@ static void vb2_vmalloc_put(void *buf_priv)
 }
 
 static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,
-                                     unsigned long size, int write)
+                                     unsigned long size,
+                                     enum dma_data_direction dma_dir)
 {
         struct vb2_vmalloc_buf *buf;
         unsigned long first, last;
@@ -82,7 +85,7 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,
         if (!buf)
                 return NULL;
 
-        buf->write = write;
+        buf->dma_dir = dma_dir;
         offset = vaddr & ~PAGE_MASK;
         buf->size = size;
 
@@ -107,7 +110,8 @@ static void *vb2_vmalloc_get_userptr(void *alloc_ctx, unsigned long vaddr,
                 /* current->mm->mmap_sem is taken by videobuf2 core */
                 n_pages = get_user_pages(current, current->mm,
                                          vaddr & PAGE_MASK, buf->n_pages,
-                                         write, 1, /* force */
+                                         dma_dir == DMA_FROM_DEVICE,
+                                         1, /* force */
                                          buf->pages, NULL);
                 if (n_pages != buf->n_pages)
                         goto fail_get_user_pages;
@@ -144,14 +148,13 @@ static void vb2_vmalloc_put_userptr(void *buf_priv)
                 if (vaddr)
                         vm_unmap_ram((void *)vaddr, buf->n_pages);
                 for (i = 0; i < buf->n_pages; ++i) {
-                        if (buf->write)
+                        if (buf->dma_dir == DMA_FROM_DEVICE)
                                 set_page_dirty_lock(buf->pages[i]);
                         put_page(buf->pages[i]);
                 }
                 kfree(buf->pages);
         } else {
-                if (buf->vma)
-                        vb2_put_vma(buf->vma);
+                vb2_put_vma(buf->vma);
                 iounmap(buf->vaddr);
         }
         kfree(buf);
@@ -209,6 +212,176 @@ static int vb2_vmalloc_mmap(void *buf_priv, struct vm_area_struct *vma)
 }
 
 /*********************************************/
+/*         DMABUF ops for exporters          */
+/*********************************************/
+
+struct vb2_vmalloc_attachment {
+        struct sg_table sgt;
+        enum dma_data_direction dma_dir;
+};
+
+static int vb2_vmalloc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev,
+        struct dma_buf_attachment *dbuf_attach)
+{
+        struct vb2_vmalloc_attachment *attach;
+        struct vb2_vmalloc_buf *buf = dbuf->priv;
+        int num_pages = PAGE_ALIGN(buf->size) / PAGE_SIZE;
+        struct sg_table *sgt;
+        struct scatterlist *sg;
+        void *vaddr = buf->vaddr;
+        int ret;
+        int i;
+
+        attach = kzalloc(sizeof(*attach), GFP_KERNEL);
+        if (!attach)
+                return -ENOMEM;
+
+        sgt = &attach->sgt;
+        ret = sg_alloc_table(sgt, num_pages, GFP_KERNEL);
+        if (ret) {
+                kfree(attach);
+                return ret;
+        }
+        for_each_sg(sgt->sgl, sg, sgt->nents, i) {
+                struct page *page = vmalloc_to_page(vaddr);
+
+                if (!page) {
+                        sg_free_table(sgt);
+                        kfree(attach);
+                        return -ENOMEM;
+                }
+                sg_set_page(sg, page, PAGE_SIZE, 0);
+                vaddr += PAGE_SIZE;
+        }
+
+        attach->dma_dir = DMA_NONE;
+        dbuf_attach->priv = attach;
+        return 0;
+}
+
+static void vb2_vmalloc_dmabuf_ops_detach(struct dma_buf *dbuf,
+        struct dma_buf_attachment *db_attach)
+{
+        struct vb2_vmalloc_attachment *attach = db_attach->priv;
+        struct sg_table *sgt;
+
+        if (!attach)
+                return;
+
+        sgt = &attach->sgt;
+
+        /* release the scatterlist cache */
+        if (attach->dma_dir != DMA_NONE)
+                dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
+                        attach->dma_dir);
+        sg_free_table(sgt);
+        kfree(attach);
+        db_attach->priv = NULL;
+}
+
+static struct sg_table *vb2_vmalloc_dmabuf_ops_map(
+        struct dma_buf_attachment *db_attach, enum dma_data_direction dma_dir)
+{
+        struct vb2_vmalloc_attachment *attach = db_attach->priv;
+        /* stealing dmabuf mutex to serialize map/unmap operations */
+        struct mutex *lock = &db_attach->dmabuf->lock;
+        struct sg_table *sgt;
+        int ret;
+
+        mutex_lock(lock);
+
+        sgt = &attach->sgt;
+        /* return previously mapped sg table */
+        if (attach->dma_dir == dma_dir) {
+                mutex_unlock(lock);
+                return sgt;
+        }
+
+        /* release any previous cache */
+        if (attach->dma_dir != DMA_NONE) {
+                dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->orig_nents,
+                        attach->dma_dir);
+                attach->dma_dir = DMA_NONE;
+        }
+
+        /* mapping to the client with new direction */
+        ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dma_dir);
+        if (ret <= 0) {
+                pr_err("failed to map scatterlist\n");
+                mutex_unlock(lock);
+                return ERR_PTR(-EIO);
+        }
+
+        attach->dma_dir = dma_dir;
+
+        mutex_unlock(lock);
+
+        return sgt;
+}
+
+static void vb2_vmalloc_dmabuf_ops_unmap(struct dma_buf_attachment *db_attach,
+        struct sg_table *sgt, enum dma_data_direction dma_dir)
+{
+        /* nothing to be done here */
+}
+
+static void vb2_vmalloc_dmabuf_ops_release(struct dma_buf *dbuf)
+{
+        /* drop reference obtained in vb2_vmalloc_get_dmabuf */
+        vb2_vmalloc_put(dbuf->priv);
+}
+
+static void *vb2_vmalloc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum)
+{
+        struct vb2_vmalloc_buf *buf = dbuf->priv;
+
+        return buf->vaddr + pgnum * PAGE_SIZE;
+}
+
+static void *vb2_vmalloc_dmabuf_ops_vmap(struct dma_buf *dbuf)
+{
+        struct vb2_vmalloc_buf *buf = dbuf->priv;
+
+        return buf->vaddr;
+}
+
+static int vb2_vmalloc_dmabuf_ops_mmap(struct dma_buf *dbuf,
+        struct vm_area_struct *vma)
+{
+        return vb2_vmalloc_mmap(dbuf->priv, vma);
+}
+
+static struct dma_buf_ops vb2_vmalloc_dmabuf_ops = {
+        .attach = vb2_vmalloc_dmabuf_ops_attach,
+        .detach = vb2_vmalloc_dmabuf_ops_detach,
+        .map_dma_buf = vb2_vmalloc_dmabuf_ops_map,
+        .unmap_dma_buf = vb2_vmalloc_dmabuf_ops_unmap,
+        .kmap = vb2_vmalloc_dmabuf_ops_kmap,
+        .kmap_atomic = vb2_vmalloc_dmabuf_ops_kmap,
+        .vmap = vb2_vmalloc_dmabuf_ops_vmap,
+        .mmap = vb2_vmalloc_dmabuf_ops_mmap,
+        .release = vb2_vmalloc_dmabuf_ops_release,
+};
+
+static struct dma_buf *vb2_vmalloc_get_dmabuf(void *buf_priv, unsigned long flags)
+{
+        struct vb2_vmalloc_buf *buf = buf_priv;
+        struct dma_buf *dbuf;
+
+        if (WARN_ON(!buf->vaddr))
+                return NULL;
+
+        dbuf = dma_buf_export(buf, &vb2_vmalloc_dmabuf_ops, buf->size, flags, NULL);
+        if (IS_ERR(dbuf))
+                return NULL;
+
+        /* dmabuf keeps reference to vb2 buffer */
+        atomic_inc(&buf->refcount);
+
+        return dbuf;
+}
+
+/*********************************************/
 /*       callbacks for DMABUF buffers        */
 /*********************************************/
 
@@ -240,7 +413,7 @@ static void vb2_vmalloc_detach_dmabuf(void *mem_priv)
 }
 
 static void *vb2_vmalloc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
-        unsigned long size, int write)
+        unsigned long size, enum dma_data_direction dma_dir)
 {
         struct vb2_vmalloc_buf *buf;
 
@@ -252,7 +425,7 @@ static void *vb2_vmalloc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf,
                 return ERR_PTR(-ENOMEM);
 
         buf->dbuf = dbuf;
-        buf->write = write;
+        buf->dma_dir = dma_dir;
         buf->size = size;
 
         return buf;
@@ -264,6 +437,7 @@ const struct vb2_mem_ops vb2_vmalloc_memops = {
         .put            = vb2_vmalloc_put,
         .get_userptr    = vb2_vmalloc_get_userptr,
         .put_userptr    = vb2_vmalloc_put_userptr,
+        .get_dmabuf     = vb2_vmalloc_get_dmabuf,
         .map_dmabuf     = vb2_vmalloc_map_dmabuf,
         .unmap_dmabuf   = vb2_vmalloc_unmap_dmabuf,
         .attach_dmabuf  = vb2_vmalloc_attach_dmabuf,