History

[media] move media platform data to linux/platform_data/media

Now that media has its own subdirectory inside platform_data, let's move the headers that are already there to such subdir. After moving those files, the references were adjusted using this script: MAIN_DIR="linux/platform_data/" PREV_DIR="linux/platform_data/" 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 a71daaa1 parent 886aa7118 files · +14 −14Browse files

Unified · Split

18 files
  1. arch/arm/mach-imx/devices/devices-common.h +2 −2
  2. arch/arm/mach-pxa/devices.c +1 −1
  3. arch/arm/mach-pxa/em-x270.c +1 −1
  4. arch/arm/mach-pxa/ezx.c +1 −1
  5. arch/arm/mach-pxa/mioa701.c +1 −1
  6. arch/arm/mach-pxa/palmtreo.c +1 −1
  7. arch/arm/mach-pxa/palmz72.c +1 −1
  8. arch/arm/mach-pxa/pcm990-baseboard.c +1 −1
  9. drivers/media/platform/coda/coda-common.c +1 −1
  10. drivers/media/platform/soc_camera/mx2_camera.c +1 −1
  11. drivers/media/platform/soc_camera/mx3_camera.c +1 −1
  12. drivers/media/platform/soc_camera/pxa_camera.c +1 −1
  13. drivers/media/platform/soc_camera/rcar_vin.c +1 −1
  14. include/linux/platform_data/media/camera-mx2.h +0 −0
  15. include/linux/platform_data/media/camera-mx3.h +0 −0
  16. include/linux/platform_data/media/camera-pxa.h +0 −0
  17. include/linux/platform_data/media/camera-rcar.h +0 −0
  18. include/linux/platform_data/media/coda.h +0 −0
