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 /include | |
| 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 'include')
| -rw-r--r-- | include/media/radio-si4713.h | 30 | ||||
| -rw-r--r-- | include/media/si4713.h | 4 |
2 files changed, 1 insertions, 33 deletions
diff --git a/include/media/radio-si4713.h b/include/media/radio-si4713.h deleted file mode 100644 index f6aae29c7741..000000000000 --- a/include/media/radio-si4713.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * include/media/radio-si4713.h - * - * Board related data definitions for Si4713 radio transmitter chip. - * - * Copyright (c) 2009 Nokia Corporation - * Contact: Eduardo Valentin <eduardo.valentin@nokia.com> - * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - * - */ - -#ifndef RADIO_SI4713_H -#define RADIO_SI4713_H - -#include <linux/i2c.h> - -#define SI4713_NAME "radio-si4713" - -/* - * Platform dependent definition - */ -struct radio_si4713_platform_data { - int i2c_bus; - struct i2c_board_info *subdev_board_info; -}; - -#endif /* ifndef RADIO_SI4713_H*/ diff --git a/include/media/si4713.h b/include/media/si4713.h index f98a0a7af61c..be4f58e2440b 100644 --- a/include/media/si4713.h +++ b/include/media/si4713.h @@ -23,9 +23,7 @@ * Platform dependent definition */ struct si4713_platform_data { - const char * const *supply_names; - unsigned supplies; - int gpio_reset; /* < 0 if not used */ + bool is_platform_device; }; /* |