iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] exynos4-is: Fix compilation for !CONFIG_COMMON_CLK

Browse Source 
CONFIG_COMMON_CLK is not enabled on S5PV210 platform, so include
some clk API data structures conditionally to avoid compilation
errors. These #ifdefs will be removed for next kernel release,
when the S5PV210 platform moves to DT and the common clk API.

Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Cc: stable@vger.kernel.org # for 3.15
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Sylwester Nawrocki 2014-04-15 14:34:29 -03:00 committed by Mauro Carvalho Chehab
parent 3e594ce7ea
commit f486e7c3cb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/exynos4-is/media-dev.c
View File

@ -1520,7 +1520,7 @@ err:
} }
#else #else
#define fimc_md_register_clk_provider(fmd) (0) #define fimc_md_register_clk_provider(fmd) (0)
#define fimc_md_unregister_clk_provider(fmd) (0) #define fimc_md_unregister_clk_provider(fmd)
#endif #endif
static int subdev_notifier_bound(struct v4l2_async_notifier *notifier, static int subdev_notifier_bound(struct v4l2_async_notifier *notifier,

4
drivers/media/platform/exynos4-is/media-dev.h
View File

@ -94,7 +94,9 @@ struct fimc_sensor_info {
}; };
struct cam_clk { struct cam_clk {
#ifdef CONFIG_COMMON_CLK
struct clk_hw hw; struct clk_hw hw;
#endif
struct fimc_md *fmd; struct fimc_md *fmd;
}; };
#define to_cam_clk(_hw) container_of(_hw, struct cam_clk, hw) #define to_cam_clk(_hw) container_of(_hw, struct cam_clk, hw)
@ -142,7 +144,9 @@ struct fimc_md {
struct cam_clk_provider { struct cam_clk_provider {
struct clk *clks[FIMC_MAX_CAMCLKS]; struct clk *clks[FIMC_MAX_CAMCLKS];
#ifdef CONFIG_COMMON_CLK
struct clk_onecell_data clk_data; struct clk_onecell_data clk_data;
#endif
struct device_node *of_node; struct device_node *of_node;
struct cam_clk camclk[FIMC_MAX_CAMCLKS]; struct cam_clk camclk[FIMC_MAX_CAMCLKS];
int num_clocks; int num_clocks;