Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / m88ds3103_priv.h

diff --git a/drivers/media/dvb-frontends/m88ds3103_priv.h b/drivers/media/dvb-frontends/m88ds3103_priv.h
index 9d7d33430e4060b1d48518bece52d30e2f7d9904..eee8c22c51ec507da592ecff92c9f2f574159dc9 100644 (file)
--- a/drivers/media/dvb-frontends/m88ds3103_priv.h
+++ b/drivers/media/dvb-frontends/m88ds3103_priv.h
@@ -1,5 +1,5 @@
 /*
- * Montage M88DS3103 demodulator driver
+ * Montage Technology M88DS3103/M88RS6000 demodulator driver
  *
  * Copyright (C) 2013 Antti Palosaari <crope@iki.fi>
  *
@@ -22,6 +22,7 @@
 #include "dvb_math.h"
 #include <linux/firmware.h>
 #include <linux/i2c-mux.h>
+#include <linux/regmap.h>
 #include <linux/math64.h>
 
 #define M88DS3103_FIRMWARE "dvb-demod-m88ds3103.fw"
@@ -30,11 +31,10 @@
 #define M88RS6000_CHIP_ID 0x74
 #define M88DS3103_CHIP_ID 0x70
 
-struct m88ds3103_priv {
-       struct i2c_adapter *i2c;
+struct m88ds3103_dev {
        struct i2c_client *client;
-       /* mutex needed due to own tuner I2C adapter */
-       struct mutex i2c_mutex;
+       struct regmap_config regmap_config;
+       struct regmap *regmap;
        struct m88ds3103_config config;
        const struct m88ds3103_config *cfg;
        struct dvb_frontend fe;