Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a71daaa1 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[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

Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 886aa71b
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -177,7 +177,7 @@ struct platform_device *__init imx_add_imx_uart_1irq(
		const struct imxuart_platform_data *pdata);
		const struct imxuart_platform_data *pdata);


#include <linux/platform_data/video-mx3fb.h>
#include <linux/platform_data/video-mx3fb.h>
#include <linux/platform_data/camera-mx3.h>
#include <linux/platform_data/media/camera-mx3.h>
struct imx_ipu_core_data {
struct imx_ipu_core_data {
	resource_size_t iobase;
	resource_size_t iobase;
	resource_size_t synirq;
	resource_size_t synirq;
@@ -192,7 +192,7 @@ struct platform_device *__init imx_add_mx3_sdc_fb(
		const struct imx_ipu_core_data *data,
		const struct imx_ipu_core_data *data,
		struct mx3fb_platform_data *pdata);
		struct mx3fb_platform_data *pdata);


#include <linux/platform_data/camera-mx2.h>
#include <linux/platform_data/media/camera-mx2.h>
struct imx_mx2_camera_data {
struct imx_mx2_camera_data {
	const char *devid;
	const char *devid;
	resource_size_t iobasecsi;
	resource_size_t iobasecsi;
+1 −1
Original line number Original line Diff line number Diff line
@@ -14,7 +14,7 @@
#include <mach/irqs.h>
#include <mach/irqs.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>
#include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <mach/audio.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <linux/platform_data/mmp_dma.h>
#include <linux/platform_data/mmp_dma.h>
+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>
#include <linux/platform_data/media/camera-pxa.h>


#include "generic.h"
#include "generic.h"
#include "devices.h"
#include "devices.h"
+1 −1
Original line number Original line Diff line number Diff line
@@ -34,7 +34,7 @@
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <linux/platform_data/usb-ohci-pxa27x.h>
#include <mach/hardware.h>
#include <mach/hardware.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/keypad-pxa27x.h>
#include <linux/platform_data/camera-pxa.h>
#include <linux/platform_data/media/camera-pxa.h>


#include "devices.h"
#include "devices.h"
#include "generic.h"
#include "generic.h"
+1 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,7 @@
#include <linux/platform_data/mmc-pxamci.h>
#include <linux/platform_data/mmc-pxamci.h>
#include <mach/udc.h>
#include <mach/udc.h>
#include <mach/pxa27x-udc.h>
#include <mach/pxa27x-udc.h>
#include <linux/platform_data/camera-pxa.h>
#include <linux/platform_data/media/camera-pxa.h>
#include <mach/audio.h>
#include <mach/audio.h>
#include <mach/smemc.h>
#include <mach/smemc.h>
#include <media/soc_camera.h>
#include <media/soc_camera.h>
Loading