1 files changed, 63 insertions, 11 deletions

diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index a6e6f1987a3a..0fab6f8f7e24 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -27,6 +27,8 @@
 #include <linux/interrupt.h>
 #include <linux/i2c.h>
 #include <linux/slab.h>
+#include <linux/gpio.h>
+#include <linux/regulator/consumer.h>
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
@@ -43,6 +45,11 @@ MODULE_AUTHOR("Eduardo Valentin <eduardo.valentin@nokia.com>");
 MODULE_DESCRIPTION("I2C driver for Si4713 FM Radio Transmitter");
 MODULE_VERSION("0.0.1");
 
+static const char *si4713_supply_names[SI4713_NUM_SUPPLIES] = {
+        "vio",
+        "vdd",
+};
+
 #define DEFAULT_RDS_PI                  0x00
 #define DEFAULT_RDS_PTY                 0x00
 #define DEFAULT_RDS_PS_NAME             ""
@@ -369,7 +376,17 @@ static int si4713_powerup(struct si4713_device *sdev)
         if (sdev->power_state)
                 return 0;
 
-        sdev->platform_data->set_power(1);
+        err = regulator_bulk_enable(ARRAY_SIZE(sdev->supplies),
+                                    sdev->supplies);
+        if (err) {
+                v4l2_err(&sdev->sd, "Failed to enable supplies: %d\n", err);
+                return err;
+        }
+        if (gpio_is_valid(sdev->gpio_reset)) {
+                udelay(50);
+                gpio_set_value(sdev->gpio_reset, 1);
+        }
+
         err = si4713_send_command(sdev, SI4713_CMD_POWER_UP,
                                         args, ARRAY_SIZE(args),
                                         resp, ARRAY_SIZE(resp),
@@ -384,7 +401,13 @@ static int si4713_powerup(struct si4713_device *sdev)
                 err = si4713_write_property(sdev, SI4713_GPO_IEN,
                                                 SI4713_STC_INT | SI4713_CTS);
         } else {
-                sdev->platform_data->set_power(0);
+                if (gpio_is_valid(sdev->gpio_reset))
+                        gpio_set_value(sdev->gpio_reset, 0);
+                err = regulator_bulk_disable(ARRAY_SIZE(sdev->supplies),
+                                             sdev->supplies);
+                if (err)
+                        v4l2_err(&sdev->sd,
+                                 "Failed to disable supplies: %d\n", err);
         }
 
         return err;
@@ -411,7 +434,13 @@ static int si4713_powerdown(struct si4713_device *sdev)
                 v4l2_dbg(1, debug, &sdev->sd, "Power down response: 0x%02x\n",
                                 resp[0]);
                 v4l2_dbg(1, debug, &sdev->sd, "Device in reset mode\n");
-                sdev->platform_data->set_power(0);
+                if (gpio_is_valid(sdev->gpio_reset))
+                        gpio_set_value(sdev->gpio_reset, 0);
+                err = regulator_bulk_disable(ARRAY_SIZE(sdev->supplies),
+                                             sdev->supplies);
+                if (err)
+                        v4l2_err(&sdev->sd,
+                                 "Failed to disable supplies: %d\n", err);
                 sdev->power_state = POWER_OFF;
         }
 
@@ -1967,7 +1996,8 @@ static int si4713_probe(struct i2c_client *client,
                                         const struct i2c_device_id *id)
 {
         struct si4713_device *sdev;
-        int rval;
+        struct si4713_platform_data *pdata = client->dev.platform_data;
+        int rval, i;
 
         sdev = kzalloc(sizeof *sdev, GFP_KERNEL);
         if (!sdev) {
@@ -1976,11 +2006,26 @@ static int si4713_probe(struct i2c_client *client,
                 goto exit;
         }
 
-        sdev->platform_data = client->dev.platform_data;
-        if (!sdev->platform_data) {
-                v4l2_err(&sdev->sd, "No platform data registered.\n");
-                rval = -ENODEV;
-                goto free_sdev;
+        sdev->gpio_reset = -1;
+        if (pdata && gpio_is_valid(pdata->gpio_reset)) {
+                rval = gpio_request(pdata->gpio_reset, "si4713 reset");
+                if (rval) {
+                        dev_err(&client->dev,
+                                "Failed to request gpio: %d\n", rval);
+                        goto free_sdev;
+                }
+                sdev->gpio_reset = pdata->gpio_reset;
+                gpio_direction_output(sdev->gpio_reset, 0);
+        }
+
+        for (i = 0; i < ARRAY_SIZE(sdev->supplies); i++)
+                sdev->supplies[i].supply = si4713_supply_names[i];
+
+        rval = regulator_bulk_get(&client->dev, ARRAY_SIZE(sdev->supplies),
+                                  sdev->supplies);
+        if (rval) {
+                dev_err(&client->dev, "Cannot get regulators: %d\n", rval);
+                goto free_gpio;
         }
 
         v4l2_i2c_subdev_init(&sdev->sd, client, &si4713_subdev_ops);
@@ -1994,7 +2039,7 @@ static int si4713_probe(struct i2c_client *client,
                         client->name, sdev);
                 if (rval < 0) {
                         v4l2_err(&sdev->sd, "Could not request IRQ\n");
-                        goto free_sdev;
+                        goto put_reg;
                 }
                 v4l2_dbg(1, debug, &sdev->sd, "IRQ requested.\n");
         } else {
@@ -2012,6 +2057,11 @@ static int si4713_probe(struct i2c_client *client,
 free_irq:
         if (client->irq)
                 free_irq(client->irq, sdev);
+put_reg:
+        regulator_bulk_free(ARRAY_SIZE(sdev->supplies), sdev->supplies);
+free_gpio:
+        if (gpio_is_valid(sdev->gpio_reset))
+                gpio_free(sdev->gpio_reset);
 free_sdev:
         kfree(sdev);
 exit:
@@ -2031,7 +2081,9 @@ static int si4713_remove(struct i2c_client *client)
                 free_irq(client->irq, sdev);
 
         v4l2_device_unregister_subdev(sd);
-
+        regulator_bulk_free(ARRAY_SIZE(sdev->supplies), sdev->supplies);
+        if (gpio_is_valid(sdev->gpio_reset))
+                gpio_free(sdev->gpio_reset);
         kfree(sdev);
 
         return 0;