include/media: move platform driver headers to a separate dir
Subsystems (30)
A message that is not in the archive (sent off-list or not yet received): 413d2bb0b813a7e62867de7a94b0ab61e16cb1cb.1447261977.git.mchehab@osg.samsung.com
PATCH 2/2 include/media: move platform driver headers to a separate dir
Let's not mix headers used by the core with those headers that are needed by some specific platform drivers.
This patch was made via this script:
mkdir include/media/platform 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 platform list`" != "" ]; then git mv $i include/media/platform; fi; fi; done git mv include/media/exynos* include/media/s5p* include/media/omap* include/media/soc_* include/media/sh_include/media/platform/ for i in $(find include/media/ -type f); do n=`basename $i`; git grep -l $n; done|sort|uniq >files && (echo "for i in \$(cat files); do cat \$i | \\"; cd include/media; for j in rc/ i2c/ platform/ common_drv/; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<]media/)($i)([\\\"\\>]),\1$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done") >script && . ./script
rename include/media/{ => platform}/exynos-fimc.h (100%)
rename include/media/{ => platform}/mmp-camera.h (100%)
rename include/media/{ => platform}/omap1_camera.h (100%)
rename include/media/{ => platform}/omap4iss.h (100%)
rename include/media/{ => platform}/s3c_camif.h (100%)
rename include/media/{ => platform}/s5p_hdmi.h (100%)
rename include/media/{ => platform}/sh_mobile_ceu.h (100%)
rename include/media/{ => platform}/sh_mobile_csi2.h (100%)
rename include/media/{ => platform}/sh_vou.h (100%)
rename include/media/{ => platform}/sii9234.h (100%)
rename include/media/{ => platform}/soc_camera.h (100%)
rename include/media/{ => platform}/soc_camera_platform.h (98%)
rename include/media/{ => platform}/soc_mediabus.h (100%)arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -1
@@ -33,7 +33,7 @@#include <linux/dma-mapping.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <sound/tlv320aic32x4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx27_3ds.c +1 -1
@@ -31,7 +31,7 @@#include <linux/regulator/machine.h> #include <linux/spi/l4f00242t03.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx31_3ds.c +1 -1
@@ -28,7 +28,7 @@#include <linux/usb/ulpi.h> #include <linux/memblock.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx35_3ds.c +1 -1
@@ -45,7 +45,7 @@#include <video/platform_lcd.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include "3ds_debugboard.h" #include "common.h"
arch/arm/mach-imx/mach-pcm037.c +1 -1
@@ -35,7 +35,7 @@#include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mx31moboard-marxbot.c +1 -1
@@ -24,7 +24,7 @@#include <linux/usb/otg.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include "common.h" #include "devices-imx31.h"
arch/arm/mach-imx/mx31moboard-smartbot.c +1 -1
@@ -23,7 +23,7 @@#include <linux/usb/otg.h> #include <linux/usb/ulpi.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include "board-mx31moboard.h" #include "common.h"
arch/arm/mach-omap1/board-ams-delta.c +1 -1
@@ -28,7 +28,7 @@#include <linux/io.h> #include <linux/platform_data/gpio-omap.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/serial.h> #include <asm/mach-types.h>
arch/arm/mach-omap1/include/mach/camera.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_ARCH_CAMERA_H_#define __ASM_ARCH_CAMERA_H_ -#include <media/omap1_camera.h> +#include <media/platform/omap1_camera.h> void omap1_camera_init (void *);
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -34,7 +34,7 @@#include <linux/i2c/pxa-i2c.h> #include <linux/regulator/userspace-consumer.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-pxa/ezx.c +1 -1
@@ -22,7 +22,7 @@#include <linux/leds-lp3944.h> #include <linux/i2c/pxa-i2c.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/setup.h> #include <asm/mach-types.h>
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -56,7 +56,7 @@#include <linux/platform_data/camera-pxa.h> #include <mach/audio.h> #include <mach/smemc.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <mach/mioa701.h>
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -51,7 +51,7 @@#include <mach/pm.h> #include <linux/platform_data/camera-pxa.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include "generic.h" #include "devices.h"
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -27,7 +27,7 @@#include <linux/pwm_backlight.h> #include <media/i2c/mt9v022.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <linux/platform_data/camera-pxa.h> #include <asm/mach/map.h>
arch/arm/mach-shmobile/board-bockw.c +1 -1
@@ -31,7 +31,7 @@#include <linux/spi/flash.h> #include <linux/usb/renesas_usbhs.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <asm/mach/arch.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h>
arch/arm/plat-samsung/devs.c +1 -1
@@ -36,7 +36,7 @@#include <linux/platform_data/s3c-hsotg.h> #include <linux/platform_data/dma-s3c24xx.h> -#include <media/s5p_hdmi.h> +#include <media/platform/s5p_hdmi.h> #include <asm/irq.h> #include <asm/mach/arch.h>
arch/sh/boards/mach-ap325rxa/setup.c +3 -3
@@ -28,9 +28,9 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> -#include <media/soc_camera_platform.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_camera_platform.h> +#include <media/platform/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> #include <asm/io.h> #include <asm/clock.h>
arch/sh/boards/mach-ecovec24/setup.c +3 -3
@@ -38,8 +38,8 @@#include <video/sh_mobile_lcdc.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> -#include <media/sh_mobile_ceu.h> -#include <media/soc_camera.h> +#include <media/platform/sh_mobile_ceu.h> +#include <media/platform/soc_camera.h> #include <media/i2c/tw9910.h> #include <media/i2c/mt9t112.h> #include <asm/heartbeat.h>
@@ -901,7 +901,7 @@ static struct platform_device irda_device = { };#include <media/i2c/ak881x.h> -#include <media/sh_vou.h> +#include <media/platform/sh_vou.h> static struct ak881x_pdata ak881x_pdata = { .flags =AK881X_IF_MODE_SLAVE ,
arch/sh/boards/mach-kfr2r09/setup.c +2 -2
@@ -28,8 +28,8 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <media/i2c/rj54n1cb0c.h> -#include <media/soc_camera.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform/soc_camera.h> +#include <media/platform/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> #include <asm/suspend.h> #include <asm/clock.h>
arch/sh/boards/mach-migor/setup.c +2 -2
@@ -27,9 +27,9 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <video/sh_mobile_lcdc.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform/sh_mobile_ceu.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/i2c/tw9910.h> #include <asm/clock.h> #include <asm/machvec.h>
arch/sh/boards/mach-se/7724/setup.c +2 -2
@@ -30,7 +30,7 @@#include <linux/sh_intc.h> #include <linux/videodev2.h> #include <video/sh_mobile_lcdc.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform/sh_mobile_ceu.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> #include <asm/io.h>
@@ -535,7 +535,7 @@ static struct platform_device irda_device = { };#include <media/i2c/ak881x.h> -#include <media/sh_vou.h> +#include <media/platform/sh_vou.h> static struct ak881x_pdata ak881x_pdata = { .flags =AK881X_IF_MODE_SLAVE ,
drivers/media/i2c/m5mols/m5mols_capture.c +1 -1
@@ -26,7 +26,7 @@#include <media/v4l2-device.h> #include <media/v4l2-subdev.h> #include <media/i2c/m5mols.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "m5mols.h" #include "m5mols_reg.h"
drivers/media/i2c/soc_camera/imx074.c +1 -1
@@ -17,7 +17,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-async.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/mt9m001.c +2 -2
@@ -14,8 +14,8 @@#include <linux/log2.h> #include <linux/module.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9m111.c +1 -1
@@ -16,7 +16,7 @@#include <linux/v4l2-mediabus.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9t031.c +1 -1
@@ -17,7 +17,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9t112.c +1 -1
@@ -26,7 +26,7 @@#include <linux/videodev2.h> #include <media/i2c/mt9t112.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-image-sizes.h>
drivers/media/i2c/soc_camera/mt9v022.c +2 -2
@@ -16,8 +16,8 @@#include <linux/module.h> #include <media/i2c/mt9v022.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-subdev.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov2640.c +1 -1
@@ -24,7 +24,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov5642.c +1 -1
@@ -23,7 +23,7 @@#include <linux/module.h> #include <linux/v4l2-mediabus.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/ov6650.c +1 -1
@@ -31,7 +31,7 @@#include <linux/v4l2-mediabus.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov772x.c +1 -1
@@ -25,7 +25,7 @@#include <linux/videodev2.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/ov9640.c +1 -1
@@ -27,7 +27,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov9740.c +1 -1
@@ -16,7 +16,7 @@#include <linux/slab.h> #include <linux/v4l2-mediabus.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/rj54n1cb0c.c +1 -1
@@ -16,7 +16,7 @@#include <linux/module.h> #include <media/i2c/rj54n1cb0c.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/tw9910.c +1 -1
@@ -25,7 +25,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/i2c/tw9910.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/platform/exynos4-is/common.c +1 -1
@@ -10,7 +10,7 @@*/ #include <linux/module.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "common.h" /* Called with the media graph mutex held or entity->stream_count > 0. */
drivers/media/platform/exynos4-is/fimc-core.h +1 -1
@@ -27,7 +27,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mem2mem.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #define dbg(fmt, args...) \ pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
drivers/media/platform/exynos4-is/fimc-isp-video.c +1 -1
@@ -30,7 +30,7 @@#include <media/v4l2-ioctl.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "common.h" #include "media-dev.h"
drivers/media/platform/exynos4-is/fimc-isp.h +1 -1
@@ -24,7 +24,7 @@#include <media/videobuf2-v4l2.h> #include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> extern int fimc_isp_debug;
drivers/media/platform/exynos4-is/fimc-lite-reg.c +1 -1
@@ -12,7 +12,7 @@#include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "fimc-lite-reg.h" #include "fimc-lite.h"
drivers/media/platform/exynos4-is/fimc-lite.c +1 -1
@@ -30,7 +30,7 @@#include <media/v4l2-mem2mem.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "common.h" #include "fimc-core.h"
drivers/media/platform/exynos4-is/fimc-lite.h +1 -1
@@ -23,7 +23,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #define FIMC_LITE_DRV_NAME "exynos-fimc-lite"#define FLITE_CLK_NAME "flite"
drivers/media/platform/exynos4-is/fimc-reg.c +1 -1
@@ -13,7 +13,7 @@#include <linux/io.h> #include <linux/regmap.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "media-dev.h" #include "fimc-reg.h"
drivers/media/platform/exynos4-is/media-dev.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-of.h> #include <media/media-device.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "media-dev.h" #include "fimc-core.h"
drivers/media/platform/exynos4-is/media-dev.h +1 -1
@@ -19,7 +19,7 @@#include <media/media-entity.h> #include <media/v4l2-device.h> #include <media/v4l2-subdev.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include "fimc-core.h" #include "fimc-lite.h"
drivers/media/platform/exynos4-is/mipi-csis.c +1 -1
@@ -29,7 +29,7 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/videodev2.h> -#include <media/exynos-fimc.h> +#include <media/platform/exynos-fimc.h> #include <media/v4l2-of.h> #include <media/v4l2-subdev.h>
drivers/media/platform/marvell-ccic/mmp-driver.c +1 -1
@@ -18,7 +18,7 @@#include <linux/slab.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> -#include <media/mmp-camera.h> +#include <media/platform/mmp-camera.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/gpio.h>
drivers/media/platform/s3c-camif/camif-core.h +1 -1
@@ -26,7 +26,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> #include <media/videobuf2-v4l2.h> -#include <media/s3c_camif.h> +#include <media/platform/s3c_camif.h> #define S3C_CAMIF_DRIVER_NAME "s3c-camif"#define CAMIF_REQ_BUFS_MIN 3
drivers/media/platform/s3c-camif/camif-regs.h +1 -1
@@ -13,7 +13,7 @@#define CAMIF_REGS_H_ #include "camif-core.h" -#include <media/s3c_camif.h> +#include <media/platform/s3c_camif.h> /* * The id argument indicates the processing path:
drivers/media/platform/s5p-tv/hdmi_drv.c +1 -1
@@ -33,7 +33,7 @@#include <linux/regulator/consumer.h> #include <linux/v4l2-dv-timings.h> -#include <media/s5p_hdmi.h> +#include <media/platform/s5p_hdmi.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/s5p-tv/sii9234_drv.c +1 -1
@@ -23,7 +23,7 @@#include <linux/regulator/machine.h> #include <linux/slab.h> -#include <media/sii9234.h> +#include <media/platform/sii9234.h> #include <media/v4l2-subdev.h> MODULE_AUTHOR ("Tomasz Stanislawski <[email protected]>" );
drivers/media/platform/sh_vou.c +1 -1
@@ -22,7 +22,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/sh_vou.h> +#include <media/platform/sh_vou.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h>
drivers/media/platform/soc_camera/atmel-isi.c +2 -2
@@ -23,8 +23,8 @@#include <linux/pm_runtime.h> #include <linux/slab.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-of.h> #include <media/videobuf2-dma-contig.h>
drivers/media/platform/soc_camera/mx2_camera.c +2 -2
@@ -34,8 +34,8 @@#include <media/v4l2-dev.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <linux/videodev2.h>
drivers/media/platform/soc_camera/mx3_camera.c +2 -2
@@ -22,8 +22,8 @@#include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/videobuf2-dma-contig.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <linux/platform_data/camera-mx3.h> #include <linux/platform_data/dma-imx.h>
drivers/media/platform/soc_camera/omap1_camera.c +3 -3
@@ -28,9 +28,9 @@#include <linux/platform_device.h> #include <linux/slab.h> -#include <media/omap1_camera.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/omap1_camera.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/videobuf-dma-contig.h> #include <media/videobuf-dma-sg.h>
drivers/media/platform/soc_camera/pxa_camera.c +2 -2
@@ -32,8 +32,8 @@#include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/videobuf-dma-sg.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-of.h> #include <linux/videodev2.h>
drivers/media/platform/soc_camera/rcar_vin.c +2 -2
@@ -27,8 +27,8 @@#include <linux/slab.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +4 -4
@@ -39,12 +39,12 @@#include <media/v4l2-async.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> -#include <media/soc_camera.h> -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> +#include <media/platform/soc_camera.h> +#include <media/platform/sh_mobile_ceu.h> +#include <media/platform/sh_mobile_csi2.h> #include <media/videobuf2-dma-contig.h> #include <media/v4l2-mediabus.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_mediabus.h> #include "soc_scale_crop.h"
drivers/media/platform/soc_camera/sh_mobile_csi2.c +4 -4
@@ -18,10 +18,10 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/sh_mobile_ceu.h> +#include <media/platform/sh_mobile_csi2.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/soc_camera/soc_camera.c +2 -2
@@ -29,8 +29,8 @@#include <linux/slab.h> #include <linux/vmalloc.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_mediabus.h> #include <media/v4l2-async.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h>
drivers/media/platform/soc_camera/soc_camera_platform.c +2 -2
@@ -17,8 +17,8 @@#include <linux/platform_device.h> #include <linux/videodev2.h> #include <media/v4l2-subdev.h> -#include <media/soc_camera.h> -#include <media/soc_camera_platform.h> +#include <media/platform/soc_camera.h> +#include <media/platform/soc_camera_platform.h> struct soc_camera_platform_priv {struct v4l2_subdev subdev;
drivers/media/platform/soc_camera/soc_mediabus.c +1 -1
@@ -13,7 +13,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/soc_mediabus.h> +#include <media/platform/soc_mediabus.h> static const struct soc_mbus_lookup mbus_fmt[] = { {
drivers/media/platform/soc_camera/soc_scale_crop.c +1 -1
@@ -12,7 +12,7 @@#include <linux/device.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-common.h> #include "soc_scale_crop.h"
drivers/media/usb/em28xx/em28xx-camera.c +1 -1
@@ -20,7 +20,7 @@*/ #include <linux/i2c.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/i2c/mt9v011.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h>
drivers/staging/media/omap4iss/iss.h +1 -1
@@ -20,7 +20,7 @@#include <linux/platform_device.h> #include <linux/wait.h> -#include <media/omap4iss.h> +#include <media/platform/omap4iss.h> #include "iss_regs.h" #include "iss_csiphy.h"
drivers/staging/media/omap4iss/iss_csiphy.h +1 -1
@@ -14,7 +14,7 @@#ifndef OMAP4_ISS_CSI_PHY_H #define OMAP4_ISS_CSI_PHY_H -#include <media/omap4iss.h> +#include <media/platform/omap4iss.h> struct iss_csi2_device ;
include/media/i2c/tw9910.h +1 -1
@@ -16,7 +16,7 @@#ifndef __TW9910_H__#define __TW9910_H__ -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> enum tw9910_mpout_pin { TW9910_MPO_VLOSS,
include/media/platform/exynos-fimc.h renamed from include/media/exynos-fimc.h +0 -0
include/media/platform/mmp-camera.h renamed from include/media/mmp-camera.h +0 -0
include/media/platform/omap1_camera.h renamed from include/media/omap1_camera.h +0 -0
include/media/platform/omap4iss.h renamed from include/media/omap4iss.h +0 -0
include/media/platform/s3c_camif.h renamed from include/media/s3c_camif.h +0 -0
include/media/platform/s5p_hdmi.h renamed from include/media/s5p_hdmi.h +0 -0
include/media/platform/sh_mobile_ceu.h renamed from include/media/sh_mobile_ceu.h +0 -0
include/media/platform/sh_mobile_csi2.h renamed from include/media/sh_mobile_csi2.h +0 -0
include/media/platform/sh_vou.h renamed from include/media/sh_vou.h +0 -0
include/media/platform/sii9234.h renamed from include/media/sii9234.h +0 -0
include/media/platform/soc_camera.h renamed from include/media/soc_camera.h +0 -0
include/media/platform/soc_camera_platform.h renamed from include/media/soc_camera_platform.h +1 -1
@@ -12,7 +12,7 @@#define __SOC_CAMERA_H__#include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform/soc_camera.h> #include <media/v4l2-mediabus.h> struct device ;
include/media/platform/soc_mediabus.h renamed from include/media/soc_mediabus.h +0 -0
Signature · 1 line
2.4.3
PATCH 2/2 include/media: move platform driver headers to a separate dir
Quoted 5 lines · On Wednesday 11 November 2015 15:14:48 Mauro Carvalho Chehab wrote:
rename include/media/{ => platform}/exynos-fimc.h (100%)
rename include/media/{ => platform}/mmp-camera.h (100%)
rename include/media/{ => platform}/omap1_camera.h (100%)
rename include/media/{ => platform}/omap4iss.h (100%)
rename include/media/{ => platform}/s3c_camif.h (100%)Quoted 8 lines
rename include/media/{ => platform}/s5p_hdmi.h (100%)
rename include/media/{ => platform}/sh_mobile_ceu.h (100%)
rename include/media/{ => platform}/sh_mobile_csi2.h (100%)
rename include/media/{ => platform}/sh_vou.h (100%)
rename include/media/{ => platform}/sii9234.h (100%)
rename include/media/{ => platform}/soc_camera.h (100%)
rename include/media/{ => platform}/soc_camera_platform.h (98%)
rename include/media/{ => platform}/soc_mediabus.h (100%)This still seems to be a mix of various things. Some of these are interfaces between drivers, while others declare a foo_platform_data structure that is used to interface between platform code and the driver.
I think the latter should go into include/linux/platform_data/media/*.h instead.
Arnd
PATCH 2/2 include/media: move platform driver headers to a separate dir
Em Wed, 11 Nov 2015 21:26:31 +0100
Arnd Bergmann <[email protected]> escreveu:
Quoted 15 lines · On Wednesday 11 November 2015 15:14:48 Mauro Carvalho Chehab wrote:
Quoted 5 lines
rename include/media/{ => platform}/exynos-fimc.h (100%) rename include/media/{ => platform}/mmp-camera.h (100%) rename include/media/{ => platform}/omap1_camera.h (100%) rename include/media/{ => platform}/omap4iss.h (100%) rename include/media/{ => platform}/s3c_camif.h (100%)Quoted 8 lines
rename include/media/{ => platform}/s5p_hdmi.h (100%) rename include/media/{ => platform}/sh_mobile_ceu.h (100%) rename include/media/{ => platform}/sh_mobile_csi2.h (100%) rename include/media/{ => platform}/sh_vou.h (100%) rename include/media/{ => platform}/sii9234.h (100%) rename include/media/{ => platform}/soc_camera.h (100%) rename include/media/{ => platform}/soc_camera_platform.h (98%) rename include/media/{ => platform}/soc_mediabus.h (100%)
Quoted 3 lines
This still seems to be a mix of various things. Some of these are interfaces between drivers, while others declare a
foo_platform_datastructure that is used to interface between platform code and the driver.
True. What about calling putting those driver interfaces under include/media/drv-intf? That also helps moving the headers for other non-platform drivers too.
Quoted 2 lines
I think the latter should go into
include/linux/platform_data/media/*.hinstead.
Agreed.
Please see the enclosed patch:
Subject: [PATCH] [media] include/media: move platform driver headers to a
separate dirs
Let's not mix headers used by the core with those headers that are needed by some specific platform drivers or by platform data.
This patch was made via this script:
mkdir include/media/platform mkdir include/media/platform_data (cd include/media/; git mv $(grep -l platform_data *.h|grep -v v4l2) platform_data/) 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 platform list`" != "" ]; then git mv $i include/media/drv-intf; fi; fi; done git mv include/media/exynos* include/media/soc_* include/media/sh_* include/media/drv-intf/
And some headers were manually adjusted. Then, this script fixed the address for those new headers:
for i in $(find include/media/ -type f); do n=`basename $i`; git grep -l $n; done|sort|uniq >files && (echo "for i in \$(cat files); do cat \$i | \\"; cd include/media; for j in platform/ platform_data/; do for i in $(ls $j); do echo "perl -ne 's,(include [\\\"\\<]media/)($i)([\\\"\\>]),\1$j\2\3,; print \$_' |\\"; done; done; echo "cat > a && mv a \$i; done") >script&& . ./script
---
arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 2 +-
arch/arm/mach-imx/mach-mx27_3ds.c | 2 +-
arch/arm/mach-imx/mach-mx31_3ds.c | 2 +-
arch/arm/mach-imx/mach-mx35_3ds.c | 2 +-
arch/arm/mach-imx/mach-pcm037.c | 2 +-
arch/arm/mach-imx/mx31moboard-marxbot.c | 2 +-
arch/arm/mach-imx/mx31moboard-smartbot.c | 2 +-
arch/arm/mach-omap1/board-ams-delta.c | 2 +-
arch/arm/mach-omap1/include/mach/camera.h | 2 +-
arch/arm/mach-omap2/board-rx51-peripherals.c | 4 ++--
arch/arm/mach-pxa/em-x270.c | 2 +-
arch/arm/mach-pxa/ezx.c | 2 +-
arch/arm/mach-pxa/mioa701.c | 2 +-
arch/arm/mach-pxa/palmz72.c | 2 +-
arch/arm/mach-pxa/pcm990-baseboard.c | 2 +-
arch/arm/mach-shmobile/board-bockw.c | 2 +-
arch/arm/plat-samsung/devs.c | 2 +-
arch/sh/boards/mach-ap325rxa/setup.c | 6 +++---
arch/sh/boards/mach-ecovec24/setup.c | 6 +++---
arch/sh/boards/mach-kfr2r09/setup.c | 4 ++--
arch/sh/boards/mach-migor/setup.c | 4 ++--
arch/sh/boards/mach-se/7724/setup.c | 4 ++--
drivers/media/common/cx2341x.c | 2 +-
drivers/media/common/saa7146/saa7146_core.c | 2 +-
drivers/media/common/saa7146/saa7146_fops.c | 2 +-
drivers/media/common/saa7146/saa7146_hlp.c | 2 +-
drivers/media/common/saa7146/saa7146_i2c.c | 2 +-
drivers/media/common/saa7146/saa7146_vbi.c | 2 +-
drivers/media/common/saa7146/saa7146_video.c | 2 +-
drivers/media/i2c/cx25840/cx25840-audio.c | 2 +-
drivers/media/i2c/cx25840/cx25840-core.c | 2 +-
drivers/media/i2c/cx25840/cx25840-firmware.c | 2 +-
drivers/media/i2c/cx25840/cx25840-ir.c | 2 +-
drivers/media/i2c/cx25840/cx25840-vbi.c | 2 +-
drivers/media/i2c/m5mols/m5mols_capture.c | 2 +-
drivers/media/i2c/msp3400-driver.c | 2 +-
drivers/media/i2c/msp3400-driver.h | 2 +-
drivers/media/i2c/msp3400-kthreads.c | 2 +-
drivers/media/i2c/smiapp/smiapp.h | 2 +-
drivers/media/i2c/soc_camera/imx074.c | 2 +-
drivers/media/i2c/soc_camera/mt9m001.c | 4 ++--
drivers/media/i2c/soc_camera/mt9m111.c | 2 +-
drivers/media/i2c/soc_camera/mt9t031.c | 2 +-
drivers/media/i2c/soc_camera/mt9t112.c | 2 +-
drivers/media/i2c/soc_camera/mt9v022.c | 4 ++--
drivers/media/i2c/soc_camera/ov2640.c | 2 +-
drivers/media/i2c/soc_camera/ov5642.c | 2 +-
drivers/media/i2c/soc_camera/ov6650.c | 2 +-
drivers/media/i2c/soc_camera/ov772x.c | 2 +-
drivers/media/i2c/soc_camera/ov9640.c | 2 +-
drivers/media/i2c/soc_camera/ov9740.c | 2 +-
drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +-
drivers/media/i2c/soc_camera/tw9910.c | 2 +-
drivers/media/pci/bt8xx/bttv-driver.c | 2 +-
drivers/media/pci/bt8xx/bttvp.h | 2 +-
drivers/media/pci/cx18/cx23418.h | 2 +-
drivers/media/pci/cx23885/cx23885-417.c | 2 +-
drivers/media/pci/cx23885/cx23885-cards.c | 2 +-
drivers/media/pci/cx23885/cx23885-video.c | 2 +-
drivers/media/pci/cx23885/cx23885.h | 2 +-
drivers/media/pci/cx88/cx88-blackbird.c | 2 +-
drivers/media/pci/cx88/cx88.h | 2 +-
drivers/media/pci/ivtv/ivtv-cards.c | 4 ++--
drivers/media/pci/ivtv/ivtv-driver.h | 2 +-
drivers/media/pci/ivtv/ivtv-i2c.c | 2 +-
drivers/media/pci/ivtv/ivtv-routing.c | 2 +-
drivers/media/pci/saa7146/hexium_gemini.c | 2 +-
drivers/media/pci/saa7146/hexium_orion.c | 2 +-
drivers/media/pci/saa7146/mxb.c | 2 +-
drivers/media/pci/ttpci/av7110.h | 2 +-
drivers/media/pci/ttpci/budget-av.c | 2 +-
drivers/media/pci/ttpci/budget.h | 2 +-
drivers/media/platform/exynos4-is/common.c | 2 +-
drivers/media/platform/exynos4-is/fimc-core.h | 2 +-
drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +-
drivers/media/platform/exynos4-is/fimc-isp.h | 2 +-
drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +-
drivers/media/platform/exynos4-is/fimc-lite.c | 2 +-
drivers/media/platform/exynos4-is/fimc-lite.h | 2 +-
drivers/media/platform/exynos4-is/fimc-reg.c | 2 +-
drivers/media/platform/exynos4-is/media-dev.c | 2 +-
drivers/media/platform/exynos4-is/media-dev.h | 2 +-
drivers/media/platform/exynos4-is/mipi-csis.c | 2 +-
drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +-
drivers/media/platform/s3c-camif/camif-core.h | 2 +-
drivers/media/platform/s3c-camif/camif-regs.h | 2 +-
drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +-
drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +-
drivers/media/platform/sh_vou.c | 2 +-
drivers/media/platform/soc_camera/atmel-isi.c | 4 ++--
drivers/media/platform/soc_camera/mx2_camera.c | 4 ++--
drivers/media/platform/soc_camera/mx3_camera.c | 4 ++--
drivers/media/platform/soc_camera/omap1_camera.c | 6 +++---
drivers/media/platform/soc_camera/pxa_camera.c | 4 ++--
drivers/media/platform/soc_camera/rcar_vin.c | 4 ++--
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c | 8 ++++----
drivers/media/platform/soc_camera/sh_mobile_csi2.c | 8 ++++----
drivers/media/platform/soc_camera/soc_camera.c | 4 ++--
drivers/media/platform/soc_camera/soc_camera_platform.c | 4 ++--
drivers/media/platform/soc_camera/soc_mediabus.c | 2 +-
drivers/media/platform/soc_camera/soc_scale_crop.c | 2 +-
drivers/media/platform/timblogiw.c | 2 +-
drivers/media/radio/radio-maxiradio.c | 2 +-
drivers/media/radio/radio-sf16fmr2.c | 2 +-
drivers/media/radio/radio-shark.c | 2 +-
drivers/media/radio/radio-si476x.c | 2 +-
drivers/media/radio/radio-timb.c | 2 +-
drivers/media/radio/si4713/radio-usb-si4713.c | 2 +-
drivers/media/radio/si4713/si4713.h | 2 +-
drivers/media/radio/tea575x.c | 2 +-
drivers/media/rc/gpio-ir-recv.c | 2 +-
drivers/media/rc/ir-rx51.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-417.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 2 +-
drivers/media/usb/cx231xx/cx231xx.h | 2 +-
drivers/media/usb/em28xx/em28xx-camera.c | 2 +-
drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
drivers/media/usb/em28xx/em28xx-video.c | 2 +-
drivers/media/usb/pvrusb2/pvrusb2-audio.c | 2 +-
drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +-
drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 2 +-
drivers/mfd/timberdale.c | 4 ++--
drivers/staging/media/omap4iss/iss.h | 2 +-
drivers/staging/media/omap4iss/iss_csiphy.h | 2 +-
include/media/{ => drv-intf}/cx2341x.h | 0
include/media/{ => drv-intf}/cx25840.h | 0
include/media/{ => drv-intf}/exynos-fimc.h | 0
include/media/{ => drv-intf}/msp3400.h | 0
include/media/{ => drv-intf}/s3c_camif.h | 0
include/media/{ => drv-intf}/saa7146.h | 0
include/media/{ => drv-intf}/saa7146_vv.h | 2 +-
include/media/{ => drv-intf}/sh_mobile_ceu.h | 0
include/media/{ => drv-intf}/sh_mobile_csi2.h | 0
include/media/{ => drv-intf}/sh_vou.h | 0
include/media/{ => drv-intf}/si476x.h | 0
include/media/{ => drv-intf}/soc_mediabus.h | 0
include/media/{ => drv-intf}/tea575x.h | 0
include/media/i2c/tw9910.h | 2 +-
include/media/{ => platform_data}/gpio-ir-recv.h | 0
include/media/{ => platform_data}/ir-rx51.h | 0
include/media/{ => platform_data}/mmp-camera.h | 0
include/media/{ => platform_data}/omap1_camera.h | 0
include/media/{ => platform_data}/omap4iss.h | 0
include/media/{ => platform_data}/s5p_hdmi.h | 0
include/media/{ => platform_data}/si4713.h | 0
include/media/{ => platform_data}/sii9234.h | 0
include/media/{ => platform_data}/smiapp.h | 0
include/media/{ => platform_data}/soc_camera.h | 0
include/media/{ => platform_data}/soc_camera_platform.h | 2 +-
include/media/{ => platform_data}/timb_radio.h | 0
include/media/{ => platform_data}/timb_video.h | 0
sound/pci/es1968.c | 2 +-
sound/pci/fm801.c | 2 +-
155 files changed, 158 insertions(+), 158 deletions(-)arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1 -1
@@ -33,7 +33,7 @@#include <linux/dma-mapping.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <sound/tlv320aic32x4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx27_3ds.c +1 -1
@@ -31,7 +31,7 @@#include <linux/regulator/machine.h> #include <linux/spi/l4f00242t03.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx31_3ds.c +1 -1
@@ -28,7 +28,7 @@#include <linux/usb/ulpi.h> #include <linux/memblock.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mach-mx35_3ds.c +1 -1
@@ -45,7 +45,7 @@#include <video/platform_lcd.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include "3ds_debugboard.h" #include "common.h"
arch/arm/mach-imx/mach-pcm037.c +1 -1
@@ -35,7 +35,7 @@#include <linux/regulator/machine.h> #include <linux/regulator/fixed.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-imx/mx31moboard-marxbot.c +1 -1
@@ -24,7 +24,7 @@#include <linux/usb/otg.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include "common.h" #include "devices-imx31.h"
arch/arm/mach-imx/mx31moboard-smartbot.c +1 -1
@@ -23,7 +23,7 @@#include <linux/usb/otg.h> #include <linux/usb/ulpi.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include "board-mx31moboard.h" #include "common.h"
arch/arm/mach-omap1/board-ams-delta.c +1 -1
@@ -28,7 +28,7 @@#include <linux/io.h> #include <linux/platform_data/gpio-omap.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/serial.h> #include <asm/mach-types.h>
arch/arm/mach-omap1/include/mach/camera.h +1 -1
@@ -1,7 +1,7 @@#ifndef __ASM_ARCH_CAMERA_H_#define __ASM_ARCH_CAMERA_H_ -#include <media/omap1_camera.h> +#include <media/platform_data/omap1_camera.h> void omap1_camera_init (void *);
arch/arm/mach-omap2/board-rx51-peripherals.c +2 -2
@@ -39,7 +39,7 @@#include <sound/tlv320aic3x.h> #include <sound/tpa6130a2-plat.h> -#include <media/si4713.h> +#include <media/platform_data/si4713.h> #include <linux/platform_data/leds-lp55xx.h> #include <linux/platform_data/tsl2563.h>
@@ -48,7 +48,7 @@#include <video/omap-panel-data.h> #if defined(CONFIG_IR_RX51 ) || defined(CONFIG_IR_RX51_MODULE ) -#include <media/ir-rx51.h> +#include <media/platform_data/ir-rx51.h> #endif #include "mux.h"
arch/arm/mach-pxa/em-x270.c +1 -1
@@ -34,7 +34,7 @@#include <linux/i2c/pxa-i2c.h> #include <linux/regulator/userspace-consumer.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
arch/arm/mach-pxa/ezx.c +1 -1
@@ -22,7 +22,7 @@#include <linux/leds-lp3944.h> #include <linux/i2c/pxa-i2c.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/setup.h> #include <asm/mach-types.h>
arch/arm/mach-pxa/mioa701.c +1 -1
@@ -56,7 +56,7 @@#include <linux/platform_data/camera-pxa.h> #include <mach/audio.h> #include <mach/smemc.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <mach/mioa701.h>
arch/arm/mach-pxa/palmz72.c +1 -1
@@ -51,7 +51,7 @@#include <mach/pm.h> #include <linux/platform_data/camera-pxa.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include "generic.h" #include "devices.h"
arch/arm/mach-pxa/pcm990-baseboard.c +1 -1
@@ -27,7 +27,7 @@#include <linux/pwm_backlight.h> #include <media/i2c/mt9v022.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <linux/platform_data/camera-pxa.h> #include <asm/mach/map.h>
arch/arm/mach-shmobile/board-bockw.c +1 -1
@@ -31,7 +31,7 @@#include <linux/spi/flash.h> #include <linux/usb/renesas_usbhs.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <asm/mach/arch.h> #include <sound/rcar_snd.h> #include <sound/simple_card.h>
arch/arm/plat-samsung/devs.c +1 -1
@@ -36,7 +36,7 @@#include <linux/platform_data/s3c-hsotg.h> #include <linux/platform_data/dma-s3c24xx.h> -#include <media/s5p_hdmi.h> +#include <media/platform_data/s5p_hdmi.h> #include <asm/irq.h> #include <asm/mach/arch.h>
arch/sh/boards/mach-ap325rxa/setup.c +3 -3
@@ -28,9 +28,9 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> -#include <media/soc_camera_platform.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform_data/soc_camera.h> +#include <media/platform_data/soc_camera_platform.h> +#include <media/drv-intf/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> #include <asm/io.h> #include <asm/clock.h>
arch/sh/boards/mach-ecovec24/setup.c +3 -3
@@ -38,8 +38,8 @@#include <video/sh_mobile_lcdc.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> -#include <media/sh_mobile_ceu.h> -#include <media/soc_camera.h> +#include <media/drv-intf/sh_mobile_ceu.h> +#include <media/platform_data/soc_camera.h> #include <media/i2c/tw9910.h> #include <media/i2c/mt9t112.h> #include <asm/heartbeat.h>
@@ -901,7 +901,7 @@ static struct platform_device irda_device = { };#include <media/i2c/ak881x.h> -#include <media/sh_vou.h> +#include <media/drv-intf/sh_vou.h> static struct ak881x_pdata ak881x_pdata = { .flags =AK881X_IF_MODE_SLAVE ,
arch/sh/boards/mach-kfr2r09/setup.c +2 -2
@@ -28,8 +28,8 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <media/i2c/rj54n1cb0c.h> -#include <media/soc_camera.h> -#include <media/sh_mobile_ceu.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/sh_mobile_ceu.h> #include <video/sh_mobile_lcdc.h> #include <asm/suspend.h> #include <asm/clock.h>
arch/sh/boards/mach-migor/setup.c +2 -2
@@ -27,9 +27,9 @@#include <linux/videodev2.h> #include <linux/sh_intc.h> #include <video/sh_mobile_lcdc.h> -#include <media/sh_mobile_ceu.h> +#include <media/drv-intf/sh_mobile_ceu.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/i2c/tw9910.h> #include <asm/clock.h> #include <asm/machvec.h>
arch/sh/boards/mach-se/7724/setup.c +2 -2
@@ -30,7 +30,7 @@#include <linux/sh_intc.h> #include <linux/videodev2.h> #include <video/sh_mobile_lcdc.h> -#include <media/sh_mobile_ceu.h> +#include <media/drv-intf/sh_mobile_ceu.h> #include <sound/sh_fsi.h> #include <sound/simple_card.h> #include <asm/io.h>
@@ -535,7 +535,7 @@ static struct platform_device irda_device = { };#include <media/i2c/ak881x.h> -#include <media/sh_vou.h> +#include <media/drv-intf/sh_vou.h> static struct ak881x_pdata ak881x_pdata = { .flags =AK881X_IF_MODE_SLAVE ,
drivers/media/common/cx2341x.c +1 -1
@@ -27,7 +27,7 @@#include <linux/videodev2.h> #include <media/tuner.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/v4l2-common.h> MODULE_DESCRIPTION ("cx23415/6/8 driver" );
drivers/media/common/saa7146/saa7146_core.c +1 -1
@@ -20,7 +20,7 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <media/saa7146.h> +#include <media/drv-intf/saa7146.h> #include <linux/module.h> static int saa7146_num;
drivers/media/common/saa7146/saa7146_fops.c +1 -1
@@ -1,6 +1,6 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <linux/module.h> /****************************************************************************/
drivers/media/common/saa7146/saa7146_hlp.c +1 -1
@@ -2,7 +2,7 @@#include <linux/kernel.h> #include <linux/export.h> -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> static void calculate_output_format_register (struct saa7146_dev * saa,u32 palette,u32 * clip_format) {
drivers/media/common/saa7146/saa7146_i2c.c +1 -1
@@ -1,6 +1,6 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> static u32 saa7146_i2c_func (struct i2c_adapter *adapter) {
drivers/media/common/saa7146/saa7146_vbi.c +1 -1
@@ -1,4 +1,4 @@ -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> static int vbi_pixel_to_capture =720 *2 ;
drivers/media/common/saa7146/saa7146_video.c +1 -1
@@ -1,6 +1,6 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <media/v4l2-event.h> #include <media/v4l2-ctrls.h> #include <linux/module.h>
drivers/media/i2c/cx25840/cx25840-audio.c +1 -1
@@ -19,7 +19,7 @@#include <linux/videodev2.h> #include <linux/i2c.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "cx25840-core.h"
drivers/media/i2c/cx25840/cx25840-core.c +1 -1
@@ -45,7 +45,7 @@#include <linux/delay.h> #include <linux/math64.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "cx25840-core.h"
drivers/media/i2c/cx25840/cx25840-firmware.c +1 -1
@@ -19,7 +19,7 @@#include <linux/i2c.h> #include <linux/firmware.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "cx25840-core.h"
drivers/media/i2c/cx25840/cx25840-ir.c +1 -1
@@ -24,7 +24,7 @@#include <linux/slab.h> #include <linux/kfifo.h> #include <linux/module.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <media/rc-core.h> #include "cx25840-core.h"
drivers/media/i2c/cx25840/cx25840-vbi.c +1 -1
@@ -19,7 +19,7 @@#include <linux/videodev2.h> #include <linux/i2c.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "cx25840-core.h"
drivers/media/i2c/m5mols/m5mols_capture.c +1 -1
@@ -26,7 +26,7 @@#include <media/v4l2-device.h> #include <media/v4l2-subdev.h> #include <media/i2c/m5mols.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "m5mols.h" #include "m5mols_reg.h"
drivers/media/i2c/msp3400-driver.c +1 -1
@@ -56,7 +56,7 @@#include <linux/videodev2.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/i2c/tvaudio.h> #include "msp3400-driver.h"
drivers/media/i2c/msp3400-driver.h +1 -1
@@ -4,7 +4,7 @@#ifndef MSP3400_DRIVER_H #define MSP3400_DRIVER_H -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/v4l2-device.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/msp3400-kthreads.c +1 -1
@@ -26,7 +26,7 @@#include <linux/freezer.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <linux/kthread.h> #include <linux/suspend.h> #include "msp3400-driver.h"
drivers/media/i2c/smiapp/smiapp.h +1 -1
@@ -22,7 +22,7 @@#include <linux/mutex.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> -#include <media/smiapp.h> +#include <media/platform_data/smiapp.h> #include "smiapp-pll.h" #include "smiapp-reg.h"
drivers/media/i2c/soc_camera/imx074.c +1 -1
@@ -17,7 +17,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-async.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/mt9m001.c +2 -2
@@ -14,8 +14,8 @@#include <linux/log2.h> #include <linux/module.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9m111.c +1 -1
@@ -16,7 +16,7 @@#include <linux/v4l2-mediabus.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9t031.c +1 -1
@@ -17,7 +17,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/mt9t112.c +1 -1
@@ -26,7 +26,7 @@#include <linux/videodev2.h> #include <media/i2c/mt9t112.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-image-sizes.h>
drivers/media/i2c/soc_camera/mt9v022.c +2 -2
@@ -16,8 +16,8 @@#include <linux/module.h> #include <media/i2c/mt9v022.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-subdev.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov2640.c +1 -1
@@ -24,7 +24,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov5642.c +1 -1
@@ -23,7 +23,7 @@#include <linux/module.h> #include <linux/v4l2-mediabus.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/ov6650.c +1 -1
@@ -31,7 +31,7 @@#include <linux/v4l2-mediabus.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov772x.c +1 -1
@@ -25,7 +25,7 @@#include <linux/videodev2.h> #include <media/i2c/ov772x.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h>
drivers/media/i2c/soc_camera/ov9640.c +1 -1
@@ -27,7 +27,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/ov9740.c +1 -1
@@ -16,7 +16,7 @@#include <linux/slab.h> #include <linux/v4l2-mediabus.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/rj54n1cb0c.c +1 -1
@@ -16,7 +16,7 @@#include <linux/module.h> #include <media/i2c/rj54n1cb0c.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h>
drivers/media/i2c/soc_camera/tw9910.c +1 -1
@@ -25,7 +25,7 @@#include <linux/v4l2-mediabus.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/i2c/tw9910.h> #include <media/v4l2-clk.h> #include <media/v4l2-subdev.h>
drivers/media/pci/bt8xx/bttv-driver.c +1 -1
@@ -51,7 +51,7 @@#include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> #include <media/i2c/tvaudio.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <linux/dma-mapping.h>
drivers/media/pci/bt8xx/bttvp.h +1 -1
@@ -42,7 +42,7 @@#include <media/tveeprom.h> #include <media/rc-core.h> #include <media/i2c/ir-kbd-i2c.h> -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> #include "bt848.h" #include "bttv.h"
drivers/media/pci/cx18/cx23418.h +1 -1
@@ -22,7 +22,7 @@#ifndef CX23418_H #define CX23418_H -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #define MGR_CMD_MASK 0x40000000/* The MSB of the command code indicates that this is the completion of a
drivers/media/pci/cx23885/cx23885-417.c +1 -1
@@ -30,7 +30,7 @@#include <linux/slab.h> #include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include "cx23885.h" #include "cx23885-ioctl.h"
drivers/media/pci/cx23885/cx23885-cards.c +1 -1
@@ -19,7 +19,7 @@#include <linux/module.h> #include <linux/pci.h> #include <linux/delay.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <linux/firmware.h> #include <misc/altera.h>
drivers/media/pci/cx23885/cx23885-video.c +1 -1
@@ -35,7 +35,7 @@#include "cx23885-ioctl.h" #include "tuner-xc2028.h" -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> MODULE_DESCRIPTION ("v4l2 driver module for cx23885 based TV cards" );MODULE_AUTHOR ("Steven Toth <[email protected]>" );
drivers/media/pci/cx23885/cx23885.h +1 -1
@@ -30,7 +30,7 @@#include <media/rc-core.h> #include "cx23885-reg.h" -#include "media/cx2341x.h" +#include "media/drv-intf/cx2341x.h" #include <linux/mutex.h>
drivers/media/pci/cx88/cx88-blackbird.c +1 -1
@@ -36,7 +36,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include "cx88.h"
drivers/media/pci/cx88/cx88.h +1 -1
@@ -30,7 +30,7 @@#include <media/tuner.h> #include <media/tveeprom.h> #include <media/videobuf2-dma-sg.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/videobuf2-dvb.h> #include <media/i2c/ir-kbd-i2c.h> #include <media/i2c/wm8775.h>
drivers/media/pci/ivtv/ivtv-cards.c +2 -2
@@ -22,11 +22,11 @@#include "ivtv-cards.h" #include "ivtv-i2c.h" -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/i2c/m52790.h> #include <media/i2c/wm8775.h> #include <media/i2c/cs53l32a.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <media/i2c/upd64031a.h> #define MSP_TUNER MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1, \
drivers/media/pci/ivtv/ivtv-driver.h +1 -1
@@ -64,7 +64,7 @@#include <media/v4l2-device.h> #include <media/v4l2-fh.h> #include <media/tuner.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/i2c/ir-kbd-i2c.h> #include <linux/ivtv.h>
drivers/media/pci/ivtv/ivtv-i2c.c +1 -1
@@ -63,7 +63,7 @@#include "ivtv-cards.h" #include "ivtv-gpio.h" #include "ivtv-i2c.h" -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> /* i2c implementation for cx23415/6 chip, ivtv project. * Author: Kevin Thayer (nufan_wfk at yahoo.com)
drivers/media/pci/ivtv/ivtv-routing.c +1 -1
@@ -24,7 +24,7 @@#include "ivtv-gpio.h" #include "ivtv-routing.h" -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/i2c/m52790.h> #include <media/i2c/upd64031a.h> #include <media/i2c/upd64083.h>
drivers/media/pci/saa7146/hexium_gemini.c +1 -1
@@ -25,7 +25,7 @@#define DEBUG_VARIABLE debug -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <linux/module.h> static int debug;
drivers/media/pci/saa7146/hexium_orion.c +1 -1
@@ -25,7 +25,7 @@#define DEBUG_VARIABLE debug -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <linux/module.h> static int debug;
drivers/media/pci/saa7146/mxb.c +1 -1
@@ -25,7 +25,7 @@#define DEBUG_VARIABLE debug -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <media/tuner.h> #include <media/v4l2-common.h> #include <media/i2c/saa7115.h>
drivers/media/pci/ttpci/av7110.h +1 -1
@@ -32,7 +32,7 @@#include "stv0297.h" #include "l64781.h" -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #define ANALOG_TUNER_VES1820 1
drivers/media/pci/ttpci/budget-av.c +1 -1
@@ -46,7 +46,7 @@#include "tda1004x.h" #include "tua6100.h" #include "dvb-pll.h" -#include <media/saa7146_vv.h> +#include <media/drv-intf/saa7146_vv.h> #include <linux/module.h> #include <linux/errno.h> #include <linux/slab.h>
drivers/media/pci/ttpci/budget.h +1 -1
@@ -13,7 +13,7 @@#include <linux/module.h> #include <linux/mutex.h> -#include <media/saa7146.h> +#include <media/drv-intf/saa7146.h> extern int budget_debug;
drivers/media/platform/exynos4-is/common.c +1 -1
@@ -10,7 +10,7 @@*/ #include <linux/module.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "common.h" /* Called with the media graph mutex held or entity->stream_count > 0. */
drivers/media/platform/exynos4-is/fimc-core.h +1 -1
@@ -27,7 +27,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mem2mem.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #define dbg(fmt, args...) \ pr_debug("%s:%d: " fmt "\n", __func__, __LINE__, ##args)
drivers/media/platform/exynos4-is/fimc-isp-video.c +1 -1
@@ -30,7 +30,7 @@#include <media/v4l2-ioctl.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "common.h" #include "media-dev.h"
drivers/media/platform/exynos4-is/fimc-isp.h +1 -1
@@ -24,7 +24,7 @@#include <media/videobuf2-v4l2.h> #include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> extern int fimc_isp_debug;
drivers/media/platform/exynos4-is/fimc-lite-reg.c +1 -1
@@ -12,7 +12,7 @@#include <linux/bitops.h> #include <linux/delay.h> #include <linux/io.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "fimc-lite-reg.h" #include "fimc-lite.h"
drivers/media/platform/exynos4-is/fimc-lite.c +1 -1
@@ -30,7 +30,7 @@#include <media/v4l2-mem2mem.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "common.h" #include "fimc-core.h"
drivers/media/platform/exynos4-is/fimc-lite.h +1 -1
@@ -23,7 +23,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #define FIMC_LITE_DRV_NAME "exynos-fimc-lite"#define FLITE_CLK_NAME "flite"
drivers/media/platform/exynos4-is/fimc-reg.c +1 -1
@@ -13,7 +13,7 @@#include <linux/io.h> #include <linux/regmap.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "media-dev.h" #include "fimc-reg.h"
drivers/media/platform/exynos4-is/media-dev.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-ctrls.h> #include <media/v4l2-of.h> #include <media/media-device.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "media-dev.h" #include "fimc-core.h"
drivers/media/platform/exynos4-is/media-dev.h +1 -1
@@ -19,7 +19,7 @@#include <media/media-entity.h> #include <media/v4l2-device.h> #include <media/v4l2-subdev.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include "fimc-core.h" #include "fimc-lite.h"
drivers/media/platform/exynos4-is/mipi-csis.c +1 -1
@@ -29,7 +29,7 @@#include <linux/slab.h> #include <linux/spinlock.h> #include <linux/videodev2.h> -#include <media/exynos-fimc.h> +#include <media/drv-intf/exynos-fimc.h> #include <media/v4l2-of.h> #include <media/v4l2-subdev.h>
drivers/media/platform/marvell-ccic/mmp-driver.c +1 -1
@@ -18,7 +18,7 @@#include <linux/slab.h> #include <linux/videodev2.h> #include <media/v4l2-device.h> -#include <media/mmp-camera.h> +#include <media/platform_data/mmp-camera.h> #include <linux/device.h> #include <linux/platform_device.h> #include <linux/gpio.h>
drivers/media/platform/s3c-camif/camif-core.h +1 -1
@@ -26,7 +26,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> #include <media/videobuf2-v4l2.h> -#include <media/s3c_camif.h> +#include <media/drv-intf/s3c_camif.h> #define S3C_CAMIF_DRIVER_NAME "s3c-camif"#define CAMIF_REQ_BUFS_MIN 3
drivers/media/platform/s3c-camif/camif-regs.h +1 -1
@@ -13,7 +13,7 @@#define CAMIF_REGS_H_ #include "camif-core.h" -#include <media/s3c_camif.h> +#include <media/drv-intf/s3c_camif.h> /* * The id argument indicates the processing path:
drivers/media/platform/s5p-tv/hdmi_drv.c +1 -1
@@ -33,7 +33,7 @@#include <linux/regulator/consumer.h> #include <linux/v4l2-dv-timings.h> -#include <media/s5p_hdmi.h> +#include <media/platform_data/s5p_hdmi.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/s5p-tv/sii9234_drv.c +1 -1
@@ -23,7 +23,7 @@#include <linux/regulator/machine.h> #include <linux/slab.h> -#include <media/sii9234.h> +#include <media/platform_data/sii9234.h> #include <media/v4l2-subdev.h> MODULE_AUTHOR ("Tomasz Stanislawski <[email protected]>" );
drivers/media/platform/sh_vou.c +1 -1
@@ -22,7 +22,7 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/sh_vou.h> +#include <media/drv-intf/sh_vou.h> #include <media/v4l2-common.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h>
drivers/media/platform/soc_camera/atmel-isi.c +2 -2
@@ -23,8 +23,8 @@#include <linux/pm_runtime.h> #include <linux/slab.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-of.h> #include <media/videobuf2-dma-contig.h>
drivers/media/platform/soc_camera/mx2_camera.c +2 -2
@@ -34,8 +34,8 @@#include <media/v4l2-dev.h> #include <media/videobuf2-v4l2.h> #include <media/videobuf2-dma-contig.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <linux/videodev2.h>
drivers/media/platform/soc_camera/mx3_camera.c +2 -2
@@ -22,8 +22,8 @@#include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/videobuf2-dma-contig.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <linux/platform_data/camera-mx3.h> #include <linux/platform_data/dma-imx.h>
drivers/media/platform/soc_camera/omap1_camera.c +3 -3
@@ -28,9 +28,9 @@#include <linux/platform_device.h> #include <linux/slab.h> -#include <media/omap1_camera.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/omap1_camera.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/videobuf-dma-contig.h> #include <media/videobuf-dma-sg.h>
drivers/media/platform/soc_camera/pxa_camera.c +2 -2
@@ -32,8 +32,8 @@#include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/videobuf-dma-sg.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-of.h> #include <linux/videodev2.h>
drivers/media/platform/soc_camera/rcar_vin.c +2 -2
@@ -27,8 +27,8 @@#include <linux/slab.h> #include <linux/videodev2.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +4 -4
@@ -39,12 +39,12 @@#include <media/v4l2-async.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> -#include <media/soc_camera.h> -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/sh_mobile_ceu.h> +#include <media/drv-intf/sh_mobile_csi2.h> #include <media/videobuf2-dma-contig.h> #include <media/v4l2-mediabus.h> -#include <media/soc_mediabus.h> +#include <media/drv-intf/soc_mediabus.h> #include "soc_scale_crop.h"
drivers/media/platform/soc_camera/sh_mobile_csi2.c +4 -4
@@ -18,10 +18,10 @@#include <linux/videodev2.h> #include <linux/module.h> -#include <media/sh_mobile_ceu.h> -#include <media/sh_mobile_csi2.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/drv-intf/sh_mobile_ceu.h> +#include <media/drv-intf/sh_mobile_csi2.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-common.h> #include <media/v4l2-dev.h> #include <media/v4l2-device.h>
drivers/media/platform/soc_camera/soc_camera.c +2 -2
@@ -29,8 +29,8 @@#include <linux/slab.h> #include <linux/vmalloc.h> -#include <media/soc_camera.h> -#include <media/soc_mediabus.h> +#include <media/platform_data/soc_camera.h> +#include <media/drv-intf/soc_mediabus.h> #include <media/v4l2-async.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h>
drivers/media/platform/soc_camera/soc_camera_platform.c +2 -2
@@ -17,8 +17,8 @@#include <linux/platform_device.h> #include <linux/videodev2.h> #include <media/v4l2-subdev.h> -#include <media/soc_camera.h> -#include <media/soc_camera_platform.h> +#include <media/platform_data/soc_camera.h> +#include <media/platform_data/soc_camera_platform.h> struct soc_camera_platform_priv {struct v4l2_subdev subdev;
drivers/media/platform/soc_camera/soc_mediabus.c +1 -1
@@ -13,7 +13,7 @@#include <media/v4l2-device.h> #include <media/v4l2-mediabus.h> -#include <media/soc_mediabus.h> +#include <media/drv-intf/soc_mediabus.h> static const struct soc_mbus_lookup mbus_fmt[] = { {
drivers/media/platform/soc_camera/soc_scale_crop.c +1 -1
@@ -12,7 +12,7 @@#include <linux/device.h> #include <linux/module.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-common.h> #include "soc_scale_crop.h"
drivers/media/platform/timblogiw.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-ioctl.h> #include <media/v4l2-device.h> #include <media/videobuf-dma-contig.h> -#include <media/timb_video.h> +#include <media/platform_data/timb_video.h> #define DRIVER_NAME "timb-video"
drivers/media/radio/radio-maxiradio.c +1 -1
@@ -42,7 +42,7 @@#include <linux/videodev2.h> #include <linux/io.h> #include <linux/slab.h> -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> #include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-fh.h>
drivers/media/radio/radio-sf16fmr2.c +1 -1
@@ -14,7 +14,7 @@#include <linux/io.h> /* outb, outb_p */ #include <linux/isa.h> #include <linux/pnp.h> -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> MODULE_AUTHOR ("Ondrej Zary" );MODULE_DESCRIPTION ("MediaForte SF16-FMR2 and SF16-FMD2 FM radio card driver" );
drivers/media/radio/radio-shark.c +1 -1
@@ -33,7 +33,7 @@#include <linux/usb.h> #include <linux/workqueue.h> #include <media/v4l2-device.h> -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> #if defined(CONFIG_LEDS_CLASS ) || \ (defined(CONFIG_LEDS_CLASS_MODULE ) && defined(CONFIG_RADIO_SHARK_MODULE ))
drivers/media/radio/radio-si476x.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-event.h> #include <media/v4l2-device.h> -#include <media/si476x.h> +#include <media/drv-intf/si476x.h> #include <linux/mfd/si476x-core.h> #define FM_FREQ_RANGE_LOW 64000000
drivers/media/radio/radio-timb.c +1 -1
@@ -26,7 +26,7 @@#include <linux/slab.h> #include <linux/i2c.h> #include <linux/module.h> -#include <media/timb_radio.h> +#include <media/platform_data/timb_radio.h> #define DRIVER_NAME "timb-radio"
drivers/media/radio/si4713/radio-usb-si4713.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-device.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> -#include <media/si4713.h> +#include <media/platform_data/si4713.h> #include "si4713.h"
drivers/media/radio/si4713/si4713.h +1 -1
@@ -20,7 +20,7 @@#include <linux/gpio/consumer.h> #include <media/v4l2-subdev.h> #include <media/v4l2-ctrls.h> -#include <media/si4713.h> +#include <media/platform_data/si4713.h> #define SI4713_PRODUCT_NUMBER 0x0D
drivers/media/radio/tea575x.c +1 -1
@@ -31,7 +31,7 @@#include <media/v4l2-fh.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> MODULE_AUTHOR ("Jaroslav Kysela <[email protected]>" );MODULE_DESCRIPTION ("Routines for control of TEA5757/5759 Philips AM/FM radio tuner chips" );
drivers/media/rc/gpio-ir-recv.c +1 -1
@@ -21,7 +21,7 @@#include <linux/platform_device.h> #include <linux/irq.h> #include <media/rc-core.h> -#include <media/gpio-ir-recv.h> +#include <media/platform_data/gpio-ir-recv.h> #define GPIO_IR_DRIVER_NAME "gpio-rc-recv"#define GPIO_IR_DEVICE_NAME "gpio_ir_recv"
drivers/media/rc/ir-rx51.c +1 -1
@@ -31,7 +31,7 @@#include <media/lirc.h> #include <media/lirc_dev.h> -#include <media/ir-rx51.h> +#include <media/platform_data/ir-rx51.h> #define LIRC_RX51_DRIVER_FEATURES (LIRC_CAN_SET_SEND_DUTY_CYCLE | \ LIRC_CAN_SET_SEND_CARRIER | \
drivers/media/usb/cx231xx/cx231xx-417.c +1 -1
@@ -37,7 +37,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/tuner.h> #define CX231xx_FIRM_IMAGE_SIZE 376836
drivers/media/usb/cx231xx/cx231xx-cards.c +1 -1
@@ -30,7 +30,7 @@#include <media/tveeprom.h> #include <media/v4l2-common.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include "dvb-usb-ids.h" #include "xc5000.h" #include "tda18271.h"
drivers/media/usb/cx231xx/cx231xx-vbi.c +1 -1
@@ -32,7 +32,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/tuner.h> #include "cx231xx-vbi.h"
drivers/media/usb/cx231xx/cx231xx-video.c +1 -1
@@ -36,7 +36,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/tuner.h> #include "dvb_frontend.h"
drivers/media/usb/cx231xx/cx231xx.h +1 -1
@@ -30,7 +30,7 @@#include <linux/mutex.h> #include <linux/usb.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/videobuf-vmalloc.h> #include <media/v4l2-device.h>
drivers/media/usb/em28xx/em28xx-camera.c +1 -1
@@ -20,7 +20,7 @@*/ #include <linux/i2c.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/i2c/mt9v011.h> #include <media/v4l2-clk.h> #include <media/v4l2-common.h>
drivers/media/usb/em28xx/em28xx-cards.c +1 -1
@@ -30,7 +30,7 @@#include <linux/i2c.h> #include <linux/usb.h> #include <media/tuner.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/i2c/saa7115.h> #include <media/i2c/tvp5150.h> #include <media/i2c/tvaudio.h>
drivers/media/usb/em28xx/em28xx-video.c +1 -1
@@ -43,7 +43,7 @@#include <media/v4l2-ioctl.h> #include <media/v4l2-event.h> #include <media/v4l2-clk.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/tuner.h> #define DRIVER_AUTHOR "Ludovico Cavedon <[email protected]>, " \
drivers/media/usb/pvrusb2/pvrusb2-audio.c +1 -1
@@ -23,7 +23,7 @@#include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" #include <linux/videodev2.h> -#include <media/msp3400.h> +#include <media/drv-intf/msp3400.h> #include <media/v4l2-common.h>
drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c +1 -1
@@ -32,7 +32,7 @@#include "pvrusb2-hdw-internal.h" #include "pvrusb2-debug.h" -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> #include <linux/errno.h>
drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h +1 -1
@@ -39,7 +39,7 @@#include "pvrusb2-hdw.h" #include "pvrusb2-io.h" #include <media/v4l2-device.h> -#include <media/cx2341x.h> +#include <media/drv-intf/cx2341x.h> #include <media/i2c/ir-kbd-i2c.h> #include "pvrusb2-devattr.h"
drivers/mfd/timberdale.c +2 -2
@@ -39,8 +39,8 @@#include <linux/spi/max7301.h> #include <linux/spi/mc33880.h> -#include <media/timb_radio.h> -#include <media/timb_video.h> +#include <media/platform_data/timb_radio.h> +#include <media/platform_data/timb_video.h> #include <linux/timb_dma.h>
drivers/staging/media/omap4iss/iss.h +1 -1
@@ -20,7 +20,7 @@#include <linux/platform_device.h> #include <linux/wait.h> -#include <media/omap4iss.h> +#include <media/platform_data/omap4iss.h> #include "iss_regs.h" #include "iss_csiphy.h"
drivers/staging/media/omap4iss/iss_csiphy.h +1 -1
@@ -14,7 +14,7 @@#ifndef OMAP4_ISS_CSI_PHY_H #define OMAP4_ISS_CSI_PHY_H -#include <media/omap4iss.h> +#include <media/platform_data/omap4iss.h> struct iss_csi2_device ;
include/media/drv-intf/cx2341x.h renamed from include/media/cx2341x.h +0 -0
include/media/drv-intf/cx25840.h renamed from include/media/cx25840.h +0 -0
include/media/drv-intf/exynos-fimc.h renamed from include/media/exynos-fimc.h +0 -0
include/media/drv-intf/msp3400.h renamed from include/media/msp3400.h +0 -0
include/media/drv-intf/s3c_camif.h renamed from include/media/s3c_camif.h +0 -0
include/media/drv-intf/saa7146.h renamed from include/media/saa7146.h +0 -0
include/media/drv-intf/saa7146_vv.h renamed from include/media/saa7146_vv.h +1 -1
@@ -4,7 +4,7 @@#include <media/v4l2-common.h> #include <media/v4l2-ioctl.h> #include <media/v4l2-fh.h> -#include <media/saa7146.h> +#include <media/drv-intf/saa7146.h> #include <media/videobuf-dma-sg.h> #define MAX_SAA7146_CAPTURE_BUFFERS 32/* arbitrary */
include/media/drv-intf/sh_mobile_ceu.h renamed from include/media/sh_mobile_ceu.h +0 -0
include/media/drv-intf/sh_mobile_csi2.h renamed from include/media/sh_mobile_csi2.h +0 -0
include/media/drv-intf/sh_vou.h renamed from include/media/sh_vou.h +0 -0
include/media/drv-intf/si476x.h renamed from include/media/si476x.h +0 -0
include/media/drv-intf/soc_mediabus.h renamed from include/media/soc_mediabus.h +0 -0
include/media/drv-intf/tea575x.h renamed from include/media/tea575x.h +0 -0
include/media/i2c/tw9910.h +1 -1
@@ -16,7 +16,7 @@#ifndef __TW9910_H__#define __TW9910_H__ -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> enum tw9910_mpout_pin { TW9910_MPO_VLOSS,
include/media/platform_data/gpio-ir-recv.h renamed from include/media/gpio-ir-recv.h +0 -0
include/media/platform_data/ir-rx51.h renamed from include/media/ir-rx51.h +0 -0
include/media/platform_data/mmp-camera.h renamed from include/media/mmp-camera.h +0 -0
include/media/platform_data/omap1_camera.h renamed from include/media/omap1_camera.h +0 -0
include/media/platform_data/omap4iss.h renamed from include/media/omap4iss.h +0 -0
include/media/platform_data/s5p_hdmi.h renamed from include/media/s5p_hdmi.h +0 -0
include/media/platform_data/si4713.h renamed from include/media/si4713.h +0 -0
include/media/platform_data/sii9234.h renamed from include/media/sii9234.h +0 -0
include/media/platform_data/smiapp.h renamed from include/media/smiapp.h +0 -0
include/media/platform_data/soc_camera.h renamed from include/media/soc_camera.h +0 -0
include/media/platform_data/soc_camera_platform.h renamed from include/media/soc_camera_platform.h +1 -1
@@ -12,7 +12,7 @@#define __SOC_CAMERA_H__#include <linux/videodev2.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <media/v4l2-mediabus.h> struct device ;
include/media/platform_data/timb_radio.h renamed from include/media/timb_radio.h +0 -0
include/media/platform_data/timb_video.h renamed from include/media/timb_video.h +0 -0
sound/pci/es1968.c +1 -1
@@ -113,7 +113,7 @@#include <sound/initval.h> #ifdef CONFIG_SND_ES1968_RADIO -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> #endif #define CARD_NAME "ESS Maestro1/2"
sound/pci/fm801.c +1 -1
@@ -30,7 +30,7 @@#include <sound/initval.h> #ifdef CONFIG_SND_FM801_TEA575X_BOOL -#include <media/tea575x.h> +#include <media/drv-intf/tea575x.h> #endif MODULE_AUTHOR ("Jaroslav Kysela <[email protected]>" );
PATCH 2/2 include/media: move platform driver headers to a separate dir
Quoted 10 lines · Mauro Carvalho Chehab
Quoted 1 line
I think the latter should go into
include/linux/platform_data/media/*.hinstead.Agreed.
Please see the enclosed patch:
Subject: [PATCH] [media]
include/media: move platform driver headers to a
separate dirs
Quoted 6 lines
Let's not mix headers used by the core with those headers that are needed by some specific platform drivers or by platform data.
This patch was made via this script:
mkdirinclude/media/platformmkdirinclude/media/platform_data(cdinclude/media/; git mv $(grep -lplatform_data*.h|grep -v v4l2)
I think include/linux/platform_data/media/, like Arnd suggested, would be better.
Then we can make it a common goal to empty include/linux/platform_data/ ;-)
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert at linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
PATCH 2/2 include/media: move platform driver headers to a separate dir
In reply to Mauro Carvalho ChehabQuoted 26 lines · On Friday 13 November 2015 17:13:41 Mauro Carvalho Chehab wrote:
Em Wed, 11 Nov 2015 21:26:31 +0100
Arnd Bergmann <[email protected]> escreveu:include/media/{ => drv-intf}/cx2341x.h | 0 include/media/{ => drv-intf}/cx25840.h | 0 include/media/{ => drv-intf}/exynos-fimc.h | 0 include/media/{ => drv-intf}/msp3400.h | 0 include/media/{ => drv-intf}/s3c_camif.h | 0 include/media/{ => drv-intf}/saa7146.h | 0 include/media/{ => drv-intf}/saa7146_vv.h | 2 +- include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 include/media/{ => drv-intf}/sh_vou.h | 0 include/media/{ => drv-intf}/si476x.h | 0 include/media/{ => drv-intf}/soc_mediabus.h | 0 include/media/{ => drv-intf}/tea575x.h | 0 include/media/i2c/tw9910.h | 2 +- include/media/{ => platform_data}/gpio-ir-recv.h | 0 include/media/{ => platform_data}/ir-rx51.h | 0 include/media/{ => platform_data}/mmp-camera.h | 0 include/media/{ => platform_data}/omap1_camera.h | 0 include/media/{ => platform_data}/omap4iss.h | 0 include/media/{ => platform_data}/s5p_hdmi.h | 0 include/media/{ => platform_data}/si4713.h | 0 include/media/{ => platform_data}/sii9234.h | 0
Quoted 8 lines
include/media/{ => platform_data}/smiapp.h | 0
include/media/{ => platform_data}/soc_camera.h | 0
include/media/{ => platform_data}/soc_camera_platform.h | 2 +-
include/media/{ => platform_data}/timb_radio.h | 0
include/media/{ => platform_data}/timb_video.h | 0
sound/pci/es1968.c | 2 +-
sound/pci/fm801.c | 2 +-
155 files changed, 158 insertions(+), 158 deletions(-)As Geert said, include/linux/platform_data/media/ would be nicer for consistency with other subsystems.
arch/arm/mach-imx/mach-imx27_visstrim_m10.c line 39
Quoted 13 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1
-1@@ -33,7 +33,7 @@#include <linux/dma-mapping.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <sound/tlv320aic32x4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
This looks like a mistake: the header contains the string 'platform_data', but it is not actually a platform data header file in the sense that it defines the interface between platform and driver.
Maybe soc_camera.h is important enough to still leave it as a core file in the existing location? Or possibly a separate directory for media/soc_camera/*.h
arch/arm/mach-imx/mach-imx27_visstrim_m10.c line 30
Quoted 9 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1
-1@@ -24,7 +24,7 @@#include <linux/slab.h> #include <linux/kfifo.h> #include <linux/module.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <media/rc-core.h> #include "cx25840-core.h"
For this case, I think the original patch to move it into include/media/i2c was more logical as it mirrors the file structure. I was mainly talking about the platform_data being different from the rest.
Arnd
PATCH 2/2 include/media: move platform driver headers to a separate dir
Em Fri, 13 Nov 2015 22:31:15 +0100
Arnd Bergmann <[email protected]> escreveu:
Quoted 36 lines · On Friday 13 November 2015 17:13:41 Mauro Carvalho Chehab wrote:
Quoted 26 lines
Em Wed, 11 Nov 2015 21:26:31 +0100
Arnd Bergmann <[email protected]> escreveu:include/media/{ => drv-intf}/cx2341x.h | 0 include/media/{ => drv-intf}/cx25840.h | 0 include/media/{ => drv-intf}/exynos-fimc.h | 0 include/media/{ => drv-intf}/msp3400.h | 0 include/media/{ => drv-intf}/s3c_camif.h | 0 include/media/{ => drv-intf}/saa7146.h | 0 include/media/{ => drv-intf}/saa7146_vv.h | 2 +- include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 include/media/{ => drv-intf}/sh_vou.h | 0 include/media/{ => drv-intf}/si476x.h | 0 include/media/{ => drv-intf}/soc_mediabus.h | 0 include/media/{ => drv-intf}/tea575x.h | 0 include/media/i2c/tw9910.h | 2 +- include/media/{ => platform_data}/gpio-ir-recv.h | 0 include/media/{ => platform_data}/ir-rx51.h | 0 include/media/{ => platform_data}/mmp-camera.h | 0 include/media/{ => platform_data}/omap1_camera.h | 0 include/media/{ => platform_data}/omap4iss.h | 0 include/media/{ => platform_data}/s5p_hdmi.h | 0 include/media/{ => platform_data}/si4713.h | 0 include/media/{ => platform_data}/sii9234.h | 0Quoted 8 lines
include/media/{ => platform_data}/smiapp.h | 0 include/media/{ => platform_data}/soc_camera.h | 0 include/media/{ => platform_data}/soc_camera_platform.h | 2 +- include/media/{ => platform_data}/timb_radio.h | 0 include/media/{ => platform_data}/timb_video.h | 0 sound/pci/es1968.c | 2 +- sound/pci/fm801.c | 2 +- 155 files changed, 158 insertions(+), 158 deletions(-)
Quoted 2 lines
As Geert said,
include/linux/platform_data/media/would be nicer for consistency with other subsystems.
OK! I have a new series of patches almost ready. I'll be sending it tomorrow, after addressing your concerns.
Quoted 19 lines
Quoted 6 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +0
-0arch/arm/mach-imx/mach-imx27_visstrim_m10.c line 39
Quoted 8 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1
-1@@ -33,7 +33,7 @@#include <linux/dma-mapping.h> #include <linux/leds.h> #include <linux/platform_data/asoc-mx27vis.h> -#include <media/soc_camera.h> +#include <media/platform_data/soc_camera.h> #include <sound/tlv320aic32x4.h> #include <asm/mach-types.h> #include <asm/mach/arch.h> This looks like a mistake: the header contains the string '
platform_data', but it is not actually a platform data header file in the sense that it defines the interface between platform and driver.
Quoted 3 lines
Maybe
soc_camera.his important enough to still leave it as a core file in the existing location? Or possibly a separate directory for media/soc_camera/*.h
Ok, I'll fix it.
Quoted 9 lines
Quoted 9 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +1
-1@@ -24,7 +24,7 @@#include <linux/slab.h> #include <linux/kfifo.h> #include <linux/module.h> -#include <media/cx25840.h> +#include <media/drv-intf/cx25840.h> #include <media/rc-core.h>
Quoted 5 lines
arch/arm/mach-imx/mach-imx27_visstrim_m10.c line 30
Quoted 1 line
arch/arm/mach-imx/mach-imx27_visstrim_m10.c +0
-0#include "cx25840-core.h" For this case, I think the original patch to move it into
include/media/i2cwas more logical as it mirrors the file structure. I was mainly talking about theplatform_databeing different from the rest.
cx25840 is not (always) an I2C. On most devices, this is actually an IP block inside the bridge chipset.
That's why I didn't include it on patch 1/1. There's one thing to notice about that, though: while most of the header is describing the driver interface, it does contain one platform_data in the end:
/* pvr150_workaround activates a workaround for a hardware bug that is
present in Hauppauge PVR-150 (and possibly PVR-500) cards that have certain NTSC tuners (tveeprom tuner model numbers 85, 99 and 112). The audio autodetect fails on some channels for these models and the workaround is to select the audio standard explicitly. Many thanks to Hauppauge for providing this information.
This platform data only needs to be supplied by the ivtv driver. */
struct cx25840_platform_data {
int pvr150_workaround;
};While we might split it, I guess it is not worth, specially since I don't think we'll see any new driver using it.
Also, this is actually a hack used only by the ivtv driver.
Regards,
Mauro
PATCH 1/1 smiapp: Move include/media/smiapp.h under include/media/i2c
In reply to a message not in the archive---
Hi Mauro,
Your script appears to miss smiapp as it's in a separate directory. Could you either change the script, or apply this patch, please?
Kind regards,
Sakari
MAINTAINERS | 2 +-
drivers/media/i2c/smiapp/smiapp.h | 2 +-
include/media/{ => i2c}/smiapp.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
rename include/media/{ => i2c}/smiapp.h (98%)MAINTAINERS +1 -1
@@ -9614,7 +9614,7 @@ M: Sakari Ailus <[email protected]> L: [email protected] S: Maintained F: drivers/media/i2c/smiapp/ -F: include/media/smiapp.h +F: include/media/i2c/smiapp.h F: drivers/media/i2c/smiapp-pll.c F: drivers/media/i2c/smiapp-pll.h F: include/uapi/linux/smiapp.h
drivers/media/i2c/smiapp/smiapp.h +1 -1
@@ -20,9 +20,9 @@#define __SMIAPP_PRIV_H_#include <linux/mutex.h> +#include <media/i2c/smiapp.h> #include <media/v4l2-ctrls.h> #include <media/v4l2-subdev.h> -#include <media/smiapp.h> #include "smiapp-pll.h" #include "smiapp-reg.h"
include/media/i2c/smiapp.h renamed from include/media/smiapp.h +1 -1
@@ -1,5 +1,5 @@/* -* include/media/smiapp.h +* include/media/i2c/smiapp.h * * Generic driver for SMIA/SMIA++ compliant camera modules *
Signature · 1 line
2.1.4