summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorSebastian Reichel <sre@kernel.org>2014-11-10 17:34:41 -0300
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-14 18:08:19 -0200
commit98bea620c7ff301f9a7a6c31b2aca30964aa2fab (patch)
tree1fac557a89bbc8e57a3f2897e095fe5875833196 /include/media
parentc3a5baf452df03e3d571298c86d2ed8638c9d18d (diff)
downloadlinux-98bea620c7ff301f9a7a6c31b2aca30964aa2fab.tar.bz2
[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.h30
-rw-r--r--include/media/si4713.h1
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 @@
-/*
- * 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..343b8fb50b93 100644
--- a/include/media/si4713.h
+++ b/include/media/si4713.h
@@ -26,6 +26,7 @@ struct si4713_platform_data {
const char * const *supply_names;
unsigned supplies;
int gpio_reset; /* < 0 if not used */
+ bool is_platform_device;
};
/*