These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git] / kernel / drivers / media / dvb-frontends / a8293.c
index 780da58..e1e9bdd 100644 (file)
  *    but WITHOUT ANY WARRANTY; without even the implied warranty of
  *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License along
- *    with this program; if not, write to the Free Software Foundation, Inc.,
- *    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include "dvb_frontend.h"
 #include "a8293.h"
 
-struct a8293_priv {
-       struct i2c_adapter *i2c;
-       const struct a8293_config *cfg;
+struct a8293_dev {
+       struct i2c_client *client;
        u8 reg[2];
 };
 
-static int a8293_i2c(struct a8293_priv *priv, u8 *val, int len, bool rd)
-{
-       int ret;
-       struct i2c_msg msg[1] = {
-               {
-                       .addr = priv->cfg->i2c_addr,
-                       .len = len,
-                       .buf = val,
-               }
-       };
-
-       if (rd)
-               msg[0].flags = I2C_M_RD;
-       else
-               msg[0].flags = 0;
-
-       ret = i2c_transfer(priv->i2c, msg, 1);
-       if (ret == 1) {
-               ret = 0;
-       } else {
-               dev_warn(&priv->i2c->dev, "%s: i2c failed=%d rd=%d\n",
-                               KBUILD_MODNAME, ret, rd);
-               ret = -EREMOTEIO;
-       }
-
-       return ret;
-}
-
-static int a8293_wr(struct a8293_priv *priv, u8 *val, int len)
-{
-       return a8293_i2c(priv, val, len, 0);
-}
-
-static int a8293_rd(struct a8293_priv *priv, u8 *val, int len)
-{
-       return a8293_i2c(priv, val, len, 1);
-}
-
 static int a8293_set_voltage(struct dvb_frontend *fe,
-       fe_sec_voltage_t fe_sec_voltage)
+                            enum fe_sec_voltage fe_sec_voltage)
 {
-       struct a8293_priv *priv = fe->sec_priv;
+       struct a8293_dev *dev = fe->sec_priv;
+       struct i2c_client *client = dev->client;
        int ret;
+       u8 reg0, reg1;
 
-       dev_dbg(&priv->i2c->dev, "%s: fe_sec_voltage=%d\n", __func__,
-                       fe_sec_voltage);
+       dev_dbg(&client->dev, "fe_sec_voltage=%d\n", fe_sec_voltage);
 
        switch (fe_sec_voltage) {
        case SEC_VOLTAGE_OFF:
                /* ENB=0 */
-               priv->reg[0] = 0x10;
+               reg0 = 0x10;
                break;
        case SEC_VOLTAGE_13:
                /* VSEL0=1, VSEL1=0, VSEL2=0, VSEL3=0, ENB=1*/
-               priv->reg[0] = 0x31;
+               reg0 = 0x31;
                break;
        case SEC_VOLTAGE_18:
                /* VSEL0=0, VSEL1=0, VSEL2=0, VSEL3=1, ENB=1*/
-               priv->reg[0] = 0x38;
+               reg0 = 0x38;
                break;
        default:
                ret = -EINVAL;
                goto err;
        }
+       if (reg0 != dev->reg[0]) {
+               ret = i2c_master_send(client, &reg0, 1);
+               if (ret < 0)
+                       goto err;
+               dev->reg[0] = reg0;
+       }
 
-       ret = a8293_wr(priv, &priv->reg[0], 1);
-       if (ret)
-               goto err;
+       /* TMODE=0, TGATE=1 */
+       reg1 = 0x82;
+       if (reg1 != dev->reg[1]) {
+               ret = i2c_master_send(client, &reg1, 1);
+               if (ret < 0)
+                       goto err;
+               dev->reg[1] = reg1;
+       }
 
        usleep_range(1500, 50000);
-
-       return ret;
+       return 0;
 err:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
+       dev_dbg(&client->dev, "failed=%d\n", ret);
        return ret;
 }
 
-static void a8293_release_sec(struct dvb_frontend *fe)
-{
-       a8293_set_voltage(fe, SEC_VOLTAGE_OFF);
-
-       kfree(fe->sec_priv);
-       fe->sec_priv = NULL;
-}
-
-struct dvb_frontend *a8293_attach(struct dvb_frontend *fe,
-       struct i2c_adapter *i2c, const struct a8293_config *cfg)
+static int a8293_probe(struct i2c_client *client,
+                      const struct i2c_device_id *id)
 {
+       struct a8293_dev *dev;
+       struct a8293_platform_data *pdata = client->dev.platform_data;
+       struct dvb_frontend *fe = pdata->dvb_frontend;
        int ret;
-       struct a8293_priv *priv = NULL;
        u8 buf[2];
 
-       /* allocate memory for the internal priv */
-       priv = kzalloc(sizeof(struct a8293_priv), GFP_KERNEL);
-       if (priv == NULL) {
+       dev = kzalloc(sizeof(*dev), GFP_KERNEL);
+       if (!dev) {
                ret = -ENOMEM;
                goto err;
        }
 
-       /* setup the priv */
-       priv->i2c = i2c;
-       priv->cfg = cfg;
-       fe->sec_priv = priv;
+       dev->client = client;
 
        /* check if the SEC is there */
-       ret = a8293_rd(priv, buf, 2);
-       if (ret)
-               goto err;
-
-       /* ENB=0 */
-       priv->reg[0] = 0x10;
-       ret = a8293_wr(priv, &priv->reg[0], 1);
-       if (ret)
-               goto err;
-
-       /* TMODE=0, TGATE=1 */
-       priv->reg[1] = 0x82;
-       ret = a8293_wr(priv, &priv->reg[1], 1);
-       if (ret)
-               goto err;
-
-       fe->ops.release_sec = a8293_release_sec;
+       ret = i2c_master_recv(client, buf, 2);
+       if (ret < 0)
+               goto err_kfree;
 
        /* override frontend ops */
        fe->ops.set_voltage = a8293_set_voltage;
+       fe->sec_priv = dev;
+       i2c_set_clientdata(client, dev);
 
-       dev_info(&priv->i2c->dev, "%s: Allegro A8293 SEC attached\n",
-                       KBUILD_MODNAME);
-
-       return fe;
+       dev_info(&client->dev, "Allegro A8293 SEC successfully attached\n");
+       return 0;
+err_kfree:
+       kfree(dev);
 err:
-       dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
-       kfree(priv);
-       return NULL;
+       dev_dbg(&client->dev, "failed=%d\n", ret);
+       return ret;
+}
+
+static int a8293_remove(struct i2c_client *client)
+{
+       struct a8293_dev *dev = i2c_get_clientdata(client);
+
+       dev_dbg(&client->dev, "\n");
+
+       kfree(dev);
+       return 0;
 }
-EXPORT_SYMBOL(a8293_attach);
+
+static const struct i2c_device_id a8293_id_table[] = {
+       {"a8293", 0},
+       {}
+};
+MODULE_DEVICE_TABLE(i2c, a8293_id_table);
+
+static struct i2c_driver a8293_driver = {
+       .driver = {
+               .name   = "a8293",
+               .suppress_bind_attrs = true,
+       },
+       .probe          = a8293_probe,
+       .remove         = a8293_remove,
+       .id_table       = a8293_id_table,
+};
+
+module_i2c_driver(a8293_driver);
 
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Allegro A8293 SEC driver");