History

[media] include/media: split I2C headers from V4L2 core

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.

Mauro Carvalho Chehab committed 11 years ago

Commit b5dcee21 parent b7be755155 files · +140 −143Browse files

Unified · Split

155 files
  1. MAINTAINERS +10 −10
  2. arch/arm/mach-davinci/board-da850-evm.c +2 −2
  3. arch/arm/mach-davinci/board-dm355-evm.c +1 −1
  4. arch/arm/mach-davinci/board-dm365-evm.c +2 −2
  5. arch/arm/mach-davinci/board-dm644x-evm.c +1 −1
  6. arch/arm/mach-davinci/board-dm646x-evm.c +2 −2
  7. arch/arm/mach-pxa/pcm990-baseboard.c +1 −1
  8. arch/blackfin/mach-bf561/boards/ezkit.c +1 −1
  9. arch/blackfin/mach-bf609/boards/ezkit.c +3 −3
  10. arch/sh/boards/mach-ap325rxa/setup.c +1 −1
  11. arch/sh/boards/mach-ecovec24/setup.c +3 −3
  12. arch/sh/boards/mach-kfr2r09/setup.c +1 −1
  13. arch/sh/boards/mach-migor/setup.c +2 −2
  14. arch/sh/boards/mach-se/7724/setup.c +1 −1
  15. drivers/media/i2c/ad9389b.c +1 −1
  16. drivers/media/i2c/adp1653.c +1 −1
  17. drivers/media/i2c/adv7183.c +1 −1
  18. drivers/media/i2c/adv7343.c +1 −1
  19. drivers/media/i2c/adv7393.c +1 −1
  20. drivers/media/i2c/adv7511.c +1 −1
  21. drivers/media/i2c/adv7604.c +1 −1
  22. drivers/media/i2c/adv7842.c +1 −1
  23. drivers/media/i2c/ak881x.c +1 −1
  24. drivers/media/i2c/as3645a.c +1 −1
  25. drivers/media/i2c/bt819.c +1 −1
  26. drivers/media/i2c/ir-kbd-i2c.c +1 −1
  27. drivers/media/i2c/lm3560.c +1 −1
  28. drivers/media/i2c/lm3646.c +1 −1
  29. drivers/media/i2c/m52790.c +1 −1
  30. drivers/media/i2c/m5mols/m5mols_capture.c +1 −1
  31. drivers/media/i2c/m5mols/m5mols_core.c +1 −1
  32. drivers/media/i2c/msp3400-driver.c +1 −1
  33. drivers/media/i2c/mt9m032.c +1 −1
  34. drivers/media/i2c/mt9p031.c +1 −1
  35. drivers/media/i2c/mt9t001.c +1 −1
  36. drivers/media/i2c/mt9v011.c +1 −1
  37. drivers/media/i2c/mt9v032.c +1 −1
  38. drivers/media/i2c/noon010pc30.c +1 −1
  39. drivers/media/i2c/ov2659.c +1 −1
  40. drivers/media/i2c/ov7670.c +1 −1
  41. drivers/media/i2c/ov9650.c +1 −1
  42. drivers/media/i2c/s5c73m3/s5c73m3-core.c +1 −1
  43. drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c +1 −1
  44. drivers/media/i2c/s5c73m3/s5c73m3.h +1 −1
  45. drivers/media/i2c/s5k4ecgx.c +1 −1
  46. drivers/media/i2c/s5k6aa.c +1 −1
  47. drivers/media/i2c/saa6588.c +1 −1
  48. drivers/media/i2c/saa7115.c +1 −1
  49. drivers/media/i2c/saa7127.c +1 −1
  50. drivers/media/i2c/smiapp/smiapp.h +1 −1
  51. drivers/media/i2c/soc_camera/mt9t112.c +1 −1
  52. drivers/media/i2c/soc_camera/mt9v022.c +1 −1
  53. drivers/media/i2c/soc_camera/ov772x.c +1 −1
  54. drivers/media/i2c/soc_camera/rj54n1cb0c.c +1 −1
  55. drivers/media/i2c/soc_camera/tw9910.c +1 −1
  56. drivers/media/i2c/sr030pc30.c +1 −1
  57. drivers/media/i2c/tc358743.c +1 −1
  58. drivers/media/i2c/ths7303.c +1 −1
  59. drivers/media/i2c/tvaudio.c +1 −1
  60. drivers/media/i2c/tvp514x.c +1 −1
  61. drivers/media/i2c/tvp5150.c +1 −1
  62. drivers/media/i2c/tvp7002.c +1 −1
  63. drivers/media/i2c/uda1342.c +1 −1
  64. drivers/media/i2c/upd64031a.c +1 −1
  65. drivers/media/i2c/upd64083.c +1 −1
  66. drivers/media/i2c/wm8775.c +1 −1
  67. drivers/media/pci/bt8xx/bttv-cards.c +1 −1
  68. drivers/media/pci/bt8xx/bttv-driver.c +2 −2
  69. drivers/media/pci/bt8xx/bttvp.h +1 −1
  70. drivers/media/pci/cobalt/cobalt-driver.c +3 −3
  71. drivers/media/pci/cobalt/cobalt-irq.c +1 −1
  72. drivers/media/pci/cobalt/cobalt-v4l2.c +2 −2
  73. drivers/media/pci/cx18/cx18-cards.c +1 −1
  74. drivers/media/pci/cx18/cx18-driver.h +1 −1
  75. drivers/media/pci/cx88/cx88-alsa.c +1 −1
  76. drivers/media/pci/cx88/cx88-video.c +1 −1
  77. drivers/media/pci/cx88/cx88.h +2 −2
  78. drivers/media/pci/ivtv/ivtv-cards.c +4 −4
  79. drivers/media/pci/ivtv/ivtv-driver.c +1 −1
  80. drivers/media/pci/ivtv/ivtv-driver.h +1 −1
  81. drivers/media/pci/ivtv/ivtv-fileops.c +1 −1
  82. drivers/media/pci/ivtv/ivtv-firmware.c +1 −1
  83. drivers/media/pci/ivtv/ivtv-ioctl.c +1 −1
  84. drivers/media/pci/ivtv/ivtv-routing.c +3 −3
  85. drivers/media/pci/saa7134/saa7134-video.c +1 −1
  86. drivers/media/pci/saa7134/saa7134.h +1 −1
  87. drivers/media/pci/saa7146/mxb.c +1 −1
  88. drivers/media/pci/zoran/zoran_card.c +1 −1
  89. drivers/media/platform/marvell-ccic/mcam-core.c +1 −1
  90. drivers/media/platform/via-camera.c +1 −1
  91. drivers/media/usb/cx231xx/cx231xx.h +1 −1
  92. drivers/media/usb/em28xx/em28xx-camera.c +1 −1
  93. drivers/media/usb/em28xx/em28xx-cards.c +3 −3
  94. drivers/media/usb/em28xx/em28xx.h +1 −1
  95. drivers/media/usb/go7007/go7007-usb.c +2 −2
  96. drivers/media/usb/go7007/go7007-v4l2.c +1 −1
  97. drivers/media/usb/hdpvr/hdpvr.h +1 −1
  98. drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h +1 −1
  99. drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c +1 −1
  100. drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c +1 −1
  101. drivers/media/usb/stk1160/stk1160-core.c +1 −1
  102. drivers/media/usb/stk1160/stk1160-v4l.c +1 −1
  103. drivers/media/usb/tm6000/tm6000-cards.c +1 −1
  104. drivers/media/usb/usbvision/usbvision-core.c +1 −1
  105. drivers/media/usb/usbvision/usbvision-video.c +1 −1
  106. include/media/i2c/ad9389b.h +0 −0
  107. include/media/i2c/adp1653.h +1 −1
  108. include/media/i2c/adv7183.h +0 −0
  109. include/media/i2c/adv7343.h +0 −0
  110. include/media/i2c/adv7393.h +0 −0
  111. include/media/i2c/adv7511.h +0 −0
  112. include/media/i2c/adv7604.h +0 −0
  113. include/media/i2c/adv7842.h +0 −0
  114. include/media/i2c/ak881x.h +0 −0
  115. include/media/i2c/as3645a.h +1 −1
  116. include/media/i2c/bt819.h +0 −0
  117. include/media/i2c/cs5345.h +0 −0
  118. include/media/i2c/cs53l32a.h +0 −0
  119. include/media/i2c/ir-kbd-i2c.h +0 −0
  120. include/media/i2c/lm3560.h +1 −1
  121. include/media/i2c/lm3646.h +1 −1
  122. include/media/i2c/m52790.h +0 −0
  123. include/media/i2c/m5mols.h +0 −0
  124. include/media/i2c/mt9m032.h +0 −0
  125. include/media/i2c/mt9p031.h +0 −0
  126. include/media/i2c/mt9t001.h +0 −0
  127. include/media/i2c/mt9t112.h +0 −0
  128. include/media/i2c/mt9v011.h +0 −0
  129. include/media/i2c/mt9v022.h +0 −0
  130. include/media/i2c/mt9v032.h +0 −0
  131. include/media/i2c/noon010pc30.h +0 −0
  132. include/media/i2c/ov2659.h +0 −0
  133. include/media/i2c/ov7670.h +0 −0
  134. include/media/i2c/ov772x.h +0 −0
  135. include/media/i2c/ov9650.h +0 −0
  136. include/media/i2c/rj54n1cb0c.h +0 −0
  137. include/media/i2c/s5c73m3.h +0 −0
  138. include/media/i2c/s5k4ecgx.h +0 −0
  139. include/media/i2c/s5k6aa.h +0 −0
  140. include/media/i2c/saa6588.h +0 −0
  141. include/media/i2c/saa7115.h +0 −1
  142. include/media/i2c/saa7127.h +0 −1
  143. include/media/i2c/smiapp.h +1 −1
  144. include/media/i2c/sr030pc30.h +0 −0
  145. include/media/i2c/tc358743.h +0 −0
  146. include/media/i2c/ths7303.h +0 −0
  147. include/media/i2c/tvaudio.h +0 −0
  148. include/media/i2c/tvp514x.h +0 −0
  149. include/media/i2c/tvp5150.h +0 −1
  150. include/media/i2c/tvp7002.h +0 −0
  151. include/media/i2c/tw9910.h +0 −0
  152. include/media/i2c/uda1342.h +0 −0
  153. include/media/i2c/upd64031a.h +0 −0
  154. include/media/i2c/upd64083.h +0 −0
  155. include/media/i2c/wm8775.h +0 −0
