diff options
author | Sebastian Reichel <sre@kernel.org> | 2014-04-06 13:05:17 +0200 |
---|---|---|
committer | Sebastian Reichel <sre@kernel.org> | 2014-04-26 01:49:02 +0200 |
commit | 46ae5c45b5abacf18efb1f7b5f18c9d44553cb42 (patch) | |
tree | e9f2c8a9aca957413318eb1da4fa9fc79a6f8bbf /drivers/media/radio/si4713/si4713.h | |
parent | bb15410a5979b0238156f9443987c9f30e76e7af (diff) | |
download | linux-46ae5c45b5abacf18efb1f7b5f18c9d44553cb42.tar.bz2 |
[media] si4713: add Device Tree support
Update si4713 driver to support being instantiated via
Device Tree. This includes moving the regulator names
back into the drivers, using regulator_get_optional
to avoid breaking the USB driver and switching to the
gpio resource interface.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Diffstat (limited to 'drivers/media/radio/si4713/si4713.h')
-rw-r--r-- | drivers/media/radio/si4713/si4713.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/media/radio/si4713/si4713.h b/drivers/media/radio/si4713/si4713.h index 4837cf6e0e1b..2ff772e75887 100644 --- a/drivers/media/radio/si4713/si4713.h +++ b/drivers/media/radio/si4713/si4713.h @@ -15,7 +15,9 @@ #ifndef SI4713_I2C_H #define SI4713_I2C_H +#include <linux/platform_device.h> #include <linux/regulator/consumer.h> +#include <linux/gpio/consumer.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h> #include <media/si4713.h> @@ -190,8 +192,6 @@ #define MIN_ACOMP_THRESHOLD (-40) #define MAX_ACOMP_GAIN 20 -#define SI4713_NUM_SUPPLIES 2 - /* * si4713_device - private data */ @@ -227,9 +227,10 @@ struct si4713_device { struct v4l2_ctrl *tune_ant_cap; }; struct completion work; - unsigned supplies; - struct regulator_bulk_data supply_data[SI4713_NUM_SUPPLIES]; - int gpio_reset; + struct regulator *vdd; + struct regulator *vio; + struct gpio_desc *gpio_reset; + struct platform_device *pd; u32 power_state; u32 rds_enabled; u32 frequency; @@ -237,4 +238,8 @@ struct si4713_device { u32 stereo; u32 tune_rnl; }; + +struct radio_si4713_platform_data { + struct i2c_client *subdev; +}; #endif /* ifndef SI4713_I2C_H */ |