Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / media / platform / vsp1 / vsp1_drv.c

diff --git a/drivers/media/platform/vsp1/vsp1_drv.c b/drivers/media/platform/vsp1/vsp1_drv.c
index a0f4012..57c713a 100644 (file)
--- a/drivers/media/platform/vsp1/vsp1_drv.c
+++ b/drivers/media/platform/vsp1/vsp1_drv.c
@@ -60,7 +60,7 @@ static irqreturn_t vsp1_irq_handler(int irq, void *data)
                status = vsp1_read(vsp1, VI6_WPF_IRQ_STA(i));
                vsp1_write(vsp1, VI6_WPF_IRQ_STA(i), ~status & mask);
 
-               if (status & VI6_WFP_IRQ_STA_FRE) {
+               if (status & VI6_WFP_IRQ_STA_DFE) {
                        vsp1_pipeline_frame_end(wpf->pipe);
                        ret = IRQ_HANDLED;
                }
@@ -600,6 +600,28 @@ static const struct vsp1_device_info vsp1_device_infos[] = {
                .wpf_count = 4,
                .num_bru_inputs = 4,
                .uapi = true,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPS_V2H,
+               .model = "VSP1V-S",
+               .gen = 2,
+               .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT
+                         | VSP1_HAS_SRU | VSP1_HAS_WPF_VFLIP,
+               .rpf_count = 4,
+               .uds_count = 1,
+               .wpf_count = 4,
+               .num_bru_inputs = 4,
+               .uapi = true,
+       }, {
+               .version = VI6_IP_VERSION_MODEL_VSPD_V2H,
+               .model = "VSP1V-D",
+               .gen = 2,
+               .features = VSP1_HAS_BRU | VSP1_HAS_CLU | VSP1_HAS_LUT
+                         | VSP1_HAS_LIF,
+               .rpf_count = 4,
+               .uds_count = 1,
+               .wpf_count = 1,
+               .num_bru_inputs = 4,
+               .uapi = true,
        }, {
                .version = VI6_IP_VERSION_MODEL_VSPI_GEN3,
                .model = "VSP2-I",