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
Unified · Split
| @@ -177,7 +177,7 @@ struct platform_device *__init imx_add_imx_uart_1irq( · 176 unmodified lines | |||
| 177 | const struct imxuart_platform_data *pdata); | 177 | const struct imxuart_platform_data *pdata); |
| 178 | 178 | ||
| 179 | #include <linux/platform_data/video-mx3fb.h> | 179 | #include <linux/platform_data/video-mx3fb.h> |
| 180 | #include <linux/platform_data/camera-mx3.h> | 180 | #include <linux/platform_data/media/camera-mx3.h> |
| 181 | struct imx_ipu_core_data { | 181 | struct imx_ipu_core_data { |
| 182 | resource_size_t iobase; | 182 | resource_size_t iobase; |
| 183 | resource_size_t synirq; | 183 | resource_size_t synirq; |
| @@ -192,7 +192,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb( · 8 unmodified lines | |||
| 192 | const struct imx_ipu_core_data *data, | 192 | const struct imx_ipu_core_data *data, |
| 193 | struct mx3fb_platform_data *pdata); | 193 | struct mx3fb_platform_data *pdata); |
| 194 | 194 | ||
| 195 | #include <linux/platform_data/camera-mx2.h> | 195 | #include <linux/platform_data/media/camera-mx2.h> |
| 196 | struct imx_mx2_camera_data { | 196 | struct imx_mx2_camera_data { |
| 197 | const char *devid; | 197 | const char *devid; |
| 198 | resource_size_t iobasecsi; | 198 | resource_size_t iobasecsi; |
| @@ -14,7 +14,7 @@ · 13 unmodified lines | |||
| 14 | #include <mach/irqs.h> | 14 | #include <mach/irqs.h> |
| 15 | #include <linux/platform_data/usb-ohci-pxa27x.h> | 15 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 16 | #include <linux/platform_data/keypad-pxa27x.h> | 16 | #include <linux/platform_data/keypad-pxa27x.h> |
| 17 | #include <linux/platform_data/camera-pxa.h> | 17 | #include <linux/platform_data/media/camera-pxa.h> |
| 18 | #include <mach/audio.h> | 18 | #include <mach/audio.h> |
| 19 | #include <mach/hardware.h> | 19 | #include <mach/hardware.h> |
| 20 | #include <linux/platform_data/mmp_dma.h> | 20 | #include <linux/platform_data/mmp_dma.h> |
| @@ -46,7 +46,7 @@ · 45 unmodified lines | |||
| 46 | #include <linux/platform_data/usb-ohci-pxa27x.h> | 46 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 47 | #include <linux/platform_data/mmc-pxamci.h> | 47 | #include <linux/platform_data/mmc-pxamci.h> |
| 48 | #include <linux/platform_data/keypad-pxa27x.h> | 48 | #include <linux/platform_data/keypad-pxa27x.h> |
| 49 | #include <linux/platform_data/camera-pxa.h> | 49 | #include <linux/platform_data/media/camera-pxa.h> |
| 50 | 50 | ||
| 51 | #include "generic.h" | 51 | #include "generic.h" |
| 52 | #include "devices.h" | 52 | #include "devices.h" |
| @@ -34,7 +34,7 @@ · 33 unmodified lines | |||
| 34 | #include <linux/platform_data/usb-ohci-pxa27x.h> | 34 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 35 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
| 36 | #include <linux/platform_data/keypad-pxa27x.h> | 36 | #include <linux/platform_data/keypad-pxa27x.h> |
| 37 | #include <linux/platform_data/camera-pxa.h> | 37 | #include <linux/platform_data/media/camera-pxa.h> |
| 38 | 38 | ||
| 39 | #include "devices.h" | 39 | #include "devices.h" |
| 40 | #include "generic.h" | 40 | #include "generic.h" |
| @@ -54,7 +54,7 @@ · 53 unmodified lines | |||
| 54 | #include <linux/platform_data/mmc-pxamci.h> | 54 | #include <linux/platform_data/mmc-pxamci.h> |
| 55 | #include <mach/udc.h> | 55 | #include <mach/udc.h> |
| 56 | #include <mach/pxa27x-udc.h> | 56 | #include <mach/pxa27x-udc.h> |
| 57 | #include <linux/platform_data/camera-pxa.h> | 57 | #include <linux/platform_data/media/camera-pxa.h> |
| 58 | #include <mach/audio.h> | 58 | #include <mach/audio.h> |
| 59 | #include <mach/smemc.h> | 59 | #include <mach/smemc.h> |
| 60 | #include <media/soc_camera.h> | 60 | #include <media/soc_camera.h> |
| @@ -43,7 +43,7 @@ · 42 unmodified lines | |||
| 43 | #include <linux/platform_data/usb-ohci-pxa27x.h> | 43 | #include <linux/platform_data/usb-ohci-pxa27x.h> |
| 44 | #include <mach/pxa2xx-regs.h> | 44 | #include <mach/pxa2xx-regs.h> |
| 45 | #include <linux/platform_data/asoc-palm27x.h> | 45 | #include <linux/platform_data/asoc-palm27x.h> |
| 46 | #include <linux/platform_data/camera-pxa.h> | 46 | #include <linux/platform_data/media/camera-pxa.h> |
| 47 | #include <mach/palm27x.h> | 47 | #include <mach/palm27x.h> |
| 48 | 48 | ||
| 49 | #include <sound/pxa2xx-lib.h> | 49 | #include <sound/pxa2xx-lib.h> |
| @@ -49,7 +49,7 @@ · 48 unmodified lines | |||
| 49 | #include <mach/palm27x.h> | 49 | #include <mach/palm27x.h> |
| 50 | 50 | ||
| 51 | #include <mach/pm.h> | 51 | #include <mach/pm.h> |
| 52 | #include <linux/platform_data/camera-pxa.h> | 52 | #include <linux/platform_data/media/camera-pxa.h> |
| 53 | 53 | ||
| 54 | #include <media/soc_camera.h> | 54 | #include <media/soc_camera.h> |
| 55 | 55 | ||
| @@ -30,7 +30,7 @@ · 29 unmodified lines | |||
| 30 | #include <media/i2c/mt9v022.h> | 30 | #include <media/i2c/mt9v022.h> |
| 31 | #include <media/soc_camera.h> | 31 | #include <media/soc_camera.h> |
| 32 | 32 | ||
| 33 | #include <linux/platform_data/camera-pxa.h> | 33 | #include <linux/platform_data/media/camera-pxa.h> |
| 34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
| 35 | #include <mach/pxa27x.h> | 35 | #include <mach/pxa27x.h> |
| 36 | #include <mach/audio.h> | 36 | #include <mach/audio.h> |
| @@ -28,7 +28,7 @@ · 27 unmodified lines | |||
| 28 | #include <linux/slab.h> | 28 | #include <linux/slab.h> |
| 29 | #include <linux/videodev2.h> | 29 | #include <linux/videodev2.h> |
| 30 | #include <linux/of.h> | 30 | #include <linux/of.h> |
| 31 | #include <linux/platform_data/coda.h> | 31 | #include <linux/platform_data/media/coda.h> |
| 32 | #include <linux/reset.h> | 32 | #include <linux/reset.h> |
| 33 | 33 | ||
| 34 | #include <media/v4l2-ctrls.h> | 34 | #include <media/v4l2-ctrls.h> |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | |||
| 39 | 39 | ||
| 40 | #include <linux/videodev2.h> | 40 | #include <linux/videodev2.h> |
| 41 | 41 | ||
| 42 | #include <linux/platform_data/camera-mx2.h> | 42 | #include <linux/platform_data/media/camera-mx2.h> |
| 43 | 43 | ||
| 44 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
| 45 | 45 | ||
| @@ -25,7 +25,7 @@ · 24 unmodified lines | |||
| 25 | #include <media/soc_camera.h> | 25 | #include <media/soc_camera.h> |
| 26 | #include <media/drv-intf/soc_mediabus.h> | 26 | #include <media/drv-intf/soc_mediabus.h> |
| 27 | 27 | ||
| 28 | #include <linux/platform_data/camera-mx3.h> | 28 | #include <linux/platform_data/media/camera-mx3.h> |
| 29 | #include <linux/platform_data/dma-imx.h> | 29 | #include <linux/platform_data/dma-imx.h> |
| 30 | 30 | ||
| 31 | #define MX3_CAM_DRV_NAME "mx3-camera" | 31 | #define MX3_CAM_DRV_NAME "mx3-camera" |
| @@ -39,7 +39,7 @@ · 38 unmodified lines | |||
| 39 | #include <linux/videodev2.h> | 39 | #include <linux/videodev2.h> |
| 40 | 40 | ||
| 41 | #include <mach/dma.h> | 41 | #include <mach/dma.h> |
| 42 | #include <linux/platform_data/camera-pxa.h> | 42 | #include <linux/platform_data/media/camera-pxa.h> |
| 43 | 43 | ||
| 44 | #define PXA_CAM_VERSION "0.0.6" | 44 | #define PXA_CAM_VERSION "0.0.6" |
| 45 | #define PXA_CAM_DRV_NAME "pxa27x-camera" | 45 | #define PXA_CAM_DRV_NAME "pxa27x-camera" |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/of.h> | 22 | #include <linux/of.h> |
| 23 | #include <linux/of_device.h> | 23 | #include <linux/of_device.h> |
| 24 | #include <linux/platform_data/camera-rcar.h> | 24 | #include <linux/platform_data/media/camera-rcar.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/pm_runtime.h> | 26 | #include <linux/pm_runtime.h> |
| 27 | #include <linux/slab.h> | 27 | #include <linux/slab.h> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.