diff options
| author | Sebastian Reichel <sre@kernel.org> | 2014-11-10 15:34:41 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-11-14 15:08:19 -0500 |
| commit | 98bea620c7ff301f9a7a6c31b2aca30964aa2fab (patch) | |
| tree | 1fac557a89bbc8e57a3f2897e095fe5875833196 /include/media | |
| parent | c3a5baf452df03e3d571298c86d2ed8638c9d18d (diff) | |
[media] si4713: add device tree support
Add device tree support by changing the device registration order.
In the device tree the si4713 node is a normal I2C device, which
will be probed as such. Thus the V4L device must be probed from
the I2C device and not the other way around.
Signed-off-by: Sebastian Reichel <sre@kernel.org>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/radio-si4713.h | 30 | ||||
| -rw-r--r-- | include/media/si4713.h | 1 |
2 files changed, 1 insertions, 30 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 @@ | |||
| 1 | /* | ||
| 2 | * include/media/radio-si4713.h | ||
| 3 | * | ||
| 4 | * Board related data definitions for Si4713 radio transmitter chip. | ||
| 5 | * | ||
| 6 | * Copyright (c) 2009 Nokia Corporation | ||
| 7 | * Contact: Eduardo Valentin <eduardo.valentin@nokia.com> | ||
| 8 | * | ||
| 9 | * This file is licensed under the terms of the GNU General Public License | ||
| 10 | * version 2. This program is licensed "as is" without any warranty of any | ||
| 11 | * kind, whether express or implied. | ||
| 12 | * | ||
| 13 | */ | ||
| 14 | |||
| 15 | #ifndef RADIO_SI4713_H | ||
| 16 | #define RADIO_SI4713_H | ||
| 17 | |||
| 18 | #include <linux/i2c.h> | ||
| 19 | |||
| 20 | #define SI4713_NAME "radio-si4713" | ||
| 21 | |||
| 22 | /* | ||
| 23 | * Platform dependent definition | ||
| 24 | */ | ||
| 25 | struct radio_si4713_platform_data { | ||
| 26 | int i2c_bus; | ||
| 27 | struct i2c_board_info *subdev_board_info; | ||
| 28 | }; | ||
| 29 | |||
| 30 | #endif /* ifndef RADIO_SI4713_H*/ | ||
diff --git a/include/media/si4713.h b/include/media/si4713.h index f98a0a7af61c..343b8fb50b93 100644 --- a/include/media/si4713.h +++ b/include/media/si4713.h | |||
| @@ -26,6 +26,7 @@ struct si4713_platform_data { | |||
| 26 | const char * const *supply_names; | 26 | const char * const *supply_names; |
| 27 | unsigned supplies; | 27 | unsigned supplies; |
| 28 | int gpio_reset; /* < 0 if not used */ | 28 | int gpio_reset; /* < 0 if not used */ |
| 29 | bool is_platform_device; | ||
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | /* | 32 | /* |
