[media] v4l: atmel-isi: Should clear bits before set the hardware register

In the ISI driver it reads the config register to get original value,
then set the correct FRATE_DIV and YCC_SWAP_MODE directly. This will
cause some bits overlap.

So we need to clear these bits first, then set correct value. This patch
fix it.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

1 files changed, 2 insertions, 0 deletions

diff --git a/include/media/atmel-isi.h b/include/media/atmel-isi.h
index 656823075709..2b023471ac89 100644
--- a/include/media/atmel-isi.h
+++ b/include/media/atmel-isi.h
@@ -56,6 +56,7 @@
 #define         ISI_CFG1_FRATE_DIV_6            (5 << 8)
 #define         ISI_CFG1_FRATE_DIV_7            (6 << 8)
 #define         ISI_CFG1_FRATE_DIV_8            (7 << 8)
+#define         ISI_CFG1_FRATE_DIV_MASK         (7 << 8)
 #define ISI_CFG1_DISCR                          (1 << 11)
 #define ISI_CFG1_FULL_MODE                      (1 << 12)
 
@@ -66,6 +67,7 @@
 #define         ISI_CFG2_YCC_SWAP_MODE_1        (1 << 28)
 #define         ISI_CFG2_YCC_SWAP_MODE_2        (2 << 28)
 #define         ISI_CFG2_YCC_SWAP_MODE_3        (3 << 28)
+#define         ISI_CFG2_YCC_SWAP_MODE_MASK     (3 << 28)
 #define ISI_CFG2_IM_VSIZE_OFFSET                0
 #define ISI_CFG2_IM_HSIZE_OFFSET                16
 #define ISI_CFG2_IM_VSIZE_MASK          (0x7FF << ISI_CFG2_IM_VSIZE_OFFSET)