Patchwork [U-Boot,13/13] SMDK5250: Use statically defined structures only in non DT case

login
register
mail settings
Submitter Ajay Kumar
Date Feb. 22, 2013, 9:53 a.m.
Message ID <1361526789-29787-14-git-send-email-ajaykumar.rs@samsung.com>
Download mbox | patch
Permalink /patch/222490/
State Accepted
Delegated to: Minkyu Kang
Headers show

Comments

Ajay Kumar - Feb. 22, 2013, 9:53 a.m.
Since we have DT support in exynos_fb and exynos_dp drivers now,
we need not define any static structure or platform data related to
display in the board file smdk5250.c.
So, we place the already existing structures inside #ifndef CONFIG_OF_CONTROL block.

Signed-off-by: Ajay Kumar <ajaykumar.rs@samsung.com>
---
 board/samsung/smdk5250/smdk5250.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

Patch

diff --git a/board/samsung/smdk5250/smdk5250.c b/board/samsung/smdk5250/smdk5250.c
index 9e1e5db..1563bec 100644
--- a/board/samsung/smdk5250/smdk5250.c
+++ b/board/samsung/smdk5250/smdk5250.c
@@ -408,6 +408,12 @@  void exynos_cfg_lcd_gpio(void)
 	s5p_gpio_cfg_pin(&gpio1->x0, 7, GPIO_FUNC(0x3));
 }
 
+void exynos_set_dp_phy(unsigned int onoff)
+{
+	set_dp_phy_ctrl(onoff);
+}
+
+#ifndef CONFIG_OF_CONTROL
 vidinfo_t panel_info = {
 	.vl_freq	= 60,
 	.vl_col		= 2560,
@@ -440,11 +446,6 @@  vidinfo_t panel_info = {
 	.dp_enabled	= 1,
 };
 
-void exynos_set_dp_phy(unsigned int onoff)
-{
-	set_dp_phy_ctrl(onoff);
-}
-
 static struct edp_device_info edp_info = {
 	.disp_info = {
 		.h_res = 2560,
@@ -478,10 +479,13 @@  static struct exynos_dp_platform_data dp_platform_data = {
 	.edp_dev_info	= &edp_info,
 };
 
+#endif
 void init_panel_info(vidinfo_t *vid)
 {
+#ifndef CONFIG_OF_CONTROL
 	vid->rgb_mode   = MODE_RGB_P,
 
 	exynos_set_dp_platform_data(&dp_platform_data);
+#endif
 }
 #endif