summaryrefslogtreecommitdiff
path: root/packages/linux/linux-omap
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-12-16 12:13:32 +0100
committerKoen Kooi <koen@openembedded.org>2008-12-16 12:13:32 +0100
commit19fb84f81c15a3e78e5fd1b8fe8fc869a07ff996 (patch)
tree14b0868ac6353b253cf2bfb9df8926a2c4f0a6c3 /packages/linux/linux-omap
parentfde85c6fedd02f0dab19e58afecd2f8133061d9d (diff)
linux-omap git: move to 2.6.28rc8, this makes usb OTG work properly (even cable detection works!)
Diffstat (limited to 'packages/linux/linux-omap')
-rw-r--r--packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch59
-rw-r--r--packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch2
-rw-r--r--packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch2
-rw-r--r--packages/linux/linux-omap/0007-DSS-support-for-Beagle-Board.patch2
-rw-r--r--packages/linux/linux-omap/0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch2
-rw-r--r--packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch2
-rw-r--r--packages/linux/linux-omap/0009-DSS-support-for-OMAP3-SDP-board.patch2
-rw-r--r--packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch4
-rw-r--r--packages/linux/linux-omap/0012-DSS-OMAPFB-PAGE_ALIGN-sizes-in-mem-alloc.patch36
-rw-r--r--packages/linux/linux-omap/0013-Refreshed-and-Cleaned-up-as-per-the-latest-Tomi-s-DS.patch222
-rw-r--r--packages/linux/linux-omap/beagleboard/defconfig63
11 files changed, 338 insertions, 58 deletions
diff --git a/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch b/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch
index 8e64005c68..661106b4ad 100644
--- a/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch
+++ b/packages/linux/linux-omap/0004-DSS-New-display-subsystem-driver-for-OMAP2-3.patch
@@ -1,4 +1,4 @@
-From 0eceac2ba3548ae41200403a8dae9907ab788fd0 Mon Sep 17 00:00:00 2001
+From 491d4b0389fb95e43017b7d4d07d866b114f6c7d Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Mon, 8 Dec 2008 13:43:36 +0200
Subject: [PATCH] DSS: New display subsystem driver for OMAP2/3
@@ -13,13 +13,13 @@ Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
arch/arm/plat-omap/dss/display.c | 765 +++++++
arch/arm/plat-omap/dss/dpi.c | 320 +++
arch/arm/plat-omap/dss/dsi.c | 3135 +++++++++++++++++++++++++++++
- arch/arm/plat-omap/dss/dss.c | 784 +++++++
+ arch/arm/plat-omap/dss/dss.c | 789 ++++++++
arch/arm/plat-omap/dss/dss.h | 268 +++
arch/arm/plat-omap/dss/rfbi.c | 1225 +++++++++++
arch/arm/plat-omap/dss/sdi.c | 150 ++
arch/arm/plat-omap/dss/venc.c | 501 +++++
arch/arm/plat-omap/include/mach/display.h | 463 +++++
- 14 files changed, 9708 insertions(+), 0 deletions(-)
+ 14 files changed, 9713 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/plat-omap/dss/Kconfig
create mode 100644 arch/arm/plat-omap/dss/Makefile
create mode 100644 arch/arm/plat-omap/dss/dispc.c
@@ -6407,10 +6407,10 @@ index 0000000..7f7db32
+
diff --git a/arch/arm/plat-omap/dss/dss.c b/arch/arm/plat-omap/dss/dss.c
new file mode 100644
-index 0000000..e585fcd
+index 0000000..cc402dc
--- /dev/null
+++ b/arch/arm/plat-omap/dss/dss.c
-@@ -0,0 +1,784 @@
+@@ -0,0 +1,789 @@
+/*
+ * linux/arch/arm/plat-omap/dss/dss.c
+ *
@@ -6488,21 +6488,6 @@ index 0000000..e585fcd
+ u32 ctx[DSS_SZ_REGS / sizeof(u32)];
+} dss;
+
-+/* PM TESTING */
-+#if 1
-+static unsigned last_tr_id;
-+
-+unsigned get_last_off_on_transaction_id(struct device *dev)
-+{
-+ return last_tr_id;
-+}
-+
-+void inc_last_off_on_transaction_id(void)
-+{
-+ last_tr_id++;
-+}
-+#endif
-+
+static void dss_clk_enable_all_no_ctx(void);
+static void dss_clk_disable_all_no_ctx(void);
+static void dss_clk_enable_no_ctx(enum dss_clock clks);
@@ -6543,16 +6528,36 @@ index 0000000..e585fcd
+#undef SR
+#undef RR
+
++/* PM TESTING */
++#if 0
++static unsigned last_tr_id;
++
++unsigned get_last_off_on_transaction_id(struct device *dev)
++{
++ return last_tr_id;
++}
++
++void inc_last_off_on_transaction_id(void)
++{
++ last_tr_id++;
++}
++
+unsigned get_last_off_on_transaction_id(struct device *dev);
+
-+unsigned dss_get_id(void)
++unsigned dss_get_ctx_id(void)
+{
+ return get_last_off_on_transaction_id(&dss.pdev->dev);
+}
++#else
++static unsigned dss_get_ctx_id(void)
++{
++ return 0;
++}
++#endif
+
+static void save_all_ctx(void)
+{
-+ //printk("save context\n");
++ DSSDBG("save context\n");
+
+ dss_clk_enable_no_ctx(DSS_CLK_ICK | DSS_CLK_FCK1);
+
@@ -6567,7 +6572,7 @@ index 0000000..e585fcd
+
+static void restore_all_ctx(void)
+{
-+ //printk("restore context\n");
++ DSSDBG("restore context\n");
+
+ dss_clk_enable_all_no_ctx();
+
@@ -6782,10 +6787,10 @@ index 0000000..e585fcd
+
+ dss_clk_enable_no_ctx(clks);
+
-+ id = dss_get_id();
++ id = dss_get_ctx_id();
+
+ if (id != dss.ctx_id) {
-+ printk("old id %u, new id %u\n",
++ DSSDBG("ctx id %u -> id %u\n",
+ dss.ctx_id, id);
+ restore_all_ctx();
+ dss.ctx_id = id;
@@ -7072,8 +7077,8 @@ index 0000000..e585fcd
+
+ dss_clk_enable_all_no_ctx();
+
-+ dss.ctx_id = dss_get_id();
-+ printk("initial id %u\n", dss.ctx_id);
++ dss.ctx_id = dss_get_ctx_id();
++ DSSDBG("initial ctx id %u\n", dss.ctx_id);
+
+ r = dss_init();
+ if (r) {
diff --git a/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch b/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch
index b5cf7e81f8..831f32711e 100644
--- a/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch
+++ b/packages/linux/linux-omap/0005-DSS-OMAPFB-fb-driver-for-new-display-subsystem.patch
@@ -1,4 +1,4 @@
-From ecdfbac90a49f517c7d5132e44522b089123b413 Mon Sep 17 00:00:00 2001
+From a2bd3b5934be26656ba88ac1083cb76c9665822e Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Tue, 4 Nov 2008 15:12:21 +0200
Subject: [PATCH] DSS: OMAPFB: fb driver for new display subsystem
diff --git a/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch b/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch
index 3ee48826c7..4a393401bd 100644
--- a/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch
+++ b/packages/linux/linux-omap/0006-DSS-Add-generic-DVI-panel.patch
@@ -1,4 +1,4 @@
-From 51d884828725c9e1d1c69c3a061fb5aa9d3d9814 Mon Sep 17 00:00:00 2001
+From 80146c830e0b14f92db3b7d02a05be315cab12b6 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Tue, 11 Nov 2008 13:52:56 +0200
Subject: [PATCH] DSS: Add generic DVI panel
diff --git a/packages/linux/linux-omap/0007-DSS-support-for-Beagle-Board.patch b/packages/linux/linux-omap/0007-DSS-support-for-Beagle-Board.patch
index a5e29129a4..d5d1c5fb1a 100644
--- a/packages/linux/linux-omap/0007-DSS-support-for-Beagle-Board.patch
+++ b/packages/linux/linux-omap/0007-DSS-support-for-Beagle-Board.patch
@@ -1,4 +1,4 @@
-From eed2f51a01acd47ab83000bf6870d8b24829fa30 Mon Sep 17 00:00:00 2001
+From f0685afb06fbe2e00d75beb2c997f0367a0fe6ad Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Mon, 29 Sep 2008 17:03:36 +0300
Subject: [PATCH] DSS: support for Beagle Board
diff --git a/packages/linux/linux-omap/0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch b/packages/linux/linux-omap/0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch
index 8a7238d3ea..cc7ad9d0f2 100644
--- a/packages/linux/linux-omap/0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch
+++ b/packages/linux/linux-omap/0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch
@@ -1,4 +1,4 @@
-From 64421d1bbb3aadb91fedc6c0f0093e0496f2c0bf Mon Sep 17 00:00:00 2001
+From 285a7d392dcbc9b60c7523eb6f5c2b064cf52cc6 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Fri, 7 Nov 2008 16:54:01 +0200
Subject: [PATCH] DSS: BEAGLE: Enable DSS in beagle defconfig
diff --git a/packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch b/packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch
index 7e087f4bae..aeba95e1f5 100644
--- a/packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch
+++ b/packages/linux/linux-omap/0009-DSS-Sharp-LS037V7DW01-LCD-Panel-driver.patch
@@ -1,4 +1,4 @@
-From 2262ea3226ee073fefa37d5706f09205ae74580d Mon Sep 17 00:00:00 2001
+From b4718ad31fb4ba43e7f3058b42f3c7c01ee1596a Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Fri, 14 Nov 2008 15:47:19 +0200
Subject: [PATCH] DSS: Sharp LS037V7DW01 LCD Panel driver
diff --git a/packages/linux/linux-omap/0009-DSS-support-for-OMAP3-SDP-board.patch b/packages/linux/linux-omap/0009-DSS-support-for-OMAP3-SDP-board.patch
index a8ad93cee0..b632a46a49 100644
--- a/packages/linux/linux-omap/0009-DSS-support-for-OMAP3-SDP-board.patch
+++ b/packages/linux/linux-omap/0009-DSS-support-for-OMAP3-SDP-board.patch
@@ -1,4 +1,4 @@
-From fc87accafe1f6266f85142ade5fc81886ba4685d Mon Sep 17 00:00:00 2001
+From 782177389d60fd3e5444d0a8ecf4f73343ca7e1d Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Fri, 14 Nov 2008 15:47:55 +0200
Subject: [PATCH] DSS: Support for OMAP3 SDP board
diff --git a/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch b/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
index bd83a36f4f..a0def29abf 100644
--- a/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
+++ b/packages/linux/linux-omap/0011-DSS-Support-for-OMAP3-EVM-board.patch
@@ -1,4 +1,4 @@
-From c50a7b6c9ceb75c1bc49bc596556fdf6b1960306 Mon Sep 17 00:00:00 2001
+From 722267d4a82e6f502f08e252d12563f5ce07a744 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Fri, 14 Nov 2008 16:03:34 +0200
Subject: [PATCH] DSS: Support for OMAP3 EVM board
@@ -154,7 +154,7 @@ index e4e60e2..7756dd8 100644
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0,
+ TWL4030_VPLL2_DEV_GRP);
+ }
-+ gpio_direction_output(LCD_PANEL_ENABLE_GPIO, 1);
++ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1);
+ lcd_enabled = 0;
+}
+
diff --git a/packages/linux/linux-omap/0012-DSS-OMAPFB-PAGE_ALIGN-sizes-in-mem-alloc.patch b/packages/linux/linux-omap/0012-DSS-OMAPFB-PAGE_ALIGN-sizes-in-mem-alloc.patch
new file mode 100644
index 0000000000..47976563cd
--- /dev/null
+++ b/packages/linux/linux-omap/0012-DSS-OMAPFB-PAGE_ALIGN-sizes-in-mem-alloc.patch
@@ -0,0 +1,36 @@
+From aebae68fd82a47e5d7c83176cf14720559300e2b Mon Sep 17 00:00:00 2001
+From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
+Date: Mon, 15 Dec 2008 14:33:11 +0200
+Subject: [PATCH] DSS: OMAPFB: PAGE_ALIGN sizes in mem alloc
+
+Sizes in omapfb region struct were not page aligned, and that caused
+mmap to fail.
+---
+ drivers/video/omap2/omapfb-main.c | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/video/omap2/omapfb-main.c b/drivers/video/omap2/omapfb-main.c
+index 89ad631..bca0e28 100644
+--- a/drivers/video/omap2/omapfb-main.c
++++ b/drivers/video/omap2/omapfb-main.c
+@@ -874,6 +874,8 @@ static int omapfb_alloc_fbmem(struct omapfb2_device *fbdev, int fbnum,
+ unsigned long paddr;
+ void *vaddr;
+
++ size = PAGE_ALIGN(size);
++
+ ofbi = FB2OFB(fbdev->fbs[fbnum]);
+ rg = &ofbi->region;
+ memset(rg, 0, sizeof(*rg));
+@@ -906,6 +908,8 @@ int omapfb_realloc_fbmem(struct omapfb2_device *fbdev, int fbnum,
+ unsigned old_size = rg->size;
+ int r;
+
++ size = PAGE_ALIGN(size);
++
+ omapfb_free_fbmem(fbdev, fbnum);
+
+ if (size == 0)
+--
+1.5.6.3
+
diff --git a/packages/linux/linux-omap/0013-Refreshed-and-Cleaned-up-as-per-the-latest-Tomi-s-DS.patch b/packages/linux/linux-omap/0013-Refreshed-and-Cleaned-up-as-per-the-latest-Tomi-s-DS.patch
new file mode 100644
index 0000000000..68b5dce723
--- /dev/null
+++ b/packages/linux/linux-omap/0013-Refreshed-and-Cleaned-up-as-per-the-latest-Tomi-s-DS.patch
@@ -0,0 +1,222 @@
+From 0eb1facf382b7654f28222a2a41c3d029bcd7965 Mon Sep 17 00:00:00 2001
+From: Vaibhav Hiremath <hvaibhav@ti.com>
+Date: Mon, 15 Dec 2008 14:52:08 +0200
+Subject: [PATCH] Refreshed and Cleaned up as per the latest Tomi's DSS2
+ code-base -
+
+http://www.bat.org/~tomba/git/linux-omap-dss.git
+
+Tomi,
+
+Can you please merge this patch to your repository, so
+that it will be available as part of your HEAD?
+
+Signed-off-by: Brijesh Jadav <brijesh.j@ti.com>
+Signed-off-by: Hardik Shah <hardik.shah@ti.com>
+Signed-off-by: Manjunath Hadli <mrh@ti.com>
+Signed-off-by: R Sivaraj <sivaraj@ti.com>
+Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
+---
+ arch/arm/mach-omap2/board-omap3evm.c | 69 +++++++++++++---------------------
+ 1 files changed, 26 insertions(+), 43 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
+index 0a722d7..cf0a6b3 100644
+--- a/arch/arm/mach-omap2/board-omap3evm.c
++++ b/arch/arm/mach-omap2/board-omap3evm.c
+@@ -36,7 +36,6 @@
+ #include <mach/usb-ehci.h>
+ #include <mach/common.h>
+ #include <mach/mcspi.h>
+-#include <mach/omapfb.h>
+ #include <mach/display.h>
+
+ #include "sdram-micron-mt46h32m32lf-6.h"
+@@ -161,20 +160,7 @@ static int __init omap3_evm_i2c_init(void)
+ omap_register_i2c_bus(3, 400, NULL, 0);
+ return 0;
+ }
+-static struct omap_fbmem_config evm_fbmem0_config = {
+- .size = 480*720*4,
+- .start = OMAPFB_MEMTYPE_SDRAM,
+-};
+-
+-static struct omap_fbmem_config evm_fbmem1_config = {
+- .size = 480*720*4,
+- .start = OMAPFB_MEMTYPE_SDRAM,
+-};
+
+-static struct omap_fbmem_config evm_fbmem2_config = {
+- .size = 480*720*4,
+- .start = OMAPFB_MEMTYPE_SDRAM,
+-};
+ #define LCD_PANEL_LR 2
+ #define LCD_PANEL_UD 3
+ #define LCD_PANEL_INI 152
+@@ -195,7 +181,7 @@ static struct omap_fbmem_config evm_fbmem2_config = {
+ static int lcd_enabled;
+ static int dvi_enabled;
+
+-static void __init evm_display_init(void)
++static void __init omap3_evm_display_init(void)
+ {
+ int r;
+ r = gpio_request(LCD_PANEL_LR, "lcd_panel_lr");
+@@ -258,7 +244,7 @@ err_1:
+
+ }
+
+-static int evm_panel_enable_lcd(struct omap_display *display)
++static int omap3_evm_panel_enable_lcd(struct omap_display *display)
+ {
+ if (dvi_enabled) {
+ printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
+@@ -275,7 +261,7 @@ static int evm_panel_enable_lcd(struct omap_display *display)
+ return 0;
+ }
+
+-static void evm_panel_disable_lcd(struct omap_display *display)
++static void omap3_evm_panel_disable_lcd(struct omap_display *display)
+ {
+ if (omap_rev() > OMAP3430_REV_ES1_0) {
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0,
+@@ -287,16 +273,16 @@ static void evm_panel_disable_lcd(struct omap_display *display)
+ lcd_enabled = 0;
+ }
+
+-static struct omap_display_data evm_display_data = {
++static struct omap_display_data omap3_evm_display_data = {
+ .type = OMAP_DISPLAY_TYPE_DPI,
+ .name = "lcd",
+ .panel_name = "sharp-ls037v7dw01",
+ .u.dpi.data_lines = 18,
+- .panel_enable = evm_panel_enable_lcd,
+- .panel_disable = evm_panel_disable_lcd,
++ .panel_enable = omap3_evm_panel_enable_lcd,
++ .panel_disable = omap3_evm_panel_disable_lcd,
+ };
+
+-static int evm_panel_enable_tv(struct omap_display *display)
++static int omap3_evm_panel_enable_tv(struct omap_display *display)
+ {
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+ ENABLE_VDAC_DEDICATED, TWL4030_VDAC_DEDICATED);
+@@ -305,7 +291,7 @@ static int evm_panel_enable_tv(struct omap_display *display)
+ return 0;
+ }
+
+-static void evm_panel_disable_tv(struct omap_display *display)
++static void omap3_evm_panel_disable_tv(struct omap_display *display)
+ {
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x00,
+ TWL4030_VDAC_DEDICATED);
+@@ -313,16 +299,16 @@ static void evm_panel_disable_tv(struct omap_display *display)
+ TWL4030_VDAC_DEV_GRP);
+ }
+
+-static struct omap_display_data evm_display_data_tv = {
++static struct omap_display_data omap3_evm_display_data_tv = {
+ .type = OMAP_DISPLAY_TYPE_VENC,
+ .name = "tv",
+ .u.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
+- .panel_enable = evm_panel_enable_tv,
+- .panel_disable = evm_panel_disable_tv,
++ .panel_enable = omap3_evm_panel_enable_tv,
++ .panel_disable = omap3_evm_panel_disable_tv,
+ };
+
+
+-static int evm_panel_enable_dvi(struct omap_display *display)
++static int omap3_evm_panel_enable_dvi(struct omap_display *display)
+ {
+ if (lcd_enabled) {
+ printk(KERN_ERR "cannot enable DVI, LCD is enabled\n");
+@@ -337,7 +323,7 @@ static int evm_panel_enable_dvi(struct omap_display *display)
+ return 0;
+ }
+
+-static void evm_panel_disable_dvi(struct omap_display *display)
++static void omap3_evm_panel_disable_dvi(struct omap_display *display)
+ {
+ twl4030_i2c_write_u8(TWL4030_MODULE_GPIO, 0x00,
+ TWL4030_GPIODATA_IN3);
+@@ -347,28 +333,28 @@ static void evm_panel_disable_dvi(struct omap_display *display)
+ }
+
+
+-static struct omap_display_data evm_display_data_dvi = {
++static struct omap_display_data omap3_evm_display_data_dvi = {
+ .type = OMAP_DISPLAY_TYPE_DPI,
+ .name = "dvi",
+ .panel_name = "panel-dvi",
+ .u.dpi.data_lines = 24,
+- .panel_enable = evm_panel_enable_dvi,
+- .panel_disable = evm_panel_disable_dvi,
++ .panel_enable = omap3_evm_panel_enable_dvi,
++ .panel_disable = omap3_evm_panel_disable_dvi,
+ };
+
+-static struct omap_dss_platform_data evm_dss_data = {
++static struct omap_dss_platform_data omap3_evm_dss_data = {
+ .num_displays = 3,
+ .displays = {
+- &evm_display_data,
+- &evm_display_data_dvi,
+- &evm_display_data_tv,
++ &omap3_evm_display_data,
++ &omap3_evm_display_data_dvi,
++ &omap3_evm_display_data_tv,
+ }
+ };
+-static struct platform_device evm_dss_device = {
++static struct platform_device omap3_evm_dss_device = {
+ .name = "omap-dss",
+ .id = -1,
+ .dev = {
+- .platform_data = &evm_dss_data,
++ .platform_data = &omap3_evm_dss_data,
+ },
+ };
+
+@@ -428,13 +414,10 @@ static void __init omap3_evm_init_irq(void)
+
+ static struct omap_board_config_kernel omap3_evm_config[] __initdata = {
+ { OMAP_TAG_UART, &omap3_evm_uart_config },
+- { OMAP_TAG_FBMEM, &evm_fbmem0_config },
+- { OMAP_TAG_FBMEM, &evm_fbmem1_config },
+- { OMAP_TAG_FBMEM, &evm_fbmem2_config },
+ };
+
+ static struct platform_device *omap3_evm_devices[] __initdata = {
+- &evm_dss_device,
++ &omap3_evm_dss_device,
+ &omap3evm_smc911x_device,
+ };
+
+@@ -453,6 +436,8 @@ static void __init omap3_evm_init(void)
+ omap3_evm_i2c_init();
+
+ platform_add_devices(omap3_evm_devices, ARRAY_SIZE(omap3_evm_devices));
++ omap_board_config = omap3_evm_config;
++ omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
+
+ spi_register_board_info(omap3evm_spi_board_info,
+ ARRAY_SIZE(omap3evm_spi_board_info));
+@@ -463,13 +448,11 @@ static void __init omap3_evm_init(void)
+ usb_ehci_init();
+ omap3evm_flash_init();
+ ads7846_dev_init();
+- evm_display_init();
++ omap3_evm_display_init();
+ }
+
+ static void __init omap3_evm_map_io(void)
+ {
+- omap_board_config = omap3_evm_config;
+- omap_board_config_size = ARRAY_SIZE(omap3_evm_config);
+ omap2_set_globals_343x();
+ omap2_map_common_io();
+ }
+--
+1.5.6.3
+
diff --git a/packages/linux/linux-omap/beagleboard/defconfig b/packages/linux/linux-omap/beagleboard/defconfig
index cf6cc12d6e..7d1be92383 100644
--- a/packages/linux/linux-omap/beagleboard/defconfig
+++ b/packages/linux/linux-omap/beagleboard/defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.28-rc4-omap1
-# Mon Nov 17 15:37:33 2008
+# Linux kernel version: 2.6.28-rc8-omap1
+# Tue Dec 16 12:11:47 2008
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -617,8 +617,10 @@ CONFIG_CDROM_PKTCDVD_BUFFERS=8
# CONFIG_ATA_OVER_ETH is not set
CONFIG_MISC_DEVICES=y
CONFIG_EEPROM_93CX6=m
+# CONFIG_ICS932S401 is not set
# CONFIG_OMAP_STI is not set
# CONFIG_ENCLOSURE_SERVICES is not set
+# CONFIG_C2PORT is not set
CONFIG_HAVE_IDE=y
# CONFIG_IDE is not set
@@ -800,6 +802,7 @@ CONFIG_INPUT_KEYBOARD=y
# CONFIG_KEYBOARD_XTKBD is not set
# CONFIG_KEYBOARD_NEWTON is not set
# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_TWL4030 is not set
# CONFIG_KEYBOARD_LM8323 is not set
CONFIG_KEYBOARD_GPIO=y
CONFIG_INPUT_MOUSE=y
@@ -908,11 +911,8 @@ CONFIG_SENSORS_EEPROM=y
# CONFIG_PCF8575 is not set
# CONFIG_SENSORS_PCA9539 is not set
# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_ISP1301_OMAP is not set
# CONFIG_TPS65010 is not set
-# CONFIG_SENSORS_TLV320AIC23 is not set
CONFIG_TWL4030_MADC=m
-CONFIG_TWL4030_USB=y
CONFIG_TWL4030_PWRBUTTON=y
CONFIG_TWL4030_POWEROFF=y
# CONFIG_SENSORS_MAX6875 is not set
@@ -937,8 +937,6 @@ CONFIG_SPI_MASTER=y
# SPI Protocol Masters
#
# CONFIG_SPI_AT25 is not set
-# CONFIG_SPI_TSC2101 is not set
-# CONFIG_SPI_TSC2102 is not set
# CONFIG_SPI_TSC210X is not set
# CONFIG_SPI_TSC2301 is not set
# CONFIG_SPI_SPIDEV is not set
@@ -949,6 +947,10 @@ CONFIG_GPIOLIB=y
CONFIG_GPIO_SYSFS=y
#
+# Memory mapped GPIO expanders:
+#
+
+#
# I2C GPIO expanders:
#
# CONFIG_GPIO_MAX732X is not set
@@ -970,6 +972,7 @@ CONFIG_POWER_SUPPLY=m
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_TWL4030_BCI_BATTERY is not set
# CONFIG_BATTERY_BQ27x00 is not set
CONFIG_HWMON=y
# CONFIG_HWMON_VID is not set
@@ -982,6 +985,7 @@ CONFIG_HWMON=y
# CONFIG_SENSORS_ADM1029 is not set
# CONFIG_SENSORS_ADM1031 is not set
# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ADT7462 is not set
# CONFIG_SENSORS_ADT7470 is not set
# CONFIG_SENSORS_ADT7473 is not set
# CONFIG_SENSORS_ATXP1 is not set
@@ -1042,11 +1046,11 @@ CONFIG_OMAP_WATCHDOG=y
# USB-based Watchdog Cards
#
# CONFIG_USBPCWATCHDOG is not set
+CONFIG_SSB_POSSIBLE=y
#
# Sonics Silicon Backplane
#
-CONFIG_SSB_POSSIBLE=y
# CONFIG_SSB is not set
#
@@ -1319,14 +1323,15 @@ CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=14
CONFIG_FB_OMAP2=y
CONFIG_FB_OMAP2_DEBUG=y
# CONFIG_FB_OMAP2_FORCE_AUTO_UPDATE is not set
+CONFIG_FB_OMAP2_NUM_FBS=3
#
# OMAP2/3 Display Device Drivers
#
CONFIG_PANEL_DVI=y
-# CONFIG_PANEL_DVI_640X480 is not set
+CONFIG_PANEL_DVI_640X480=y
# CONFIG_PANEL_DVI_800X600 is not set
-CONFIG_PANEL_DVI_1024X768=y
+# CONFIG_PANEL_DVI_1024X768 is not set
# CONFIG_PANEL_DVI_1280X1024 is not set
# CONFIG_PANEL_SHARP_LS037V7DW01 is not set
# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
@@ -1447,7 +1452,7 @@ CONFIG_USB_DEVICEFS=y
CONFIG_USB_DEVICE_CLASS=y
# CONFIG_USB_DYNAMIC_MINORS is not set
CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
+CONFIG_USB_OTG=y
# CONFIG_USB_OTG_WHITELIST is not set
# CONFIG_USB_OTG_BLACKLIST_HUB is not set
CONFIG_USB_MON=y
@@ -1460,7 +1465,6 @@ CONFIG_USB_MON=y
# CONFIG_USB_C67X00_HCD is not set
# CONFIG_USB_EHCI_HCD is not set
# CONFIG_USB_ISP116X_HCD is not set
-# CONFIG_USB_ISP1760_HCD is not set
# CONFIG_USB_OHCI_HCD is not set
# CONFIG_USB_SL811_HCD is not set
# CONFIG_USB_R8A66597_HCD is not set
@@ -1471,10 +1475,10 @@ CONFIG_USB_MUSB_SOC=y
#
# OMAP 343x high speed USB support
#
-CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_HOST is not set
# CONFIG_USB_MUSB_PERIPHERAL is not set
-# CONFIG_USB_MUSB_OTG is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
+CONFIG_USB_MUSB_OTG=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
CONFIG_USB_MUSB_HDRC_HCD=y
# CONFIG_MUSB_PIO_ONLY is not set
CONFIG_USB_INVENTRA_DMA=y
@@ -1490,11 +1494,11 @@ CONFIG_USB_WDM=m
# CONFIG_USB_TMC is not set
#
-# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;
#
#
-# may also be needed; see USB_STORAGE Help for more information
+# see USB_STORAGE Help for more information
#
CONFIG_USB_STORAGE=y
# CONFIG_USB_STORAGE_DEBUG is not set
@@ -1616,8 +1620,7 @@ CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_PXA25X is not set
# CONFIG_USB_GADGET_PXA27X is not set
# CONFIG_USB_GADGET_S3C2410 is not set
-CONFIG_USB_GADGET_M66592=y
-CONFIG_USB_M66592=y
+# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_NET2280 is not set
@@ -1625,7 +1628,7 @@ CONFIG_USB_M66592=y
# CONFIG_USB_GADGET_DUMMY_HCD is not set
CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=m
+CONFIG_USB_ETH=y
CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
@@ -1633,6 +1636,14 @@ CONFIG_USB_ETH_RNDIS=y
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+CONFIG_USB_GPIO_VBUS=y
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TWL4030_USB=y
CONFIG_MMC=y
# CONFIG_MMC_DEBUG is not set
CONFIG_MMC_UNSAFE_RESUME=y
@@ -1705,12 +1716,14 @@ CONFIG_RTC_INTF_DEV=y
CONFIG_RTC_DRV_TWL4030=y
# CONFIG_RTC_DRV_S35390A is not set
# CONFIG_RTC_DRV_FM3130 is not set
+# CONFIG_RTC_DRV_RX8581 is not set
#
# SPI RTC drivers
#
# CONFIG_RTC_DRV_M41T94 is not set
# CONFIG_RTC_DRV_DS1305 is not set
+# CONFIG_RTC_DRV_DS1390 is not set
# CONFIG_RTC_DRV_MAX6902 is not set
# CONFIG_RTC_DRV_R9701 is not set
# CONFIG_RTC_DRV_RS5C348 is not set
@@ -2013,11 +2026,15 @@ CONFIG_CRYPTO=y
#
# CONFIG_CRYPTO_FIPS is not set
CONFIG_CRYPTO_ALGAPI=y
-CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_BLKCIPHER=y
-CONFIG_CRYPTO_HASH=y
-CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=m
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG2=y
CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
CONFIG_CRYPTO_GF128MUL=m
CONFIG_CRYPTO_NULL=m
CONFIG_CRYPTO_CRYPTD=m