History

[media] include/media: move platform_data to linux/platform_data/media

Let's not mix platform_data headers with the core headers. Instead, let's create a subdir at linux/platform_data and move the headers to that common place, adding it to MAINTAINERS. The headers were moved with: mkdir include/linux/platform_data/media/; git mv include/media/gpio-ir-recv.h include/media/ir-rx51.h include/media/mmp-camera.h include/media/omap1_camera.h include/media/omap4iss.h include/media/s5p_hdmi.h include/media/si4713.h include/media/sii9234.h include/media/smiapp.h include/media/soc_camera.h include/media/soc_camera_platform.h include/media/timb_radio.h include/media/timb_video.h include/linux/platform_data/media/ And the references fixed with this script: MAIN_DIR="linux/platform_data/" PREV_DIR="media/" DIRS="media/" 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

Mauro Carvalho Chehab committed 11 years ago

Commit eb4b0ec1 parent d647f0b32 files · +24 −25Browse files

Unified · Split

32 files
  1. Documentation/video4linux/omap4_camera.txt +1 −1
  2. Documentation/video4linux/si4713.txt +1 −1
  3. MAINTAINERS +1 −0
  4. arch/arm/mach-omap1/include/mach/camera.h +1 −1
  5. arch/arm/mach-omap2/board-rx51-peripherals.c +2 −2
  6. arch/arm/plat-samsung/devs.c +1 −1
  7. arch/sh/boards/mach-ap325rxa/setup.c +1 −1
  8. drivers/media/platform/marvell-ccic/mmp-driver.c +1 −1
  9. drivers/media/platform/s5p-tv/hdmi_drv.c +1 −1
  10. drivers/media/platform/s5p-tv/sii9234_drv.c +1 −1
  11. drivers/media/platform/soc_camera/omap1_camera.c +1 −1
  12. drivers/media/platform/soc_camera/soc_camera_platform.c +1 −1
  13. drivers/media/platform/timblogiw.c +1 −1
  14. drivers/media/radio/radio-timb.c +1 −1
  15. drivers/media/radio/si4713/radio-usb-si4713.c +1 −1
  16. drivers/media/radio/si4713/si4713.h +1 −1
  17. drivers/media/rc/gpio-ir-recv.c +1 −1
  18. drivers/media/rc/ir-rx51.c +1 −1
  19. drivers/mfd/timberdale.c +2 −2
  20. drivers/staging/media/omap4iss/iss.h +1 −1
  21. drivers/staging/media/omap4iss/iss_csiphy.h +1 −1
  22. include/linux/platform_data/media/gpio-ir-recv.h +0 −1
  23. include/linux/platform_data/media/ir-rx51.h +0 −0
  24. include/linux/platform_data/media/mmp-camera.h +0 −0
  25. include/linux/platform_data/media/omap1_camera.h +0 −0
  26. include/linux/platform_data/media/omap4iss.h +0 −0
  27. include/linux/platform_data/media/s5p_hdmi.h +0 −1
  28. include/linux/platform_data/media/si4713.h +1 −1
  29. include/linux/platform_data/media/sii9234.h +0 −0
  30. include/linux/platform_data/media/soc_camera_platform.h +0 −0
  31. include/linux/platform_data/media/timb_radio.h +0 −0
  32. include/linux/platform_data/media/timb_video.h +0 −0
