Merge branch 'drm-next-4.8' of git://people.freedesktop.org/~agd5f/linux into drm...

[deliverable/linux.git] / drivers / media / i2c / adv7180.c

diff --git a/drivers/media/i2c/adv7180.c b/drivers/media/i2c/adv7180.c
index b77b0a4dbf68ebb164b20f785391c767c382ff3f..95cbc857f36e981145a01e221281767afa6adaa9 100644 (file)
--- a/drivers/media/i2c/adv7180.c
+++ b/drivers/media/i2c/adv7180.c
@@ -100,7 +100,7 @@
 #define ADV7180_REG_IDENT 0x0011
 #define ADV7180_ID_7180 0x18
 
-#define ADV7180_REG_ICONF1             0x0040
+#define ADV7180_REG_ICONF1             0x2040
 #define ADV7180_ICONF1_ACTIVE_LOW      0x01
 #define ADV7180_ICONF1_PSYNC_ONLY      0x10
 #define ADV7180_ICONF1_ACTIVE_TO_CLR   0xC0
@@ -113,15 +113,15 @@
 
 #define ADV7180_IRQ1_LOCK      0x01
 #define ADV7180_IRQ1_UNLOCK    0x02
-#define ADV7180_REG_ISR1       0x0042
-#define ADV7180_REG_ICR1       0x0043
-#define ADV7180_REG_IMR1       0x0044
-#define ADV7180_REG_IMR2       0x0048
+#define ADV7180_REG_ISR1       0x2042
+#define ADV7180_REG_ICR1       0x2043
+#define ADV7180_REG_IMR1       0x2044
+#define ADV7180_REG_IMR2       0x2048
 #define ADV7180_IRQ3_AD_CHANGE 0x08
-#define ADV7180_REG_ISR3       0x004A
-#define ADV7180_REG_ICR3       0x004B
-#define ADV7180_REG_IMR3       0x004C
-#define ADV7180_REG_IMR4       0x50
+#define ADV7180_REG_ISR3       0x204A
+#define ADV7180_REG_ICR3       0x204B
+#define ADV7180_REG_IMR3       0x204C
+#define ADV7180_REG_IMR4       0x2050
 
 #define ADV7180_REG_NTSC_V_BIT_END     0x00E6
 #define ADV7180_NTSC_V_BIT_END_MANUAL_NVEND    0x4F