1 files changed, 24 insertions, 21 deletions

diff --git a/drivers/media/dvb-frontends/mn88472.h b/drivers/media/dvb-frontends/mn88472.h
index 095294d292f3..323632523876 100644
--- a/drivers/media/dvb-frontends/mn88472.h
+++ b/drivers/media/dvb-frontends/mn88472.h
@@ -19,23 +19,33 @@
 
 #include <linux/dvb/frontend.h>
 
-enum ts_clock {
-        VARIABLE_TS_CLOCK,
-        FIXED_TS_CLOCK,
-};
+/**
+ * struct mn88472_config - Platform data for the mn88472 driver
+ * @xtal: Clock frequency.
+ * @ts_mode: TS mode.
+ * @ts_clock: TS clock config.
+ * @i2c_wr_max: Max number of bytes driver writes to I2C at once.
+ * @get_dvb_frontend: Get DVB frontend.
+ */
 
-enum ts_mode {
-        SERIAL_TS_MODE,
-        PARALLEL_TS_MODE,
-};
+/* Define old names for backward compatibility */
+#define VARIABLE_TS_CLOCK   MN88472_TS_CLK_VARIABLE
+#define FIXED_TS_CLOCK      MN88472_TS_CLK_FIXED
+#define SERIAL_TS_MODE      MN88472_TS_MODE_SERIAL
+#define PARALLEL_TS_MODE    MN88472_TS_MODE_PARALLEL
 
 struct mn88472_config {
-        /*
-         * Max num of bytes given I2C adapter could write at once.
-         * Default: none
-         */
-        u16 i2c_wr_max;
+        unsigned int xtal;
+
+#define MN88472_TS_MODE_SERIAL      0
+#define MN88472_TS_MODE_PARALLEL    1
+        int ts_mode;
 
+#define MN88472_TS_CLK_FIXED        0
+#define MN88472_TS_CLK_VARIABLE     1
+        int ts_clock;
+
+        u16 i2c_wr_max;
 
         /* Everything after that is returned by the driver. */
 
@@ -43,14 +53,7 @@ struct mn88472_config {
          * DVB frontend.
          */
         struct dvb_frontend **fe;
-
-        /*
-         * Xtal frequency.
-         * Hz
-         */
-        u32 xtal;
-        int ts_mode;
-        int ts_clock;
+        struct dvb_frontend* (*get_dvb_frontend)(struct i2c_client *);
 };
 
 #endif