From 14e1ed70361f7f5a5e54d93a606a7c8d53460b95 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 17 May 2010 13:31:01 +0200
Subject: linux-openmoko-2.6.32: add patches from gdrm-for-merging instead of
 gdrm-2.6.32 branch and rebase

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes/linux/linux-openmoko-2.6.32_git.bb | 44 ++++++++++++------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

(limited to 'recipes/linux/linux-openmoko-2.6.32_git.bb')

diff --git a/recipes/linux/linux-openmoko-2.6.32_git.bb b/recipes/linux/linux-openmoko-2.6.32_git.bb
index fb842419dd..133e5afe2d 100644
--- a/recipes/linux/linux-openmoko-2.6.32_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.32_git.bb
@@ -6,7 +6,7 @@ DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Sma
 KERNEL_RELEASE="2.6.32.13"
 
 SRCREV = "a9254be10ac2294ea20165a87c09ea6afcf66d94"
-OEV = "oe1"
+OEV = "oe2"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 
 SRC_URI = "\
@@ -16,32 +16,22 @@ SRC_URI = "\
   ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${KERNEL_RELEASE}.bz2;patch=1;name=stablepatch \
 # build fix
   file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
-# patches from Weiss's gdrm-2.6.32 branch
-  file://0002-DRM-for-platform-devices.patch;patch=1 \
-  file://0003-Glamo-DRM-and-KMS-driver.patch;patch=1 \
-  file://0004-Work-on-Glamo-core-for-DRM.patch;patch=1 \
-  file://0005-Add-JBT6k74-hook-for-use-by-KMS.patch;patch=1 \
-  file://0006-glamo-drm-use-dev_set_drvdata-instead-of-setting-dri.patch;patch=1 \
-  file://0007-glamo-drm-select-DRM_KMS_HELPER-for-crtc-functions.patch;patch=1 \
-  file://0008-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch;patch=1 \
-  file://0009-A-couple-of-GEM-refcounting-fixes.patch;patch=1 \
-  file://0010-Simplify-the-JBT6k74-driver.patch;patch=1 \
-  file://0011-Don-t-choke-if-userspace-provides-a-pixel-clock-valu.patch;patch=1 \
-  file://0012-Report-all-FB-modes-given-by-the-lower-levels.patch;patch=1 \
-  file://0013-Change-connector-type-to-LVDS.patch;patch=1 \
-  file://0014-Clean-up-JBT-hooks-and-allow-resolution-switching.patch;patch=1 \
-  file://0015-Enable-display-before-trying-to-set-mode-or-base.patch;patch=1 \
-  file://0016-accels.patch.patch;patch=1 \
-  file://0017-usbhost.patch.patch;patch=1 \
-  file://0018-ar6000_delay.patch.patch;patch=1 \
-  file://0019-save_regs.patch.patch;patch=1 \
-  file://0020-Fix-KMS-framebuffer-physical-address.patch;patch=1 \
-  file://0021-Reject-modes-with-clock-0.patch;patch=1 \
-  file://0022-JBT6k74-tweaks-Make-resolution-switch-work.patch;patch=1 \
-  file://0023-Remove-a-couple-of-debugging-messages.patch;patch=1 \
-  file://0024-Enable-dummy-frames-when-switching-resolution.patch;patch=1 \
-  file://0025-Almost-make-rotation-work.patch;patch=1 \
-  file://0026-gta02-defconfigs-enable-LEDS_S3C24XX.patch;patch=1 \
+# patches from Radek Polak used in qtmoko
+  file://0002-accels.patch.patch;patch=1 \
+  file://0003-usbhost.patch.patch;patch=1 \
+  file://0004-ar6000_delay.patch.patch;patch=1 \
+  file://0005-save_regs.patch.patch;patch=1 \
+# defconfig updates
+  file://0006-gta02-defconfigs-enable-LEDS_S3C24XX-and-dummy-batte.patch;patch=1 \
+# patches from Weiss's gdrm-for-merging branch
+  file://0007-DRM-for-platform-devices.patch;patch=1 \
+  file://0008-Glamo-DRM-and-KMS-driver.patch;patch=1 \
+  file://0009-Work-on-Glamo-core-for-DRM.patch;patch=1 \
+  file://0010-JBT6k74-work-for-KMS.patch;patch=1 \
+  file://0011-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch;patch=1 \
+  file://0012-Fix-dynamic-command-queue-allocation.patch;patch=1 \
+  file://0013-Debug-statements-for-testing.patch;patch=1 \
+  file://0014-Fix-claim-of-2D-register-resource.patch;patch=1 \
 "
 
 SRC_URI[stablepatch.md5sum] = "ba6abb1ffee513a1d4f831599ddae490"
-- 
cgit 1.2.3-korg