Merge branch 'perf/urgent' into perf/core, to resolve a conflict
[firefly-linux-kernel-4.4.55.git] / drivers / media / dvb-frontends / a8293.c
index 97ecbe01034cc1bb6a72c36c9ed5a7da47004302..e1e9bddcf516a2a2476f3600be171097f08dbf4d 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 {
-       u8 i2c_addr;
-       struct i2c_adapter *i2c;
+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->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,
-       enum fe_sec_voltage 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;
        }
-
-       ret = a8293_wr(priv, &priv->reg[0], 1);
-       if (ret)
-               goto err;
-
-       usleep_range(1500, 50000);
-
-       return ret;
-err:
-       dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, 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)
-{
-       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) {
-               ret = -ENOMEM;
-               goto err;
+       if (reg0 != dev->reg[0]) {
+               ret = i2c_master_send(client, &reg0, 1);
+               if (ret < 0)
+                       goto err;
+               dev->reg[0] = reg0;
        }
 
-       /* setup the priv */
-       priv->i2c = i2c;
-       priv->i2c_addr = cfg->i2c_addr;
-       fe->sec_priv = priv;
-
-       /* 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;
-
-       /* override frontend ops */
-       fe->ops.set_voltage = a8293_set_voltage;
-
-       dev_info(&priv->i2c->dev, "%s: Allegro A8293 SEC attached\n",
-                       KBUILD_MODNAME);
+       reg1 = 0x82;
+       if (reg1 != dev->reg[1]) {
+               ret = i2c_master_send(client, &reg1, 1);
+               if (ret < 0)
+                       goto err;
+               dev->reg[1] = reg1;
+       }
 
-       return fe;
+       usleep_range(1500, 50000);
+       return 0;
 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;
 }
-EXPORT_SYMBOL(a8293_attach);
 
 static int a8293_probe(struct i2c_client *client,
-                       const struct i2c_device_id *id)
+                      const struct i2c_device_id *id)
 {
-       struct a8293_priv *dev;
+       struct a8293_dev *dev;
        struct a8293_platform_data *pdata = client->dev.platform_data;
        struct dvb_frontend *fe = pdata->dvb_frontend;
        int ret;
@@ -181,29 +87,14 @@ static int a8293_probe(struct i2c_client *client,
        }
 
        dev->client = client;
-       dev->i2c = client->adapter;
-       dev->i2c_addr = client->addr;
 
        /* check if the SEC is there */
-       ret = a8293_rd(dev, buf, 2);
-       if (ret)
-               goto err_kfree;
-
-       /* ENB=0 */
-       dev->reg[0] = 0x10;
-       ret = a8293_wr(dev, &dev->reg[0], 1);
-       if (ret)
-               goto err_kfree;
-
-       /* TMODE=0, TGATE=1 */
-       dev->reg[1] = 0x82;
-       ret = a8293_wr(dev, &dev->reg[1], 1);
-       if (ret)
+       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);
 
@@ -234,7 +125,6 @@ MODULE_DEVICE_TABLE(i2c, a8293_id_table);
 
 static struct i2c_driver a8293_driver = {
        .driver = {
-               .owner  = THIS_MODULE,
                .name   = "a8293",
                .suppress_bind_attrs = true,
        },