arch/arm/mach-imx/devices/devices-common.h+2−2
@@ -177,7 +177,7 @@ struct platform_device *__init imx_add_imx_uart_1irq( · 176 unmodified lines
177177 const struct imxuart_platform_data *pdata);
178178
179179 #include <linux/platform_data/video-mx3fb.h>
180−#include <linux/platform_data/camera-mx3.h>
180+#include <linux/platform_data/media/camera-mx3.h>
181181 struct imx_ipu_core_data {
182182 resource_size_t iobase;
183183 resource_size_t synirq;
@@ -192,7 +192,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb( · 8 unmodified lines
192192 const struct imx_ipu_core_data *data,
193193 struct mx3fb_platform_data *pdata);
194194
195−#include <linux/platform_data/camera-mx2.h>
195+#include <linux/platform_data/media/camera-mx2.h>
196196 struct imx_mx2_camera_data {
197197 const char *devid;
198198 resource_size_t iobasecsi;
arch/arm/mach-pxa/devices.c+1−1
@@ -14,7 +14,7 @@ · 13 unmodified lines
1414 #include <mach/irqs.h>
1515 #include <linux/platform_data/usb-ohci-pxa27x.h>
1616 #include <linux/platform_data/keypad-pxa27x.h>
17−#include <linux/platform_data/camera-pxa.h>
17+#include <linux/platform_data/media/camera-pxa.h>
1818 #include <mach/audio.h>
1919 #include <mach/hardware.h>
2020 #include <linux/platform_data/mmp_dma.h>
arch/arm/mach-pxa/em-x270.c+1−1
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646 #include <linux/platform_data/usb-ohci-pxa27x.h>
4747 #include <linux/platform_data/mmc-pxamci.h>
4848 #include <linux/platform_data/keypad-pxa27x.h>
49−#include <linux/platform_data/camera-pxa.h>
49+#include <linux/platform_data/media/camera-pxa.h>
5050
5151 #include "generic.h"
5252 #include "devices.h"
arch/arm/mach-pxa/ezx.c+1−1
@@ -34,7 +34,7 @@ · 33 unmodified lines
3434 #include <linux/platform_data/usb-ohci-pxa27x.h>
3535 #include <mach/hardware.h>
3636 #include <linux/platform_data/keypad-pxa27x.h>
37−#include <linux/platform_data/camera-pxa.h>
37+#include <linux/platform_data/media/camera-pxa.h>
3838
3939 #include "devices.h"
4040 #include "generic.h"
arch/arm/mach-pxa/mioa701.c+1−1
@@ -54,7 +54,7 @@ · 53 unmodified lines
5454 #include <linux/platform_data/mmc-pxamci.h>
5555 #include <mach/udc.h>
5656 #include <mach/pxa27x-udc.h>
57−#include <linux/platform_data/camera-pxa.h>
57+#include <linux/platform_data/media/camera-pxa.h>
5858 #include <mach/audio.h>
5959 #include <mach/smemc.h>
6060 #include <media/soc_camera.h>
arch/arm/mach-pxa/palmtreo.c+1−1
@@ -43,7 +43,7 @@ · 42 unmodified lines
4343 #include <linux/platform_data/usb-ohci-pxa27x.h>
4444 #include <mach/pxa2xx-regs.h>
4545 #include <linux/platform_data/asoc-palm27x.h>
46−#include <linux/platform_data/camera-pxa.h>
46+#include <linux/platform_data/media/camera-pxa.h>
4747 #include <mach/palm27x.h>
4848
4949 #include <sound/pxa2xx-lib.h>
arch/arm/mach-pxa/palmz72.c+1−1
@@ -49,7 +49,7 @@ · 48 unmodified lines
4949 #include <mach/palm27x.h>
5050
5151 #include <mach/pm.h>
52−#include <linux/platform_data/camera-pxa.h>
52+#include <linux/platform_data/media/camera-pxa.h>
5353
5454 #include <media/soc_camera.h>
5555
arch/arm/mach-pxa/pcm990-baseboard.c+1−1
@@ -30,7 +30,7 @@ · 29 unmodified lines
3030 #include <media/i2c/mt9v022.h>
3131 #include <media/soc_camera.h>
3232
33−#include <linux/platform_data/camera-pxa.h>
33+#include <linux/platform_data/media/camera-pxa.h>
3434 #include <asm/mach/map.h>
3535 #include <mach/pxa27x.h>
3636 #include <mach/audio.h>
drivers/media/platform/coda/coda-common.c+1−1
@@ -28,7 +28,7 @@ · 27 unmodified lines
2828 #include <linux/slab.h>
2929 #include <linux/videodev2.h>
3030 #include <linux/of.h>
31−#include <linux/platform_data/coda.h>
31+#include <linux/platform_data/media/coda.h>
3232 #include <linux/reset.h>
3333
3434 #include <media/v4l2-ctrls.h>
drivers/media/platform/soc_camera/mx2_camera.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
3939
4040 #include <linux/videodev2.h>
4141
42−#include <linux/platform_data/camera-mx2.h>
42+#include <linux/platform_data/media/camera-mx2.h>
4343
4444 #include <asm/dma.h>
4545
drivers/media/platform/soc_camera/mx3_camera.c+1−1
@@ -25,7 +25,7 @@ · 24 unmodified lines
2525 #include <media/soc_camera.h>
2626 #include <media/drv-intf/soc_mediabus.h>
2727
28−#include <linux/platform_data/camera-mx3.h>
28+#include <linux/platform_data/media/camera-mx3.h>
2929 #include <linux/platform_data/dma-imx.h>
3030
3131 #define MX3_CAM_DRV_NAME "mx3-camera"
drivers/media/platform/soc_camera/pxa_camera.c+1−1
@@ -39,7 +39,7 @@ · 38 unmodified lines
3939 #include <linux/videodev2.h>
4040
4141 #include <mach/dma.h>
42−#include <linux/platform_data/camera-pxa.h>
42+#include <linux/platform_data/media/camera-pxa.h>
4343
4444 #define PXA_CAM_VERSION "0.0.6"
4545 #define PXA_CAM_DRV_NAME "pxa27x-camera"
drivers/media/platform/soc_camera/rcar_vin.c+1−1
@@ -21,7 +21,7 @@ · 20 unmodified lines
2121 #include <linux/module.h>
2222 #include <linux/of.h>
2323 #include <linux/of_device.h>
24−#include <linux/platform_data/camera-rcar.h>
24+#include <linux/platform_data/media/camera-rcar.h>
2525 #include <linux/platform_device.h>
2626 #include <linux/pm_runtime.h>
2727 #include <linux/slab.h>
include/linux/platform_data/media/camera-mx2.hrenamed from include/linux/platform_data/camera-mx2.h+0−0

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

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