Exynos4: add support for device tree

This patch adds api to decode peripheral id based in interrupt number.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

CC Minkyu Kang <[email protected]>

---
 arch/arm/cpu/armv7/exynos/pinmux.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

arch/arm/cpu/armv7/exynos/pinmux.c +0 -0

index 904177a..3201d53 100644

arch/arm/cpu/armv7/exynos/pinmux.c +8 -0

+		return cell[1];
+
+	debug(" invalid peripheral id\n");
+	return PERIPH_ID_NONE;
+}
+
 static int exynos5_pinmux_decode_periph_id(const void *blob, int node)
 {
 	int err;

@@ -763,6 +782,8 @@ int pinmux_decode_periph_id(const void *blob, int node)
 {
 	if (cpu_is_exynos5())
 		return  exynos5_pinmux_decode_periph_id(blob, node);
+	else if (cpu_is_exynos4())
+		return  exynos4_pinmux_decode_periph_id(blob, node);
 	else
 		return PERIPH_ID_NONE;
 }

-----Original Message-----

Hi, Piotr.

Quoted 1 line · Piotr Wilczek

This patch adds api to decode peripheral id based in interrupt

number.

Quoted 16 lines

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

CC Minkyu Kang <[email protected]>

---
 arch/arm/cpu/armv7/exynos/pinmux.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

arch/arm/cpu/armv7/exynos/pinmux.c +0 -0

index 904177a..3201d53 100644
@@ -741,6 +741,25 @@ int exynos_pinmux_config(int peripheral, int
 flags)  }
 

