X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Fti%2Fbeagle%2Fbeagle.c;h=23c79333a223681b67e53bd3277b7d545ba7f537;hb=79267edd10fde0815c382157b9cb280166637fac;hp=3b0a9e7141be1ddabc8d80a22f2eb1341457f86c;hpb=1a2728ae4faf12874173de156b8a7e66cfbbeae5;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 3b0a9e7..23c7933 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -29,7 +29,7 @@
 #include <asm/gpio.h>
 #include <asm/mach-types.h>
 #include <asm/omap_musb.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
 #include <linux/usb/musb.h>
@@ -73,13 +73,14 @@ static struct {
 } expansion_config;
 
 static const struct ns16550_platdata beagle_serial = {
-	OMAP34XX_UART3,
-	2,
-	V_NS16550_CLK
+	.base = OMAP34XX_UART3,
+	.reg_shift = 2,
+	.clock = V_NS16550_CLK,
+	.fcr = UART_FCR_DEFVAL,
 };
 
 U_BOOT_DEVICE(beagle_uart) = {
-	"serial_omap",
+	"ns16550_serial",
 	&beagle_serial
 };
 
@@ -494,7 +495,7 @@ int misc_init_r(void)
 	writel(~(GPIO31 | GPIO30 | GPIO29 | GPIO28 | GPIO22 | GPIO21 |
 		GPIO15 | GPIO14 | GPIO13 | GPIO12), &gpio5_base->oe);
 
-	dieid_num_r();
+	omap_die_id_display();
 
 #ifdef CONFIG_VIDEO_OMAP3
 	beagle_dvi_pup();
@@ -506,12 +507,8 @@ int misc_init_r(void)
 	musb_register(&musb_plat, &musb_board_data, (void *)MUSB_BASE);
 #endif
 
-	if (generate_fake_mac) {
-		u32 id[4];
-
-		get_dieid(id);
-		usb_fake_mac_from_die_id(id);
-	}
+	if (generate_fake_mac)
+		omap_die_id_usbethaddr();
 
 	return 0;
 }