[oe-commits] Koen Kooi : linux omap git: bump to 2.6.28rc4, fix evm dss2 patch for upstream changes
GIT User account
git at amethyst.openembedded.net
Fri Nov 14 12:04:16 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5bbc2d06e61847ae30a3f3a87e1ff5c9b2e15652
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5bbc2d06e61847ae30a3f3a87e1ff5c9b2e15652
Author: Koen Kooi <koen at openembedded.org>
Date: Fri Nov 14 13:03:25 2008 +0100
linux omap git: bump to 2.6.28rc4, fix evm dss2 patch for upstream changes
* dss2 still not enabled in defconfig
---
.../linux/linux-omap/omap3evm/omap3evm-dss2.diff | 8 ++++----
packages/linux/linux-omap_git.bb | 10 +++++-----
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff
index afcebba..60832e7 100644
--- a/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff
+++ b/packages/linux/linux-omap/omap3evm/omap3evm-dss2.diff
@@ -146,7 +146,7 @@ index 42ab826..e244fa7 100644
+ printk(KERN_ERR "cannot enable LCD, DVI is enabled\n");
+ return -EINVAL;
+ }
-+ if (system_rev > OMAP3430_REV_ES1_0) {
++ if (omap_rev() > OMAP3430_REV_ES1_0) {
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
+ ENABLE_VPLL2_DEDICATED, TWL4030_VPLL2_DEDICATED);
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER,
@@ -159,20 +159,20 @@ index 42ab826..e244fa7 100644
+
+static void panel_disable_lcd(struct omap_display *display)
+{
-+ if (system_rev > OMAP3430_REV_ES1_0) {
++ if (omap_rev() > OMAP3430_REV_ES1_0) {
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0,
+ TWL4030_VPLL2_DEDICATED);
+ twl4030_i2c_write_u8(TWL4030_MODULE_PM_RECEIVER, 0x0,
+ TWL4030_VPLL2_DEV_GRP);
+ }
-+ omap_set_gpio_dataout(LCD_PANEL_ENABLE_GPIO, 1);
++ gpio_set_value(LCD_PANEL_ENABLE_GPIO, 1);
+ lcd_enabled = 0;
+}
+
+static struct omap_display_data evm_display_data = {
+ .type = OMAP_DISPLAY_TYPE_DPI,
+ .name = "lcd",
-+ .panel_name = "panel-evm",
++ .panel_name = "panel-sdp3430",
+ .u.dpi.data_lines = 16,
+ .panel_enable = panel_enable_lcd,
+ .panel_disable = panel_disable_lcd,
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 81f717a..c56f87e 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -6,11 +6,11 @@ KERNEL_IMAGETYPE = "uImage"
COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|omap3evm"
-SRCREV = "444fcab6e8f8bad4ffc50feb91516c246d91e901"
+SRCREV = "5ecf98b76fa95078277c9037bb01640fd3de5e2c"
-PV = "2.6.27+2.6.28-rc3+${PR}+gitr${SRCREV}"
+PV = "2.6.27+2.6.28-rc4+${PR}+gitr${SRCREV}"
#PV = "2.6.27+${PR}+gitr${SRCREV}"
-PR = "r4"
+PR = "r0"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
file://defconfig"
@@ -41,7 +41,7 @@ SRC_URI_append = " \
file://0007-DSS-support-for-Beagle-Board.patch;patch=1 \
file://0008-DSS-BEAGLE-Enable-DSS-in-beagle-defconfig.patch;patch=1 \
file://0009-DSS-support-for-OMAP3-SDP-board.patch;patch=1 \
- file://fix-asoc.diff;patch=1 \
+# file://fix-asoc.diff;patch=1 \
"
@@ -50,7 +50,7 @@ SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \
SRC_URI_append_omap3evm = " \
file://evm-mcspi-ts.diff;patch=1 \
- file://omap3evm-lcd-redtint.diff;patch=1 \
+# file://omap3evm-lcd-redtint.diff;patch=1 \
file://omap3evm-dss2.diff;patch=1 \
"
More information about the Openembedded-commits
mailing list