arch/arm/cpu/armv7/exynos/pinmux.c int exynos_pinmux_config(int peripheral, int · line 744

Quoted 2 lines

arch/arm/cpu/armv7/exynos/pinmux.c +1 -0

 #ifdef CONFIG_OF_CONTROL
+

Remove the white space.

arch/arm/cpu/armv7/exynos/pinmux.c int exynos_pinmux_config(int peripheral, int flags) · line 756

Quoted 13 lines

arch/arm/cpu/armv7/exynos/pinmux.c +12 -0

+static int exynos4_pinmux_decode_periph_id(const void *blob, int
+node) {
+	int err;
+	u32 cell[3];
+
+	err = fdtdec_get_int_array(blob, node, "interrupts", cell,
+					ARRAY_SIZE(cell));
+	if (err)
+		return PERIPH_ID_NONE;
+
+	/* check for invalid peripheral id */
+	if ((PERIPH_ID_SDMMC4 > cell[1]) || (cell[1] < PERIPH_ID_UART0))

What's condition checking? i didn't understand this. PERIPH_ID_SDMMC > cell[1] or PERIPH_ID_UART0 > cell[1] is valid?

Best Regards,
Jaehoon Chung

Quoted 11 lines

arch/arm/cpu/armv7/exynos/pinmux.c +6 -0

+		return cell[1];
+
+	debug(" invalid peripheral id\n");
+	return PERIPH_ID_NONE;
+}
+
 static int exynos5_pinmux_decode_periph_id(const void *blob, int
 node)  {
 	int err;

@@ -763,6 +782,8 @@ int pinmux_decode_periph_id(const void *blob, int
 node)  {

arch/arm/cpu/armv7/exynos/pinmux.c int pinmux_decode_periph_id(const void *blob, int node) · line 789

Quoted 8 lines

arch/arm/cpu/armv7/exynos/pinmux.c +2 -0

 	if (cpu_is_exynos5())
 		return  exynos5_pinmux_decode_periph_id(blob, node);
+	else if (cpu_is_exynos4())
+		return  exynos4_pinmux_decode_periph_id(blob, node);
 	else
 		return PERIPH_ID_NONE;
 }

Hi Jaehoon,

Thanks for review. Please comments below.

Quoted 23 lines

-----Original Message-----

Hi, Piotr.

Quoted 1 line · Piotr Wilczek

This patch adds api to decode peripheral id based in interrupt

number.

Quoted 16 lines

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

CC Minkyu Kang <[email protected]>

---
 arch/arm/cpu/armv7/exynos/pinmux.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

arch/arm/cpu/armv7/exynos/pinmux.c +0 -0

index 904177a..3201d53 100644
@@ -741,6 +741,25 @@ int exynos_pinmux_config(int peripheral, int
 flags)  }
 

Quoted 4 lines

arch/arm/cpu/armv7/exynos/pinmux.c int exynos_pinmux_config(int peripheral, int · line 744

Quoted 2 lines

arch/arm/cpu/armv7/exynos/pinmux.c +1 -0

 #ifdef CONFIG_OF_CONTROL
+

Remove the white space.

Ok.

Quoted 17 lines

arch/arm/cpu/armv7/exynos/pinmux.c int exynos_pinmux_config(int peripheral, int flags) · line 756

Quoted 13 lines

arch/arm/cpu/armv7/exynos/pinmux.c +12 -0

+static int exynos4_pinmux_decode_periph_id(const void *blob, int
+node) {
+	int err;
+	u32 cell[3];
+
+	err = fdtdec_get_int_array(blob, node, "interrupts", cell,
+					ARRAY_SIZE(cell));
+	if (err)
+		return PERIPH_ID_NONE;
+
+	/* check for invalid peripheral id */
+	if ((PERIPH_ID_SDMMC4 > cell[1]) || (cell[1] < PERIPH_ID_UART0))

What's condition checking? i didn't understand this. PERIPH_ID_SDMMC > cell[1] or PERIPH_ID_UART0 > cell[1] is valid?

It supposed to check if cell[1] is within supported periph_id range and should be like this:
If ((cell[1] >= PERIPH_ID_UART0) && (cell[1] < PERIPH_ID_COUNT))

This patch enables parsing mipi data from device tree. Non device tree case is still supported.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 arch/arm/include/asm/arch-exynos/mipi_dsim.h |    3 +
 drivers/video/exynos_mipi_dsi.c              |   98 ++++++++++++++++++++++++++
 include/fdtdec.h                             |    1 +
 lib/fdtdec.c                                 |    1 +
 4 files changed, 103 insertions(+)

arch/arm/include/asm/arch-exynos/mipi_dsim.h +3 -0

index 40aca71..c9e8e06 100644
@@ -12,6 +12,7 @@
 
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <lcd.h>
 
 #define PANEL_NAME_SIZE		(32)
 

@@ -368,8 +369,10 @@ int exynos_mipi_dsi_register_lcd_device(struct mipi_dsim_lcd_device
 						*lcd_dev);
 
 void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim *pd);
+void exynos_init_dsim_platform_data(vidinfo_t *vid);
 
 /* panel driver init based on mipi dsi interface */
 void s6e8ax0_init(void);
 
+extern int mipi_power(void);
 #endif /* _DSIM_H */

drivers/video/exynos_mipi_dsi.c +83 -0

index 8bb8fea..ab15ad6 100644
@@ -9,6 +9,8 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <fdtdec.h>
+#include <libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>

@@ -22,7 +24,12 @@
 #define master_to_driver(a)	(a->dsim_lcd_drv)
 #define master_to_device(a)	(a->dsim_lcd_dev)
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static struct exynos_platform_mipi_dsim *dsim_pd;
+static struct mipi_dsim_config dsim_config_dt;
+static struct exynos_platform_mipi_dsim dsim_platform_data_dt;
+static struct mipi_dsim_lcd_device mipi_lcd_device_dt;
 
 struct mipi_dsim_ddi {
 	int				bus_id;

@@ -238,3 +245,94 @@ void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim *pd)
 
 	dsim_pd = pd;
 }
+
+#ifdef CONFIG_OF_CONTROL
+int exynos_dsim_config_parse_dt(const void *blob)
+{
+	int node;
+
+	node = fdtdec_next_compatible(blob, 0, COMPAT_SAMSUNG_EXYNOS_MIPI_DSI);
+	if (node <= 0) {
+		printf("exynos_mipi_dsi: Can't get device node for mipi dsi\n");
+		return -ENODEV;
+	}
+
+	dsim_config_dt.e_interface = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_interface", 0);
+
+	dsim_config_dt.e_virtual_ch = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_virtual_ch", 0);
+
+	dsim_config_dt.e_pixel_format = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_pixel_format", 0);
+
+	dsim_config_dt.e_burst_mode = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_burst_mode", 0);
+
+	dsim_config_dt.e_no_data_lane = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_no_data_lane", 0);
+
+	dsim_config_dt.e_byte_clk = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_byte_clk", 0);
+
+	dsim_config_dt.hfp = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-hfp", 0);
+
+	dsim_config_dt.p = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-p", 0);
+	dsim_config_dt.m = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-m", 0);
+	dsim_config_dt.s = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-s", 0);
+
+	dsim_config_dt.pll_stable_time = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-pll_stable_time", 0);
+
+	dsim_config_dt.esc_clk = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-esc_clk", 0);
+
+	dsim_config_dt.stop_holding_cnt = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-stop_holding_cnt", 0);
+
+	dsim_config_dt.bta_timeout = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-bta_timeout", 0);
+
+	dsim_config_dt.rx_timeout = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-rx_timeout", 0);
+
+	mipi_lcd_device_dt.name = fdtdec_get_config_string(blob,
+				"samsung,dsim-device-name");
+
+	mipi_lcd_device_dt.id = fdtdec_get_int(blob, node,
+				"samsung,dsim-device-id", 0);
+
+	mipi_lcd_device_dt.bus_id = fdtdec_get_int(blob, node,
+				"samsung,dsim-device-bus_id", 0);
+
+	mipi_lcd_device_dt.reverse_panel = fdtdec_get_int(blob, node,
+				"samsung,dsim-device-reverse_panel", 0);
+
+	return 0;
+}
+
+void exynos_init_dsim_platform_data(vidinfo_t *vid)
+{
+	if (exynos_dsim_config_parse_dt(gd->fdt_blob))
+		debug("Can't get proper dsim config.\n");
+
+	strcpy(dsim_platform_data_dt.lcd_panel_name, mipi_lcd_device_dt.name);

drivers/video/exynos_mipi_dsi.c +5 -0

+#endif
+
+	dsim_pd = &dsim_platform_data_dt;
+}
+#endif

include/fdtdec.h +1 -0

index 433d6a7..f12b4aa 100644
@@ -78,6 +78,7 @@ enum fdt_compat_id {
 	COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for usb3.0 */
 	COMPAT_SAMSUNG_EXYNOS_TMU,	/* Exynos TMU */
 	COMPAT_SAMSUNG_EXYNOS_FIMD,	/* Exynos Display controller */
+	COMPAT_SAMSUNG_EXYNOS_MIPI_DSI,	/* Exynos mipi dsi */
 	COMPAT_SAMSUNG_EXYNOS5_DP,	/* Exynos Display port controller */
 	COMPAT_SAMSUNG_EXYNOS5_DWMMC,	/* Exynos5 DWMMC controller */
 	COMPAT_SAMSUNG_EXYNOS_SERIAL,	/* Exynos UART */

lib/fdtdec.c +0 -0

index 207314f..46e67ff 100644

-----Original Message-----

Quoted 9 lines · Piotr Wilczek

This patch enables parsing mipi data from device tree. Non device tree case is still supported.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 arch/arm/include/asm/arch-exynos/mipi_dsim.h |    3 +
 drivers/video/exynos_mipi_dsi.c              |   98

++++++++++++++++++++++++++

arch/arm/include/asm/arch-exynos/mipi_dsim.h int exynos_mipi_dsi_register_lcd_device(struct

Quoted 18 lines

 include/fdtdec.h                             |    1 +
 lib/fdtdec.c                                 |    1 +
 4 files changed, 103 insertions(+)

arch/arm/include/asm/arch-exynos/mipi_dsim.h +1 -0

index 40aca71..c9e8e06 100644
@@ -12,6 +12,7 @@
 
 #include <linux/list.h>
 #include <linux/fb.h>
+#include <lcd.h>
 
 #define PANEL_NAME_SIZE		(32)
 

@@ -368,8 +369,10 @@ int exynos_mipi_dsi_register_lcd_device(struct

mipi_dsim_lcd_device

Quoted 38 lines

arch/arm/include/asm/arch-exynos/mipi_dsim.h +2 -0

 						*lcd_dev);
 
 void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim
 *pd);
+void exynos_init_dsim_platform_data(vidinfo_t *vid);
 
 /* panel driver init based on mipi dsi interface */  void
 s6e8ax0_init(void);
 
+extern int mipi_power(void);

#endif /* _DSIM_H */

(quoted diff) +0 -0

b/drivers/video/exynos_mipi_dsi.c index 8bb8fea..ab15ad6 100644

drivers/video/exynos_mipi_dsi.c +7 -0

@@ -9,6 +9,8 @@
 
 #include <common.h>
 #include <malloc.h>
+#include <fdtdec.h>
+#include <libfdt.h>
 #include <linux/err.h>
 #include <asm/arch/dsim.h>
 #include <asm/arch/mipi_dsim.h>

@@ -22,7 +24,12 @@
 #define master_to_driver(a)	(a->dsim_lcd_drv)
 #define master_to_device(a)	(a->dsim_lcd_dev)
 
+DECLARE_GLOBAL_DATA_PTR;
+
 static struct exynos_platform_mipi_dsim *dsim_pd;
+static struct mipi_dsim_config dsim_config_dt; static struct
+exynos_platform_mipi_dsim dsim_platform_data_dt; static struct
+mipi_dsim_lcd_device mipi_lcd_device_dt;
 
 struct mipi_dsim_ddi {
 	int				bus_id;

drivers/video/exynos_mipi_dsi.c void exynos_set_dsim_platform_data(struct

Quoted 10 lines

drivers/video/exynos_mipi_dsi.c +6 -0

@@ -238,3 +245,94 @@ void exynos_set_dsim_platform_data(struct
 exynos_platform_mipi_dsim *pd)
 
 	dsim_pd = pd;
 }
+
+#ifdef CONFIG_OF_CONTROL
+int exynos_dsim_config_parse_dt(const void *blob) {
+	int node;
+
+	node = fdtdec_next_compatible(blob, 0,

COMPAT_SAMSUNG_EXYNOS_MIPI_DSI);

drivers/video/exynos_mipi_dsi.c

Quoted 2 lines

drivers/video/exynos_mipi_dsi.c +2 -0

+	if (node <= 0) {
+		printf("exynos_mipi_dsi: Can't get device node for mipi

dsi\n");

Quoted 56 lines

drivers/video/exynos_mipi_dsi.c +56 -0

+		return -ENODEV;
+	}
+
+	dsim_config_dt.e_interface = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_interface", 0);
+
+	dsim_config_dt.e_virtual_ch = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_virtual_ch", 0);
+
+	dsim_config_dt.e_pixel_format = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_pixel_format", 0);
+
+	dsim_config_dt.e_burst_mode = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_burst_mode", 0);
+
+	dsim_config_dt.e_no_data_lane = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_no_data_lane", 0);
+
+	dsim_config_dt.e_byte_clk = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-e_byte_clk", 0);
+
+	dsim_config_dt.hfp = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-hfp", 0);
+
+	dsim_config_dt.p = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-p", 0);
+	dsim_config_dt.m = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-m", 0);
+	dsim_config_dt.s = fdtdec_get_int(blob, node,
+					  "samsung,dsim-config-s", 0);
+
+	dsim_config_dt.pll_stable_time = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-pll_stable_time", 0);
+
+	dsim_config_dt.esc_clk = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-esc_clk", 0);
+
+	dsim_config_dt.stop_holding_cnt = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-stop_holding_cnt", 0);
+
+	dsim_config_dt.bta_timeout = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-bta_timeout", 0);
+
+	dsim_config_dt.rx_timeout = fdtdec_get_int(blob, node,
+				"samsung,dsim-config-rx_timeout", 0);
+
+	mipi_lcd_device_dt.name = fdtdec_get_config_string(blob,
+				"samsung,dsim-device-name");
+
+	mipi_lcd_device_dt.id = fdtdec_get_int(blob, node,
+				"samsung,dsim-device-id", 0);
+
+	mipi_lcd_device_dt.bus_id = fdtdec_get_int(blob, node,
+				"samsung,dsim-device-bus_id", 0);
+
+	mipi_lcd_device_dt.reverse_panel = fdtdec_get_int(blob, node,

drivers/video/exynos_mipi_dsi.c void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim *pd)

Quoted 10 lines

drivers/video/exynos_mipi_dsi.c +10 -0

+				"samsung,dsim-device-reverse_panel", 0);
+
+	return 0;
+}
+
+void exynos_init_dsim_platform_data(vidinfo_t *vid) {
+	if (exynos_dsim_config_parse_dt(gd->fdt_blob))
+		debug("Can't get proper dsim config.\n");
+
+	strcpy(dsim_platform_data_dt.lcd_panel_name,

mipi_lcd_device_dt.name);

drivers/video/exynos_mipi_dsi.c void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim *pd)

Quoted 6 lines

drivers/video/exynos_mipi_dsi.c +6 -0

+	dsim_platform_data_dt.dsim_config = &dsim_config_dt;
+	dsim_platform_data_dt.mipi_power = mipi_power;
+	dsim_platform_data_dt.phy_enable = set_mipi_phy_ctrl;
+	dsim_platform_data_dt.lcd_panel_info = (void *)vid;
+
+	mipi_lcd_device_dt.platform_data = (void

*)&dsim_platform_data_dt;

drivers/video/exynos_mipi_dsi.c void exynos_set_dsim_platform_data(struct exynos_platform_mipi_dsim *pd) · line 333

Quoted 4 lines

drivers/video/exynos_mipi_dsi.c +4 -0

+	exynos_mipi_dsi_register_lcd_device(&mipi_lcd_device_dt);
+
+#ifdef CONFIG_S6E8AX0
+	s6e8ax0_init();

No.
Please don't init specific panel at here. looks weird.

include/fdtdec.h enum fdt_compat_id { · line 78

Quoted 11 lines

drivers/video/exynos_mipi_dsi.c +5 -0

+#endif
+
+	dsim_pd = &dsim_platform_data_dt;
+}
+#endif

include/fdtdec.h index renamed from include/fdtdec.h +0 -0

433d6a7..f12b4aa 100644

include/fdtdec.h +0 -0

@@ -78,6 +78,7 @@ enum fdt_compat_id {
 	COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for

usb3.0 */

lib/fdtdec.c index 207314f..46e67ff

Quoted 7 lines

include/fdtdec.h +1 -0

 	COMPAT_SAMSUNG_EXYNOS_TMU,	/* Exynos TMU */
 	COMPAT_SAMSUNG_EXYNOS_FIMD,	/* Exynos Display controller */
+	COMPAT_SAMSUNG_EXYNOS_MIPI_DSI,	/* Exynos mipi dsi */
 	COMPAT_SAMSUNG_EXYNOS5_DP,	/* Exynos Display port controller */
 	COMPAT_SAMSUNG_EXYNOS5_DWMMC,	/* Exynos5 DWMMC controller */
 	COMPAT_SAMSUNG_EXYNOS_SERIAL,	/* Exynos UART */

lib/fdtdec.c index 207314f..46e67ff renamed from lib/fdtdec.c +0 -0

100644

lib/fdtdec.c static const char * const

Quoted 3 lines

lib/fdtdec.c +0 -0

@@ -51,6 +51,7 @@ static const char * const

compat_names[COMPAT_COUNT] = {

lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 57

Quoted 8 lines

lib/fdtdec.c +1 -0

 	COMPAT(SAMSUNG_EXYNOS5_USB3_PHY, "samsung,exynos5250-usb3-phy"),
 	COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"),
 	COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"),
+	COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
 	COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"),
 	COMPAT(SAMSUNG_EXYNOS5_DWMMC, "samsung,exynos5250-dwmmc"),
 	COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"),

Thanks,
Minkyu Kang.

This patch adds additional data parsing from DTB.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 drivers/video/exynos_fb.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

drivers/video/exynos_fb.c +1 -0

index d4863e8..7e0099f 100644
@@ -20,6 +20,7 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/system.h>
 #include <asm-generic/errno.h>
+#include <libtizen.h>
 
 #include "exynos_fb.h"
 

drivers/video/exynos_fb.c +1 -0

+#endif
 	return 0;
 }
 #endif

Quoted 19 lines

This patch adds additional data parsing from DTB.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 drivers/video/exynos_fb.c |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

drivers/video/exynos_fb.c +1 -0

index d4863e8..7e0099f 100644
@@ -20,6 +20,7 @@
 #include <asm/arch/dp_info.h>
 #include <asm/arch/system.h>
 #include <asm-generic/errno.h>
+#include <libtizen.h>
 

drivers/video/exynos_fb.c int exynos_fimd_parse_dt(const void *blob) · line 271

Quoted 5 lines

drivers/video/exynos_fb.c +0 -0

 #include "exynos_fb.h"
 

@@ -269,6 +270,21 @@ int exynos_fimd_parse_dt(const void *blob)
 	panel_info.dual_lcd_enabled = fdtdec_get_int(blob, node,
 						"samsung,dual-lcd-enabled",

drivers/video/exynos_fb.c int exynos_fimd_parse_dt(const void *blob) · line 274

Quoted 3 lines

drivers/video/exynos_fb.c +2 -0

+	panel_info.logo_on = fdtdec_get_int(blob, node,
+						"samsung,logo-on", 0);

duplicated.

drivers/video/exynos_fb.c int exynos_fimd_parse_dt(const void *blob)

Quoted 10 lines

drivers/video/exynos_fb.c +9 -0

+
+	panel_info.resolution = fdtdec_get_int(blob, node,
+						"samsung,resolution", 0);
+
+	panel_info.rgb_mode = fdtdec_get_int(blob, node,
+						"samsung,rgb-mode", 0);
+
+	panel_info.power_on_delay = fdtdec_get_int(blob, node,
+						"samsung,power-on-delay",

drivers/video/exynos_fb.c int exynos_fimd_parse_dt(const void *blob) · line 286

Quoted 3 lines

drivers/video/exynos_fb.c +3 -0

+
+#ifdef CONFIG_TIZEN
+	get_tizen_logo_info(&panel_info);

It looks strange.
Why you load the logo at frame buffer driver?

Quoted 11 lines

drivers/video/exynos_fb.c +1 -0

+#endif
 	return 0;
 }
 #endif

@@ -281,6 +297,9 @@ void lcd_ctrl_init(void *lcdbase)  #ifdef

CONFIG_OF_CONTROL

drivers/video/exynos_fb.c +2 -0

 	if (exynos_fimd_parse_dt(gd->fdt_blob))
 		debug("Can't get proper panel info\n");
+#ifdef CONFIG_EXYNOS_MIPI_DSIM
+	exynos_init_dsim_platform_data(&panel_info);

drivers/video/exynos_fb.c void lcd_ctrl_init(void *lcdbase) · line 305

Quoted 5 lines

drivers/video/exynos_fb.c +1 -0

+#endif
 #else
 	/* initialize parameters which is specific to panel. */
 	init_panel_info(&panel_info);

Thanks,
Minkyu Kang.

This patch enables support for device tree for sdhci driver. Non DT case is still supported.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 arch/arm/include/asm/arch-exynos/mmc.h |    7 ++
 drivers/mmc/s5p_sdhci.c                |  130 +++++++++++++++++++++++++++++++-
 include/fdtdec.h                       |    1 +
 include/sdhci.h                        |    5 ++
 lib/fdtdec.c                           |    1 +
 5 files changed, 143 insertions(+), 1 deletion(-)

arch/arm/include/asm/arch-exynos/mmc.h +7 -0

index 98d6530..0fb6461 100644
@@ -53,6 +53,8 @@
 #define SDHCI_CTRL4_DRIVE_MASK(_x)	((_x) << 16)
 #define SDHCI_CTRL4_DRIVE_SHIFT		(16)
 
+#define SDHCI_MAX_HOSTS 4
+
 int s5p_sdhci_init(u32 regbase, int index, int bus_width);
 
 static inline int s5p_mmc_init(int index, int bus_width)

@@ -62,4 +64,9 @@ static inline int s5p_mmc_init(int index, int bus_width)
 
 	return s5p_sdhci_init(base, index, bus_width);
 }
+
+#ifdef CONFIG_OF_CONTROL
+int exynos_mmc_init(const void *blob);
+#endif
+
 #endif

drivers/mmc/s5p_sdhci.c +11 -1

index 40ff873..7456ee0 100644
@@ -8,9 +8,15 @@
 #include <common.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <fdtdec.h>
+#include <libfdt.h>
+#include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/clk.h>
-
+#include <errno.h>
+#ifdef CONFIG_OF_CONTROL
+#include <asm/arch/pinmux.h>
+#endif
 static char *S5P_NAME = "SAMSUNG SDHCI";
 static void s5p_sdhci_set_control_reg(struct sdhci_host *host)
 {

@@ -86,3 +92,125 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)
 
 	return add_sdhci(host, 52000000, 400000);
 }
+
+#ifdef CONFIG_OF_CONTROL
+struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
+

drivers/mmc/s5p_sdhci.c +33 -0

+		err = exynos_pinmux_config(dev_id, flag);
+		if (err) {
+			debug("MMC not configured\n");
+			return err;
+		}
+	}
+
+	if (fdt_gpio_isvalid(&host->cd_gpio)) {
+		gpio_direction_output(host->cd_gpio.gpio, 0xf);
+		if (gpio_get_value(host->cd_gpio.gpio))
+			return -ENODEV;
+
+		err = exynos_pinmux_config(dev_id, flag);
+		if (err) {
+			printf("external SD not configured\n");
+			return err;
+		}
+	}
+
+	host->name = S5P_NAME;
+
+	host->quirks = SDHCI_QUIRK_NO_HISPD_BIT | SDHCI_QUIRK_BROKEN_VOLTAGE |
+		SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
+		SDHCI_QUIRK_WAIT_SEND_CMD;
+	host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
+	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
+
+	host->set_control_reg = &s5p_sdhci_set_control_reg;
+	host->set_clock = set_mmc_clk;
+
+	host->host_caps = MMC_MODE_HC;
+
+	return add_sdhci(host, 52000000, 400000);

drivers/mmc/s5p_sdhci.c +7 -0

+		debug("MMC: Can't get device id\n");
+		return -1;
+	}
+	host->index = dev_id - PERIPH_ID_SDMMC0;
+
+	/* Get bus width */
+	bus_width = fdtdec_get_int(blob, node, "samsung,bus-width", 0);

drivers/mmc/s5p_sdhci.c +48 -0

+		return -1;
+	}
+	host->ioaddr = (void *)base;
+
+	fdtdec_decode_gpio(blob, node, "pwr-gpios", &host->pwr_gpio);
+	fdtdec_decode_gpio(blob, node, "cd-gpios", &host->cd_gpio);
+
+	return 0;
+}
+
+static int process_nodes(const void *blob, int node_list[], int count)
+{
+	struct sdhci_host *host;
+	int i, node;
+
+	debug("%s: count = %d\n", __func__, count);
+
+	/* build sdhci_host[] for each controller */
+	for (i = 0; i < count; i++) {
+		node = node_list[i];
+		if (node <= 0)
+			continue;
+
+		host = &sdhci_host[i];
+
+		if (sdhci_get_config(blob, node, host)) {
+			printf("%s: failed to decode dev %d\n",	__func__, i);
+			return -1;
+		}
+		do_sdhci_init(host);
+	}
+	return 0;
+}
+
+int exynos_mmc_init(const void *blob)
+{
+	int count;
+	int node_list[SDHCI_MAX_HOSTS];
+
+	count = fdtdec_find_aliases_for_id(blob, "mmc",
+			COMPAT_SAMSUNG_EXYNOS_MMC, node_list,
+			SDHCI_MAX_HOSTS);
+
+	process_nodes(blob, node_list, count);
+
+	return 1;
+}
+#endif