MAINTAINERS+10−10
@@ -395,7 +395,7 @@ M: Sakari Ailus <sakari.ailus@iki.fi> · 394 unmodified lines
395395 L: linux-media@vger.kernel.org
396396 S: Maintained
397397 F: drivers/media/i2c/adp1653.c
398−F: include/media/adp1653.h
398+F: include/media/i2c/adp1653.h
399399
400400 ADP5520 BACKLIGHT DRIVER WITH IO EXPANDER (ADP5520/ADP5501)
401401 M: Michael Hennerich <michael.hennerich@analog.com>
@@ -1773,7 +1773,7 @@ L: linux-media@vger.kernel.org · 1371 unmodified lines
17731773 T: git git://linuxtv.org/media_tree.git
17741774 S: Maintained
17751775 F: drivers/media/i2c/as3645a.c
1776−F: include/media/as3645a.h
1776+F: include/media/i2c/as3645a.h
17771777
17781778 ASC7621 HARDWARE MONITOR DRIVER
17791779 M: George Joseph <george.joseph@fairview5.com>
@@ -4596,7 +4596,7 @@ M: Heungjun Kim <riverful.kim@samsung.com> · 2816 unmodified lines
45964596 L: linux-media@vger.kernel.org
45974597 S: Maintained
45984598 F: drivers/media/i2c/m5mols/
4599−F: include/media/m5mols.h
4599+F: include/media/i2c/m5mols.h
46004600
46014601 FUJITSU TABLET EXTRAS
46024602 M: Robert Gerlach <khnz@gmx.de>
@@ -7169,7 +7169,7 @@ L: linux-media@vger.kernel.org · 2566 unmodified lines
71697169 T: git git://linuxtv.org/media_tree.git
71707170 S: Maintained
71717171 F: drivers/media/i2c/mt9m032.c
7172−F: include/media/mt9m032.h
7172+F: include/media/i2c/mt9m032.h
71737173
71747174 MT9P031 APTINA CAMERA SENSOR
71757175 M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -7177,7 +7177,7 @@ L: linux-media@vger.kernel.org · 1 unmodified line
71777177 T: git git://linuxtv.org/media_tree.git
71787178 S: Maintained
71797179 F: drivers/media/i2c/mt9p031.c
7180−F: include/media/mt9p031.h
7180+F: include/media/i2c/mt9p031.h
71817181
71827182 MT9T001 APTINA CAMERA SENSOR
71837183 M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -7185,7 +7185,7 @@ L: linux-media@vger.kernel.org · 1 unmodified line
71857185 T: git git://linuxtv.org/media_tree.git
71867186 S: Maintained
71877187 F: drivers/media/i2c/mt9t001.c
7188−F: include/media/mt9t001.h
7188+F: include/media/i2c/mt9t001.h
71897189
71907190 MT9V032 APTINA CAMERA SENSOR
71917191 M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
@@ -7194,7 +7194,7 @@ T: git git://linuxtv.org/media_tree.git · 2 unmodified lines
71947194 S: Maintained
71957195 F: Documentation/devicetree/bindings/media/i2c/mt9v032.txt
71967196 F: drivers/media/i2c/mt9v032.c
7197−F: include/media/mt9v032.h
7197+F: include/media/i2c/mt9v032.h
71987198
71997199 MULTIFUNCTION DEVICES (MFD)
72007200 M: Lee Jones <lee.jones@linaro.org>
@@ -9751,7 +9751,7 @@ Q: http://patchwork.linuxtv.org/project/linux-media/list/ · 2550 unmodified lines
97519751 T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
97529752 S: Maintained
97539753 F: drivers/media/i2c/ov2659.c
9754−F: include/media/ov2659.h
9754+F: include/media/i2c/ov2659.h
97559755
97569756 SILICON MOTION SM712 FRAME BUFFER DRIVER
97579757 M: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
@@ -9840,7 +9840,7 @@ M: Sakari Ailus <sakari.ailus@iki.fi> · 82 unmodified lines
98409840 L: linux-media@vger.kernel.org
98419841 S: Maintained
98429842 F: drivers/media/i2c/smiapp/
9843−F: include/media/smiapp.h
9843+F: include/media/i2c/smiapp.h
98449844 F: drivers/media/i2c/smiapp-pll.c
98459845 F: drivers/media/i2c/smiapp-pll.h
98469846 F: include/uapi/linux/smiapp.h
@@ -10781,7 +10781,7 @@ M: Mats Randgaard <matrandg@cisco.com> · 934 unmodified lines
1078110781 L: linux-media@vger.kernel.org
1078210782 S: Maintained
1078310783 F: drivers/media/i2c/tc358743*
10784−F: include/media/tc358743.h
10784+F: include/media/i2c/tc358743.h
1078510785
1078610786 TMIO MMC DRIVER
1078710787 M: Ian Molton <ian@mnementh.co.uk>
arch/arm/mach-davinci/board-da850-evm.c+2−2
@@ -49,8 +49,8 @@ · 48 unmodified lines
4949 #include <asm/mach/arch.h>
5050 #include <asm/system_info.h>
5151
52−#include <media/tvp514x.h>
53−#include <media/adv7343.h>
52+#include <media/i2c/tvp514x.h>
53+#include <media/i2c/adv7343.h>
5454
5555 #define DA850_EVM_PHY_ID "davinci_mdio-0:00"
5656 #define DA850_LCD_PWR_PIN GPIO_TO_PIN(2, 8)
arch/arm/mach-davinci/board-dm355-evm.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <linux/gpio.h>
2020 #include <linux/clk.h>
2121 #include <linux/videodev2.h>
22−#include <media/tvp514x.h>
22+#include <media/i2c/tvp514x.h>
2323 #include <linux/spi/spi.h>
2424 #include <linux/spi/eeprom.h>
2525 #include <linux/platform_data/gpio-davinci.h>
arch/arm/mach-davinci/board-dm365-evm.c+2−2
@@ -40,8 +40,8 @@ · 39 unmodified lines
4040 #include <linux/platform_data/mtd-davinci.h>
4141 #include <linux/platform_data/keyscan-davinci.h>
4242
43−#include <media/ths7303.h>
44−#include <media/tvp514x.h>
43+#include <media/i2c/ths7303.h>
44+#include <media/i2c/tvp514x.h>
4545
4646 #include "davinci.h"
4747
arch/arm/mach-davinci/board-dm644x-evm.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/v4l2-dv-timings.h>
2727 #include <linux/export.h>
2828
29−#include <media/tvp514x.h>
29+#include <media/i2c/tvp514x.h>
3030
3131 #include <asm/mach-types.h>
3232 #include <asm/mach/arch.h>
arch/arm/mach-davinci/board-dm646x-evm.c+2−2
@@ -25,8 +25,8 @@ · 24 unmodified lines
2525 #include <linux/platform_data/at24.h>
2626 #include <linux/i2c/pcf857x.h>
2727
28−#include <media/tvp514x.h>
29−#include <media/adv7343.h>
28+#include <media/i2c/tvp514x.h>
29+#include <media/i2c/adv7343.h>
3030
3131 #include <linux/mtd/mtd.h>
3232 #include <linux/mtd/nand.h>
arch/arm/mach-pxa/pcm990-baseboard.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/pwm.h>
2828 #include <linux/pwm_backlight.h>
2929
30−#include <media/mt9v022.h>
30+#include <media/i2c/mt9v022.h>
3131 #include <media/soc_camera.h>
3232
3333 #include <linux/platform_data/camera-pxa.h>
arch/blackfin/mach-bf561/boards/ezkit.c+1−1
@@ -443,7 +443,7 @@ static const struct ppi_info ppi_info = { · 442 unmodified lines
443443 };
444444
445445 #if IS_ENABLED(CONFIG_VIDEO_ADV7183)
446−#include <media/adv7183.h>
446+#include <media/i2c/adv7183.h>
447447 static struct v4l2_input adv7183_inputs[] = {
448448 {
449449 .index = 0,
arch/blackfin/mach-bf609/boards/ezkit.c+3−3
@@ -933,7 +933,7 @@ static struct bfin_capture_config bfin_capture_data = { · 932 unmodified lines
933933 #endif
934934
935935 #if IS_ENABLED(CONFIG_VIDEO_ADV7842)
936−#include <media/adv7842.h>
936+#include <media/i2c/adv7842.h>
937937
938938 static struct v4l2_input adv7842_inputs[] = {
939939 {
@@ -1084,7 +1084,7 @@ static const struct ppi_info ppi_info = { · 144 unmodified lines
10841084 };
10851085
10861086 #if IS_ENABLED(CONFIG_VIDEO_ADV7511)
1087−#include <media/adv7511.h>
1087+#include <media/i2c/adv7511.h>
10881088
10891089 static struct v4l2_output adv7511_outputs[] = {
10901090 {
@@ -1125,7 +1125,7 @@ static struct bfin_display_config bfin_display_data = { · 34 unmodified lines
11251125 #endif
11261126
11271127 #if IS_ENABLED(CONFIG_VIDEO_ADV7343)
1128−#include <media/adv7343.h>
1128+#include <media/i2c/adv7343.h>
11291129
11301130 static struct v4l2_output adv7343_outputs[] = {
11311131 {
arch/sh/boards/mach-ap325rxa/setup.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/gpio.h>
2828 #include <linux/videodev2.h>
2929 #include <linux/sh_intc.h>
30−#include <media/ov772x.h>
30+#include <media/i2c/ov772x.h>
3131 #include <media/soc_camera.h>
3232 #include <media/soc_camera_platform.h>
3333 #include <media/sh_mobile_ceu.h>
arch/sh/boards/mach-ecovec24/setup.c+3−3
@@ -40,8 +40,8 @@ · 39 unmodified lines
4040 #include <sound/simple_card.h>
4141 #include <media/sh_mobile_ceu.h>
4242 #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>
4545 #include <asm/heartbeat.h>
4646 #include <asm/clock.h>
4747 #include <asm/suspend.h>
@@ -900,7 +900,7 @@ static struct platform_device irda_device = { · 852 unmodified lines
900900 .resource = irda_resources,
901901 };
902902
903−#include <media/ak881x.h>
903+#include <media/i2c/ak881x.h>
904904 #include <media/sh_vou.h>
905905
906906 static struct ak881x_pdata ak881x_pdata = {
arch/sh/boards/mach-kfr2r09/setup.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/usb/r8a66597.h>
2828 #include <linux/videodev2.h>
2929 #include <linux/sh_intc.h>
30−#include <media/rj54n1cb0c.h>
30+#include <media/i2c/rj54n1cb0c.h>
3131 #include <media/soc_camera.h>
3232 #include <media/sh_mobile_ceu.h>
3333 #include <video/sh_mobile_lcdc.h>
arch/sh/boards/mach-migor/setup.c+2−2
@@ -28,9 +28,9 @@ · 27 unmodified lines
2828 #include <linux/sh_intc.h>
2929 #include <video/sh_mobile_lcdc.h>
3030 #include <media/sh_mobile_ceu.h>
31−#include <media/ov772x.h>
31+#include <media/i2c/ov772x.h>
3232 #include <media/soc_camera.h>
33−#include <media/tw9910.h>
33+#include <media/i2c/tw9910.h>
3434 #include <asm/clock.h>
3535 #include <asm/machvec.h>
3636 #include <asm/io.h>
arch/sh/boards/mach-se/7724/setup.c+1−1
@@ -534,7 +534,7 @@ static struct platform_device irda_device = { · 533 unmodified lines
534534 .resource = irda_resources,
535535 };
536536
537−#include <media/ak881x.h>
537+#include <media/i2c/ak881x.h>
538538 #include <media/sh_vou.h>
539539
540540 static struct ak881x_pdata ak881x_pdata = {
drivers/media/i2c/ad9389b.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 #include <media/v4l2-common.h>
3636 #include <media/v4l2-dv-timings.h>
3737 #include <media/v4l2-ctrls.h>
38−#include <media/ad9389b.h>
38+#include <media/i2c/ad9389b.h>
3939
4040 static int debug;
4141 module_param(debug, int, 0644);
drivers/media/i2c/adp1653.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include <linux/slab.h>
3838 #include <linux/of.h>
3939 #include <linux/gpio/consumer.h>
40−#include <media/adp1653.h>
40+#include <media/i2c/adp1653.h>
4141 #include <media/v4l2-device.h>
4242
4343 #define TIMEOUT_MAX 820000
drivers/media/i2c/adv7183.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/types.h>
2828 #include <linux/videodev2.h>
2929
30−#include <media/adv7183.h>
30+#include <media/i2c/adv7183.h>
3131 #include <media/v4l2-ctrls.h>
3232 #include <media/v4l2-device.h>
3333
drivers/media/i2c/adv7343.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <linux/of.h>
2929 #include <linux/of_graph.h>
3030
31−#include <media/adv7343.h>
31+#include <media/i2c/adv7343.h>
3232 #include <media/v4l2-async.h>
3333 #include <media/v4l2-device.h>
3434 #include <media/v4l2-ctrls.h>
drivers/media/i2c/adv7393.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/videodev2.h>
3232 #include <linux/uaccess.h>
3333
34−#include <media/adv7393.h>
34+#include <media/i2c/adv7393.h>
3535 #include <media/v4l2-device.h>
3636 #include <media/v4l2-ctrls.h>
3737
drivers/media/i2c/adv7511.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <media/v4l2-common.h>
3333 #include <media/v4l2-ctrls.h>
3434 #include <media/v4l2-dv-timings.h>
35−#include <media/adv7511.h>
35+#include <media/i2c/adv7511.h>
3636
3737 static int debug;
3838 module_param(debug, int, 0644);
drivers/media/i2c/adv7604.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
3939 #include <linux/workqueue.h>
4040 #include <linux/regmap.h>
4141
42−#include <media/adv7604.h>
42+#include <media/i2c/adv7604.h>
4343 #include <media/v4l2-ctrls.h>
4444 #include <media/v4l2-device.h>
4545 #include <media/v4l2-event.h>
drivers/media/i2c/adv7842.c+1−1
@@ -43,7 +43,7 @@ · 42 unmodified lines
4343 #include <media/v4l2-event.h>
4444 #include <media/v4l2-ctrls.h>
4545 #include <media/v4l2-dv-timings.h>
46−#include <media/adv7842.h>
46+#include <media/i2c/adv7842.h>
4747
4848 static int debug;
4949 module_param(debug, int, 0644);
drivers/media/i2c/ak881x.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/videodev2.h>
1616 #include <linux/module.h>
1717
18−#include <media/ak881x.h>
18+#include <media/i2c/ak881x.h>
1919 #include <media/v4l2-common.h>
2020 #include <media/v4l2-device.h>
2121
drivers/media/i2c/as3645a.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/mutex.h>
3232 #include <linux/slab.h>
3333
34−#include <media/as3645a.h>
34+#include <media/i2c/as3645a.h>
3535 #include <media/v4l2-ctrls.h>
3636 #include <media/v4l2-device.h>
3737
drivers/media/i2c/bt819.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include <linux/slab.h>
3838 #include <media/v4l2-device.h>
3939 #include <media/v4l2-ctrls.h>
40−#include <media/bt819.h>
40+#include <media/i2c/bt819.h>
4141
4242 MODULE_DESCRIPTION("Brooktree-819 video decoder driver");
4343 MODULE_AUTHOR("Mike Bernson & Dave Perks");
drivers/media/i2c/ir-kbd-i2c.c+1−1
@@ -47,7 +47,7 @@ · 46 unmodified lines
4747 #include <linux/workqueue.h>
4848
4949 #include <media/rc-core.h>
50−#include <media/ir-kbd-i2c.h>
50+#include <media/i2c/ir-kbd-i2c.h>
5151
5252 /* ----------------------------------------------------------------------- */
5353 /* insmod parameters */
drivers/media/i2c/lm3560.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <linux/mutex.h>
2525 #include <linux/regmap.h>
2626 #include <linux/videodev2.h>
27−#include <media/lm3560.h>
27+#include <media/i2c/lm3560.h>
2828 #include <media/v4l2-ctrls.h>
2929 #include <media/v4l2-device.h>
3030
drivers/media/i2c/lm3646.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/slab.h>
1919 #include <linux/regmap.h>
2020 #include <linux/videodev2.h>
21−#include <media/lm3646.h>
21+#include <media/i2c/lm3646.h>
2222 #include <media/v4l2-ctrls.h>
2323 #include <media/v4l2-device.h>
2424
drivers/media/i2c/m52790.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <asm/uaccess.h>
2828 #include <linux/i2c.h>
2929 #include <linux/videodev2.h>
30−#include <media/m52790.h>
30+#include <media/i2c/m52790.h>
3131 #include <media/v4l2-device.h>
3232
3333 MODULE_DESCRIPTION("i2c device driver for m52790 A/V switch");
drivers/media/i2c/m5mols/m5mols_capture.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <media/v4l2-ctrls.h>
2626 #include <media/v4l2-device.h>
2727 #include <media/v4l2-subdev.h>
28−#include <media/m5mols.h>
28+#include <media/i2c/m5mols.h>
2929 #include <media/exynos-fimc.h>
3030
3131 #include "m5mols.h"
drivers/media/i2c/m5mols/m5mols_core.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <media/v4l2-ctrls.h>
2626 #include <media/v4l2-device.h>
2727 #include <media/v4l2-subdev.h>
28−#include <media/m5mols.h>
28+#include <media/i2c/m5mols.h>
2929
3030 #include "m5mols.h"
3131 #include "m5mols_reg.h"
drivers/media/i2c/msp3400-driver.c+1−1
@@ -57,7 +57,7 @@ · 56 unmodified lines
5757 #include <media/v4l2-device.h>
5858 #include <media/v4l2-ioctl.h>
5959 #include <media/msp3400.h>
60−#include <media/tvaudio.h>
60+#include <media/i2c/tvaudio.h>
6161 #include "msp3400-driver.h"
6262
6363 /* ---------------------------------------------------------------------- */
drivers/media/i2c/mt9m032.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/v4l2-mediabus.h>
3232
3333 #include <media/media-entity.h>
34−#include <media/mt9m032.h>
34+#include <media/i2c/mt9m032.h>
3535 #include <media/v4l2-ctrls.h>
3636 #include <media/v4l2-device.h>
3737 #include <media/v4l2-subdev.h>
drivers/media/i2c/mt9p031.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/slab.h>
2727 #include <linux/videodev2.h>
2828
29−#include <media/mt9p031.h>
29+#include <media/i2c/mt9p031.h>
3030 #include <media/v4l2-async.h>
3131 #include <media/v4l2-ctrls.h>
3232 #include <media/v4l2-device.h>
drivers/media/i2c/mt9t001.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/videodev2.h>
2222 #include <linux/v4l2-mediabus.h>
2323
24−#include <media/mt9t001.h>
24+#include <media/i2c/mt9t001.h>
2525 #include <media/v4l2-ctrls.h>
2626 #include <media/v4l2-device.h>
2727 #include <media/v4l2-subdev.h>
drivers/media/i2c/mt9v011.c+1−1
@@ -13,7 +13,7 @@ · 12 unmodified lines
1313 #include <asm/div64.h>
1414 #include <media/v4l2-device.h>
1515 #include <media/v4l2-ctrls.h>
16−#include <media/mt9v011.h>
16+#include <media/i2c/mt9v011.h>
1717
1818 MODULE_DESCRIPTION("Micron mt9v011 sensor driver");
1919 MODULE_AUTHOR("Mauro Carvalho Chehab");
drivers/media/i2c/mt9v032.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <linux/v4l2-mediabus.h>
2626 #include <linux/module.h>
2727
28−#include <media/mt9v032.h>
28+#include <media/i2c/mt9v032.h>
2929 #include <media/v4l2-ctrls.h>
3030 #include <media/v4l2-device.h>
3131 #include <media/v4l2-of.h>
drivers/media/i2c/noon010pc30.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 #include <linux/i2c.h>
1919 #include <linux/slab.h>
2020 #include <linux/regulator/consumer.h>
21−#include <media/noon010pc30.h>
21+#include <media/i2c/noon010pc30.h>
2222 #include <linux/videodev2.h>
2323 #include <linux/module.h>
2424 #include <media/v4l2-ctrls.h>
drivers/media/i2c/ov2659.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include <linux/videodev2.h>
3838
3939 #include <media/media-entity.h>
40−#include <media/ov2659.h>
40+#include <media/i2c/ov2659.h>
4141 #include <media/v4l2-common.h>
4242 #include <media/v4l2-ctrls.h>
4343 #include <media/v4l2-device.h>
drivers/media/i2c/ov7670.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <media/v4l2-ctrls.h>
2121 #include <media/v4l2-mediabus.h>
2222 #include <media/v4l2-image-sizes.h>
23−#include <media/ov7670.h>
23+#include <media/i2c/ov7670.h>
2424
2525 MODULE_AUTHOR("Jonathan Corbet <corbet@lwn.net>");
2626 MODULE_DESCRIPTION("A low-level driver for OmniVision ov7670 sensors");
drivers/media/i2c/ov9650.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 #include <media/v4l2-image-sizes.h>
3030 #include <media/v4l2-subdev.h>
3131 #include <media/v4l2-mediabus.h>
32−#include <media/ov9650.h>
32+#include <media/i2c/ov9650.h>
3333
3434 static int debug;
3535 module_param(debug, int, 0644);
drivers/media/i2c/s5c73m3/s5c73m3-core.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include <media/v4l2-device.h>
3535 #include <media/v4l2-subdev.h>
3636 #include <media/v4l2-mediabus.h>
37−#include <media/s5c73m3.h>
37+#include <media/i2c/s5c73m3.h>
3838 #include <media/v4l2-of.h>
3939
4040 #include "s5c73m3.h"
drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <media/v4l2-device.h>
3333 #include <media/v4l2-subdev.h>
3434 #include <media/v4l2-mediabus.h>
35−#include <media/s5c73m3.h>
35+#include <media/i2c/s5c73m3.h>
3636
3737 #include "s5c73m3.h"
3838
drivers/media/i2c/s5c73m3/s5c73m3.h+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
2323 #include <media/v4l2-common.h>
2424 #include <media/v4l2-ctrls.h>
2525 #include <media/v4l2-subdev.h>
26−#include <media/s5c73m3.h>
26+#include <media/i2c/s5c73m3.h>
2727
2828 #define DRIVER_NAME "S5C73M3"
2929
drivers/media/i2c/s5k4ecgx.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <asm/unaligned.h>
2828
2929 #include <media/media-entity.h>
30−#include <media/s5k4ecgx.h>
30+#include <media/i2c/s5k4ecgx.h>
3131 #include <media/v4l2-ctrls.h>
3232 #include <media/v4l2-device.h>
3333 #include <media/v4l2-mediabus.h>
drivers/media/i2c/s5k6aa.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <media/v4l2-device.h>
2929 #include <media/v4l2-subdev.h>
3030 #include <media/v4l2-mediabus.h>
31−#include <media/s5k6aa.h>
31+#include <media/i2c/s5k6aa.h>
3232
3333 static int debug;
3434 module_param(debug, int, 0644);
drivers/media/i2c/saa6588.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
3131 #include <linux/wait.h>
3232 #include <asm/uaccess.h>
3333
34−#include <media/saa6588.h>
34+#include <media/i2c/saa6588.h>
3535 #include <media/v4l2-device.h>
3636
3737
drivers/media/i2c/saa7115.c+1−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646 #include <linux/videodev2.h>
4747 #include <media/v4l2-device.h>
4848 #include <media/v4l2-ctrls.h>
49−#include <media/saa7115.h>
49+#include <media/i2c/saa7115.h>
5050 #include <asm/div64.h>
5151
5252 #define VRES_60HZ (480+16)
drivers/media/i2c/saa7127.c+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #include <linux/i2c.h>
5555 #include <linux/videodev2.h>
5656 #include <media/v4l2-device.h>
57−#include <media/saa7127.h>
57+#include <media/i2c/saa7127.h>
5858
5959 static int debug;
6060 static int test_image;
drivers/media/i2c/smiapp/smiapp.h+1−1
@@ -22,7 +22,7 @@ · 21 unmodified lines
2222 #include <linux/mutex.h>
2323 #include <media/v4l2-ctrls.h>
2424 #include <media/v4l2-subdev.h>
25−#include <media/smiapp.h>
25+#include <media/i2c/smiapp.h>
2626
2727 #include "smiapp-pll.h"
2828 #include "smiapp-reg.h"
drivers/media/i2c/soc_camera/mt9t112.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <linux/v4l2-mediabus.h>
2626 #include <linux/videodev2.h>
2727
28−#include <media/mt9t112.h>
28+#include <media/i2c/mt9t112.h>
2929 #include <media/soc_camera.h>
3030 #include <media/v4l2-clk.h>
3131 #include <media/v4l2-common.h>
drivers/media/i2c/soc_camera/mt9v022.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/log2.h>
1616 #include <linux/module.h>
1717
18−#include <media/mt9v022.h>
18+#include <media/i2c/mt9v022.h>
1919 #include <media/soc_camera.h>
2020 #include <media/soc_mediabus.h>
2121 #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/ov772x.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <linux/v4l2-mediabus.h>
2525 #include <linux/videodev2.h>
2626
27−#include <media/ov772x.h>
27+#include <media/i2c/ov772x.h>
2828 #include <media/soc_camera.h>
2929 #include <media/v4l2-clk.h>
3030 #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/rj54n1cb0c.c+1−1
@@ -15,7 +15,7 @@ · 14 unmodified lines
1515 #include <linux/videodev2.h>
1616 #include <linux/module.h>
1717
18−#include <media/rj54n1cb0c.h>
18+#include <media/i2c/rj54n1cb0c.h>
1919 #include <media/soc_camera.h>
2020 #include <media/v4l2-clk.h>
2121 #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/tw9910.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/videodev2.h>
2727
2828 #include <media/soc_camera.h>
29−#include <media/tw9910.h>
29+#include <media/i2c/tw9910.h>
3030 #include <media/v4l2-clk.h>
3131 #include <media/v4l2-subdev.h>
3232
drivers/media/i2c/sr030pc30.c+1−1
@@ -24,7 +24,7 @@ · 23 unmodified lines
2424 #include <media/v4l2-subdev.h>
2525 #include <media/v4l2-mediabus.h>
2626 #include <media/v4l2-ctrls.h>
27−#include <media/sr030pc30.h>
27+#include <media/i2c/sr030pc30.h>
2828
2929 static int debug;
3030 module_param(debug, int, 0644);
drivers/media/i2c/tc358743.c+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
4242 #include <media/v4l2-ctrls.h>
4343 #include <media/v4l2-event.h>
4444 #include <media/v4l2-of.h>
45−#include <media/tc358743.h>
45+#include <media/i2c/tc358743.h>
4646
4747 #include "tc358743_regs.h"
4848
drivers/media/i2c/ths7303.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <linux/module.h>
2626 #include <linux/slab.h>
2727
28−#include <media/ths7303.h>
28+#include <media/i2c/ths7303.h>
2929 #include <media/v4l2-device.h>
3030
3131 #define THS7303_CHANNEL_1 1
drivers/media/i2c/tvaudio.c+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636 #include <linux/kthread.h>
3737 #include <linux/freezer.h>
3838
39−#include <media/tvaudio.h>
39+#include <media/i2c/tvaudio.h>
4040 #include <media/v4l2-device.h>
4141 #include <media/v4l2-ctrls.h>
4242
drivers/media/i2c/tvp514x.c+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444 #include <media/v4l2-mediabus.h>
4545 #include <media/v4l2-of.h>
4646 #include <media/v4l2-ctrls.h>
47−#include <media/tvp514x.h>
47+#include <media/i2c/tvp514x.h>
4848 #include <media/media-entity.h>
4949
5050 #include "tvp514x_regs.h"
drivers/media/i2c/tvp5150.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 #include <linux/module.h>
1313 #include <media/v4l2-async.h>
1414 #include <media/v4l2-device.h>
15−#include <media/tvp5150.h>
15+#include <media/i2c/tvp5150.h>
1616 #include <media/v4l2-ctrls.h>
1717
1818 #include "tvp5150_reg.h"
drivers/media/i2c/tvp7002.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include <linux/of.h>
3333 #include <linux/of_graph.h>
3434 #include <linux/v4l2-dv-timings.h>
35−#include <media/tvp7002.h>
35+#include <media/i2c/tvp7002.h>
3636 #include <media/v4l2-async.h>
3737 #include <media/v4l2-device.h>
3838 #include <media/v4l2-common.h>
drivers/media/i2c/uda1342.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020 #include <linux/i2c.h>
2121 #include <linux/videodev2.h>
2222 #include <media/v4l2-device.h>
23−#include <media/uda1342.h>
23+#include <media/i2c/uda1342.h>
2424 #include <linux/slab.h>
2525
2626 static int write_reg(struct i2c_client *client, int reg, int value)
drivers/media/i2c/upd64031a.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/videodev2.h>
2828 #include <linux/slab.h>
2929 #include <media/v4l2-device.h>
30−#include <media/upd64031a.h>
30+#include <media/i2c/upd64031a.h>
3131
3232 /* --------------------- read registers functions define -------------------- */
3333
drivers/media/i2c/upd64083.c+1−1
@@ -27,7 +27,7 @@ · 26 unmodified lines
2727 #include <linux/videodev2.h>
2828 #include <linux/slab.h>
2929 #include <media/v4l2-device.h>
30−#include <media/upd64083.h>
30+#include <media/i2c/upd64083.h>
3131
3232 MODULE_DESCRIPTION("uPD64083 driver");
3333 MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil");
drivers/media/i2c/wm8775.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include <linux/videodev2.h>
3535 #include <media/v4l2-device.h>
3636 #include <media/v4l2-ctrls.h>
37−#include <media/wm8775.h>
37+#include <media/i2c/wm8775.h>
3838
3939 MODULE_DESCRIPTION("wm8775 driver");
4040 MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
drivers/media/pci/bt8xx/bttv-cards.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
4141
4242 #include "bttvp.h"
4343 #include <media/v4l2-common.h>
44−#include <media/tvaudio.h>
44+#include <media/i2c/tvaudio.h>
4545 #include "bttv-audio-hook.h"
4646
4747 /* fwd decl */
drivers/media/pci/bt8xx/bttv-driver.c+2−2
@@ -50,7 +50,7 @@ · 49 unmodified lines
5050 #include <media/v4l2-common.h>
5151 #include <media/v4l2-ioctl.h>
5252 #include <media/v4l2-event.h>
53−#include <media/tvaudio.h>
53+#include <media/i2c/tvaudio.h>
5454 #include <media/msp3400.h>
5555
5656 #include <linux/dma-mapping.h>
@@ -58,7 +58,7 @@ · 1 unmodified line
5858 #include <asm/io.h>
5959 #include <asm/byteorder.h>
6060
61−#include <media/saa6588.h>
61+#include <media/i2c/saa6588.h>
6262
6363 #define BTTV_VERSION "0.9.19"
6464
drivers/media/pci/bt8xx/bttvp.h+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
4141 #include <media/videobuf-dma-sg.h>
4242 #include <media/tveeprom.h>
4343 #include <media/rc-core.h>
44−#include <media/ir-kbd-i2c.h>
44+#include <media/i2c/ir-kbd-i2c.h>
4545 #include <media/tea575x.h>
4646
4747 #include "bt848.h"
drivers/media/pci/cobalt/cobalt-driver.c+3−3
@@ -21,9 +21,9 @@ · 20 unmodified lines
2121 */
2222
2323 #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>
2727 #include <media/v4l2-event.h>
2828 #include <media/v4l2-ctrls.h>
2929
drivers/media/pci/cobalt/cobalt-irq.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 * SOFTWARE.
1919 */
2020
21−#include <media/adv7604.h>
21+#include <media/i2c/adv7604.h>
2222
2323 #include "cobalt-driver.h"
2424 #include "cobalt-irq.h"
drivers/media/pci/cobalt/cobalt-v4l2.c+2−2
@@ -29,8 +29,8 @@ · 28 unmodified lines
2929 #include <media/v4l2-ctrls.h>
3030 #include <media/v4l2-event.h>
3131 #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>
3434
3535 #include "cobalt-alsa.h"
3636 #include "cobalt-cpld.h"
drivers/media/pci/cx18/cx18-cards.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include "cx18-cards.h"
2727 #include "cx18-av-core.h"
2828 #include "cx18-i2c.h"
29−#include <media/cs5345.h>
29+#include <media/i2c/cs5345.h>
3030
3131 #define V4L2_STD_PAL_SECAM (V4L2_STD_PAL|V4L2_STD_SECAM)
3232
drivers/media/pci/cx18/cx18-driver.h+1−1
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949 #include <media/v4l2-device.h>
5050 #include <media/v4l2-fh.h>
5151 #include <media/tuner.h>
52−#include <media/ir-kbd-i2c.h>
52+#include <media/i2c/ir-kbd-i2c.h>
5353 #include "cx18-mailbox.h"
5454 #include "cx18-av-core.h"
5555 #include "cx23418.h"
drivers/media/pci/cx88/cx88-alsa.c+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 #include <sound/control.h>
4141 #include <sound/initval.h>
4242 #include <sound/tlv.h>
43−#include <media/wm8775.h>
43+#include <media/i2c/wm8775.h>
4444
4545 #include "cx88.h"
4646 #include "cx88-reg.h"
drivers/media/pci/cx88/cx88-video.c+1−1
@@ -41,7 +41,7 @@ · 40 unmodified lines
4141 #include <media/v4l2-common.h>
4242 #include <media/v4l2-ioctl.h>
4343 #include <media/v4l2-event.h>
44−#include <media/wm8775.h>
44+#include <media/i2c/wm8775.h>
4545
4646 MODULE_DESCRIPTION("v4l2 driver module for cx2388x based TV cards");
4747 MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]");
drivers/media/pci/cx88/cx88.h+2−2
@@ -32,8 +32,8 @@ · 31 unmodified lines
3232 #include <media/videobuf2-dma-sg.h>
3333 #include <media/cx2341x.h>
3434 #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>
3737
3838 #include "cx88-reg.h"
3939 #include "tuner-xc2028.h"
drivers/media/pci/ivtv/ivtv-cards.c+4−4
@@ -23,11 +23,11 @@ · 22 unmodified lines
2323 #include "ivtv-i2c.h"
2424
2525 #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>
2929 #include <media/cx25840.h>
30−#include <media/upd64031a.h>
30+#include <media/i2c/upd64031a.h>
3131
3232 #define MSP_TUNER MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \
3333 MSP_DSP_IN_TUNER, MSP_DSP_IN_TUNER)
drivers/media/pci/ivtv/ivtv-driver.c+1−1
@@ -57,7 +57,7 @@ · 56 unmodified lines
5757 #include "ivtv-gpio.h"
5858 #include <linux/dma-mapping.h>
5959 #include <media/tveeprom.h>
60−#include <media/saa7115.h>
60+#include <media/i2c/saa7115.h>
6161 #include "tuner-xc2028.h"
6262
6363 /* If you have already X v4l cards, then set this to X. This way
drivers/media/pci/ivtv/ivtv-driver.h+1−1
@@ -65,7 +65,7 @@ · 64 unmodified lines
6565 #include <media/v4l2-fh.h>
6666 #include <media/tuner.h>
6767 #include <media/cx2341x.h>
68−#include <media/ir-kbd-i2c.h>
68+#include <media/i2c/ir-kbd-i2c.h>
6969
7070 #include <linux/ivtv.h>
7171
drivers/media/pci/ivtv/ivtv-fileops.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include "ivtv-cards.h"
3535 #include "ivtv-firmware.h"
3636 #include <media/v4l2-event.h>
37−#include <media/saa7115.h>
37+#include <media/i2c/saa7115.h>
3838
3939 /* This function tries to claim the stream for a specific file descriptor.
4040 If no one else is using this stream then the stream is claimed and
drivers/media/pci/ivtv/ivtv-firmware.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include "ivtv-ioctl.h"
2727 #include "ivtv-cards.h"
2828 #include <linux/firmware.h>
29−#include <media/saa7127.h>
29+#include <media/i2c/saa7127.h>
3030
3131 #define IVTV_MASK_SPU_ENABLE 0xFFFFFFFE
3232 #define IVTV_MASK_VPU_ENABLE15 0xFFFFFFF6
drivers/media/pci/ivtv/ivtv-ioctl.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232 #include "ivtv-gpio.h"
3333 #include "ivtv-controls.h"
3434 #include "ivtv-cards.h"
35−#include <media/saa7127.h>
35+#include <media/i2c/saa7127.h>
3636 #include <media/tveeprom.h>
3737 #include <media/v4l2-event.h>
3838 #include <linux/dvb/audio.h>
drivers/media/pci/ivtv/ivtv-routing.c+3−3
@@ -25,9 +25,9 @@ · 24 unmodified lines
2525 #include "ivtv-routing.h"
2626
2727 #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>
3131
3232 /* Selects the audio input and output according to the current
3333 settings. */
drivers/media/pci/saa7134/saa7134-video.c+1−1
@@ -32,7 +32,7 @@ · 31 unmodified lines
3232
3333 #include <media/v4l2-common.h>
3434 #include <media/v4l2-event.h>
35−#include <media/saa6588.h>
35+#include <media/i2c/saa6588.h>
3636
3737 /* ------------------------------------------------------------------ */
3838
drivers/media/pci/saa7134/saa7134.h+1−1
@@ -42,7 +42,7 @@ · 41 unmodified lines
4242 #include <media/v4l2-ctrls.h>
4343 #include <media/tuner.h>
4444 #include <media/rc-core.h>
45−#include <media/ir-kbd-i2c.h>
45+#include <media/i2c/ir-kbd-i2c.h>
4646 #include <media/videobuf2-dma-sg.h>
4747 #include <sound/core.h>
4848 #include <sound/pcm.h>
drivers/media/pci/saa7146/mxb.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <media/saa7146_vv.h>
2929 #include <media/tuner.h>
3030 #include <media/v4l2-common.h>
31−#include <media/saa7115.h>
31+#include <media/i2c/saa7115.h>
3232 #include <linux/module.h>
3333
3434 #include "tea6415c.h"
drivers/media/pci/zoran/zoran_card.c+1−1
@@ -50,7 +50,7 @@ · 49 unmodified lines
5050 #include <linux/mutex.h>
5151 #include <linux/io.h>
5252 #include <media/v4l2-common.h>
53−#include <media/bt819.h>
53+#include <media/i2c/bt819.h>
5454
5555 #include "videocodec.h"
5656 #include "zoran.h"
drivers/media/platform/marvell-ccic/mcam-core.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <media/v4l2-ioctl.h>
2626 #include <media/v4l2-ctrls.h>
2727 #include <media/v4l2-event.h>
28−#include <media/ov7670.h>
28+#include <media/i2c/ov7670.h>
2929 #include <media/videobuf2-vmalloc.h>
3030 #include <media/videobuf2-dma-contig.h>
3131 #include <media/videobuf2-dma-sg.h>
drivers/media/platform/via-camera.c+1−1
@@ -19,7 +19,7 @@ · 18 unmodified lines
1919 #include <media/v4l2-ioctl.h>
2020 #include <media/v4l2-ctrls.h>
2121 #include <media/v4l2-image-sizes.h>
22−#include <media/ov7670.h>
22+#include <media/i2c/ov7670.h>
2323 #include <media/videobuf-dma-sg.h>
2424 #include <linux/delay.h>
2525 #include <linux/dma-mapping.h>
drivers/media/usb/cx231xx/cx231xx.h+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include <media/v4l2-ctrls.h>
3838 #include <media/v4l2-fh.h>
3939 #include <media/rc-core.h>
40−#include <media/ir-kbd-i2c.h>
40+#include <media/i2c/ir-kbd-i2c.h>
4141 #include <media/videobuf-dvb.h>
4242
4343 #include "cx231xx-reg.h"
drivers/media/usb/em28xx/em28xx-camera.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121
2222 #include <linux/i2c.h>
2323 #include <media/soc_camera.h>
24−#include <media/mt9v011.h>
24+#include <media/i2c/mt9v011.h>
2525 #include <media/v4l2-clk.h>
2626 #include <media/v4l2-common.h>
2727
drivers/media/usb/em28xx/em28xx-cards.c+3−3
@@ -31,9 +31,9 @@ · 30 unmodified lines
3131 #include <linux/usb.h>
3232 #include <media/tuner.h>
3333 #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>
3737 #include <media/i2c-addr.h>
3838 #include <media/tveeprom.h>
3939 #include <media/v4l2-common.h>
drivers/media/usb/em28xx/em28xx.h+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 #include <media/v4l2-device.h>
4141 #include <media/v4l2-ctrls.h>
4242 #include <media/v4l2-fh.h>
43−#include <media/ir-kbd-i2c.h>
43+#include <media/i2c/ir-kbd-i2c.h>
4444 #include <media/rc-core.h>
4545 #include "tuner-xc2028.h"
4646 #include "xc5000.h"
drivers/media/usb/go7007/go7007-usb.c+2−2
@@ -23,9 +23,9 @@ · 22 unmodified lines
2323 #include <linux/usb.h>
2424 #include <linux/i2c.h>
2525 #include <asm/byteorder.h>
26−#include <media/saa7115.h>
26+#include <media/i2c/saa7115.h>
2727 #include <media/tuner.h>
28−#include <media/uda1342.h>
28+#include <media/i2c/uda1342.h>
2929
3030 #include "go7007-priv.h"
3131
drivers/media/usb/go7007/go7007-v4l2.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include <media/v4l2-subdev.h>
3131 #include <media/v4l2-event.h>
3232 #include <media/videobuf2-vmalloc.h>
33−#include <media/saa7115.h>
33+#include <media/i2c/saa7115.h>
3434
3535 #include "go7007-priv.h"
3636
drivers/media/usb/hdpvr/hdpvr.h+1−1
@@ -17,7 +17,7 @@ · 16 unmodified lines
1717
1818 #include <media/v4l2-device.h>
1919 #include <media/v4l2-ctrls.h>
20−#include <media/ir-kbd-i2c.h>
20+#include <media/i2c/ir-kbd-i2c.h>
2121
2222 #define HDPVR_MAX 8
2323 #define HDPVR_I2C_MAX_SIZE 128
drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h+1−1
@@ -40,7 +40,7 @@ · 39 unmodified lines
4040 #include "pvrusb2-io.h"
4141 #include <media/v4l2-device.h>
4242 #include <media/cx2341x.h>
43−#include <media/ir-kbd-i2c.h>
43+#include <media/i2c/ir-kbd-i2c.h>
4444 #include "pvrusb2-devattr.h"
4545
4646 /* Legal values for PVR2_CID_HSM */
drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
2020
2121 #include <linux/i2c.h>
2222 #include <linux/module.h>
23−#include <media/ir-kbd-i2c.h>
23+#include <media/i2c/ir-kbd-i2c.h>
2424 #include "pvrusb2-i2c-core.h"
2525 #include "pvrusb2-hdw-internal.h"
2626 #include "pvrusb2-debug.h"
drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c+1−1
@@ -35,7 +35,7 @@ · 34 unmodified lines
3535 #include "pvrusb2-debug.h"
3636 #include <linux/videodev2.h>
3737 #include <media/v4l2-common.h>
38−#include <media/saa7115.h>
38+#include <media/i2c/saa7115.h>
3939 #include <linux/errno.h>
4040
4141 struct routing_scheme {
drivers/media/usb/stk1160/stk1160-core.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include <linux/usb.h>
3535 #include <linux/mm.h>
3636 #include <linux/vmalloc.h>
37−#include <media/saa7115.h>
37+#include <media/i2c/saa7115.h>
3838
3939 #include "stk1160.h"
4040 #include "stk1160-reg.h"
drivers/media/usb/stk1160/stk1160-v4l.c+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333 #include <media/v4l2-event.h>
3434 #include <media/videobuf2-vmalloc.h>
3535
36−#include <media/saa7115.h>
36+#include <media/i2c/saa7115.h>
3737
3838 #include "stk1160.h"
3939 #include "stk1160-reg.h"
drivers/media/usb/tm6000/tm6000-cards.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626 #include <linux/slab.h>
2727 #include <media/v4l2-common.h>
2828 #include <media/tuner.h>
29−#include <media/tvaudio.h>
29+#include <media/i2c/tvaudio.h>
3030 #include <media/i2c-addr.h>
3131 #include <media/rc-map.h>
3232
drivers/media/usb/usbvision/usbvision-core.c+1−1
@@ -37,7 +37,7 @@ · 36 unmodified lines
3737 #include <linux/videodev2.h>
3838 #include <linux/i2c.h>
3939
40−#include <media/saa7115.h>
40+#include <media/i2c/saa7115.h>
4141 #include <media/v4l2-common.h>
4242 #include <media/tuner.h>
4343
drivers/media/usb/usbvision/usbvision-video.c+1−1
@@ -59,7 +59,7 @@ · 58 unmodified lines
5959 #include <linux/videodev2.h>
6060 #include <linux/i2c.h>
6161
62−#include <media/saa7115.h>
62+#include <media/i2c/saa7115.h>
6363 #include <media/v4l2-common.h>
6464 #include <media/v4l2-ioctl.h>
6565 #include <media/v4l2-event.h>
include/media/i2c/ad9389b.hrenamed from include/media/ad9389b.h+0−0

File renamed without changes.

include/media/i2c/adp1653.hrenamed from include/media/adp1653.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/media/adp1653.h
2+ * include/media/i2c/adp1653.h
33 *
44 * Copyright (C) 2008--2011 Nokia Corporation
55 *
include/media/i2c/adv7183.hrenamed from include/media/adv7183.h+0−0

File renamed without changes.

include/media/i2c/adv7343.hrenamed from include/media/adv7343.h+0−0

File renamed without changes.

include/media/i2c/adv7393.hrenamed from include/media/adv7393.h+0−0

File renamed without changes.

include/media/i2c/adv7511.hrenamed from include/media/adv7511.h+0−0

File renamed without changes.

include/media/i2c/adv7604.hrenamed from include/media/adv7604.h+0−0

File renamed without changes.

include/media/i2c/adv7842.hrenamed from include/media/adv7842.h+0−0

File renamed without changes.

include/media/i2c/ak881x.hrenamed from include/media/ak881x.h+0−0

File renamed without changes.

include/media/i2c/as3645a.hrenamed from include/media/as3645a.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/media/as3645a.h
2+ * include/media/i2c/as3645a.h
33 *
44 * Copyright (C) 2008-2011 Nokia Corporation
55 *
include/media/i2c/bt819.hrenamed from include/media/bt819.h+0−0

File renamed without changes.

include/media/i2c/cs5345.hrenamed from include/media/cs5345.h+0−0

File renamed without changes.

include/media/i2c/cs53l32a.hrenamed from include/media/cs53l32a.h+0−0

File renamed without changes.

include/media/i2c/ir-kbd-i2c.hrenamed from include/media/ir-kbd-i2c.h+0−0

File renamed without changes.

include/media/i2c/lm3560.hrenamed from include/media/lm3560.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/media/lm3560.h
2+ * include/media/i2c/lm3560.h
33 *
44 * Copyright (C) 2013 Texas Instruments
55 *
include/media/i2c/lm3646.hrenamed from include/media/lm3646.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/media/lm3646.h
2+ * include/media/i2c/lm3646.h
33 *
44 * Copyright (C) 2014 Texas Instruments
55 *
include/media/i2c/m52790.hrenamed from include/media/m52790.h+0−0

File renamed without changes.

include/media/i2c/m5mols.hrenamed from include/media/m5mols.h+0−0

File renamed without changes.

include/media/i2c/mt9m032.hrenamed from include/media/mt9m032.h+0−0

File renamed without changes.

include/media/i2c/mt9p031.hrenamed from include/media/mt9p031.h+0−0

File renamed without changes.

include/media/i2c/mt9t001.hrenamed from include/media/mt9t001.h+0−0

File renamed without changes.

include/media/i2c/mt9t112.hrenamed from include/media/mt9t112.h+0−0

File renamed without changes.

include/media/i2c/mt9v011.hrenamed from include/media/mt9v011.h+0−0

File renamed without changes.

include/media/i2c/mt9v022.hrenamed from include/media/mt9v022.h+0−0

File renamed without changes.

include/media/i2c/mt9v032.hrenamed from include/media/mt9v032.h+0−0

File renamed without changes.

include/media/i2c/noon010pc30.hrenamed from include/media/noon010pc30.h+0−0

File renamed without changes.

include/media/i2c/ov2659.hrenamed from include/media/ov2659.h+0−0

File renamed without changes.

include/media/i2c/ov7670.hrenamed from include/media/ov7670.h+0−0

File renamed without changes.

include/media/i2c/ov772x.hrenamed from include/media/ov772x.h+0−0

File renamed without changes.

include/media/i2c/ov9650.hrenamed from include/media/ov9650.h+0−0

File renamed without changes.

include/media/i2c/rj54n1cb0c.hrenamed from include/media/rj54n1cb0c.h+0−0

File renamed without changes.

include/media/i2c/s5c73m3.hrenamed from include/media/s5c73m3.h+0−0

File renamed without changes.

include/media/i2c/s5k4ecgx.hrenamed from include/media/s5k4ecgx.h+0−0

File renamed without changes.

include/media/i2c/s5k6aa.hrenamed from include/media/s5k6aa.h+0−0

File renamed without changes.

include/media/i2c/saa6588.hrenamed from include/media/saa6588.h+0−0

File renamed without changes.

include/media/i2c/saa7115.hrenamed from include/media/saa7115.h+0−1
@@ -138,4 +138,3 @@ struct saa7115_platform_data { · 137 unmodified lines
138138 };
139139
140140 #endif
141−
include/media/i2c/saa7127.hrenamed from include/media/saa7127.h+0−1
@@ -38,4 +38,3 @@ enum saa7127_output_type { · 37 unmodified lines
3838 };
3939
4040 #endif
41−
include/media/i2c/smiapp.hrenamed from include/media/smiapp.h+1−1
@@ -1,5 +1,5 @@
11 /*
2− * include/media/smiapp.h
2+ * include/media/i2c/smiapp.h
33 *
44 * Generic driver for SMIA/SMIA++ compliant camera modules
55 *
include/media/i2c/sr030pc30.hrenamed from include/media/sr030pc30.h+0−0

File renamed without changes.

include/media/i2c/tc358743.hrenamed from include/media/tc358743.h+0−0

File renamed without changes.

include/media/i2c/ths7303.hrenamed from include/media/ths7303.h+0−0

File renamed without changes.

include/media/i2c/tvaudio.hrenamed from include/media/tvaudio.h+0−0

File renamed without changes.

include/media/i2c/tvp514x.hrenamed from include/media/tvp514x.h+0−0

File renamed without changes.

include/media/i2c/tvp5150.hrenamed from include/media/tvp5150.h+0−1
@@ -31,4 +31,3 @@ · 30 unmodified lines
3131 #define TVP5150_BLACK_SCREEN 1
3232
3333 #endif
34−
include/media/i2c/tvp7002.hrenamed from include/media/tvp7002.h+0−0

File renamed without changes.

include/media/i2c/tw9910.hrenamed from include/media/tw9910.h+0−0

File renamed without changes.

include/media/i2c/uda1342.hrenamed from include/media/uda1342.h+0−0

File renamed without changes.

include/media/i2c/upd64031a.hrenamed from include/media/upd64031a.h+0−0

File renamed without changes.

include/media/i2c/upd64083.hrenamed from include/media/upd64083.h+0−0

File renamed without changes.

include/media/i2c/wm8775.hrenamed from include/media/wm8775.h+0−0

File renamed without changes.

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t