[media] s5p-fimc: Remove dependency on fimc-core.h in fimc-lite driver
Drop fimc-lite.h header inclusion to make the exynos-fimc-lite module independent on other modules. Move struct fimc_fmt declaration to the driver's private headers as it is used in multiple modules. Reported-by: Shaik Ameer Basha <shaik.ameer@samsung.com> Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
f8bca4f529
commit
80f958f40d
|
@ -136,37 +136,6 @@ enum fimc_color_fmt {
|
|||
/* Y (16 ~ 235), Cb/Cr (16 ~ 240) */
|
||||
#define FIMC_COLOR_RANGE_NARROW (1 << 3)
|
||||
|
||||
/**
|
||||
* struct fimc_fmt - the driver's internal color format data
|
||||
* @mbus_code: Media Bus pixel code, -1 if not applicable
|
||||
* @name: format description
|
||||
* @fourcc: the fourcc code for this format, 0 if not applicable
|
||||
* @color: the corresponding fimc_color_fmt
|
||||
* @memplanes: number of physically non-contiguous data planes
|
||||
* @colplanes: number of physically contiguous data planes
|
||||
* @depth: per plane driver's private 'number of bits per pixel'
|
||||
* @mdataplanes: bitmask indicating meta data plane(s), (1 << plane_no)
|
||||
* @flags: flags indicating which operation mode format applies to
|
||||
*/
|
||||
struct fimc_fmt {
|
||||
enum v4l2_mbus_pixelcode mbus_code;
|
||||
char *name;
|
||||
u32 fourcc;
|
||||
u32 color;
|
||||
u16 memplanes;
|
||||
u16 colplanes;
|
||||
u8 depth[VIDEO_MAX_PLANES];
|
||||
u16 mdataplanes;
|
||||
u16 flags;
|
||||
#define FMT_FLAGS_CAM (1 << 0)
|
||||
#define FMT_FLAGS_M2M_IN (1 << 1)
|
||||
#define FMT_FLAGS_M2M_OUT (1 << 2)
|
||||
#define FMT_FLAGS_M2M (1 << 1 | 1 << 2)
|
||||
#define FMT_HAS_ALPHA (1 << 3)
|
||||
#define FMT_FLAGS_COMPRESSED (1 << 4)
|
||||
#define FMT_FLAGS_WRITEBACK (1 << 5)
|
||||
};
|
||||
|
||||
/**
|
||||
* struct fimc_dma_offset - pixel offset information for DMA
|
||||
* @y_h: y value horizontal offset
|
||||
|
|
|
@ -32,7 +32,6 @@
|
|||
#include <media/s5p_fimc.h>
|
||||
|
||||
#include "fimc-mdevice.h"
|
||||
#include "fimc-core.h"
|
||||
#include "fimc-lite.h"
|
||||
#include "fimc-lite-reg.h"
|
||||
|
||||
|
|
|
@ -20,12 +20,11 @@
|
|||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/videobuf2-core.h>
|
||||
#include <media/v4l2-ctrls.h>
|
||||
#include <media/v4l2-device.h>
|
||||
#include <media/v4l2-mediabus.h>
|
||||
#include <media/s5p_fimc.h>
|
||||
|
||||
#include "fimc-core.h"
|
||||
|
||||
#define FIMC_LITE_DRV_NAME "exynos-fimc-lite"
|
||||
#define FLITE_CLK_NAME "flite"
|
||||
#define FIMC_LITE_MAX_DEVS 2
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#define S5P_FIMC_H_
|
||||
|
||||
#include <media/media-entity.h>
|
||||
#include <media/v4l2-mediabus.h>
|
||||
|
||||
/*
|
||||
* Enumeration of data inputs to the camera subsystem.
|
||||
|
@ -93,6 +94,39 @@ struct s5p_platform_fimc {
|
|||
*/
|
||||
#define S5P_FIMC_TX_END_NOTIFY _IO('e', 0)
|
||||
|
||||
#define FIMC_MAX_PLANES 3
|
||||
|
||||
/**
|
||||
* struct fimc_fmt - color format data structure
|
||||
* @mbus_code: media bus pixel code, -1 if not applicable
|
||||
* @name: format description
|
||||
* @fourcc: fourcc code for this format, 0 if not applicable
|
||||
* @color: the driver's private color format id
|
||||
* @memplanes: number of physically non-contiguous data planes
|
||||
* @colplanes: number of physically contiguous data planes
|
||||
* @depth: per plane driver's private 'number of bits per pixel'
|
||||
* @mdataplanes: bitmask indicating meta data plane(s), (1 << plane_no)
|
||||
* @flags: flags indicating which operation mode format applies to
|
||||
*/
|
||||
struct fimc_fmt {
|
||||
enum v4l2_mbus_pixelcode mbus_code;
|
||||
char *name;
|
||||
u32 fourcc;
|
||||
u32 color;
|
||||
u16 memplanes;
|
||||
u16 colplanes;
|
||||
u8 depth[FIMC_MAX_PLANES];
|
||||
u16 mdataplanes;
|
||||
u16 flags;
|
||||
#define FMT_FLAGS_CAM (1 << 0)
|
||||
#define FMT_FLAGS_M2M_IN (1 << 1)
|
||||
#define FMT_FLAGS_M2M_OUT (1 << 2)
|
||||
#define FMT_FLAGS_M2M (1 << 1 | 1 << 2)
|
||||
#define FMT_HAS_ALPHA (1 << 3)
|
||||
#define FMT_FLAGS_COMPRESSED (1 << 4)
|
||||
#define FMT_FLAGS_WRITEBACK (1 << 5)
|
||||
};
|
||||
|
||||
enum fimc_subdev_index {
|
||||
IDX_SENSOR,
|
||||
IDX_CSIS,
|
||||
|
|
Loading…
Reference in a new issue