include/fdtdec.h +1 -0

index f12b4aa..d637f88 100644
@@ -81,6 +81,7 @@ enum fdt_compat_id {
 	COMPAT_SAMSUNG_EXYNOS_MIPI_DSI,	/* Exynos mipi dsi */
 	COMPAT_SAMSUNG_EXYNOS5_DP,	/* Exynos Display port controller */
 	COMPAT_SAMSUNG_EXYNOS5_DWMMC,	/* Exynos5 DWMMC controller */
+	COMPAT_SAMSUNG_EXYNOS_MMC,	/* Exynos MMC controller */
 	COMPAT_SAMSUNG_EXYNOS_SERIAL,	/* Exynos UART */
 	COMPAT_MAXIM_MAX77686_PMIC,	/* MAX77686 PMIC */
 	COMPAT_GENERIC_SPI_FLASH,	/* Generic SPI Flash chip */

include/sdhci.h +1 -0

index 74d06ae..0cba703 100644
@@ -12,6 +12,7 @@
 
 #include <asm/io.h>
 #include <mmc.h>
+#include <fdtdec.h>
 
 /*
  * Controller registers

lib/fdtdec.c +0 -0

 	COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"),
 	COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
 	COMPAT(GENERIC_SPI_FLASH, "spi-flash"),

Hi, Piotr.

Quoted 9 lines · Piotr Wilczek

This patch enables support for device tree for sdhci driver. Non DT case is still supported.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Cc Minkyu Kang <[email protected]>

---
 arch/arm/include/asm/arch-exynos/mmc.h |    7 ++
 drivers/mmc/s5p_sdhci.c                |  130

+++++++++++++++++++++++++++++++-

Quoted 46 lines

 include/fdtdec.h                       |    1 +
 include/sdhci.h                        |    5 ++
 lib/fdtdec.c                           |    1 +
 5 files changed, 143 insertions(+), 1 deletion(-)

arch/arm/include/asm/arch-exynos/mmc.h +7 -0

index 98d6530..0fb6461 100644
@@ -53,6 +53,8 @@
 #define SDHCI_CTRL4_DRIVE_MASK(_x)	((_x) << 16)
 #define SDHCI_CTRL4_DRIVE_SHIFT		(16)
 
+#define SDHCI_MAX_HOSTS 4
+
 int s5p_sdhci_init(u32 regbase, int index, int bus_width);
 
 static inline int s5p_mmc_init(int index, int bus_width) @@ -62,4
+64,9 @@ static inline int s5p_mmc_init(int index, int bus_width)
 
 	return s5p_sdhci_init(base, index, bus_width);  }
+
+#ifdef CONFIG_OF_CONTROL
+int exynos_mmc_init(const void *blob); #endif
+
 #endif

drivers/mmc/s5p_sdhci.c index renamed from drivers/mmc/s5p_sdhci.c +0 -0

40ff873..7456ee0 100644

drivers/mmc/s5p_sdhci.c +7 -1

@@ -8,9 +8,15 @@
 #include <common.h>
 #include <malloc.h>
 #include <sdhci.h>
+#include <fdtdec.h>
+#include <libfdt.h>
+#include <asm/gpio.h>
 #include <asm/arch/mmc.h>
 #include <asm/arch/clk.h>
-
+#include <errno.h>
+#ifdef CONFIG_OF_CONTROL
+#include <asm/arch/pinmux.h>
+#endif
 static char *S5P_NAME = "SAMSUNG SDHCI";  static void

Quoted 1 line

s5p_sdhci_set_control_reg(struct sdhci_host *host) { @@ -86,3

+92,125

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width)

Quoted 12 lines

@@ int s5p_sdhci_init(u32 regbase, int index, int bus_width)

drivers/mmc/s5p_sdhci.c +9 -0

 	return add_sdhci(host, 52000000, 400000);  }
+
+#ifdef CONFIG_OF_CONTROL
+struct sdhci_host sdhci_host[SDHCI_MAX_HOSTS];
+
+static int do_sdhci_init(struct sdhci_host *host) {
+	int dev_id, flag;
+	int err = 0;
+
+	flag = host->bus_width == 8 ? PINMUX_FLAG_8BIT_MODE :

PINMUX_FLAG_NONE;

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width) · line 108

Quoted 4 lines

drivers/mmc/s5p_sdhci.c +4 -0

+	dev_id = host->index + PERIPH_ID_SDMMC0;
+
+	if (fdt_gpio_isvalid(&host->pwr_gpio)) {
+		gpio_direction_output(host->pwr_gpio.gpio, 1);

what's pwr_gpio? Is it used for the both(eMMC and SD card)?

Quoted 13 lines

drivers/mmc/s5p_sdhci.c +12 -0

+		err = exynos_pinmux_config(dev_id, flag);
+		if (err) {
+			debug("MMC not configured\n");
+			return err;
+		}
+	}
+
+	if (fdt_gpio_isvalid(&host->cd_gpio)) {
+		gpio_direction_output(host->cd_gpio.gpio, 0xf);
+		if (gpio_get_value(host->cd_gpio.gpio))
+			return -ENODEV;
+

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width)

Quoted 10 lines

drivers/mmc/s5p_sdhci.c +10 -0

+		err = exynos_pinmux_config(dev_id, flag);
+		if (err) {
+			printf("external SD not configured\n");
+			return err;
+		}
+	}
+
+	host->name = S5P_NAME;
+
+	host->quirks = SDHCI_QUIRK_NO_HISPD_BIT |

SDHCI_QUIRK_BROKEN_VOLTAGE |

Quoted 14 lines

drivers/mmc/s5p_sdhci.c +14 -0

+		SDHCI_QUIRK_BROKEN_R1B | SDHCI_QUIRK_32BIT_DMA_ADDR |
+		SDHCI_QUIRK_WAIT_SEND_CMD;
+	host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
+	host->version = sdhci_readw(host, SDHCI_HOST_VERSION);
+
+	host->set_control_reg = &s5p_sdhci_set_control_reg;
+	host->set_clock = set_mmc_clk;
+
+	host->host_caps = MMC_MODE_HC;
+
+	return add_sdhci(host, 52000000, 400000); }
+
+static int sdhci_get_config(const void *blob, int node, struct
+sdhci_host *host) {

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width) · line 151

Quoted 6 lines

drivers/mmc/s5p_sdhci.c +6 -0

+	int bus_width, dev_id;
+	unsigned int base;
+
+	/* Get device id */
+	dev_id = pinmux_decode_periph_id(blob, node);
+	if (dev_id < PERIPH_ID_SDMMC0) {

Didn't need to check other boundary?

Quoted 12 lines

drivers/mmc/s5p_sdhci.c +11 -0

+		debug("MMC: Can't get device id\n");
+		return -1;
+	}
+	host->index = dev_id - PERIPH_ID_SDMMC0;
+
+	/* Get bus width */
+	bus_width = fdtdec_get_int(blob, node, "samsung,bus-width", 0);
+	if (bus_width <= 0) {
+		debug("MMC: Can't get bus-width\n");
+		return -1;
+	}

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width) · line 168

