Commit f486e7c3 authored by Sylwester Nawrocki's avatar Sylwester Nawrocki Committed by Mauro Carvalho Chehab

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

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: default avatarSylwester Nawrocki <s.nawrocki@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Cc: stable@vger.kernel.org # for 3.15
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 3e594ce7
...@@ -1520,7 +1520,7 @@ static int fimc_md_register_clk_provider(struct fimc_md *fmd) ...@@ -1520,7 +1520,7 @@ static int fimc_md_register_clk_provider(struct fimc_md *fmd)
} }
#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,
......
...@@ -94,7 +94,9 @@ struct fimc_sensor_info { ...@@ -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 { ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment