1 files changed, 33 insertions, 8 deletions

diff --git a/drivers/media/dvb/frontends/lnbp21.c b/drivers/media/dvb/frontends/lnbp21.c
index 76f935d9755a..772a0bbb0dd8 100644
--- a/drivers/media/dvb/frontends/lnbp21.c
+++ b/drivers/media/dvb/frontends/lnbp21.c
@@ -1,7 +1,8 @@
 /*
- * lnbp21.h - driver for lnb supply and control ic lnbp21
+ * lnbp21.c - driver for lnb supply and control ic lnbp21
  *
  * Copyright (C) 2006 Oliver Endriss
+ * Copyright (C) 2009 Igor M. Liplianin <liplianin@netup.ru>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -33,18 +34,21 @@
 
 #include "dvb_frontend.h"
 #include "lnbp21.h"
+#include "lnbh24.h"
 
 struct lnbp21 {
         u8                      config;
         u8                      override_or;
         u8                      override_and;
         struct i2c_adapter      *i2c;
+        u8                      i2c_addr;
 };
 
-static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
+static int lnbp21_set_voltage(struct dvb_frontend *fe,
+                                        fe_sec_voltage_t voltage)
 {
         struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->sec_priv;
-        struct i2c_msg msg = {  .addr = 0x08, .flags = 0,
+        struct i2c_msg msg = {  .addr = lnbp21->i2c_addr, .flags = 0,
                                 .buf = &lnbp21->config,
                                 .len = sizeof(lnbp21->config) };
 
@@ -72,7 +76,7 @@ static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
 static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
 {
         struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->sec_priv;
-        struct i2c_msg msg = {  .addr = 0x08, .flags = 0,
+        struct i2c_msg msg = {  .addr = lnbp21->i2c_addr, .flags = 0,
                                 .buf = &lnbp21->config,
                                 .len = sizeof(lnbp21->config) };
 
@@ -97,15 +101,18 @@ static void lnbp21_release(struct dvb_frontend *fe)
         fe->sec_priv = NULL;
 }
 
-struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
+static struct dvb_frontend *lnbx2x_attach(struct dvb_frontend *fe,
+                                struct i2c_adapter *i2c, u8 override_set,
+                                u8 override_clear, u8 i2c_addr, u8 config)
 {
         struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);
         if (!lnbp21)
                 return NULL;
 
         /* default configuration */
-        lnbp21->config = LNBP21_ISEL;
+        lnbp21->config = config;
         lnbp21->i2c = i2c;
+        lnbp21->i2c_addr = i2c_addr;
         fe->sec_priv = lnbp21;
 
         /* bits which should be forced to '1' */
@@ -126,11 +133,29 @@ struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe, struct i2c_adapter *
         /* override frontend ops */
         fe->ops.set_voltage = lnbp21_set_voltage;
         fe->ops.enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
+        printk(KERN_INFO "LNBx2x attached on addr=%x", lnbp21->i2c_addr);
 
         return fe;
 }
+
+struct dvb_frontend *lnbp24_attach(struct dvb_frontend *fe,
+                                struct i2c_adapter *i2c, u8 override_set,
+                                u8 override_clear, u8 i2c_addr)
+{
+        return lnbx2x_attach(fe, i2c, override_set, override_clear,
+                                                        i2c_addr, LNBH24_TTX);
+}
+EXPORT_SYMBOL(lnbh24_attach);
+
+struct dvb_frontend *lnbp21_attach(struct dvb_frontend *fe,
+                                struct i2c_adapter *i2c, u8 override_set,
+                                u8 override_clear)
+{
+        return lnbx2x_attach(fe, i2c, override_set, override_clear,
+                                                        0x08, LNBP21_ISEL);
+}
 EXPORT_SYMBOL(lnbp21_attach);
 
-MODULE_DESCRIPTION("Driver for lnb supply and control ic lnbp21");
-MODULE_AUTHOR("Oliver Endriss");
+MODULE_DESCRIPTION("Driver for lnb supply and control ic lnbp21, lnbh24");
+MODULE_AUTHOR("Oliver Endriss, Igor M. Liplianin");
 MODULE_LICENSE("GPL");