Quoted 6 lines

drivers/mmc/s5p_sdhci.c +6 -0

+	host->bus_width = bus_width;
+
+	/* Get the base address from the device node */
+	base = fdtdec_get_addr(blob, node, "reg");
+	if (!base) {
+		debug("DWMMC: Can't get base address\n");

DWMMC?

Quoted 18 lines

drivers/mmc/s5p_sdhci.c +17 -0

+		return -1;
+	}
+	host->ioaddr = (void *)base;
+
+	fdtdec_decode_gpio(blob, node, "pwr-gpios", &host->pwr_gpio);
+	fdtdec_decode_gpio(blob, node, "cd-gpios", &host->cd_gpio);
+
+	return 0;
+}
+
+static int process_nodes(const void *blob, int node_list[], int
+count) {
+	struct sdhci_host *host;
+	int i, node;
+
+	debug("%s: count = %d\n", __func__, count);
+

drivers/mmc/s5p_sdhci.c int s5p_sdhci_init(u32 regbase, int index, int bus_width)

Quoted 10 lines

drivers/mmc/s5p_sdhci.c +10 -0

+	/* build sdhci_host[] for each controller */
+	for (i = 0; i < count; i++) {
+		node = node_list[i];
+		if (node <= 0)
+			continue;
+
+		host = &sdhci_host[i];
+
+		if (sdhci_get_config(blob, node, host)) {
+			printf("%s: failed to decode dev %d\n",	__func__,

i);

Quoted 48 lines

drivers/mmc/s5p_sdhci.c +20 -0

+			return -1;
+		}
+		do_sdhci_init(host);
+	}
+	return 0;
+}
+
+int exynos_mmc_init(const void *blob) {
+	int count;
+	int node_list[SDHCI_MAX_HOSTS];
+
+	count = fdtdec_find_aliases_for_id(blob, "mmc",
+			COMPAT_SAMSUNG_EXYNOS_MMC, node_list,
+			SDHCI_MAX_HOSTS);
+
+	process_nodes(blob, node_list, count);
+
+	return 1;
+}
+#endif

include/fdtdec.h index renamed from include/fdtdec.h +0 -0

f12b4aa..d637f88 100644

include/fdtdec.h +1 -0

@@ -81,6 +81,7 @@ enum fdt_compat_id {
 	COMPAT_SAMSUNG_EXYNOS_MIPI_DSI,	/* Exynos mipi dsi */
 	COMPAT_SAMSUNG_EXYNOS5_DP,	/* Exynos Display port controller */
 	COMPAT_SAMSUNG_EXYNOS5_DWMMC,	/* Exynos5 DWMMC controller */
+	COMPAT_SAMSUNG_EXYNOS_MMC,	/* Exynos MMC controller */
 	COMPAT_SAMSUNG_EXYNOS_SERIAL,	/* Exynos UART */
 	COMPAT_MAXIM_MAX77686_PMIC,	/* MAX77686 PMIC */
 	COMPAT_GENERIC_SPI_FLASH,	/* Generic SPI Flash chip */

include/sdhci.h index 74d06ae..0cba703 renamed from include/sdhci.h +0 -0

100644

include/sdhci.h +1 -0

@@ -12,6 +12,7 @@
 
 #include <asm/io.h>
 #include <mmc.h>
+#include <fdtdec.h>
 
 /*
  * Controller registers

@@ -244,6 +245,10 @@ struct sdhci_host {
 	const struct sdhci_ops *ops;
 	int index;
 

include/sdhci.h struct sdhci_host { · line 249

Quoted 2 lines

include/sdhci.h +2 -0

+	int bus_width;
+	struct fdt_gpio_state pwr_gpio;	/* Change Detect GPIO */

pwr_gpio is Change Detect GPIO? I think that Comment is wrong.

include/sdhci.h struct sdhci_host { · line 250

Quoted 2 lines

include/sdhci.h +1 -0

+	struct fdt_gpio_state cd_gpio;		/* Change Detect GPIO */

Maybe Card detect GPIO is right.

lib/fdtdec.c index 46e67ff..a88f648

Quoted 5 lines

include/sdhci.h +1 -0

+
 	void (*set_control_reg)(struct sdhci_host *host);
 	void (*set_clock)(int dev_index, unsigned int div);
 	uint	voltages;

lib/fdtdec.c index 46e67ff..a88f648 renamed from lib/fdtdec.c +0 -0

100644

lib/fdtdec.c static const char * const

Quoted 3 lines

lib/fdtdec.c +0 -0

@@ -54,6 +54,7 @@ static const char * const

compat_names[COMPAT_COUNT] = {

lib/fdtdec.c static const char * const compat_names[COMPAT_COUNT] = { · line 57

Quoted 4 lines

lib/fdtdec.c +1 -0

 	COMPAT(SAMSUNG_EXYNOS_MIPI_DSI, "samsung,exynos-mipi-dsi"),
 	COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"),
 	COMPAT(SAMSUNG_EXYNOS5_DWMMC, "samsung,exynos5250-dwmmc"),
+	COMPAT(SAMSUNG_EXYNOS_MMC, "samsung,exynos-mmc"),

how about using "exynos4-mmc" instead of "exynos-mmc"?

Best Regards,
Jaehoon Chung

Quoted 4 lines

lib/fdtdec.c +0 -0

 	COMPAT(SAMSUNG_EXYNOS_SERIAL, "samsung,exynos4210-uart"),
 	COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"),
 	COMPAT(GENERIC_SPI_FLASH, "spi-flash"),

board/samsung/common/board_exynos4.c new file +83 -0

@@ -0,0 +1,83 @@
+/*
+ * (C) Copyright 2014 SAMSUNG Electronics
+ * Piotr Wilczek <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <asm/io.h>
+#include <asm/arch/board.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/mmc.h>
+#include <asm/arch/pinmux.h>
+#include <asm/arch/power.h>
+#include <power/pmic.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+	int i;
+	u32 addr;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+		addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+		gd->ram_size += get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+	}
+	return 0;
+}
+
+void dram_init_banksize(void)
+{
+	int i;
+	u32 addr, size;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+		addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+		size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+
+		gd->bd->bi_dram[i].start = addr;
+		gd->bd->bi_dram[i].size = size;
+	}
+}
+
+int board_init(void)
+{
+#ifdef CONFIG_SYS_SPL_ARGS_ADDR
+	gd->bd->bi_boot_params = CONFIG_SYS_SPL_ARGS_ADDR;
+#else
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100;
+#endif
+
+	return exynos_init();
+}
+
+#ifdef CONFIG_OF_CONTROL
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	int ret;
+
+	/* mmc initializattion for available channels */
+	ret = exynos_mmc_init(gd->fdt_blob);
+	if (ret)
+		debug("mmc init failed\n");
+
+	return ret;
+}
+#endif
+#ifdef CONFIG_DISPLAY_BOARDINFO
+int checkboard(void)
+{
+	const char *board_name;
+
+	board_name = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
+	printf("Board: %s\n", board_name ? board_name : "Unknown board");
+
+	return 0;
+}
+#endif
+#endif

include/configs/exynos4-dt.h new file +6 -0

new file mode 100644
index 0000000..aa941f3
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * Configuration settings for the SAMSUNG EXYNOS5 board.
+ *
+ * SPDX-License-Identifier:	GPL-2.0+

include/configs/exynos4-dt.h new file +19 -0

+
+#include <asm/arch/cpu.h>		/* get chip and board defs */
+
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_BOARD_COMMON_EXYNOS4
+
+/* Enable fdt support */
+#define CONFIG_OF_CONTROL
+#define CONFIG_OF_EMBED
+
+#define CONFIG_SYS_CACHELINE_SIZE	32
+
+/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
+#define CONFIG_SYS_CLK_FREQ		24000000
+
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_CMDLINE_TAG

-----Original Message-----
From: Minkyu Kang [mailto:mk7.kang at samsung.com]
Sent: Friday, February 07, 2014 8:53 AM
To: Piotr Wilczek
Cc: u-boot at lists.denx.de; Kyungmin Park; Lukasz Majewski; Jaehoon Chung; Inha Song; Chanho Park
Subject: Re: [PATCH 5/9] arm:exynos: add common board file for exynos 4

Quoted 6 lines · Piotr Wilczek

This patch adds common board file for Exynos 4 based boards.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 arch/arm/dts/exynos4.dtsi            |  139

+++++++++++++++++++++++++++

Quoted 3 lines

 board/samsung/common/Makefile        |    1 +
 board/samsung/common/board_exynos4.c |   83 +++++++++++++++++
 include/configs/exynos4-dt.h         |  170

++++++++++++++++++++++++++++++++++

arch/arm/dts/exynos4.dtsi

Quoted 6 lines

 4 files changed, 393 insertions(+)
 create mode 100644 arch/arm/dts/exynos4.dtsi  create mode 100644
board/samsung/common/board_exynos4.c
 create mode 100644 include/configs/exynos4-dt.h

arch/arm/dts/exynos4.dtsi +0 -0

new

Quoted 149 lines

file mode 100644 index 0000000..38a6919

arch/arm/dts/exynos4.dtsi new file +139 -0

@@ -0,0 +1,139 @@
+/*
+ * Samsung's Exynos4 SoC common device tree source
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+
+	serial at 13800000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13800000 0x3c>;
+		id = <0>;
+	};
+
+	serial at 13810000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13810000 0x3c>;
+		id = <1>;
+	};
+
+	serial at 13820000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13820000 0x3c>;
+		id = <2>;
+	};
+
+	serial at 13830000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13830000 0x3c>;
+		id = <3>;
+	};
+
+	serial at 13840000 {
+		compatible = "samsung,exynos4210-uart";
+		reg = <0x13840000 0x3c>;
+		id = <4>;
+	};
+
+	i2c at 13860000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <0 0 0>;
+	};
+
+	i2c at 13870000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <1 1 0>;
+	};
+
+	i2c at 13880000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <2 2 0>;
+	};
+
+	i2c at 13890000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <3 3 0>;
+	};
+
+	i2c at 138a0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <4 4 0>;
+	};
+
+	i2c at 138b0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <5 5 0>;
+	};
+
+	i2c at 138c0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <6 6 0>;
+	};
+
+	i2c at 138d0000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,s3c2440-i2c";
+		interrupts = <7 7 0>;
+	};
+
+	sdhci at 12510000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,exynos-mmc";
+		reg = <0x12510000 0x1000>;
+		interrupts = <0 75 0>;
+	};
+
+	sdhci at 12520000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,exynos-mmc";
+		reg = <0x12520000 0x1000>;
+		interrupts = <0 76 0>;
+	};
+
+	sdhci at 12530000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,exynos-mmc";
+		reg = <0x12530000 0x1000>;
+		interrupts = <0 77 0>;
+	};
+
+	sdhci at 12540000 {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "samsung,exynos-mmc";
+		reg = <0x12540000 0x1000>;
+		interrupts = <0 78 0>;
+	};
+
+	gpio: gpio {
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		interrupt-controller;
+		#interrupt-cells = <2>;
+	};
+};

(quoted diff) +0 -0

b/board/samsung/common/Makefile index 7d2bb8c..25f1e40 100644

board/samsung/common/Makefile +0 -0

@@ -12,4 +12,5 @@ obj-$(CONFIG_MISC_COMMON) += misc.o
 

board/samsung/common/board_exynos4.c

Quoted 10 lines

board/samsung/common/Makefile +1 -0

 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_BOARD_COMMON)	+= board.o
+obj-$(CONFIG_BOARD_COMMON_EXYNOS4)	+= board_exynos4.o
 endif

board/samsung/common/board_exynos4.c new file +0 -0

new file mode 100644
index 0000000..2d313e6

I don't understand why need exynos4 common board file. There's already exist board.c that is common board file for samsung.

Quoted 19 lines

board/samsung/common/board_exynos4.c new file +18 -0

@@ -0,0 +1,83 @@
+/*
+ * (C) Copyright 2014 SAMSUNG Electronics
+ * Piotr Wilczek <[email protected]>
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#include <common.h>
+#include <fdtdec.h>
+#include <asm/io.h>
+#include <asm/arch/board.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/gpio.h>
+#include <asm/arch/mmc.h>
+#include <asm/arch/pinmux.h>
+#include <asm/arch/power.h>
+#include <power/pmic.h>
+

board/samsung/common/board_exynos4.c line 28

Quoted 10 lines

board/samsung/common/board_exynos4.c new file +10 -0

+DECLARE_GLOBAL_DATA_PTR;
+
+int dram_init(void)
+{
+	int i;
+	u32 addr;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+		addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+		gd->ram_size += get_ram_size((long *)addr,

SDRAM_BANK_SIZE);

Quoted 64 lines

board/samsung/common/board_exynos4.c new file +53 -0

+	}
+	return 0;
+}
+
+void dram_init_banksize(void)
+{
+	int i;
+	u32 addr, size;
+
+	for (i = 0; i < CONFIG_NR_DRAM_BANKS; i++) {
+		addr = CONFIG_SYS_SDRAM_BASE + (i * SDRAM_BANK_SIZE);
+		size = get_ram_size((long *)addr, SDRAM_BANK_SIZE);
+
+		gd->bd->bi_dram[i].start = addr;
+		gd->bd->bi_dram[i].size = size;
+	}
+}
+
+int board_init(void)
+{
+#ifdef CONFIG_SYS_SPL_ARGS_ADDR
+	gd->bd->bi_boot_params = CONFIG_SYS_SPL_ARGS_ADDR; #else
+	gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; #endif
+
+	return exynos_init();
+}
+
+#ifdef CONFIG_OF_CONTROL
+#ifdef CONFIG_GENERIC_MMC
+int board_mmc_init(bd_t *bis)
+{
+	int ret;
+
+	/* mmc initializattion for available channels */
+	ret = exynos_mmc_init(gd->fdt_blob);
+	if (ret)
+		debug("mmc init failed\n");
+
+	return ret;
+}
+#endif
+#ifdef CONFIG_DISPLAY_BOARDINFO
+int checkboard(void)
+{
+	const char *board_name;
+
+	board_name = fdt_getprop(gd->fdt_blob, 0, "model", NULL);
+	printf("Board: %s\n", board_name ? board_name : "Unknown board");
+
+	return 0;
+}
+#endif
+#endif

(quoted diff) +0 -0

b/include/configs/exynos4-dt.h new file mode 100644 index 0000000..aa941f3

include/configs/exynos4-dt.h new file +5 -0

@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2014 Samsung Electronics
+ *
+ * Configuration settings for the SAMSUNG EXYNOS5 board.
+ *

include/configs/exynos4-dt.h line 15

Quoted 10 lines

include/configs/exynos4-dt.h new file +10 -0

+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+/* High Level Configuration Options */
+#define CONFIG_SAMSUNG			/* in a SAMSUNG core */
+#define CONFIG_S5P			/* S5P Family */
+#define CONFIG_EXYNOS4			/* which is in a Exynos5

Family */

include/configs/exynos4-dt.h line 16

Quoted 1 line

include/configs/exynos4-dt.h new file +1 -0

+#define CONFIG_TIZEN			/* TIZEN lib */

It's a board specific.

Quoted 17 lines

include/configs/exynos4-dt.h new file +16 -0

+
+#include <asm/arch/cpu.h>		/* get chip and board defs */
+
+#define CONFIG_ARCH_CPU_INIT
+#define CONFIG_DISPLAY_CPUINFO
+#define CONFIG_DISPLAY_BOARDINFO
+#define CONFIG_BOARD_COMMON_EXYNOS4
+
+/* Enable fdt support */
+#define CONFIG_OF_CONTROL
+#define CONFIG_OF_EMBED
+
+#define CONFIG_SYS_CACHELINE_SIZE	32
+
+/* input clock of PLL: EXYNOS4 boards have 24MHz input clock */
+#define CONFIG_SYS_CLK_FREQ		24000000

include/configs/exynos4-dt.h

Quoted 10 lines

include/configs/exynos4-dt.h new file +10 -0

+
+#define CONFIG_SETUP_MEMORY_TAGS
+#define CONFIG_CMDLINE_TAG
+#define CONFIG_REVISION_TAG
+#define CONFIG_INITRD_TAG
+#define CONFIG_CMDLINE_EDITING
+
+#include <asm/sizes.h>
+/* Size of malloc() pool */
+#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 *

SZ_1M))

