  #if !defined(CONFIG_FB_DA8XX) && !defined(CONFIG_FB_DA8XX_MODULE)
  static struct da8xx_clcd_platform_data da8xx_evm_clcd_pdata = {
  	.version = CONFIG_SPACE_1,
+@@ -664,9 +670,11 @@ int da8xx_register_rtc(void)
+ {
+ 	int ret;
+ 
++#ifdef CONFIG_RTC_DRV_OMAP
+ 	/* Unlock the rtc's registers */
+ 	__raw_writel(0x83e70b13, IO_ADDRESS(DA8XX_RTC_BASE + 0x6c));
+ 	__raw_writel(0x95a4f1e0, IO_ADDRESS(DA8XX_RTC_BASE + 0x70));
++#endif
+ 
+ 	ret = platform_device_register(&da8xx_rtc_device);
+ 	if (!ret)
 diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
-index d684431..3288273 100755
+index f76433f..c39b5b0 100755
 --- a/arch/arm/mach-davinci/include/mach/da8xx.h
 +++ b/arch/arm/mach-davinci/include/mach/da8xx.h
 @@ -168,6 +168,8 @@ extern struct platform_device da8xx_serial_device;

 arch/arm/mach-davinci/Makefile                     |    1 +
 arch/arm/mach-davinci/board-da850-hawk.c           |  657 +++++++
 arch/arm/mach-davinci/da850.c                      |    2 +-
 arch/arm/mach-davinci/devices-da8xx.c              |    6 +
 arch/arm/mach-davinci/include/mach/da8xx.h         |    2 +
 arch/arm/mach-davinci/include/mach/debug-macro.S   |    3 +-
 drivers/media/video/Kconfig                        |    4 +-
 drivers/video/da8xx-fb.c                           |   14 +
 sound/soc/davinci/Kconfig                          |    6 +-
 sound/soc/davinci/davinci-evm.c                    |    5 +-
 12 files changed, 2565 insertions(+), 9 deletions(-)
 create mode 100644 arch/arm/configs/da850_omapl138_hawkboard_defconfig
 create mode 100644 arch/arm/mach-davinci/board-da850-hawk.c


 	  To compile this driver as a module, choose M here: the
 	  module will be called vpif_capture.
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c
index faa1fd3..d416923 100644
--- a/drivers/video/da8xx-fb.c
+++ b/drivers/video/da8xx-fb.c
@@ -196,6 +196,20 @@ static struct da8xx_panel known_lcd_panels[] = {
