Currently, include/media is messy, as it contains both the V4L2 core headers and some driver-specific headers on the same place. That makes harder to identify what core headers should be documented and what headers belong to I2C drivers that are included only by bridge/main drivers that would require the functions provided by them. Let's move those i2c specific files to its own subdirectory. The files to move were produced via the following script: mkdir include/media/i2c (cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done) (cd include/media; for i in *.h; do n=`echo $i|sed s/.h$/.c/`; if [ -e ../../drivers/media/*/i2c/$n ]; then echo $i; git mv $i i2c/; fi; done) for i in include/media/*.h; do n=`basename $i`; (for j in $(git grep -l $n); do dirname $j; done)|sort|uniq|grep -ve '^.$' > list; num=$(wc -l list|cut -d' ' -f1); if [ $num == 1 ]; then if [ "`grep i2c list`" != "" ]; then git mv $i include/media/i2c; fi; fi; done And the references corrected via this script: MAIN_DIR="media/" PREV_DIR="media/" DIRS="i2c/" echo "Checking affected files" >&2 for i in $DIRS; do for j in $(find include/$MAIN_DIR/$i -type f -name '*.h'); do n=`basename $j` git grep -l $n done done|sort|uniq >files && ( echo "Handling files..." >&2; echo "for i in \$(cat files|grep -v Documentation); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<])$PREV_DIR($i)([\\\"\\>]),\1$MAIN_DIR$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done"; ); echo "Handling documentation..." >&2; echo "for i in MAINTAINERS \$(cat files); do cat \$i | \\"; ( cd include/$MAIN_DIR; for j in $DIRS; do for i in $(ls $j); do echo " perl -ne 's,include/$PREV_DIR($i)\b,include/$MAIN_DIR$j\1,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done" ); ) >script && . ./script Merged Sakari Ailus patch that moves smiapp.h to include/media/i2c.
Unified · Split
| @@ -395,7 +395,7 @@ M: Sakari Ailus <sakari.ailus@iki.fi> · 394 unmodified lines | ||
| 395 | 395 | L: linux-media@vger.kernel.org |
| 396 | 396 | S: Maintained |
| 397 | 397 | F: drivers/media/i2c/adp1653.c |
| 398 | −F: include/media/adp1653.h | |
| 398 | +F: include/media/i2c/adp1653.h | |
| 399 | 399 | |
| 400 | 400 | ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501) |
| 401 | 401 | M: Michael Hennerich <michael.hennerich@analog.com> |
| @@ -1773,7 +1773,7 @@ L: linux-media@vger.kernel.org · 1371 unmodified lines | ||
| 1773 | 1773 | T: git git://linuxtv.org/media_tree.git |
| 1774 | 1774 | S: Maintained |
| 1775 | 1775 | F: drivers/media/i2c/as3645a.c |
| 1776 | −F: include/media/as3645a.h | |
| 1776 | +F: include/media/i2c/as3645a.h | |
| 1777 | 1777 | |
| 1778 | 1778 | ASC7621 HARDWARE MONITOR DRIVER |
| 1779 | 1779 | M: George Joseph <george.joseph@fairview5.com> |
| @@ -4596,7 +4596,7 @@ M: Heungjun Kim <riverful.kim@samsung.com> · 2816 unmodified lines | ||
| 4596 | 4596 | L: linux-media@vger.kernel.org |
| 4597 | 4597 | S: Maintained |
| 4598 | 4598 | F: drivers/media/i2c/m5mols/ |
| 4599 | −F: include/media/m5mols.h | |
| 4599 | +F: include/media/i2c/m5mols.h | |
| 4600 | 4600 | |
| 4601 | 4601 | FUJITSU TABLET EXTRAS |
| 4602 | 4602 | M: Robert Gerlach <khnz@gmx.de> |
| @@ -7169,7 +7169,7 @@ L: linux-media@vger.kernel.org · 2566 unmodified lines | ||
| 7169 | 7169 | T: git git://linuxtv.org/media_tree.git |
| 7170 | 7170 | S: Maintained |
| 7171 | 7171 | F: drivers/media/i2c/mt9m032.c |
| 7172 | −F: include/media/mt9m032.h | |
| 7172 | +F: include/media/i2c/mt9m032.h | |
| 7173 | 7173 | |
| 7174 | 7174 | MT9P031 APTINA CAMERA SENSOR |
| 7175 | 7175 | M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| @@ -7177,7 +7177,7 @@ L: linux-media@vger.kernel.org · 1 unmodified line | ||
| 7177 | 7177 | T: git git://linuxtv.org/media_tree.git |
| 7178 | 7178 | S: Maintained |
| 7179 | 7179 | F: drivers/media/i2c/mt9p031.c |
| 7180 | −F: include/media/mt9p031.h | |
| 7180 | +F: include/media/i2c/mt9p031.h | |
| 7181 | 7181 | |
| 7182 | 7182 | MT9T001 APTINA CAMERA SENSOR |
| 7183 | 7183 | M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| @@ -7185,7 +7185,7 @@ L: linux-media@vger.kernel.org · 1 unmodified line | ||
| 7185 | 7185 | T: git git://linuxtv.org/media_tree.git |
| 7186 | 7186 | S: Maintained |
| 7187 | 7187 | F: drivers/media/i2c/mt9t001.c |
| 7188 | −F: include/media/mt9t001.h | |
| 7188 | +F: include/media/i2c/mt9t001.h | |
| 7189 | 7189 | |
| 7190 | 7190 | MT9V032 APTINA CAMERA SENSOR |
| 7191 | 7191 | M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| @@ -7194,7 +7194,7 @@ T: git git://linuxtv.org/media_tree.git · 2 unmodified lines | ||
| 7194 | 7194 | S: Maintained |
| 7195 | 7195 | F: Documentation/devicetree/bindings/media/i2c/mt9v032.txt |
| 7196 | 7196 | F: drivers/media/i2c/mt9v032.c |
| 7197 | −F: include/media/mt9v032.h | |
| 7197 | +F: include/media/i2c/mt9v032.h | |
| 7198 | 7198 | |
| 7199 | 7199 | MULTIFUNCTION DEVICES (MFD) |
| 7200 | 7200 | M: Lee Jones <lee.jones@linaro.org> |
| @@ -9751,7 +9751,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ · 2550 unmodified lines | ||
| 9751 | 9751 | T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git |
| 9752 | 9752 | S: Maintained |
| 9753 | 9753 | F: drivers/media/i2c/ov2659.c |
| 9754 | −F: include/media/ov2659.h | |
| 9754 | +F: include/media/i2c/ov2659.h | |
| 9755 | 9755 | |
| 9756 | 9756 | SILICON MOTION SM712 FRAME BUFFER DRIVER |
| 9757 | 9757 | M: Sudip Mukherjee <sudipm.mukherjee@gmail.com> |
| @@ -9840,7 +9840,7 @@ M: Sakari Ailus <sakari.ailus@iki.fi> · 82 unmodified lines | ||
| 9840 | 9840 | L: linux-media@vger.kernel.org |
| 9841 | 9841 | S: Maintained |
| 9842 | 9842 | F: drivers/media/i2c/smiapp/ |
| 9843 | −F: include/media/smiapp.h | |
| 9843 | +F: include/media/i2c/smiapp.h | |
| 9844 | 9844 | F: drivers/media/i2c/smiapp-pll.c |
| 9845 | 9845 | F: drivers/media/i2c/smiapp-pll.h |
| 9846 | 9846 | F: include/uapi/linux/smiapp.h |
| @@ -10781,7 +10781,7 @@ M: Mats Randgaard <matrandg@cisco.com> · 934 unmodified lines | ||
| 10781 | 10781 | L: linux-media@vger.kernel.org |
| 10782 | 10782 | S: Maintained |
| 10783 | 10783 | F: drivers/media/i2c/tc358743* |
| 10784 | −F: include/media/tc358743.h | |
| 10784 | +F: include/media/i2c/tc358743.h | |
| 10785 | 10785 | |
| 10786 | 10786 | TMIO MMC DRIVER |
| 10787 | 10787 | M: Ian Molton <ian@mnementh.co.uk> |
| @@ -49,8 +49,8 @@ · 48 unmodified lines | ||
| 49 | 49 | #include <asm/mach/arch.h> |
| 50 | 50 | #include <asm/system_info.h> |
| 51 | 51 | |
| 52 | −#include <media/tvp514x.h> | |
| 53 | −#include <media/adv7343.h> | |
| 52 | +#include <media/i2c/tvp514x.h> | |
| 53 | +#include <media/i2c/adv7343.h> | |
| 54 | 54 | |
| 55 | 55 | #define DA850_EVM_PHY_ID "davinci_mdio-0:00" |
| 56 | 56 | #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8) |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <linux/gpio.h> |
| 20 | 20 | #include <linux/clk.h> |
| 21 | 21 | #include <linux/videodev2.h> |
| 22 | −#include <media/tvp514x.h> | |
| 22 | +#include <media/i2c/tvp514x.h> | |
| 23 | 23 | #include <linux/spi/spi.h> |
| 24 | 24 | #include <linux/spi/eeprom.h> |
| 25 | 25 | #include <linux/platform_data/gpio-davinci.h> |
| @@ -40,8 +40,8 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <linux/platform_data/mtd-davinci.h> |
| 41 | 41 | #include <linux/platform_data/keyscan-davinci.h> |
| 42 | 42 | |
| 43 | −#include <media/ths7303.h> | |
| 44 | −#include <media/tvp514x.h> | |
| 43 | +#include <media/i2c/ths7303.h> | |
| 44 | +#include <media/i2c/tvp514x.h> | |
| 45 | 45 | |
| 46 | 46 | #include "davinci.h" |
| 47 | 47 | |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/v4l2-dv-timings.h> |
| 27 | 27 | #include <linux/export.h> |
| 28 | 28 | |
| 29 | −#include <media/tvp514x.h> | |
| 29 | +#include <media/i2c/tvp514x.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm/mach-types.h> |
| 32 | 32 | #include <asm/mach/arch.h> |
| @@ -25,8 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/platform_data/at24.h> |
| 26 | 26 | #include <linux/i2c/pcf857x.h> |
| 27 | 27 | |
| 28 | −#include <media/tvp514x.h> | |
| 29 | −#include <media/adv7343.h> | |
| 28 | +#include <media/i2c/tvp514x.h> | |
| 29 | +#include <media/i2c/adv7343.h> | |
| 30 | 30 | |
| 31 | 31 | #include <linux/mtd/mtd.h> |
| 32 | 32 | #include <linux/mtd/nand.h> |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/pwm.h> |
| 28 | 28 | #include <linux/pwm_backlight.h> |
| 29 | 29 | |
| 30 | −#include <media/mt9v022.h> | |
| 30 | +#include <media/i2c/mt9v022.h> | |
| 31 | 31 | #include <media/soc_camera.h> |
| 32 | 32 | |
| 33 | 33 | #include <linux/platform_data/camera-pxa.h> |
| @@ -443,7 +443,7 @@ static const struct ppi_info ppi_info = { · 442 unmodified lines | ||
| 443 | 443 | }; |
| 444 | 444 | |
| 445 | 445 | #if IS_ENABLED(CONFIG_VIDEO_ADV7183) |
| 446 | −#include <media/adv7183.h> | |
| 446 | +#include <media/i2c/adv7183.h> | |
| 447 | 447 | static struct v4l2_input adv7183_inputs[] = { |
| 448 | 448 | { |
| 449 | 449 | .index = 0, |
| @@ -933,7 +933,7 @@ static struct bfin_capture_config bfin_capture_data = { · 932 unmodified lines | ||
| 933 | 933 | #endif |
| 934 | 934 | |
| 935 | 935 | #if IS_ENABLED(CONFIG_VIDEO_ADV7842) |
| 936 | −#include <media/adv7842.h> | |
| 936 | +#include <media/i2c/adv7842.h> | |
| 937 | 937 | |
| 938 | 938 | static struct v4l2_input adv7842_inputs[] = { |
| 939 | 939 | { |
| @@ -1084,7 +1084,7 @@ static const struct ppi_info ppi_info = { · 144 unmodified lines | ||
| 1084 | 1084 | }; |
| 1085 | 1085 | |
| 1086 | 1086 | #if IS_ENABLED(CONFIG_VIDEO_ADV7511) |
| 1087 | −#include <media/adv7511.h> | |
| 1087 | +#include <media/i2c/adv7511.h> | |
| 1088 | 1088 | |
| 1089 | 1089 | static struct v4l2_output adv7511_outputs[] = { |
| 1090 | 1090 | { |
| @@ -1125,7 +1125,7 @@ static struct bfin_display_config bfin_display_data = { · 34 unmodified lines | ||
| 1125 | 1125 | #endif |
| 1126 | 1126 | |
| 1127 | 1127 | #if IS_ENABLED(CONFIG_VIDEO_ADV7343) |
| 1128 | −#include <media/adv7343.h> | |
| 1128 | +#include <media/i2c/adv7343.h> | |
| 1129 | 1129 | |
| 1130 | 1130 | static struct v4l2_output adv7343_outputs[] = { |
| 1131 | 1131 | { |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/gpio.h> |
| 28 | 28 | #include <linux/videodev2.h> |
| 29 | 29 | #include <linux/sh_intc.h> |
| 30 | −#include <media/ov772x.h> | |
| 30 | +#include <media/i2c/ov772x.h> | |
| 31 | 31 | #include <media/soc_camera.h> |
| 32 | 32 | #include <media/soc_camera_platform.h> |
| 33 | 33 | #include <media/sh_mobile_ceu.h> |
| @@ -40,8 +40,8 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <sound/simple_card.h> |
| 41 | 41 | #include <media/sh_mobile_ceu.h> |
| 42 | 42 | #include <media/soc_camera.h> |
| 43 | −#include <media/tw9910.h> | |
| 44 | −#include <media/mt9t112.h> | |
| 43 | +#include <media/i2c/tw9910.h> | |
| 44 | +#include <media/i2c/mt9t112.h> | |
| 45 | 45 | #include <asm/heartbeat.h> |
| 46 | 46 | #include <asm/clock.h> |
| 47 | 47 | #include <asm/suspend.h> |
| @@ -900,7 +900,7 @@ static struct platform_device irda_device = { · 852 unmodified lines | ||
| 900 | 900 | .resource = irda_resources, |
| 901 | 901 | }; |
| 902 | 902 | |
| 903 | −#include <media/ak881x.h> | |
| 903 | +#include <media/i2c/ak881x.h> | |
| 904 | 904 | #include <media/sh_vou.h> |
| 905 | 905 | |
| 906 | 906 | static struct ak881x_pdata ak881x_pdata = { |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/usb/r8a66597.h> |
| 28 | 28 | #include <linux/videodev2.h> |
| 29 | 29 | #include <linux/sh_intc.h> |
| 30 | −#include <media/rj54n1cb0c.h> | |
| 30 | +#include <media/i2c/rj54n1cb0c.h> | |
| 31 | 31 | #include <media/soc_camera.h> |
| 32 | 32 | #include <media/sh_mobile_ceu.h> |
| 33 | 33 | #include <video/sh_mobile_lcdc.h> |
| @@ -28,9 +28,9 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/sh_intc.h> |
| 29 | 29 | #include <video/sh_mobile_lcdc.h> |
| 30 | 30 | #include <media/sh_mobile_ceu.h> |
| 31 | −#include <media/ov772x.h> | |
| 31 | +#include <media/i2c/ov772x.h> | |
| 32 | 32 | #include <media/soc_camera.h> |
| 33 | −#include <media/tw9910.h> | |
| 33 | +#include <media/i2c/tw9910.h> | |
| 34 | 34 | #include <asm/clock.h> |
| 35 | 35 | #include <asm/machvec.h> |
| 36 | 36 | #include <asm/io.h> |
| @@ -534,7 +534,7 @@ static struct platform_device irda_device = { · 533 unmodified lines | ||
| 534 | 534 | .resource = irda_resources, |
| 535 | 535 | }; |
| 536 | 536 | |
| 537 | −#include <media/ak881x.h> | |
| 537 | +#include <media/i2c/ak881x.h> | |
| 538 | 538 | #include <media/sh_vou.h> |
| 539 | 539 | |
| 540 | 540 | static struct ak881x_pdata ak881x_pdata = { |
| @@ -35,7 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | #include <media/v4l2-common.h> |
| 36 | 36 | #include <media/v4l2-dv-timings.h> |
| 37 | 37 | #include <media/v4l2-ctrls.h> |
| 38 | −#include <media/ad9389b.h> | |
| 38 | +#include <media/i2c/ad9389b.h> | |
| 39 | 39 | |
| 40 | 40 | static int debug; |
| 41 | 41 | module_param(debug, int, 0644); |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/slab.h> |
| 38 | 38 | #include <linux/of.h> |
| 39 | 39 | #include <linux/gpio/consumer.h> |
| 40 | −#include <media/adp1653.h> | |
| 40 | +#include <media/i2c/adp1653.h> | |
| 41 | 41 | #include <media/v4l2-device.h> |
| 42 | 42 | |
| 43 | 43 | #define TIMEOUT_MAX 820000 |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/types.h> |
| 28 | 28 | #include <linux/videodev2.h> |
| 29 | 29 | |
| 30 | −#include <media/adv7183.h> | |
| 30 | +#include <media/i2c/adv7183.h> | |
| 31 | 31 | #include <media/v4l2-ctrls.h> |
| 32 | 32 | #include <media/v4l2-device.h> |
| 33 | 33 | |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <linux/of.h> |
| 29 | 29 | #include <linux/of_graph.h> |
| 30 | 30 | |
| 31 | −#include <media/adv7343.h> | |
| 31 | +#include <media/i2c/adv7343.h> | |
| 32 | 32 | #include <media/v4l2-async.h> |
| 33 | 33 | #include <media/v4l2-device.h> |
| 34 | 34 | #include <media/v4l2-ctrls.h> |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/videodev2.h> |
| 32 | 32 | #include <linux/uaccess.h> |
| 33 | 33 | |
| 34 | −#include <media/adv7393.h> | |
| 34 | +#include <media/i2c/adv7393.h> | |
| 35 | 35 | #include <media/v4l2-device.h> |
| 36 | 36 | #include <media/v4l2-ctrls.h> |
| 37 | 37 | |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <media/v4l2-common.h> |
| 33 | 33 | #include <media/v4l2-ctrls.h> |
| 34 | 34 | #include <media/v4l2-dv-timings.h> |
| 35 | −#include <media/adv7511.h> | |
| 35 | +#include <media/i2c/adv7511.h> | |
| 36 | 36 | |
| 37 | 37 | static int debug; |
| 38 | 38 | module_param(debug, int, 0644); |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | ||
| 39 | 39 | #include <linux/workqueue.h> |
| 40 | 40 | #include <linux/regmap.h> |
| 41 | 41 | |
| 42 | −#include <media/adv7604.h> | |
| 42 | +#include <media/i2c/adv7604.h> | |
| 43 | 43 | #include <media/v4l2-ctrls.h> |
| 44 | 44 | #include <media/v4l2-device.h> |
| 45 | 45 | #include <media/v4l2-event.h> |
| @@ -43,7 +43,7 @@ · 42 unmodified lines | ||
| 43 | 43 | #include <media/v4l2-event.h> |
| 44 | 44 | #include <media/v4l2-ctrls.h> |
| 45 | 45 | #include <media/v4l2-dv-timings.h> |
| 46 | −#include <media/adv7842.h> | |
| 46 | +#include <media/i2c/adv7842.h> | |
| 47 | 47 | |
| 48 | 48 | static int debug; |
| 49 | 49 | module_param(debug, int, 0644); |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/videodev2.h> |
| 16 | 16 | #include <linux/module.h> |
| 17 | 17 | |
| 18 | −#include <media/ak881x.h> | |
| 18 | +#include <media/i2c/ak881x.h> | |
| 19 | 19 | #include <media/v4l2-common.h> |
| 20 | 20 | #include <media/v4l2-device.h> |
| 21 | 21 | |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/mutex.h> |
| 32 | 32 | #include <linux/slab.h> |
| 33 | 33 | |
| 34 | −#include <media/as3645a.h> | |
| 34 | +#include <media/i2c/as3645a.h> | |
| 35 | 35 | #include <media/v4l2-ctrls.h> |
| 36 | 36 | #include <media/v4l2-device.h> |
| 37 | 37 | |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/slab.h> |
| 38 | 38 | #include <media/v4l2-device.h> |
| 39 | 39 | #include <media/v4l2-ctrls.h> |
| 40 | −#include <media/bt819.h> | |
| 40 | +#include <media/i2c/bt819.h> | |
| 41 | 41 | |
| 42 | 42 | MODULE_DESCRIPTION("Brooktree-819 video decoder driver"); |
| 43 | 43 | MODULE_AUTHOR("Mike Bernson & Dave Perks"); |
| @@ -47,7 +47,7 @@ · 46 unmodified lines | ||
| 47 | 47 | #include <linux/workqueue.h> |
| 48 | 48 | |
| 49 | 49 | #include <media/rc-core.h> |
| 50 | −#include <media/ir-kbd-i2c.h> | |
| 50 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 51 | 51 | |
| 52 | 52 | /* ----------------------------------------------------------------------- */ |
| 53 | 53 | /* insmod parameters */ |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/mutex.h> |
| 25 | 25 | #include <linux/regmap.h> |
| 26 | 26 | #include <linux/videodev2.h> |
| 27 | −#include <media/lm3560.h> | |
| 27 | +#include <media/i2c/lm3560.h> | |
| 28 | 28 | #include <media/v4l2-ctrls.h> |
| 29 | 29 | #include <media/v4l2-device.h> |
| 30 | 30 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/slab.h> |
| 19 | 19 | #include <linux/regmap.h> |
| 20 | 20 | #include <linux/videodev2.h> |
| 21 | −#include <media/lm3646.h> | |
| 21 | +#include <media/i2c/lm3646.h> | |
| 22 | 22 | #include <media/v4l2-ctrls.h> |
| 23 | 23 | #include <media/v4l2-device.h> |
| 24 | 24 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <asm/uaccess.h> |
| 28 | 28 | #include <linux/i2c.h> |
| 29 | 29 | #include <linux/videodev2.h> |
| 30 | −#include <media/m52790.h> | |
| 30 | +#include <media/i2c/m52790.h> | |
| 31 | 31 | #include <media/v4l2-device.h> |
| 32 | 32 | |
| 33 | 33 | MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch"); |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <media/v4l2-ctrls.h> |
| 26 | 26 | #include <media/v4l2-device.h> |
| 27 | 27 | #include <media/v4l2-subdev.h> |
| 28 | −#include <media/m5mols.h> | |
| 28 | +#include <media/i2c/m5mols.h> | |
| 29 | 29 | #include <media/exynos-fimc.h> |
| 30 | 30 | |
| 31 | 31 | #include "m5mols.h" |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <media/v4l2-ctrls.h> |
| 26 | 26 | #include <media/v4l2-device.h> |
| 27 | 27 | #include <media/v4l2-subdev.h> |
| 28 | −#include <media/m5mols.h> | |
| 28 | +#include <media/i2c/m5mols.h> | |
| 29 | 29 | |
| 30 | 30 | #include "m5mols.h" |
| 31 | 31 | #include "m5mols_reg.h" |
| @@ -57,7 +57,7 @@ · 56 unmodified lines | ||
| 57 | 57 | #include <media/v4l2-device.h> |
| 58 | 58 | #include <media/v4l2-ioctl.h> |
| 59 | 59 | #include <media/msp3400.h> |
| 60 | −#include <media/tvaudio.h> | |
| 60 | +#include <media/i2c/tvaudio.h> | |
| 61 | 61 | #include "msp3400-driver.h" |
| 62 | 62 | |
| 63 | 63 | /* ---------------------------------------------------------------------- */ |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/v4l2-mediabus.h> |
| 32 | 32 | |
| 33 | 33 | #include <media/media-entity.h> |
| 34 | −#include <media/mt9m032.h> | |
| 34 | +#include <media/i2c/mt9m032.h> | |
| 35 | 35 | #include <media/v4l2-ctrls.h> |
| 36 | 36 | #include <media/v4l2-device.h> |
| 37 | 37 | #include <media/v4l2-subdev.h> |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/slab.h> |
| 27 | 27 | #include <linux/videodev2.h> |
| 28 | 28 | |
| 29 | −#include <media/mt9p031.h> | |
| 29 | +#include <media/i2c/mt9p031.h> | |
| 30 | 30 | #include <media/v4l2-async.h> |
| 31 | 31 | #include <media/v4l2-ctrls.h> |
| 32 | 32 | #include <media/v4l2-device.h> |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/videodev2.h> |
| 22 | 22 | #include <linux/v4l2-mediabus.h> |
| 23 | 23 | |
| 24 | −#include <media/mt9t001.h> | |
| 24 | +#include <media/i2c/mt9t001.h> | |
| 25 | 25 | #include <media/v4l2-ctrls.h> |
| 26 | 26 | #include <media/v4l2-device.h> |
| 27 | 27 | #include <media/v4l2-subdev.h> |
| @@ -13,7 +13,7 @@ · 12 unmodified lines | ||
| 13 | 13 | #include <asm/div64.h> |
| 14 | 14 | #include <media/v4l2-device.h> |
| 15 | 15 | #include <media/v4l2-ctrls.h> |
| 16 | −#include <media/mt9v011.h> | |
| 16 | +#include <media/i2c/mt9v011.h> | |
| 17 | 17 | |
| 18 | 18 | MODULE_DESCRIPTION("Micron mt9v011 sensor driver"); |
| 19 | 19 | MODULE_AUTHOR("Mauro Carvalho Chehab"); |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/v4l2-mediabus.h> |
| 26 | 26 | #include <linux/module.h> |
| 27 | 27 | |
| 28 | −#include <media/mt9v032.h> | |
| 28 | +#include <media/i2c/mt9v032.h> | |
| 29 | 29 | #include <media/v4l2-ctrls.h> |
| 30 | 30 | #include <media/v4l2-device.h> |
| 31 | 31 | #include <media/v4l2-of.h> |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <linux/i2c.h> |
| 19 | 19 | #include <linux/slab.h> |
| 20 | 20 | #include <linux/regulator/consumer.h> |
| 21 | −#include <media/noon010pc30.h> | |
| 21 | +#include <media/i2c/noon010pc30.h> | |
| 22 | 22 | #include <linux/videodev2.h> |
| 23 | 23 | #include <linux/module.h> |
| 24 | 24 | #include <media/v4l2-ctrls.h> |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/videodev2.h> |
| 38 | 38 | |
| 39 | 39 | #include <media/media-entity.h> |
| 40 | −#include <media/ov2659.h> | |
| 40 | +#include <media/i2c/ov2659.h> | |
| 41 | 41 | #include <media/v4l2-common.h> |
| 42 | 42 | #include <media/v4l2-ctrls.h> |
| 43 | 43 | #include <media/v4l2-device.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <media/v4l2-ctrls.h> |
| 21 | 21 | #include <media/v4l2-mediabus.h> |
| 22 | 22 | #include <media/v4l2-image-sizes.h> |
| 23 | −#include <media/ov7670.h> | |
| 23 | +#include <media/i2c/ov7670.h> | |
| 24 | 24 | |
| 25 | 25 | MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>"); |
| 26 | 26 | MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors"); |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <media/v4l2-image-sizes.h> |
| 30 | 30 | #include <media/v4l2-subdev.h> |
| 31 | 31 | #include <media/v4l2-mediabus.h> |
| 32 | −#include <media/ov9650.h> | |
| 32 | +#include <media/i2c/ov9650.h> | |
| 33 | 33 | |
| 34 | 34 | static int debug; |
| 35 | 35 | module_param(debug, int, 0644); |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <media/v4l2-device.h> |
| 35 | 35 | #include <media/v4l2-subdev.h> |
| 36 | 36 | #include <media/v4l2-mediabus.h> |
| 37 | −#include <media/s5c73m3.h> | |
| 37 | +#include <media/i2c/s5c73m3.h> | |
| 38 | 38 | #include <media/v4l2-of.h> |
| 39 | 39 | |
| 40 | 40 | #include "s5c73m3.h" |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <media/v4l2-device.h> |
| 33 | 33 | #include <media/v4l2-subdev.h> |
| 34 | 34 | #include <media/v4l2-mediabus.h> |
| 35 | −#include <media/s5c73m3.h> | |
| 35 | +#include <media/i2c/s5c73m3.h> | |
| 36 | 36 | |
| 37 | 37 | #include "s5c73m3.h" |
| 38 | 38 | |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <media/v4l2-common.h> |
| 24 | 24 | #include <media/v4l2-ctrls.h> |
| 25 | 25 | #include <media/v4l2-subdev.h> |
| 26 | −#include <media/s5c73m3.h> | |
| 26 | +#include <media/i2c/s5c73m3.h> | |
| 27 | 27 | |
| 28 | 28 | #define DRIVER_NAME "S5C73M3" |
| 29 | 29 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <asm/unaligned.h> |
| 28 | 28 | |
| 29 | 29 | #include <media/media-entity.h> |
| 30 | −#include <media/s5k4ecgx.h> | |
| 30 | +#include <media/i2c/s5k4ecgx.h> | |
| 31 | 31 | #include <media/v4l2-ctrls.h> |
| 32 | 32 | #include <media/v4l2-device.h> |
| 33 | 33 | #include <media/v4l2-mediabus.h> |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <media/v4l2-device.h> |
| 29 | 29 | #include <media/v4l2-subdev.h> |
| 30 | 30 | #include <media/v4l2-mediabus.h> |
| 31 | −#include <media/s5k6aa.h> | |
| 31 | +#include <media/i2c/s5k6aa.h> | |
| 32 | 32 | |
| 33 | 33 | static int debug; |
| 34 | 34 | module_param(debug, int, 0644); |
| @@ -31,7 +31,7 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/wait.h> |
| 32 | 32 | #include <asm/uaccess.h> |
| 33 | 33 | |
| 34 | −#include <media/saa6588.h> | |
| 34 | +#include <media/i2c/saa6588.h> | |
| 35 | 35 | #include <media/v4l2-device.h> |
| 36 | 36 | |
| 37 | 37 | |
| @@ -46,7 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | #include <linux/videodev2.h> |
| 47 | 47 | #include <media/v4l2-device.h> |
| 48 | 48 | #include <media/v4l2-ctrls.h> |
| 49 | −#include <media/saa7115.h> | |
| 49 | +#include <media/i2c/saa7115.h> | |
| 50 | 50 | #include <asm/div64.h> |
| 51 | 51 | |
| 52 | 52 | #define VRES_60HZ (480+16) |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | ||
| 54 | 54 | #include <linux/i2c.h> |
| 55 | 55 | #include <linux/videodev2.h> |
| 56 | 56 | #include <media/v4l2-device.h> |
| 57 | −#include <media/saa7127.h> | |
| 57 | +#include <media/i2c/saa7127.h> | |
| 58 | 58 | |
| 59 | 59 | static int debug; |
| 60 | 60 | static int test_image; |
| @@ -22,7 +22,7 @@ · 21 unmodified lines | ||
| 22 | 22 | #include <linux/mutex.h> |
| 23 | 23 | #include <media/v4l2-ctrls.h> |
| 24 | 24 | #include <media/v4l2-subdev.h> |
| 25 | −#include <media/smiapp.h> | |
| 25 | +#include <media/i2c/smiapp.h> | |
| 26 | 26 | |
| 27 | 27 | #include "smiapp-pll.h" |
| 28 | 28 | #include "smiapp-reg.h" |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/v4l2-mediabus.h> |
| 26 | 26 | #include <linux/videodev2.h> |
| 27 | 27 | |
| 28 | −#include <media/mt9t112.h> | |
| 28 | +#include <media/i2c/mt9t112.h> | |
| 29 | 29 | #include <media/soc_camera.h> |
| 30 | 30 | #include <media/v4l2-clk.h> |
| 31 | 31 | #include <media/v4l2-common.h> |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/log2.h> |
| 16 | 16 | #include <linux/module.h> |
| 17 | 17 | |
| 18 | −#include <media/mt9v022.h> | |
| 18 | +#include <media/i2c/mt9v022.h> | |
| 19 | 19 | #include <media/soc_camera.h> |
| 20 | 20 | #include <media/soc_mediabus.h> |
| 21 | 21 | #include <media/v4l2-subdev.h> |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <linux/v4l2-mediabus.h> |
| 25 | 25 | #include <linux/videodev2.h> |
| 26 | 26 | |
| 27 | −#include <media/ov772x.h> | |
| 27 | +#include <media/i2c/ov772x.h> | |
| 28 | 28 | #include <media/soc_camera.h> |
| 29 | 29 | #include <media/v4l2-clk.h> |
| 30 | 30 | #include <media/v4l2-ctrls.h> |
| @@ -15,7 +15,7 @@ · 14 unmodified lines | ||
| 15 | 15 | #include <linux/videodev2.h> |
| 16 | 16 | #include <linux/module.h> |
| 17 | 17 | |
| 18 | −#include <media/rj54n1cb0c.h> | |
| 18 | +#include <media/i2c/rj54n1cb0c.h> | |
| 19 | 19 | #include <media/soc_camera.h> |
| 20 | 20 | #include <media/v4l2-clk.h> |
| 21 | 21 | #include <media/v4l2-subdev.h> |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/videodev2.h> |
| 27 | 27 | |
| 28 | 28 | #include <media/soc_camera.h> |
| 29 | −#include <media/tw9910.h> | |
| 29 | +#include <media/i2c/tw9910.h> | |
| 30 | 30 | #include <media/v4l2-clk.h> |
| 31 | 31 | #include <media/v4l2-subdev.h> |
| 32 | 32 | |
| @@ -24,7 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #include <media/v4l2-subdev.h> |
| 25 | 25 | #include <media/v4l2-mediabus.h> |
| 26 | 26 | #include <media/v4l2-ctrls.h> |
| 27 | −#include <media/sr030pc30.h> | |
| 27 | +#include <media/i2c/sr030pc30.h> | |
| 28 | 28 | |
| 29 | 29 | static int debug; |
| 30 | 30 | module_param(debug, int, 0644); |
| @@ -42,7 +42,7 @@ · 41 unmodified lines | ||
| 42 | 42 | #include <media/v4l2-ctrls.h> |
| 43 | 43 | #include <media/v4l2-event.h> |
| 44 | 44 | #include <media/v4l2-of.h> |
| 45 | −#include <media/tc358743.h> | |
| 45 | +#include <media/i2c/tc358743.h> | |
| 46 | 46 | |
| 47 | 47 | #include "tc358743_regs.h" |
| 48 | 48 | |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/module.h> |
| 26 | 26 | #include <linux/slab.h> |
| 27 | 27 | |
| 28 | −#include <media/ths7303.h> | |
| 28 | +#include <media/i2c/ths7303.h> | |
| 29 | 29 | #include <media/v4l2-device.h> |
| 30 | 30 | |
| 31 | 31 | #define THS7303_CHANNEL_1 1 |
| @@ -36,7 +36,7 @@ · 35 unmodified lines | ||
| 36 | 36 | #include <linux/kthread.h> |
| 37 | 37 | #include <linux/freezer.h> |
| 38 | 38 | |
| 39 | −#include <media/tvaudio.h> | |
| 39 | +#include <media/i2c/tvaudio.h> | |
| 40 | 40 | #include <media/v4l2-device.h> |
| 41 | 41 | #include <media/v4l2-ctrls.h> |
| 42 | 42 | |
| @@ -44,7 +44,7 @@ · 43 unmodified lines | ||
| 44 | 44 | #include <media/v4l2-mediabus.h> |
| 45 | 45 | #include <media/v4l2-of.h> |
| 46 | 46 | #include <media/v4l2-ctrls.h> |
| 47 | −#include <media/tvp514x.h> | |
| 47 | +#include <media/i2c/tvp514x.h> | |
| 48 | 48 | #include <media/media-entity.h> |
| 49 | 49 | |
| 50 | 50 | #include "tvp514x_regs.h" |
| @@ -12,7 +12,7 @@ · 11 unmodified lines | ||
| 12 | 12 | #include <linux/module.h> |
| 13 | 13 | #include <media/v4l2-async.h> |
| 14 | 14 | #include <media/v4l2-device.h> |
| 15 | −#include <media/tvp5150.h> | |
| 15 | +#include <media/i2c/tvp5150.h> | |
| 16 | 16 | #include <media/v4l2-ctrls.h> |
| 17 | 17 | |
| 18 | 18 | #include "tvp5150_reg.h" |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <linux/of.h> |
| 33 | 33 | #include <linux/of_graph.h> |
| 34 | 34 | #include <linux/v4l2-dv-timings.h> |
| 35 | −#include <media/tvp7002.h> | |
| 35 | +#include <media/i2c/tvp7002.h> | |
| 36 | 36 | #include <media/v4l2-async.h> |
| 37 | 37 | #include <media/v4l2-device.h> |
| 38 | 38 | #include <media/v4l2-common.h> |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | #include <linux/i2c.h> |
| 21 | 21 | #include <linux/videodev2.h> |
| 22 | 22 | #include <media/v4l2-device.h> |
| 23 | −#include <media/uda1342.h> | |
| 23 | +#include <media/i2c/uda1342.h> | |
| 24 | 24 | #include <linux/slab.h> |
| 25 | 25 | |
| 26 | 26 | static int write_reg(struct i2c_client *client, int reg, int value) |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/videodev2.h> |
| 28 | 28 | #include <linux/slab.h> |
| 29 | 29 | #include <media/v4l2-device.h> |
| 30 | −#include <media/upd64031a.h> | |
| 30 | +#include <media/i2c/upd64031a.h> | |
| 31 | 31 | |
| 32 | 32 | /* --------------------- read registers functions define -------------------- */ |
| 33 | 33 | |
| @@ -27,7 +27,7 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/videodev2.h> |
| 28 | 28 | #include <linux/slab.h> |
| 29 | 29 | #include <media/v4l2-device.h> |
| 30 | −#include <media/upd64083.h> | |
| 30 | +#include <media/i2c/upd64083.h> | |
| 31 | 31 | |
| 32 | 32 | MODULE_DESCRIPTION("uPD64083 driver"); |
| 33 | 33 | MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil"); |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <linux/videodev2.h> |
| 35 | 35 | #include <media/v4l2-device.h> |
| 36 | 36 | #include <media/v4l2-ctrls.h> |
| 37 | −#include <media/wm8775.h> | |
| 37 | +#include <media/i2c/wm8775.h> | |
| 38 | 38 | |
| 39 | 39 | MODULE_DESCRIPTION("wm8775 driver"); |
| 40 | 40 | MODULE_AUTHOR("Ulf Eklund, Hans Verkuil"); |
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | #include "bttvp.h" |
| 43 | 43 | #include <media/v4l2-common.h> |
| 44 | −#include <media/tvaudio.h> | |
| 44 | +#include <media/i2c/tvaudio.h> | |
| 45 | 45 | #include "bttv-audio-hook.h" |
| 46 | 46 | |
| 47 | 47 | /* fwd decl */ |
| @@ -50,7 +50,7 @@ · 49 unmodified lines | ||
| 50 | 50 | #include <media/v4l2-common.h> |
| 51 | 51 | #include <media/v4l2-ioctl.h> |
| 52 | 52 | #include <media/v4l2-event.h> |
| 53 | −#include <media/tvaudio.h> | |
| 53 | +#include <media/i2c/tvaudio.h> | |
| 54 | 54 | #include <media/msp3400.h> |
| 55 | 55 | |
| 56 | 56 | #include <linux/dma-mapping.h> |
| @@ -58,7 +58,7 @@ · 1 unmodified line | ||
| 58 | 58 | #include <asm/io.h> |
| 59 | 59 | #include <asm/byteorder.h> |
| 60 | 60 | |
| 61 | −#include <media/saa6588.h> | |
| 61 | +#include <media/i2c/saa6588.h> | |
| 62 | 62 | |
| 63 | 63 | #define BTTV_VERSION "0.9.19" |
| 64 | 64 | |
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | #include <media/videobuf-dma-sg.h> |
| 42 | 42 | #include <media/tveeprom.h> |
| 43 | 43 | #include <media/rc-core.h> |
| 44 | −#include <media/ir-kbd-i2c.h> | |
| 44 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 45 | 45 | #include <media/tea575x.h> |
| 46 | 46 | |
| 47 | 47 | #include "bt848.h" |
| @@ -21,9 +21,9 @@ · 20 unmodified lines | ||
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | 23 | #include <linux/delay.h> |
| 24 | −#include <media/adv7604.h> | |
| 25 | −#include <media/adv7842.h> | |
| 26 | −#include <media/adv7511.h> | |
| 24 | +#include <media/i2c/adv7604.h> | |
| 25 | +#include <media/i2c/adv7842.h> | |
| 26 | +#include <media/i2c/adv7511.h> | |
| 27 | 27 | #include <media/v4l2-event.h> |
| 28 | 28 | #include <media/v4l2-ctrls.h> |
| 29 | 29 | |
| @@ -18,7 +18,7 @@ · 17 unmodified lines | ||
| 18 | 18 | * SOFTWARE. |
| 19 | 19 | */ |
| 20 | 20 | |
| 21 | −#include <media/adv7604.h> | |
| 21 | +#include <media/i2c/adv7604.h> | |
| 22 | 22 | |
| 23 | 23 | #include "cobalt-driver.h" |
| 24 | 24 | #include "cobalt-irq.h" |
| @@ -29,8 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <media/v4l2-ctrls.h> |
| 30 | 30 | #include <media/v4l2-event.h> |
| 31 | 31 | #include <media/v4l2-dv-timings.h> |
| 32 | −#include <media/adv7604.h> | |
| 33 | −#include <media/adv7842.h> | |
| 32 | +#include <media/i2c/adv7604.h> | |
| 33 | +#include <media/i2c/adv7842.h> | |
| 34 | 34 | |
| 35 | 35 | #include "cobalt-alsa.h" |
| 36 | 36 | #include "cobalt-cpld.h" |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include "cx18-cards.h" |
| 27 | 27 | #include "cx18-av-core.h" |
| 28 | 28 | #include "cx18-i2c.h" |
| 29 | −#include <media/cs5345.h> | |
| 29 | +#include <media/i2c/cs5345.h> | |
| 30 | 30 | |
| 31 | 31 | #define V4L2_STD_PAL_SECAM (V4L2_STD_PAL|V4L2_STD_SECAM) |
| 32 | 32 | |
| @@ -49,7 +49,7 @@ · 48 unmodified lines | ||
| 49 | 49 | #include <media/v4l2-device.h> |
| 50 | 50 | #include <media/v4l2-fh.h> |
| 51 | 51 | #include <media/tuner.h> |
| 52 | −#include <media/ir-kbd-i2c.h> | |
| 52 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 53 | 53 | #include "cx18-mailbox.h" |
| 54 | 54 | #include "cx18-av-core.h" |
| 55 | 55 | #include "cx23418.h" |
| @@ -40,7 +40,7 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <sound/control.h> |
| 41 | 41 | #include <sound/initval.h> |
| 42 | 42 | #include <sound/tlv.h> |
| 43 | −#include <media/wm8775.h> | |
| 43 | +#include <media/i2c/wm8775.h> | |
| 44 | 44 | |
| 45 | 45 | #include "cx88.h" |
| 46 | 46 | #include "cx88-reg.h" |
| @@ -41,7 +41,7 @@ · 40 unmodified lines | ||
| 41 | 41 | #include <media/v4l2-common.h> |
| 42 | 42 | #include <media/v4l2-ioctl.h> |
| 43 | 43 | #include <media/v4l2-event.h> |
| 44 | −#include <media/wm8775.h> | |
| 44 | +#include <media/i2c/wm8775.h> | |
| 45 | 45 | |
| 46 | 46 | MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards"); |
| 47 | 47 | MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); |
| @@ -32,8 +32,8 @@ · 31 unmodified lines | ||
| 32 | 32 | #include <media/videobuf2-dma-sg.h> |
| 33 | 33 | #include <media/cx2341x.h> |
| 34 | 34 | #include <media/videobuf2-dvb.h> |
| 35 | −#include <media/ir-kbd-i2c.h> | |
| 36 | −#include <media/wm8775.h> | |
| 35 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 36 | +#include <media/i2c/wm8775.h> | |
| 37 | 37 | |
| 38 | 38 | #include "cx88-reg.h" |
| 39 | 39 | #include "tuner-xc2028.h" |
| @@ -23,11 +23,11 @@ · 22 unmodified lines | ||
| 23 | 23 | #include "ivtv-i2c.h" |
| 24 | 24 | |
| 25 | 25 | #include <media/msp3400.h> |
| 26 | −#include <media/m52790.h> | |
| 27 | −#include <media/wm8775.h> | |
| 28 | −#include <media/cs53l32a.h> | |
| 26 | +#include <media/i2c/m52790.h> | |
| 27 | +#include <media/i2c/wm8775.h> | |
| 28 | +#include <media/i2c/cs53l32a.h> | |
| 29 | 29 | #include <media/cx25840.h> |
| 30 | −#include <media/upd64031a.h> | |
| 30 | +#include <media/i2c/upd64031a.h> | |
| 31 | 31 | |
| 32 | 32 | #define MSP_TUNER MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \ |
| 33 | 33 | MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER) |
| @@ -57,7 +57,7 @@ · 56 unmodified lines | ||
| 57 | 57 | #include "ivtv-gpio.h" |
| 58 | 58 | #include <linux/dma-mapping.h> |
| 59 | 59 | #include <media/tveeprom.h> |
| 60 | −#include <media/saa7115.h> | |
| 60 | +#include <media/i2c/saa7115.h> | |
| 61 | 61 | #include "tuner-xc2028.h" |
| 62 | 62 | |
| 63 | 63 | /* If you have already X v4l cards, then set this to X. This way |
| @@ -65,7 +65,7 @@ · 64 unmodified lines | ||
| 65 | 65 | #include <media/v4l2-fh.h> |
| 66 | 66 | #include <media/tuner.h> |
| 67 | 67 | #include <media/cx2341x.h> |
| 68 | −#include <media/ir-kbd-i2c.h> | |
| 68 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 69 | 69 | |
| 70 | 70 | #include <linux/ivtv.h> |
| 71 | 71 | |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include "ivtv-cards.h" |
| 35 | 35 | #include "ivtv-firmware.h" |
| 36 | 36 | #include <media/v4l2-event.h> |
| 37 | −#include <media/saa7115.h> | |
| 37 | +#include <media/i2c/saa7115.h> | |
| 38 | 38 | |
| 39 | 39 | /* This function tries to claim the stream for a specific file descriptor. |
| 40 | 40 | If no one else is using this stream then the stream is claimed and |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include "ivtv-ioctl.h" |
| 27 | 27 | #include "ivtv-cards.h" |
| 28 | 28 | #include <linux/firmware.h> |
| 29 | −#include <media/saa7127.h> | |
| 29 | +#include <media/i2c/saa7127.h> | |
| 30 | 30 | |
| 31 | 31 | #define IVTV_MASK_SPU_ENABLE 0xFFFFFFFE |
| 32 | 32 | #define IVTV_MASK_VPU_ENABLE15 0xFFFFFFF6 |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | #include "ivtv-gpio.h" |
| 33 | 33 | #include "ivtv-controls.h" |
| 34 | 34 | #include "ivtv-cards.h" |
| 35 | −#include <media/saa7127.h> | |
| 35 | +#include <media/i2c/saa7127.h> | |
| 36 | 36 | #include <media/tveeprom.h> |
| 37 | 37 | #include <media/v4l2-event.h> |
| 38 | 38 | #include <linux/dvb/audio.h> |
| @@ -25,9 +25,9 @@ · 24 unmodified lines | ||
| 25 | 25 | #include "ivtv-routing.h" |
| 26 | 26 | |
| 27 | 27 | #include <media/msp3400.h> |
| 28 | −#include <media/m52790.h> | |
| 29 | −#include <media/upd64031a.h> | |
| 30 | −#include <media/upd64083.h> | |
| 28 | +#include <media/i2c/m52790.h> | |
| 29 | +#include <media/i2c/upd64031a.h> | |
| 30 | +#include <media/i2c/upd64083.h> | |
| 31 | 31 | |
| 32 | 32 | /* Selects the audio input and output according to the current |
| 33 | 33 | settings. */ |
| @@ -32,7 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | |
| 33 | 33 | #include <media/v4l2-common.h> |
| 34 | 34 | #include <media/v4l2-event.h> |
| 35 | −#include <media/saa6588.h> | |
| 35 | +#include <media/i2c/saa6588.h> | |
| 36 | 36 | |
| 37 | 37 | /* ------------------------------------------------------------------ */ |
| 38 | 38 | |
| @@ -42,7 +42,7 @@ · 41 unmodified lines | ||
| 42 | 42 | #include <media/v4l2-ctrls.h> |
| 43 | 43 | #include <media/tuner.h> |
| 44 | 44 | #include <media/rc-core.h> |
| 45 | −#include <media/ir-kbd-i2c.h> | |
| 45 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 46 | 46 | #include <media/videobuf2-dma-sg.h> |
| 47 | 47 | #include <sound/core.h> |
| 48 | 48 | #include <sound/pcm.h> |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | #include <media/saa7146_vv.h> |
| 29 | 29 | #include <media/tuner.h> |
| 30 | 30 | #include <media/v4l2-common.h> |
| 31 | −#include <media/saa7115.h> | |
| 31 | +#include <media/i2c/saa7115.h> | |
| 32 | 32 | #include <linux/module.h> |
| 33 | 33 | |
| 34 | 34 | #include "tea6415c.h" |
| @@ -50,7 +50,7 @@ · 49 unmodified lines | ||
| 50 | 50 | #include <linux/mutex.h> |
| 51 | 51 | #include <linux/io.h> |
| 52 | 52 | #include <media/v4l2-common.h> |
| 53 | −#include <media/bt819.h> | |
| 53 | +#include <media/i2c/bt819.h> | |
| 54 | 54 | |
| 55 | 55 | #include "videocodec.h" |
| 56 | 56 | #include "zoran.h" |
| @@ -25,7 +25,7 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <media/v4l2-ioctl.h> |
| 26 | 26 | #include <media/v4l2-ctrls.h> |
| 27 | 27 | #include <media/v4l2-event.h> |
| 28 | −#include <media/ov7670.h> | |
| 28 | +#include <media/i2c/ov7670.h> | |
| 29 | 29 | #include <media/videobuf2-vmalloc.h> |
| 30 | 30 | #include <media/videobuf2-dma-contig.h> |
| 31 | 31 | #include <media/videobuf2-dma-sg.h> |
| @@ -19,7 +19,7 @@ · 18 unmodified lines | ||
| 19 | 19 | #include <media/v4l2-ioctl.h> |
| 20 | 20 | #include <media/v4l2-ctrls.h> |
| 21 | 21 | #include <media/v4l2-image-sizes.h> |
| 22 | −#include <media/ov7670.h> | |
| 22 | +#include <media/i2c/ov7670.h> | |
| 23 | 23 | #include <media/videobuf-dma-sg.h> |
| 24 | 24 | #include <linux/delay.h> |
| 25 | 25 | #include <linux/dma-mapping.h> |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <media/v4l2-ctrls.h> |
| 38 | 38 | #include <media/v4l2-fh.h> |
| 39 | 39 | #include <media/rc-core.h> |
| 40 | −#include <media/ir-kbd-i2c.h> | |
| 40 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 41 | 41 | #include <media/videobuf-dvb.h> |
| 42 | 42 | |
| 43 | 43 | #include "cx231xx-reg.h" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | |
| 22 | 22 | #include <linux/i2c.h> |
| 23 | 23 | #include <media/soc_camera.h> |
| 24 | −#include <media/mt9v011.h> | |
| 24 | +#include <media/i2c/mt9v011.h> | |
| 25 | 25 | #include <media/v4l2-clk.h> |
| 26 | 26 | #include <media/v4l2-common.h> |
| 27 | 27 | |
| @@ -31,9 +31,9 @@ · 30 unmodified lines | ||
| 31 | 31 | #include <linux/usb.h> |
| 32 | 32 | #include <media/tuner.h> |
| 33 | 33 | #include <media/msp3400.h> |
| 34 | −#include <media/saa7115.h> | |
| 35 | −#include <media/tvp5150.h> | |
| 36 | −#include <media/tvaudio.h> | |
| 34 | +#include <media/i2c/saa7115.h> | |
| 35 | +#include <media/i2c/tvp5150.h> | |
| 36 | +#include <media/i2c/tvaudio.h> | |
| 37 | 37 | #include <media/i2c-addr.h> |
| 38 | 38 | #include <media/tveeprom.h> |
| 39 | 39 | #include <media/v4l2-common.h> |
| @@ -40,7 +40,7 @@ · 39 unmodified lines | ||
| 40 | 40 | #include <media/v4l2-device.h> |
| 41 | 41 | #include <media/v4l2-ctrls.h> |
| 42 | 42 | #include <media/v4l2-fh.h> |
| 43 | −#include <media/ir-kbd-i2c.h> | |
| 43 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 44 | 44 | #include <media/rc-core.h> |
| 45 | 45 | #include "tuner-xc2028.h" |
| 46 | 46 | #include "xc5000.h" |
| @@ -23,9 +23,9 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/usb.h> |
| 24 | 24 | #include <linux/i2c.h> |
| 25 | 25 | #include <asm/byteorder.h> |
| 26 | −#include <media/saa7115.h> | |
| 26 | +#include <media/i2c/saa7115.h> | |
| 27 | 27 | #include <media/tuner.h> |
| 28 | −#include <media/uda1342.h> | |
| 28 | +#include <media/i2c/uda1342.h> | |
| 29 | 29 | |
| 30 | 30 | #include "go7007-priv.h" |
| 31 | 31 | |
| @@ -30,7 +30,7 @@ · 29 unmodified lines | ||
| 30 | 30 | #include <media/v4l2-subdev.h> |
| 31 | 31 | #include <media/v4l2-event.h> |
| 32 | 32 | #include <media/videobuf2-vmalloc.h> |
| 33 | −#include <media/saa7115.h> | |
| 33 | +#include <media/i2c/saa7115.h> | |
| 34 | 34 | |
| 35 | 35 | #include "go7007-priv.h" |
| 36 | 36 | |
| @@ -17,7 +17,7 @@ · 16 unmodified lines | ||
| 17 | 17 | |
| 18 | 18 | #include <media/v4l2-device.h> |
| 19 | 19 | #include <media/v4l2-ctrls.h> |
| 20 | −#include <media/ir-kbd-i2c.h> | |
| 20 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 21 | 21 | |
| 22 | 22 | #define HDPVR_MAX 8 |
| 23 | 23 | #define HDPVR_I2C_MAX_SIZE 128 |
| @@ -40,7 +40,7 @@ · 39 unmodified lines | ||
| 40 | 40 | #include "pvrusb2-io.h" |
| 41 | 41 | #include <media/v4l2-device.h> |
| 42 | 42 | #include <media/cx2341x.h> |
| 43 | −#include <media/ir-kbd-i2c.h> | |
| 43 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 44 | 44 | #include "pvrusb2-devattr.h" |
| 45 | 45 | |
| 46 | 46 | /* Legal values for PVR2_CID_HSM */ |
| @@ -20,7 +20,7 @@ · 19 unmodified lines | ||
| 20 | 20 | |
| 21 | 21 | #include <linux/i2c.h> |
| 22 | 22 | #include <linux/module.h> |
| 23 | −#include <media/ir-kbd-i2c.h> | |
| 23 | +#include <media/i2c/ir-kbd-i2c.h> | |
| 24 | 24 | #include "pvrusb2-i2c-core.h" |
| 25 | 25 | #include "pvrusb2-hdw-internal.h" |
| 26 | 26 | #include "pvrusb2-debug.h" |
| @@ -35,7 +35,7 @@ · 34 unmodified lines | ||
| 35 | 35 | #include "pvrusb2-debug.h" |
| 36 | 36 | #include <linux/videodev2.h> |
| 37 | 37 | #include <media/v4l2-common.h> |
| 38 | −#include <media/saa7115.h> | |
| 38 | +#include <media/i2c/saa7115.h> | |
| 39 | 39 | #include <linux/errno.h> |
| 40 | 40 | |
| 41 | 41 | struct routing_scheme { |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | #include <linux/usb.h> |
| 35 | 35 | #include <linux/mm.h> |
| 36 | 36 | #include <linux/vmalloc.h> |
| 37 | −#include <media/saa7115.h> | |
| 37 | +#include <media/i2c/saa7115.h> | |
| 38 | 38 | |
| 39 | 39 | #include "stk1160.h" |
| 40 | 40 | #include "stk1160-reg.h" |
| @@ -33,7 +33,7 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <media/v4l2-event.h> |
| 34 | 34 | #include <media/videobuf2-vmalloc.h> |
| 35 | 35 | |
| 36 | −#include <media/saa7115.h> | |
| 36 | +#include <media/i2c/saa7115.h> | |
| 37 | 37 | |
| 38 | 38 | #include "stk1160.h" |
| 39 | 39 | #include "stk1160-reg.h" |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/slab.h> |
| 27 | 27 | #include <media/v4l2-common.h> |
| 28 | 28 | #include <media/tuner.h> |
| 29 | −#include <media/tvaudio.h> | |
| 29 | +#include <media/i2c/tvaudio.h> | |
| 30 | 30 | #include <media/i2c-addr.h> |
| 31 | 31 | #include <media/rc-map.h> |
| 32 | 32 | |
| @@ -37,7 +37,7 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/videodev2.h> |
| 38 | 38 | #include <linux/i2c.h> |
| 39 | 39 | |
| 40 | −#include <media/saa7115.h> | |
| 40 | +#include <media/i2c/saa7115.h> | |
| 41 | 41 | #include <media/v4l2-common.h> |
| 42 | 42 | #include <media/tuner.h> |
| 43 | 43 | |
| @@ -59,7 +59,7 @@ · 58 unmodified lines | ||
| 59 | 59 | #include <linux/videodev2.h> |
| 60 | 60 | #include <linux/i2c.h> |
| 61 | 61 | |
| 62 | −#include <media/saa7115.h> | |
| 62 | +#include <media/i2c/saa7115.h> | |
| 63 | 63 | #include <media/v4l2-common.h> |
| 64 | 64 | #include <media/v4l2-ioctl.h> |
| 65 | 65 | #include <media/v4l2-event.h> |
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/media/adp1653.h | |
| 2 | + * include/media/i2c/adp1653.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2008--2011 Nokia Corporation |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/media/as3645a.h | |
| 2 | + * include/media/i2c/as3645a.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2008-2011 Nokia Corporation |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/media/lm3560.h | |
| 2 | + * include/media/i2c/lm3560.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2013 Texas Instruments |
| 5 | 5 | * |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/media/lm3646.h | |
| 2 | + * include/media/i2c/lm3646.h | |
| 3 | 3 | * |
| 4 | 4 | * Copyright (C) 2014 Texas Instruments |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -138,4 +138,3 @@ struct saa7115_platform_data { · 137 unmodified lines | ||
| 138 | 138 | }; |
| 139 | 139 | |
| 140 | 140 | #endif |
| 141 | − | |
| @@ -38,4 +38,3 @@ enum saa7127_output_type { · 37 unmodified lines | ||
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | 40 | #endif |
| 41 | − | |
| @@ -1,5 +1,5 @@ | ||
| 1 | 1 | /* |
| 2 | − * include/media/smiapp.h | |
| 2 | + * include/media/i2c/smiapp.h | |
| 3 | 3 | * |
| 4 | 4 | * Generic driver for SMIA/SMIA++ compliant camera modules |
| 5 | 5 | * |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
| @@ -31,4 +31,3 @@ · 30 unmodified lines | ||
| 31 | 31 | #define TVP5150_BLACK_SCREEN 1 |
| 32 | 32 | |
| 33 | 33 | #endif |
| 34 | − | |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.