include/configs/exynos4-dt.h line 44

Quoted 2 lines

include/configs/exynos4-dt.h new file +2 -0

+
+/* select serial console configuration */ #define CONFIG_SERIAL2

ditto.

I think you should re-arrange what is common feature (it means soc specific) and what is board specific.
It looks confused to me.
Please fix it.

Thanks,
Minkyu Kang.

Dear Minkyu Kang,

Quoted 31 lines

-----Original Message-----
From: Minkyu Kang [mailto:mk7.kang at samsung.com]
Sent: Friday, February 07, 2014 8:53 AM
To: Piotr Wilczek
Cc: u-boot at lists.denx.de; Kyungmin Park; Lukasz Majewski; Jaehoon Chung; Inha Song; Chanho Park
Subject: Re: [PATCH 5/9] arm:exynos: add common board file for exynos 4

Quoted 6 lines · Piotr Wilczek

This patch adds common board file for Exynos 4 based boards.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 arch/arm/dts/exynos4.dtsi            |  139

+++++++++++++++++++++++++++

Quoted 3 lines

 board/samsung/common/Makefile        |    1 +
 board/samsung/common/board_exynos4.c |   83 +++++++++++++++++
 include/configs/exynos4-dt.h         |  170

++++++++++++++++++++++++++++++++++

Quoted 11 lines

 4 files changed, 393 insertions(+)
 create mode 100644 arch/arm/dts/exynos4.dtsi  create mode 100644
board/samsung/common/board_exynos4.c
 create mode 100644 include/configs/exynos4-dt.h

(quoted diff) +0 -0

b/board/samsung/common/Makefile index 7d2bb8c..25f1e40 100644

board/samsung/common/Makefile +0 -0

@@ -12,4 +12,5 @@ obj-$(CONFIG_MISC_COMMON) += misc.o
 

Quoted 14 lines

board/samsung/common/board_exynos4.c

Quoted 10 lines

board/samsung/common/Makefile +1 -0

 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_BOARD_COMMON)	+= board.o
+obj-$(CONFIG_BOARD_COMMON_EXYNOS4)	+= board_exynos4.o
 endif

board/samsung/common/board_exynos4.c new file +0 -0

new file mode 100644
index 0000000..2d313e6

I don't understand why need exynos4 common board file. There's already exist board.c that is common board file for samsung.

Because in the board.c file, both common and board specific functions are added.
Max 77686, eth, power, board late initialization functions are board specific.
If they are removed, I will be able to use the board.c file.

-----Original Message-----
From: Minkyu Kang [mailto:mk7.kang at samsung.com]
Sent: Friday, February 07, 2014 10:48 AM
To: Piotr Wilczek
Cc: u-boot at lists.denx.de; 'Kyungmin Park'; Lukasz Majewski; 'Jaehoon Chung'; 'Inha Song'; 'Chanho Park'
Subject: Re: [PATCH 5/9] arm:exynos: add common board file for exynos 4

Quoted 9 lines · Piotr Wilczek

Dear Minkyu Kang,

Quoted 7 lines

-----Original Message-----
From: Minkyu Kang [mailto:mk7.kang at samsung.com]
Sent: Friday, February 07, 2014 8:53 AM
To: Piotr Wilczek
Cc: u-boot at lists.denx.de; Kyungmin Park; Lukasz Majewski; Jaehoon Chung; Inha Song; Chanho Park
Subject: Re: [PATCH 5/9] arm:exynos: add common board file for

exynos

Quoted 39 lines

Quoted 39 lines

4

Quoted 6 lines · Piotr Wilczek

This patch adds common board file for Exynos 4 based boards.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 arch/arm/dts/exynos4.dtsi            |  139

+++++++++++++++++++++++++++

Quoted 3 lines

 board/samsung/common/Makefile        |    1 +
 board/samsung/common/board_exynos4.c |   83 +++++++++++++++++
 include/configs/exynos4-dt.h         |  170

++++++++++++++++++++++++++++++++++

board/samsung/common/board_exynos4.c

Quoted 21 lines

 4 files changed, 393 insertions(+)
 create mode 100644 arch/arm/dts/exynos4.dtsi  create mode 100644
board/samsung/common/board_exynos4.c
 create mode 100644 include/configs/exynos4-dt.h

(quoted diff) +0 -0

b/board/samsung/common/Makefile index 7d2bb8c..25f1e40 100644

board/samsung/common/Makefile +1 -0

@@ -12,4 +12,5 @@ obj-$(CONFIG_MISC_COMMON) += misc.o
 
 ifndef CONFIG_SPL_BUILD
 obj-$(CONFIG_BOARD_COMMON)	+= board.o
+obj-$(CONFIG_BOARD_COMMON_EXYNOS4)	+= board_exynos4.o
 endif

board/samsung/common/board_exynos4.c new file +0 -0

new file mode 100644
index 0000000..2d313e6

I don't understand why need exynos4 common board file. There's already exist board.c that is common board file for samsung.

Quoted 5 lines

Because in the board.c file, both common and board specific functions are added.
Max 77686, eth, power, board late initialization functions are board specific.
If they are removed, I will be able to use the board.c file.

It seems to be wrapped with ifdef.
I think there's no problems to use same file.

Thanks,
Minkyu Kang.

Quoted 24 lines