Documentation/video4linux/omap4_camera.txt+1−1
@@ -47,7 +47,7 @@ Tested platforms · 46 unmodified lines
47File list47File list
48---------48---------
49drivers/staging/media/omap4iss/49drivers/staging/media/omap4iss/
50include/media/omap4iss.h50include/linux/platform_data/media/omap4iss.h
51 51
52References52References
53----------53----------
Documentation/video4linux/si4713.txt+1−1
@@ -157,7 +157,7 @@ int main (int argc, char *argv[]) · 156 unmodified lines
157}157}
158 158
159The struct si4713_rnl and SI4713_IOC_MEASURE_RNL are defined under159The struct si4713_rnl and SI4713_IOC_MEASURE_RNL are defined under
160include/media/si4713.h.160include/linux/platform_data/media/si4713.h.
161 161
162Stereo/Mono and RDS subchannels162Stereo/Mono and RDS subchannels
163===============================163===============================
MAINTAINERS+1−0
@@ -6895,6 +6895,7 @@ F: Documentation/video4linux/ · 6894 unmodified lines
6895F: Documentation/DocBook/media/6895F: Documentation/DocBook/media/
6896F: drivers/media/6896F: drivers/media/
6897F: drivers/staging/media/6897F: drivers/staging/media/
6898F: include/linux/platform_data/media/
6898F: include/media/6899F: include/media/
6899F: include/uapi/linux/dvb/6900F: include/uapi/linux/dvb/
6900F: include/uapi/linux/videodev2.h6901F: include/uapi/linux/videodev2.h
arch/arm/mach-omap1/include/mach/camera.h+1−1
@@ -1,7 +1,7 @@
1#ifndef __ASM_ARCH_CAMERA_H_1#ifndef __ASM_ARCH_CAMERA_H_
2#define __ASM_ARCH_CAMERA_H_2#define __ASM_ARCH_CAMERA_H_
3 3
4#include <media/omap1_camera.h>4#include <linux/platform_data/media/omap1_camera.h>
5 5
6void omap1_camera_init(void *);6void omap1_camera_init(void *);
7 7
arch/arm/mach-omap2/board-rx51-peripherals.c+2−2
@@ -39,7 +39,7 @@ · 38 unmodified lines
39 39
40#include <sound/tlv320aic3x.h>40#include <sound/tlv320aic3x.h>
41#include <sound/tpa6130a2-plat.h>41#include <sound/tpa6130a2-plat.h>
42#include <media/si4713.h>42#include <linux/platform_data/media/si4713.h>
43#include <linux/platform_data/leds-lp55xx.h>43#include <linux/platform_data/leds-lp55xx.h>
44 44
45#include <linux/platform_data/tsl2563.h>45#include <linux/platform_data/tsl2563.h>
@@ -48,7 +48,7 @@ · 2 unmodified lines
48#include <video/omap-panel-data.h>48#include <video/omap-panel-data.h>
49 49
50#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)50#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
51#include <media/ir-rx51.h>51#include <linux/platform_data/media/ir-rx51.h>
52#endif52#endif
53 53
54#include "mux.h"54#include "mux.h"
arch/arm/plat-samsung/devs.c+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
36#include <linux/platform_data/s3c-hsotg.h>36#include <linux/platform_data/s3c-hsotg.h>
37#include <linux/platform_data/dma-s3c24xx.h>37#include <linux/platform_data/dma-s3c24xx.h>
38 38
39#include <media/s5p_hdmi.h>39#include <linux/platform_data/media/s5p_hdmi.h>
40 40
41#include <asm/irq.h>41#include <asm/irq.h>
42#include <asm/mach/arch.h>42#include <asm/mach/arch.h>
arch/sh/boards/mach-ap325rxa/setup.c+1−1
@@ -29,7 +29,7 @@ · 28 unmodified lines
29#include <linux/sh_intc.h>29#include <linux/sh_intc.h>
30#include <media/i2c/ov772x.h>30#include <media/i2c/ov772x.h>
31#include <media/soc_camera.h>31#include <media/soc_camera.h>
32#include <media/soc_camera_platform.h>32#include <linux/platform_data/media/soc_camera_platform.h>
33#include <media/drv-intf/sh_mobile_ceu.h>33#include <media/drv-intf/sh_mobile_ceu.h>
34#include <video/sh_mobile_lcdc.h>34#include <video/sh_mobile_lcdc.h>
35#include <asm/io.h>35#include <asm/io.h>
drivers/media/platform/marvell-ccic/mmp-driver.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18#include <linux/slab.h>18#include <linux/slab.h>
19#include <linux/videodev2.h>19#include <linux/videodev2.h>
20#include <media/v4l2-device.h>20#include <media/v4l2-device.h>
21#include <media/mmp-camera.h>21#include <linux/platform_data/media/mmp-camera.h>
22#include <linux/device.h>22#include <linux/device.h>
23#include <linux/platform_device.h>23#include <linux/platform_device.h>
24#include <linux/gpio.h>24#include <linux/gpio.h>
drivers/media/platform/s5p-tv/hdmi_drv.c+1−1
@@ -33,7 +33,7 @@ · 32 unmodified lines
33#include <linux/regulator/consumer.h>33#include <linux/regulator/consumer.h>
34#include <linux/v4l2-dv-timings.h>34#include <linux/v4l2-dv-timings.h>
35 35
36#include <media/s5p_hdmi.h>36#include <linux/platform_data/media/s5p_hdmi.h>
37#include <media/v4l2-common.h>37#include <media/v4l2-common.h>
38#include <media/v4l2-dev.h>38#include <media/v4l2-dev.h>
39#include <media/v4l2-device.h>39#include <media/v4l2-device.h>
drivers/media/platform/s5p-tv/sii9234_drv.c+1−1
@@ -23,7 +23,7 @@ · 22 unmodified lines
23#include <linux/regulator/machine.h>23#include <linux/regulator/machine.h>
24#include <linux/slab.h>24#include <linux/slab.h>
25 25
26#include <media/sii9234.h>26#include <linux/platform_data/media/sii9234.h>
27#include <media/v4l2-subdev.h>27#include <media/v4l2-subdev.h>
28 28
29MODULE_AUTHOR("Tomasz Stanislawski <t.stanislaws@samsung.com>");29MODULE_AUTHOR("Tomasz Stanislawski <t.stanislaws@samsung.com>");
drivers/media/platform/soc_camera/omap1_camera.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
28#include <linux/platform_device.h>28#include <linux/platform_device.h>
29#include <linux/slab.h>29#include <linux/slab.h>
30 30
31#include <media/omap1_camera.h>31#include <linux/platform_data/media/omap1_camera.h>
32#include <media/soc_camera.h>32#include <media/soc_camera.h>
33#include <media/drv-intf/soc_mediabus.h>33#include <media/drv-intf/soc_mediabus.h>
34#include <media/videobuf-dma-contig.h>34#include <media/videobuf-dma-contig.h>
drivers/media/platform/soc_camera/soc_camera_platform.c+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
18#include <linux/videodev2.h>18#include <linux/videodev2.h>
19#include <media/v4l2-subdev.h>19#include <media/v4l2-subdev.h>
20#include <media/soc_camera.h>20#include <media/soc_camera.h>
21#include <media/soc_camera_platform.h>21#include <linux/platform_data/media/soc_camera_platform.h>
22 22
23struct soc_camera_platform_priv {23struct soc_camera_platform_priv {
24 struct v4l2_subdev subdev;24 struct v4l2_subdev subdev;
drivers/media/platform/timblogiw.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
31#include <media/v4l2-ioctl.h>31#include <media/v4l2-ioctl.h>
32#include <media/v4l2-device.h>32#include <media/v4l2-device.h>
33#include <media/videobuf-dma-contig.h>33#include <media/videobuf-dma-contig.h>
34#include <media/timb_video.h>34#include <linux/platform_data/media/timb_video.h>
35 35
36#define DRIVER_NAME "timb-video"36#define DRIVER_NAME "timb-video"
37 37
drivers/media/radio/radio-timb.c+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
26#include <linux/slab.h>26#include <linux/slab.h>
27#include <linux/i2c.h>27#include <linux/i2c.h>
28#include <linux/module.h>28#include <linux/module.h>
29#include <media/timb_radio.h>29#include <linux/platform_data/media/timb_radio.h>
30 30
31#define DRIVER_NAME "timb-radio"31#define DRIVER_NAME "timb-radio"
32 32
drivers/media/radio/si4713/radio-usb-si4713.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
31#include <media/v4l2-device.h>31#include <media/v4l2-device.h>
32#include <media/v4l2-ioctl.h>32#include <media/v4l2-ioctl.h>
33#include <media/v4l2-event.h>33#include <media/v4l2-event.h>
34#include <media/si4713.h>34#include <linux/platform_data/media/si4713.h>
35 35
36#include "si4713.h"36#include "si4713.h"
37 37
drivers/media/radio/si4713/si4713.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20#include <linux/gpio/consumer.h>20#include <linux/gpio/consumer.h>
21#include <media/v4l2-subdev.h>21#include <media/v4l2-subdev.h>
22#include <media/v4l2-ctrls.h>22#include <media/v4l2-ctrls.h>
23#include <media/si4713.h>23#include <linux/platform_data/media/si4713.h>
24 24
25#define SI4713_PRODUCT_NUMBER 0x0D25#define SI4713_PRODUCT_NUMBER 0x0D
26 26
drivers/media/rc/gpio-ir-recv.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
21#include <linux/platform_device.h>21#include <linux/platform_device.h>
22#include <linux/irq.h>22#include <linux/irq.h>
23#include <media/rc-core.h>23#include <media/rc-core.h>
24#include <media/gpio-ir-recv.h>24#include <linux/platform_data/media/gpio-ir-recv.h>
25 25
26#define GPIO_IR_DRIVER_NAME "gpio-rc-recv"26#define GPIO_IR_DRIVER_NAME "gpio-rc-recv"
27#define GPIO_IR_DEVICE_NAME "gpio_ir_recv"27#define GPIO_IR_DEVICE_NAME "gpio_ir_recv"
drivers/media/rc/ir-rx51.c+1−1
@@ -31,7 +31,7 @@ · 30 unmodified lines
31 31
32#include <media/lirc.h>32#include <media/lirc.h>
33#include <media/lirc_dev.h>33#include <media/lirc_dev.h>
34#include <media/ir-rx51.h>34#include <linux/platform_data/media/ir-rx51.h>
35 35
36#define LIRC_RX51_DRIVER_FEATURES (LIRC_CAN_SET_SEND_DUTY_CYCLE | \36#define LIRC_RX51_DRIVER_FEATURES (LIRC_CAN_SET_SEND_DUTY_CYCLE | \
37 LIRC_CAN_SET_SEND_CARRIER | \37 LIRC_CAN_SET_SEND_CARRIER | \
drivers/mfd/timberdale.c+2−2
@@ -39,8 +39,8 @@ · 38 unmodified lines
39#include <linux/spi/max7301.h>39#include <linux/spi/max7301.h>
40#include <linux/spi/mc33880.h>40#include <linux/spi/mc33880.h>
41 41
42#include <media/timb_radio.h>42#include <linux/platform_data/media/timb_radio.h>
43#include <media/timb_video.h>43#include <linux/platform_data/media/timb_video.h>
44 44
45#include <linux/timb_dma.h>45#include <linux/timb_dma.h>
46 46
drivers/staging/media/omap4iss/iss.h+1−1
@@ -20,7 +20,7 @@ · 19 unmodified lines
20#include <linux/platform_device.h>20#include <linux/platform_device.h>
21#include <linux/wait.h>21#include <linux/wait.h>
22 22
23#include <media/omap4iss.h>23#include <linux/platform_data/media/omap4iss.h>
24 24
25#include "iss_regs.h"25#include "iss_regs.h"
26#include "iss_csiphy.h"26#include "iss_csiphy.h"
drivers/staging/media/omap4iss/iss_csiphy.h+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
14#ifndef OMAP4_ISS_CSI_PHY_H14#ifndef OMAP4_ISS_CSI_PHY_H
15#define OMAP4_ISS_CSI_PHY_H15#define OMAP4_ISS_CSI_PHY_H
16 16
17#include <media/omap4iss.h>17#include <linux/platform_data/media/omap4iss.h>
18 18
19struct iss_csi2_device;19struct iss_csi2_device;
20 20
include/linux/platform_data/media/gpio-ir-recv.hrenamed from include/media/gpio-ir-recv.h+0−1
@@ -21,4 +21,3 @@ struct gpio_ir_recv_platform_data { · 20 unmodified lines
21};21};
22 22
23#endif /* __GPIO_IR_RECV_H__ */23#endif /* __GPIO_IR_RECV_H__ */
24
include/linux/platform_data/media/ir-rx51.hrenamed from include/media/ir-rx51.h+0−0

File renamed without changes.

include/linux/platform_data/media/mmp-camera.hrenamed from include/media/mmp-camera.h+0−0

File renamed without changes.

include/linux/platform_data/media/omap1_camera.hrenamed from include/media/omap1_camera.h+0−0

File renamed without changes.

include/linux/platform_data/media/omap4iss.hrenamed from include/media/omap4iss.h+0−0

File renamed without changes.

include/linux/platform_data/media/s5p_hdmi.hrenamed from include/media/s5p_hdmi.h+0−1
@@ -34,4 +34,3 @@ struct s5p_hdmi_platform_data { · 33 unmodified lines
34};34};
35 35
36#endif /* S5P_HDMI_H */36#endif /* S5P_HDMI_H */
37
include/linux/platform_data/media/si4713.hrenamed from include/media/si4713.h+1−1
@@ -1,5 +1,5 @@
1/*1/*
2 * include/media/si4713.h2 * include/linux/platform_data/media/si4713.h
3 *3 *
4 * Board related data definitions for Si4713 i2c device driver.4 * Board related data definitions for Si4713 i2c device driver.
5 *5 *
include/linux/platform_data/media/sii9234.hrenamed from include/media/sii9234.h+0−0

File renamed without changes.

include/linux/platform_data/media/soc_camera_platform.hrenamed from include/media/soc_camera_platform.h+0−0

File renamed without changes.

include/linux/platform_data/media/timb_radio.hrenamed from include/media/timb_radio.h+0−0

File renamed without changes.

include/linux/platform_data/media/timb_video.hrenamed from include/media/timb_video.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