From e6a6b304188bf6f2ea85e22a1bd530a65ea0fcc2 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Tue, 9 Apr 2013 07:19:27 -0300 Subject: [PATCH] --- yaml --- r: 366983 b: refs/heads/master c: 488f29d00e819b178f9060fa08028b73d5f8d916 h: refs/heads/master i: 366981: f3139a832b3884f852de38287701761fdb09b2b1 366979: 29b823aa75a95b252963d824d6ebd18374f13d66 366975: 3d45607541bafbaf78262ec49e5fdbca433ae1ee v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/exynos4-is/media-dev.h | 9 --------- trunk/include/media/s5p_fimc.h | 11 +++++++++++ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index ee2bd07183f0..8480b381ecd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65fccab560922d8a1a1e7d3c9711c309126d636f +refs/heads/master: 488f29d00e819b178f9060fa08028b73d5f8d916 diff --git a/trunk/drivers/media/platform/exynos4-is/media-dev.h b/trunk/drivers/media/platform/exynos4-is/media-dev.h index 0b14cd575747..7f126c3adacf 100644 --- a/trunk/drivers/media/platform/exynos4-is/media-dev.h +++ b/trunk/drivers/media/platform/exynos4-is/media-dev.h @@ -30,15 +30,6 @@ #define PINCTRL_STATE_IDLE "idle" -/* Group IDs of sensor, MIPI-CSIS, FIMC-LITE and the writeback subdevs. */ -#define GRP_ID_SENSOR (1 << 8) -#define GRP_ID_FIMC_IS_SENSOR (1 << 9) -#define GRP_ID_WRITEBACK (1 << 10) -#define GRP_ID_CSIS (1 << 11) -#define GRP_ID_FIMC (1 << 12) -#define GRP_ID_FLITE (1 << 13) -#define GRP_ID_FIMC_IS (1 << 14) - #define FIMC_MAX_SENSORS 8 #define FIMC_MAX_CAMCLKS 2 diff --git a/trunk/include/media/s5p_fimc.h b/trunk/include/media/s5p_fimc.h index e316d15896f9..f50969025ef3 100644 --- a/trunk/include/media/s5p_fimc.h +++ b/trunk/include/media/s5p_fimc.h @@ -49,6 +49,17 @@ enum fimc_bus_type { #define fimc_input_is_parallel(x) ((x) == 1 || (x) == 2) #define fimc_input_is_mipi_csi(x) ((x) == 3 || (x) == 4) +/* + * The subdevices' group IDs. + */ +#define GRP_ID_SENSOR (1 << 8) +#define GRP_ID_FIMC_IS_SENSOR (1 << 9) +#define GRP_ID_WRITEBACK (1 << 10) +#define GRP_ID_CSIS (1 << 11) +#define GRP_ID_FIMC (1 << 12) +#define GRP_ID_FLITE (1 << 13) +#define GRP_ID_FIMC_IS (1 << 14) + struct i2c_board_info; /**