-----Original Message-----
From: Minkyu Kang [mailto:mk7.kang at samsung.com]
Sent: Friday, February 07, 2014 10:48 AM
To: Piotr Wilczek
Cc: u-boot at lists.denx.de; 'Kyungmin Park'; Lukasz Majewski; 'Jaehoon Chung'; 'Inha Song'; 'Chanho Park'
Subject: Re: [PATCH 5/9] arm:exynos: add common board file for exynos 4

Quoted 15 lines

Quoted 10 lines

board/samsung/common/board_exynos4.c

Quoted 6 lines

board/samsung/common/board_exynos4.c new file +0 -0

new file mode 100644
index 0000000..2d313e6

I don't understand why need exynos4 common board file. There's already exist board.c that is common board file for samsung.

Because in the board.c file, both common and board specific functions are added.
Max 77686, eth, power, board late initialization functions are board specific.
If they are removed, I will be able to use the board.c file.

Quoted 3 lines

It seems to be wrapped with ifdef.
I think there's no problems to use same file.

Max77686 init implementation is different for Trats2 and ifdef will not help here.
I think that max77686_init() function should be removed from the board.c file.

Other board specific initializations I can resolve in the way it was done in board_init() function, if that's the preferred way.

Quoted 2 lines

Thanks,
Minkyu Kang.

Best regrds,
Piotr Wilczek

This patch enables to run Trats2 board on device tree.

Signed-off-by Piotr Wilczek <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

CC Minkyu Kang <[email protected]>

---
 board/samsung/dts/exynos4412-trats2.dts |  434 +++++++++++++++++++++++++++++++
 board/samsung/trats2/trats2.c           |  216 +--------------
 include/configs/trats2.h                |  199 ++------------
 3 files changed, 459 insertions(+), 390 deletions(-)
 create mode 100644 board/samsung/dts/exynos4412-trats2.dts

board/samsung/dts/exynos4412-trats2.dts new file +23 -0

new file mode 100644
index 0000000..c8f847c
@@ -0,0 +1,434 @@
+/*
+ * Samsung's Exynos4412 based Trats2 board device tree source
+ *
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *		http://www.samsung.com
+ *
+ * SPDX-License-Identifier:	GPL-2.0+
+ */
+
+/dts-v1/;
+/include/ "exynos4.dtsi"
+
+/ {
+	model = "Samsung Trats2 based on Exynos4412";
+	compatible = "samsung,trats2", "samsung,exynos4412";
+
+	config {
+		samsung,dsim-device-name = "s6e8ax0";
+	};
+
+	aliases {
+		i2c0 = "/i2c at 13860000";
+		i2c1 = "/i2c at 13870000";

board/samsung/dts/exynos4412-trats2.dts new file +401 -0

+	};
+
+	i2c at 138d0000 {
+		samsung,i2c-sda-delay = <100>;
+		samsung,i2c-slave-addr = <0x10>;
+		samsung,i2c-max-bus-freq = <100000>;
+		status = "okay";
+
+		max77686_pmic at 09 {
+			compatible = "maxim,max77686_pmic";
+			interrupts = <7 0>;
+			reg = <0x09 0 0>;
+			#clock-cells = <1>;
+
+			voltage-regulators {
+				ldo1_reg: ldo1 {
+					regulator-compatible = "LDO1";
+					regulator-name = "VALIVE_1.0V_AP";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo2_reg: ldo2 {
+					regulator-compatible = "LDO2";
+					regulator-name = "VM1M2_1.2V_AP";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo3_reg: ldo3 {
+					regulator-compatible = "LDO3";
+					regulator-name = "VCC_1.8V_AP";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo4_reg: ldo4 {
+					regulator-compatible = "LDO4";
+					regulator-name = "VCC_2.8V_AP";
+					regulator-min-microvolt = <2800000>;
+					regulator-max-microvolt = <2800000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo5_reg: ldo5 {
+					regulator-compatible = "LDO5";
+					regulator-name = "VCC_1.8V_IO";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo6_reg: ldo6 {
+					regulator-compatible = "LDO6";
+					regulator-name = "VMPLL_1.0V_AP";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo7_reg: ldo7 {
+					regulator-compatible = "LDO7";
+					regulator-name = "VPLL_1.0V_AP";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-always-on;
+					regulator-mem-on;
+				};
+
+				ldo8_reg: ldo8 {
+					regulator-compatible = "LDO8";
+					regulator-name = "VMIPI_1.0V";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-mem-off;
+				};
+
+				ldo9_reg: ldo9 {
+					regulator-compatible = "LDO9";
+					regulator-name = "CAM_ISP_MIPI_1.2V";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-mem-idle;
+				};
+
+				ldo10_reg: ldo10 {
+					regulator-compatible = "LDO10";
+					regulator-name = "VMIPI_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-off;
+				};
+
+				ldo11_reg: ldo11 {
+					regulator-compatible = "LDO11";
+					regulator-name = "VABB1_1.95V";
+					regulator-min-microvolt = <1950000>;
+					regulator-max-microvolt = <1950000>;
+					regulator-always-on;
+					regulator-mem-off;
+				};
+
+				ldo12_reg: ldo12 {
+					regulator-compatible = "LDO12";
+					regulator-name = "VUOTG_3.0V";
+					regulator-min-microvolt = <3000000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-mem-off;
+				};
+
+				ldo13_reg: ldo13 {
+					regulator-compatible = "LDO13";
+					regulator-name = "NFC_AVDD_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-idle;
+				};
+
+				ldo14_reg: ldo14 {
+					regulator-compatible = "LDO14";
+					regulator-name = "VABB2_1.95V";
+					regulator-min-microvolt = <1950000>;
+					regulator-max-microvolt = <1950000>;
+					regulator-always-on;
+					regulator-mem-off;
+				};
+
+				ldo15_reg: ldo15 {
+					regulator-compatible = "LDO15";
+					regulator-name = "VHSIC_1.0V";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+					regulator-mem-off;
+				};
+
+				ldo16_reg: ldo16 {
+					regulator-compatible = "LDO16";
+					regulator-name = "VHSIC_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-off;
+				};
+
+				ldo17_reg: ldo17 {
+					regulator-compatible = "LDO17";
+					regulator-name = "CAM_SENSOR_CORE_1.2V";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-mem-idle;
+				};
+
+				ldo18_reg: ldo18 {
+					regulator-compatible = "LDO18";
+					regulator-name = "CAM_ISP_SEN_IO_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-idle;
+				};
+
+				ldo19_reg: ldo19 {
+					regulator-compatible = "LDO19";
+					regulator-name = "VT_CAM_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-idle;
+				};
+
+				ldo20_reg: ldo20 {
+					regulator-compatible = "LDO20";
+					regulator-name = "VDDQ_PRE_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-idle;
+				};
+
+				ldo21_reg: ldo21 {
+					regulator-compatible = "LDO21";
+					regulator-name = "VTF_2.8V";
+					regulator-min-microvolt = <2800000>;
+					regulator-max-microvolt = <2800000>;
+					regulator-mem-idle;
+				};
+
+				ldo22_reg: ldo22 {
+					regulator-compatible = "LDO22";
+					regulator-name = "VMEM_VDD_2.8V";
+					regulator-min-microvolt = <2800000>;
+					regulator-max-microvolt = <2800000>;
+					regulator-always-on;
+					regulator-mem-off;
+				};
+
+				ldo23_reg: ldo23 {
+					regulator-compatible = "LDO23";
+					regulator-name = "TSP_AVDD_3.3V";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-mem-idle;
+				};
+
+				ldo24_reg: ldo24 {
+					regulator-compatible = "LDO24";
+					regulator-name = "TSP_VDD_1.8V";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-mem-idle;
+				};
+
+				ldo25_reg: ldo25 {
+					regulator-compatible = "LDO25";
+					regulator-name = "LCD_VCC_3.3V";
+					regulator-min-microvolt = <2800000>;
+					regulator-max-microvolt = <2800000>;
+					regulator-mem-idle;
+				};
+
+				ldo26_reg: ldo26 {
+					regulator-compatible = "LDO26";
+					regulator-name = "MOTOR_VCC_3.0V";
+					regulator-min-microvolt = <3000000>;
+					regulator-max-microvolt = <3000000>;
+					regulator-mem-idle;
+				};
+
+				buck1_reg: buck1 {
+					regulator-compatible = "BUCK1";
+					regulator-name = "vdd_mif";
+					regulator-min-microvolt = <850000>;
+					regulator-max-microvolt = <1100000>;
+					regulator-always-on;
+					regulator-boot-on;
+					regulator-mem-off;
+				};
+
+				buck2_reg: buck2 {
+					regulator-compatible = "BUCK2";
+					regulator-name = "vdd_arm";
+					regulator-min-microvolt = <850000>;
+					regulator-max-microvolt = <1500000>;
+					regulator-always-on;
+					regulator-boot-on;
+					regulator-mem-off;
+				};
+
+				buck3_reg: buck3 {
+					regulator-compatible = "BUCK3";
+					regulator-name = "vdd_int";
+					regulator-min-microvolt = <850000>;
+					regulator-max-microvolt = <1150000>;
+					regulator-always-on;
+					regulator-boot-on;
+					regulator-mem-off;
+				};
+
+				buck4_reg: buck4 {
+					regulator-compatible = "BUCK4";
+					regulator-name = "vdd_g3d";
+					regulator-min-microvolt = <850000>;
+					regulator-max-microvolt = <1150000>;
+					regulator-boot-on;
+					regulator-mem-off;
+				};
+
+				buck5_reg: buck5 {
+					regulator-compatible = "BUCK5";
+					regulator-name = "VMEM_1.2V_AP";
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-always-on;
+				};
+
+				buck6_reg: buck6 {
+					regulator-compatible = "BUCK6";
+					regulator-name = "VCC_SUB_1.35V";
+					regulator-min-microvolt = <1350000>;
+					regulator-max-microvolt = <1350000>;
+					regulator-always-on;
+				};
+
+				buck7_reg: buck7 {
+					regulator-compatible = "BUCK7";
+					regulator-name = "VCC_SUB_2.0V";
+					regulator-min-microvolt = <2000000>;
+					regulator-max-microvolt = <2000000>;
+					regulator-always-on;
+				};
+
+				buck8_reg: buck8 {
+					regulator-compatible = "BUCK8";
+					regulator-name = "VMEM_VDDF_3.0V";
+					regulator-min-microvolt = <2850000>;
+					regulator-max-microvolt = <2850000>;
+					regulator-always-on;
+					regulator-mem-off;
+				};
+
+				buck9_reg: buck9 {
+					regulator-compatible = "BUCK9";
+					regulator-name = "CAM_ISP_CORE_1.2V";
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1200000>;
+					regulator-mem-off;
+				};
+			};
+		};
+	};
+
+	fimd at 11c00000 {
+		compatible = "samsung,exynos-fimd";
+		reg = <0x11c00000 0xa4>;
+
+		samsung,vl-freq = <60>;
+		samsung,vl-col = <720>;
+		samsung,vl-row = <1280>;
+		samsung,vl-width = <720>;
+		samsung,vl-height = <1280>;
+
+		samsung,vl-clkp = <0>;
+		samsung,vl-oep = <0>;
+		samsung,vl-hsp = <1>;
+		samsung,vl-vsp = <1>;
+		samsung,vl-dp = <1>;
+		samsung,vl-bpix = <4>;
+
+		samsung,vl-hspw = <5>;
+		samsung,vl-hbpd = <10>;
+		samsung,vl-hfpd = <10>;
+		samsung,vl-vspw = <2>;
+		samsung,vl-vbpd = <1>;
+		samsung,vl-vfpd = <13>;
+		samsung,vl-cmd-allow-len = <0xf>;
+
+		samsung,winid = <0>;
+		samsung,power-on-delay = <30>;
+		samsung,interface-mode = <1>;
+		samsung,mipi-enabled = <1>;
+		samsung,dp-enabled;
+		samsung,dual-lcd-enabled;
+
+		samsung,logo-on = <1>;
+		samsung,resolution = <0>;
+		samsung,rgb-mode = <0>;
+	};
+
+	mipidsi at 11c80000 {
+		compatible = "samsung,exynos-mipi-dsi";
+		reg = <0x11c80000 0x5c>;
+
+		samsung,dsim-config-e_interface = <1>;
+		samsung,dsim-config-e_virtual_ch = <0>;
+		samsung,dsim-config-e_pixel_format = <7>;
+		samsung,dsim-config-e_burst_mode = <1>;
+		samsung,dsim-config-e_no_data_lane = <3>;
+		samsung,dsim-config-e_byte_clk = <0>;
+		samsung,dsim-config-hfp = <1>;
+
+		samsung,dsim-config-p = <3>;
+		samsung,dsim-config-m = <120>;
+		samsung,dsim-config-s = <1>;
+
+		samsung,dsim-config-pll_stable_time = <500>;
+		samsung,dsim-config-esc_clk = <20000000>;
+		samsung,dsim-config-stop_holding_cnt = <0x7ff>;
+		samsung,dsim-config-bta_timeout = <0xff>;
+		samsung,dsim-config-rx_timeout = <0xffff>;
+
+		samsung,dsim-device-id = <0xffffffff>;
+		samsung,dsim-device-bus_id = <0>;
+
+		samsung,dsim-device-reverse_panel = <1>;
+	};
+
+	sdhci at 12510000 {
+		samsung,bus-width = <8>;
+		samsung,timing = <1 3 3>;
+		pwr-gpios = <&gpio 0x2004002 0>;
+	};
+
+	sdhci at 12520000 {
+		status = "disabled";
+	};
+
+	sdhci at 12530000 {
+		samsung,bus-width = <4>;
+		samsung,timing = <1 2 3>;
+		cd-gpios = <&gpio 0x20C6004 0>;
+	};
+
+	sdhci at 12540000 {
+		status = "disabled";
+	};
+};

board/samsung/trats2/trats2.c +7 -209

index c17c24d..108d0f8 100644
@@ -8,13 +8,6 @@
 
 #include <common.h>
 #include <lcd.h>
-#include <asm/io.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/power.h>
-#include <asm/arch/clk.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/mipi_dsim.h>
 #include <asm/arch/pinmux.h>
 #include <asm/arch/power.h>
 #include <power/pmic.h>

@@ -23,7 +16,6 @@
 #include <power/max77693_pmic.h>
 #include <power/max77693_muic.h>
 #include <power/max77693_fg.h>
-#include <libtizen.h>
 #include <errno.h>
 #include <usb.h>
 #include <usb/s3c_udc.h>

@@ -69,16 +61,6 @@ static void check_hw_revision(void)
 	board_rev = modelrev << 8;
 }
 
-#ifdef CONFIG_DISPLAY_BOARDINFO
-int checkboard(void)
-{
-	puts("Board:\tTRATS2\n");
-	printf("HW Revision:\t0x%04x\n", board_rev);
-
-	return 0;
-}
-#endif
-
 u32 get_board_rev(void)
 {
 	return board_rev;

@@ -158,26 +140,21 @@ int get_soft_i2c_sda_pin(void)
 
 int board_early_init_f(void)
 {
-	check_hw_revision();
 	board_external_gpio_init();
 
-	gd->flags |= GD_FLG_DISABLE_CONSOLE;
+#ifdef CONFIG_SYS_I2C_INIT_BOARD
+	board_i2c_init(gd->fdt_blob);
+#endif
 
 	return 0;
 }
 
 static int pmic_init_max77686(void);
 
-int board_init(void)
+int exynos_init(void)
 {
-	struct exynos4_power *pwr =
-		(struct exynos4_power *)samsung_get_base_power();
-
-	gd->bd->bi_boot_params = PHYS_SDRAM_1 + 0x100;
-
-	/* workaround: clear INFORM4..5 */
-	writel(0, (unsigned int)&pwr->inform4);
-	writel(0, (unsigned int)&pwr->inform5);
+	check_hw_revision();
+	printf("HW Revision:\t0x%04x\n", board_rev);
 
 	return 0;
 }

@@ -248,90 +225,6 @@ int power_init_board(void)
 	return 0;
 }
 
-int dram_init(void)
-{
-	u32 size_mb;
-
-	size_mb = (get_ram_size((long *)PHYS_SDRAM_1, PHYS_SDRAM_1_SIZE) +
-		get_ram_size((long *)PHYS_SDRAM_2, PHYS_SDRAM_2_SIZE) +
-		get_ram_size((long *)PHYS_SDRAM_3, PHYS_SDRAM_3_SIZE) +
-		get_ram_size((long *)PHYS_SDRAM_4, PHYS_SDRAM_4_SIZE)) >> 20;
-
-	gd->ram_size = size_mb << 20;
-
-	return 0;
-}
-
-void dram_init_banksize(void)
-{
-	gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
-	gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
-	gd->bd->bi_dram[1].start = PHYS_SDRAM_2;
-	gd->bd->bi_dram[1].size = PHYS_SDRAM_2_SIZE;
-	gd->bd->bi_dram[2].start = PHYS_SDRAM_3;
-	gd->bd->bi_dram[2].size = PHYS_SDRAM_3_SIZE;
-	gd->bd->bi_dram[3].start = PHYS_SDRAM_4;
-	gd->bd->bi_dram[3].size = PHYS_SDRAM_4_SIZE;
-}
-
-int board_mmc_init(bd_t *bis)
-{
-	int err0, err2 = 0;
-
-	gpio2 = (struct exynos4x12_gpio_part2 *)samsung_get_base_gpio_part2();
-
-	/* eMMC_EN: SD_0_CDn: GPK0[2] Output High */
-	s5p_gpio_direction_output(&gpio2->k0, 2, 1);
-	s5p_gpio_set_pull(&gpio2->k0, 2, GPIO_PULL_NONE);
-
-	/*
-	 * eMMC GPIO:
-	 * SDR 8-bit at 48MHz at MMC0
-	 * GPK0[0]      SD_0_CLK(2)
-	 * GPK0[1]      SD_0_CMD(2)
-	 * GPK0[2]      SD_0_CDn        -> Not used
-	 * GPK0[3:6]    SD_0_DATA[0:3](2)
-	 * GPK1[3:6]    SD_0_DATA[0:3](3)
-	 *
-	 * DDR 4-bit at 26MHz at MMC4
-	 * GPK0[0]      SD_4_CLK(3)
-	 * GPK0[1]      SD_4_CMD(3)
-	 * GPK0[2]      SD_4_CDn        -> Not used
-	 * GPK0[3:6]    SD_4_DATA[0:3](3)
-	 * GPK1[3:6]    SD_4_DATA[4:7](4)
-	 */
-
-	err0 = exynos_pinmux_config(PERIPH_ID_SDMMC0, PINMUX_FLAG_8BIT_MODE);
-
-	/*
-	 * MMC device init
-	 * mmc0  : eMMC (8-bit buswidth)
-	 * mmc2  : SD card (4-bit buswidth)
-	 */
-	if (err0)
-		debug("SDMMC0 not configured\n");
-	else
-		err0 = s5p_mmc_init(0, 8);
-
-	/* T-flash detect */
-	s5p_gpio_cfg_pin(&gpio2->x3, 4, 0xf);
-	s5p_gpio_set_pull(&gpio2->x3, 4, GPIO_PULL_UP);
-
-	/*
-	 * Check the T-flash  detect pin
-	 * GPX3[4] T-flash detect pin
-	 */
-	if (!s5p_gpio_get_value(&gpio2->x3, 4)) {
-		err2 = exynos_pinmux_config(PERIPH_ID_SDMMC2, PINMUX_FLAG_NONE);
-		if (err2)
-			debug("SDMMC2 not configured\n");
-		else
-			err2 = s5p_mmc_init(2, 4);
-	}
-
-	return err0 & err2;
-}
-
 #ifdef CONFIG_USB_GADGET
 static int s5pc210_phy_control(int on)
 {

@@ -479,46 +372,7 @@ static int pmic_init_max77686(void)
  */
 
 #ifdef CONFIG_LCD
-static struct mipi_dsim_config dsim_config = {
-	.e_interface		= DSIM_VIDEO,
-	.e_virtual_ch		= DSIM_VIRTUAL_CH_0,
-	.e_pixel_format		= DSIM_24BPP_888,
-	.e_burst_mode		= DSIM_BURST_SYNC_EVENT,
-	.e_no_data_lane		= DSIM_DATA_LANE_4,
-	.e_byte_clk		= DSIM_PLL_OUT_DIV8,
-	.hfp			= 1,
-
-	.p			= 3,
-	.m			= 120,
-	.s			= 1,
-
-	/* D-PHY PLL stable time spec :min = 200usec ~ max 400usec */
-	.pll_stable_time	= 500,
-
-	/* escape clk : 10MHz */
-	.esc_clk		= 20 * 1000000,
-
-	/* stop state holding counter after bta change count 0 ~ 0xfff */
-	.stop_holding_cnt	= 0x7ff,
-	/* bta timeout 0 ~ 0xff */
-	.bta_timeout		= 0xff,
-	/* lp rx timeout 0 ~ 0xffff */
-	.rx_timeout		= 0xffff,
-};
-
-static struct exynos_platform_mipi_dsim dsim_platform_data = {
-	.lcd_panel_info = NULL,
-	.dsim_config = &dsim_config,
-};
-
-static struct mipi_dsim_lcd_device mipi_lcd_device = {
-	.name	= "s6e8ax0",
-	.id	= -1,
-	.bus_id	= 0,
-	.platform_data	= (void *)&dsim_platform_data,
-};
-
-static int mipi_power(void)
+int mipi_power(void)
 {
 	struct pmic *p = pmic_get("MAX77686_PMIC");
 

@@ -555,62 +409,6 @@ void exynos_reset_lcd(void)
 	udelay(10);
 	s5p_gpio_set_value(&gpio1->f2, 1, 1);
 }
-
-vidinfo_t panel_info = {
-	.vl_freq	= 60,
-	.vl_col		= 720,
-	.vl_row		= 1280,
-	.vl_width	= 720,
-	.vl_height	= 1280,
-	.vl_clkp	= CONFIG_SYS_HIGH,
-	.vl_hsp		= CONFIG_SYS_LOW,
-	.vl_vsp		= CONFIG_SYS_LOW,
-	.vl_dp		= CONFIG_SYS_LOW,
-	.vl_bpix	= 4,	/* Bits per pixel, 2^4 = 16 */
-
-	/* s6e8ax0 Panel infomation */
-	.vl_hspw	= 5,
-	.vl_hbpd	= 10,
-	.vl_hfpd	= 10,
-
-	.vl_vspw	= 2,
-	.vl_vbpd	= 1,
-	.vl_vfpd	= 13,
-	.vl_cmd_allow_len = 0xf,
-	.mipi_enabled = 1,
-
-	.dual_lcd_enabled = 0,
-
-	.init_delay	= 0,
-	.power_on_delay = 25,
-	.reset_delay	= 0,
-	.interface_mode = FIMD_RGB_INTERFACE,
-};
-
-void init_panel_info(vidinfo_t *vid)
-{
-	vid->logo_on	= 1;
-	vid->resolution	= HD_RESOLUTION;
-	vid->rgb_mode	= MODE_RGB_P;
-
-	vid->power_on_delay = 30;
-
-	mipi_lcd_device.reverse_panel = 1;
-
-#ifdef CONFIG_TIZEN
-	get_tizen_logo_info(vid);
-#endif
-
-	strcpy(dsim_platform_data.lcd_panel_name, mipi_lcd_device.name);
-	dsim_platform_data.mipi_power = mipi_power;
-	dsim_platform_data.phy_enable = set_mipi_phy_ctrl;
-	dsim_platform_data.lcd_panel_info = (void *)vid;
-	exynos_mipi_dsi_register_lcd_device(&mipi_lcd_device);
-
-	s6e8ax0_init();
-
-	exynos_set_dsim_platform_data(&dsim_platform_data);
-}
 #endif /* LCD */
 
 #ifdef CONFIG_MISC_INIT_R

include/configs/trats2.h +18 -181

index 28270fe..0ac885a 100644
@@ -8,147 +8,32 @@
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __CONFIG_H
-#define __CONFIG_H
+#ifndef __CONFIG_TRATS2_H
+#define __CONFIG_TRATS2_H
 
-/*
- * High Level Configuration Options
- * (easy to change)
- */
-#define CONFIG_SAMSUNG		/* in a SAMSUNG core */
-#define CONFIG_S5P		/* which is in a S5P Family */
-#define CONFIG_EXYNOS4		/* which is in a EXYNOS4XXX */
-#define CONFIG_TIZEN		/* TIZEN lib */
-
-#include <asm/arch/cpu.h>		/* get chip and board defs */
+#include <configs/exynos4-dt.h>
 
-#define CONFIG_ARCH_CPU_INIT
-#define CONFIG_DISPLAY_CPUINFO
-#define CONFIG_DISPLAY_BOARDINFO
-
-#define CONFIG_SKIP_LOWLEVEL_INIT
-
-#define CONFIG_SYS_CACHELINE_SIZE	32
+#define CONFIG_SYS_PROMPT	"Trats2 # "	/* Monitor Command Prompt */
 
-#ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
-#define CONFIG_SYS_PL310_BASE	0x10502000
-#endif
+#undef CONFIG_DEFAULT_DEVICE_TREE
+#define CONFIG_DEFAULT_DEVICE_TREE	exynos4412-trats2
 
-#define CONFIG_NR_DRAM_BANKS	4
-#define PHYS_SDRAM_1		0x40000000	/* LDDDR2 DMC 0 */
-#define PHYS_SDRAM_1_SIZE	(256 << 20)	/* 256 MB in CS 0 */
-#define PHYS_SDRAM_2		0x50000000	/* LPDDR2 DMC 1 */
-#define PHYS_SDRAM_2_SIZE	(256 << 20)	/* 256 MB in CS 0 */
-#define PHYS_SDRAM_3		0x60000000	/* LPDDR2 DMC 1 */
-#define PHYS_SDRAM_3_SIZE	(256 << 20)	/* 256 MB in CS 0 */
-#define PHYS_SDRAM_4		0x70000000	/* LPDDR2 DMC 1 */
-#define PHYS_SDRAM_4_SIZE	(256 << 20)	/* 256 MB in CS 0 */
-#define PHYS_SDRAM_END		0x80000000
+/* TRATS2 has 4 banks of DRAM */
+#define CONFIG_NR_DRAM_BANKS		4
+#define CONFIG_SYS_SDRAM_BASE		0x40000000
+#define SDRAM_BANK_SIZE			(256 << 20)	/* 256 MB */
 
-#define CONFIG_SYS_MEM_TOP_HIDE		(1 << 20)	/* ram console */
+/* memtest works on */
+#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
+#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x5E00000)
+#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x3E00000)
 
-#define CONFIG_SYS_SDRAM_BASE		(PHYS_SDRAM_1)
 #define CONFIG_SYS_TEXT_BASE		0x78100000
 
-#define CONFIG_SYS_CLK_FREQ		24000000
-
-#define CONFIG_SETUP_MEMORY_TAGS
-#define CONFIG_CMDLINE_TAG
-#define CONFIG_REVISION_TAG
-
-/* MACH_TYPE_TRATS2 */
-#define MACH_TYPE_TRATS2		3765
-#define CONFIG_MACH_TYPE		MACH_TYPE_TRATS2
-
-#define CONFIG_DISPLAY_CPUINFO
-
-#include <asm/sizes.h>
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN		(CONFIG_ENV_SIZE + (80 * SZ_1M))
-
-/* select serial console configuration */
-#define CONFIG_SERIAL2
-
-#define CONFIG_SYS_HUSH_PARSER		/* use "hush" command parser	*/
-#define CONFIG_SYS_PROMPT_HUSH_PS2	"> "
-
-#define CONFIG_CMDLINE_EDITING
-
-#define CONFIG_BAUDRATE			115200
-
-/* It should define before config_cmd_default.h */
-#define CONFIG_SYS_NO_FLASH
-
-/***********************************************************
- * Command definition
- ***********************************************************/
-#include <config_cmd_default.h>
-
-#undef CONFIG_CMD_ECHO
-#undef CONFIG_CMD_FPGA
-#undef CONFIG_CMD_FLASH
-#undef CONFIG_CMD_IMLS
-#undef CONFIG_CMD_NAND
-#undef CONFIG_CMD_MISC
-#undef CONFIG_CMD_NFS
-#undef CONFIG_CMD_SOURCE
-#undef CONFIG_CMD_XIMG
-#define CONFIG_CMD_CACHE
-#define CONFIG_CMD_I2C
-#define CONFIG_CMD_MMC
-#define CONFIG_CMD_DFU
-#define CONFIG_CMD_GPT
-#define CONFIG_CMD_PMIC
-
-#define CONFIG_BOOTDELAY	3
-#define CONFIG_ZERO_BOOTDELAY_CHECK
-
-#define CONFIG_CMD_FAT
-#define CONFIG_FAT_WRITE
-
-/* EXT4 */
-#define CONFIG_CMD_EXT4
-#define CONFIG_CMD_EXT4_WRITE
-
-/* USB Composite download gadget - g_dnl */
-#define CONFIG_USBDOWNLOAD_GADGET
-#define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M
-#define CONFIG_DFU_FUNCTION
-#define CONFIG_DFU_MMC
-
-/* TIZEN THOR downloader support */
-#define CONFIG_CMD_THOR_DOWNLOAD
-#define CONFIG_THOR_FUNCTION
-
-/* USB Samsung's IDs */
-#define CONFIG_G_DNL_VENDOR_NUM 0x04E8
-#define CONFIG_G_DNL_PRODUCT_NUM 0x6601
-#define CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_VENDOR_NUM
-#define CONFIG_G_DNL_THOR_PRODUCT_NUM 0x685D
-#define CONFIG_G_DNL_MANUFACTURER "Samsung"
-
-/* To use the TFTPBOOT over USB, Please enable the CONFIG_CMD_NET */
-#undef CONFIG_CMD_NET
-
-/* MMC */
-#define CONFIG_GENERIC_MMC
-#define CONFIG_MMC
-#define CONFIG_S5P_SDHCI
-#define CONFIG_SDHCI
-#define CONFIG_MMC_SDMA
-#define CONFIG_MMC_DEFAULT_DEV	0
-
-/* PWM */
-#define CONFIG_PWM
-
-#define CONFIG_BOOTARGS		"Please use defined boot"
-#define CONFIG_BOOTCOMMAND	"run mmcboot"
-#define CONFIG_DEFAULT_CONSOLE	"console=ttySAC2,115200n8\0"
+#define CONFIG_BOOTARGS			"Please use defined boot"
+#define CONFIG_BOOTCOMMAND		"run mmcboot"
 
 #define CONFIG_ENV_OVERWRITE
-#define CONFIG_SYS_CONSOLE_INFO_QUIET
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG

@@ -240,46 +125,6 @@
 		   "setenv spl_addr_tmp;\0" \
 	"fdtaddr=40800000\0" \
 
-/*
- * Miscellaneous configurable options
- */
-#define CONFIG_SYS_LONGHELP			/* undef to save memory */
-#define CONFIG_SYS_PROMPT	"Trats2 # "	/* Monitor Command Prompt */
-#define CONFIG_SYS_CBSIZE	256		/* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE	384		/* Print Buffer Size */
-#define CONFIG_SYS_MAXARGS	32		/* max number of command args */
-
-/* Boot Argument Buffer Size */
-#define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
-
-/* memtest works on */
-#define CONFIG_SYS_MEMTEST_START	CONFIG_SYS_SDRAM_BASE
-#define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_SDRAM_BASE + 0x5000000)
-#define CONFIG_SYS_LOAD_ADDR		(CONFIG_SYS_SDRAM_BASE + 0x4800000)
-
-#define CONFIG_SYS_INIT_SP_ADDR		(CONFIG_SYS_LOAD_ADDR \
-					- GENERATED_GBL_DATA_SIZE)
-
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 19200, 38400, 57600, 115200 }
-
-#define CONFIG_SYS_MONITOR_BASE		0x00000000
-
-/*-----------------------------------------------------------------------
- * FLASH and environment organization
- */
-
-#define CONFIG_SYS_MONITOR_LEN		(256 << 10)	/* Reserve 2 sectors */
-
-#define CONFIG_ENV_IS_IN_MMC
-#define CONFIG_SYS_MMC_ENV_DEV		CONFIG_MMC_DEFAULT_DEV
-#define CONFIG_ENV_SIZE			4096
-#define CONFIG_ENV_OFFSET		((32 - 4) << 10) /* 32KiB - 4KiB */
-#define CONFIG_EFI_PARTITION
-#define CONFIG_PARTITION_UUIDS
-
-#define CONFIG_BOARD_EARLY_INIT_F
-
 /* I2C */
 #include <asm/arch/gpio.h>
 

@@ -312,11 +157,6 @@ int get_soft_i2c_sda_pin(void);
 #define CONFIG_POWER_MUIC_MAX77693
 #define CONFIG_POWER_FG_MAX77693
 #define CONFIG_POWER_BATTERY_TRATS2
-#define CONFIG_USB_GADGET
-#define CONFIG_USB_GADGET_S3C_UDC_OTG
-#define CONFIG_USB_GADGET_DUALSPEED
-#define CONFIG_USB_GADGET_VBUS_DRAW	2
-#define CONFIG_USB_CABLE_CHECK
 
 /* Common misc for Samsung */
 #define CONFIG_MISC_COMMON

@@ -356,10 +196,7 @@ int get_soft_i2c_sda_pin(void);
 #define CONFIG_VIDEO_BMP_GZIP
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 160 * 4) + 54)
 
-#define CONFIG_CMD_USB_MASS_STORAGE
-#define CONFIG_USB_GADGET_MASS_STORAGE
-
-/* Pass open firmware flat tree */
-#define CONFIG_OF_LIBFDT    1
+#define LCD_XRES	720
+#define LCD_YRES	1280
 
 #endif	/* __CONFIG_H */