linux-openmoko-2.6.34: bump SRCREV, rebase patches

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
index 56197a2..d2e575a 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-DRM-for-platform-devices.patch
@@ -1,7 +1,7 @@
-From 69d87612a1b545e6d4cf9fc93117be86f871f7d2 Mon Sep 17 00:00:00 2001
+From 2ec20c69573ac255b3aefd4306f4aaed16c310bc Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 22 May 2010 18:59:58 +0200
-Subject: [PATCH 01/13] DRM for platform devices
+Subject: [PATCH 1/8] DRM for platform devices
 
 This modifies the DRM core in a small number of places to allow platform
 devices to be used for direct rendering, alongside PCI devices.

diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
index 1b6964a..9b731b5 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0001-accels.patch.patch
@@ -1,4 +1,4 @@
-From b4c5d1702abcaef7d8af5d3dc8934b2184ba6be0 Mon Sep 17 00:00:00 2001
+From 53e2489c536fc9e382be71be84800cb532acbf73 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:15:40 +0200
 Subject: [PATCH 1/4] accels.patch

diff --git a/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
index 14dca73..b76990f 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-Glamo-DRM-and-KMS-driver.patch
@@ -1,7 +1,7 @@
-From 4fe52e62cc86fc303cbc0f9a3c5081e38f95b950 Mon Sep 17 00:00:00 2001
+From b47b5c8042832424555cecda7a2ab21f8e57f9d4 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 22 May 2010 19:01:00 +0200
-Subject: [PATCH 02/13] Glamo DRM and KMS driver
+Subject: [PATCH 2/8] Glamo DRM and KMS driver
 
 This adds the Glamo DRM and KMS driver, but note that modifications are needed
 elsewhere to support it.
@@ -9,85 +9,92 @@ elsewhere to support it.
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
 ---
- drivers/mfd/glamo/Kconfig             |   16 +
- drivers/mfd/glamo/Makefile            |    5 +-
- drivers/mfd/glamo/glamo-buffer.c      |  374 +++++++++++++
- drivers/mfd/glamo/glamo-buffer.h      |   60 ++
- drivers/mfd/glamo/glamo-cmdq.c        |  555 +++++++++++++++++++
- drivers/mfd/glamo/glamo-cmdq.h        |   49 ++
- drivers/mfd/glamo/glamo-display.c     |  975 +++++++++++++++++++++++++++++++++
- drivers/mfd/glamo/glamo-display.h     |   41 ++
- drivers/mfd/glamo/glamo-drm-drv.c     |  423 ++++++++++++++
- drivers/mfd/glamo/glamo-drm-private.h |  166 ++++++
- drivers/mfd/glamo/glamo-fence.c       |  330 +++++++++++
- drivers/mfd/glamo/glamo-fence.h       |   34 ++
- drivers/mfd/glamo/glamo-kms-fb.c      |  493 +++++++++++++++++
- drivers/mfd/glamo/glamo-kms-fb.h      |   41 ++
- include/drm/Kbuild                    |    1 +
- include/drm/glamo_drm.h               |  153 +++++
- 16 files changed, 3715 insertions(+), 1 deletions(-)
- create mode 100644 drivers/mfd/glamo/glamo-buffer.c
- create mode 100644 drivers/mfd/glamo/glamo-buffer.h
- create mode 100644 drivers/mfd/glamo/glamo-cmdq.c
- create mode 100644 drivers/mfd/glamo/glamo-cmdq.h
- create mode 100644 drivers/mfd/glamo/glamo-display.c
- create mode 100644 drivers/mfd/glamo/glamo-display.h
- create mode 100644 drivers/mfd/glamo/glamo-drm-drv.c
- create mode 100644 drivers/mfd/glamo/glamo-drm-private.h
- create mode 100644 drivers/mfd/glamo/glamo-fence.c
- create mode 100644 drivers/mfd/glamo/glamo-fence.h
- create mode 100644 drivers/mfd/glamo/glamo-kms-fb.c
- create mode 100644 drivers/mfd/glamo/glamo-kms-fb.h
+ drivers/gpu/drm/Kconfig                   |   16 +
+ drivers/gpu/drm/Makefile                  |    1 +
+ drivers/gpu/drm/glamo/Makefile            |    8 +
+ drivers/gpu/drm/glamo/glamo-buffer.c      |  374 +++++++++++
+ drivers/gpu/drm/glamo/glamo-buffer.h      |   60 ++
+ drivers/gpu/drm/glamo/glamo-cmdq.c        |  557 ++++++++++++++++
+ drivers/gpu/drm/glamo/glamo-cmdq.h        |   49 ++
+ drivers/gpu/drm/glamo/glamo-display.c     |  976 +++++++++++++++++++++++++++++
+ drivers/gpu/drm/glamo/glamo-display.h     |   41 ++
+ drivers/gpu/drm/glamo/glamo-drm-drv.c     |  424 +++++++++++++
+ drivers/gpu/drm/glamo/glamo-drm-private.h |  166 +++++
+ drivers/gpu/drm/glamo/glamo-fence.c       |  331 ++++++++++
+ drivers/gpu/drm/glamo/glamo-fence.h       |   34 +
+ drivers/gpu/drm/glamo/glamo-kms-fb.c      |  494 +++++++++++++++
+ drivers/gpu/drm/glamo/glamo-kms-fb.h      |   41 ++
+ include/drm/Kbuild                        |    1 +
+ include/drm/glamo_drm.h                   |  153 +++++
+ 17 files changed, 3726 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/gpu/drm/glamo/Makefile
+ create mode 100644 drivers/gpu/drm/glamo/glamo-buffer.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-buffer.h
+ create mode 100644 drivers/gpu/drm/glamo/glamo-cmdq.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-cmdq.h
+ create mode 100644 drivers/gpu/drm/glamo/glamo-display.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-display.h
+ create mode 100644 drivers/gpu/drm/glamo/glamo-drm-drv.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-drm-private.h
+ create mode 100644 drivers/gpu/drm/glamo/glamo-fence.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-fence.h
+ create mode 100644 drivers/gpu/drm/glamo/glamo-kms-fb.c
+ create mode 100644 drivers/gpu/drm/glamo/glamo-kms-fb.h
  create mode 100644 include/drm/glamo_drm.h
 
-diff --git a/drivers/mfd/glamo/Kconfig b/drivers/mfd/glamo/Kconfig
-index 3aa4831..a12ebf6 100644
---- a/drivers/mfd/glamo/Kconfig
-+++ b/drivers/mfd/glamo/Kconfig
-@@ -40,3 +40,19 @@ config MFD_GLAMO_MCI
-         neo1973 GTA-02.
- 
-         If unsure, say N.
-+
-+config MFD_GLAMO_DRM
-+      tristate "Glamo direct rendering and kernel modesetting support"
-+      depends on MFD_GLAMO && DRM
-+      select FB_CFB_FILLRECT
-+      select FB_CFB_COPYAREA
-+      select FB_CFB_IMAGEBLIT
-+      select DRM_KMS_HELPER
-+      help
-+        Direct Rendering Manager interface for the S-Media Glamo chip, as
-+        used in Openmoko FreeRunner (GTA02).
-+
-+        This DRM driver includes kernel modesetting (KMS) support.  As such,
-+        do not select MFD_GLAMO_FB above if you choose to enable this option.
-+
-+        If unsure, say N.
-diff --git a/drivers/mfd/glamo/Makefile b/drivers/mfd/glamo/Makefile
-index ebf26f7..d5ebf8f 100644
---- a/drivers/mfd/glamo/Makefile
-+++ b/drivers/mfd/glamo/Makefile
-@@ -1,5 +1,5 @@
- #
--# Makefile for the Smedia Glamo framebuffer driver
-+# Makefile for the Smedia Glamo driver(s)
- #
- 
- obj-$(CONFIG_MFD_GLAMO)                       += glamo-core.o
-@@ -8,4 +8,7 @@ obj-$(CONFIG_MFD_GLAMO_SPI)            += glamo-spi.o
- 
- obj-$(CONFIG_MFD_GLAMO_FB)            += glamo-fb.o
- obj-$(CONFIG_MFD_GLAMO_MCI)           += glamo-mci.o
-+obj-$(CONFIG_MFD_GLAMO_DRM)           += glamo-drm.o
- 
+diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
+index 7244cef..590324c 100644
+--- a/drivers/gpu/drm/Kconfig
++++ b/drivers/gpu/drm/Kconfig
+@@ -157,3 +157,19 @@ config DRM_SAVAGE
+       help
+         Choose this option if you have a Savage3D/4/SuperSavage/Pro/Twister
+         chipset. If M is selected the module will be called savage.
++
++config DRM_GLAMO
++        tristate "Glamo direct rendering and kernel modesetting support"
++        depends on MFD_GLAMO && DRM
++        select FB_CFB_FILLRECT
++        select FB_CFB_COPYAREA
++        select FB_CFB_IMAGEBLIT
++        select DRM_KMS_HELPER
++        help
++          Direct Rendering Manager interface for the S-Media Glamo chip, as
++          used in Openmoko FreeRunner (GTA02).
++ 
++          This DRM driver includes kernel modesetting (KMS) support.  As such,
++          do not select FB_GLAMO if you choose to enable this option.
++
++          If unsure, say N.
+diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
+index abe3f44..165058e 100644
+--- a/drivers/gpu/drm/Makefile
++++ b/drivers/gpu/drm/Makefile
+@@ -33,4 +33,5 @@ obj-$(CONFIG_DRM_SAVAGE)+= savage/
+ obj-$(CONFIG_DRM_VMWGFX)+= vmwgfx/
+ obj-$(CONFIG_DRM_VIA) +=via/
+ obj-$(CONFIG_DRM_NOUVEAU) +=nouveau/
++obj-$(CONFIG_DRM_GLAMO) += glamo/
+ obj-y                 += i2c/
+diff --git a/drivers/gpu/drm/glamo/Makefile b/drivers/gpu/drm/glamo/Makefile
+new file mode 100644
+index 0000000..a111397
+--- /dev/null
++++ b/drivers/gpu/drm/glamo/Makefile
+@@ -0,0 +1,8 @@
++#
++# Makefile for the Smedia Glamo DRM driver
++#
++
++obj-$(CONFIG_DRM_GLAMO)               += glamo-drm.o
++
 +glamo-drm-objs        :=  glamo-drm-drv.o glamo-cmdq.o glamo-buffer.o \
 +                    glamo-display.o glamo-kms-fb.o glamo-fence.o
-diff --git a/drivers/mfd/glamo/glamo-buffer.c b/drivers/mfd/glamo/glamo-buffer.c
+diff --git a/drivers/gpu/drm/glamo/glamo-buffer.c b/drivers/gpu/drm/glamo/glamo-buffer.c
 new file mode 100644
 index 0000000..82ea0c0
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-buffer.c
++++ b/drivers/gpu/drm/glamo/glamo-buffer.c
 @@ -0,0 +1,374 @@
 +/*
 + * SMedia Glamo 336x/337x memory management
@@ -463,11 +470,11 @@ index 0000000..82ea0c0
 +      kfree(gdrm->mmgr);
 +      return 0;
 +}
-diff --git a/drivers/mfd/glamo/glamo-buffer.h b/drivers/mfd/glamo/glamo-buffer.h
+diff --git a/drivers/gpu/drm/glamo/glamo-buffer.h b/drivers/gpu/drm/glamo/glamo-buffer.h
 new file mode 100644
 index 0000000..41f18fd
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-buffer.h
++++ b/drivers/gpu/drm/glamo/glamo-buffer.h
 @@ -0,0 +1,60 @@
 +/*
 + * SMedia Glamo 336x/337x memory management
@@ -529,12 +536,12 @@ index 0000000..41f18fd
 +                                struct drm_file *file_priv);
 +
 +#endif /* __GLAMO_BUFFER_H */
-diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
+diff --git a/drivers/gpu/drm/glamo/glamo-cmdq.c b/drivers/gpu/drm/glamo/glamo-cmdq.c
 new file mode 100644
-index 0000000..442963c
+index 0000000..71eb53c
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-cmdq.c
-@@ -0,0 +1,555 @@
++++ b/drivers/gpu/drm/glamo/glamo-cmdq.c
+@@ -0,0 +1,557 @@
 +/*
 + * SMedia Glamo 336x/337x command queue handling
 + *
@@ -591,9 +598,11 @@ index 0000000..442963c
 +#include <drm/drmP.h>
 +#include <drm/glamo_drm.h>
 +
-+#include "glamo-core.h"
++#include <linux/mfd/glamo-core.h>
++#include <linux/mfd/glamo-regs.h>
++
 +#include "glamo-drm-private.h"
-+#include "glamo-regs.h"
++#include "glamo-buffer.h"
 +
 +
 +#define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
@@ -1090,11 +1099,11 @@ index 0000000..442963c
 +      }
 +      iounmap(cookie);
 +}
-diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h
+diff --git a/drivers/gpu/drm/glamo/glamo-cmdq.h b/drivers/gpu/drm/glamo/glamo-cmdq.h
 new file mode 100644
 index 0000000..510d195
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-cmdq.h
++++ b/drivers/gpu/drm/glamo/glamo-cmdq.h
 @@ -0,0 +1,49 @@
 +/* Smedia Glamo 336x/337x command queue handling
 + *
@@ -1145,12 +1154,12 @@ index 0000000..510d195
 +                             unsigned int count);
 +
 +#endif /* __GLAMO_CMDQ_H */
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
+diff --git a/drivers/gpu/drm/glamo/glamo-display.c b/drivers/gpu/drm/glamo/glamo-display.c
 new file mode 100644
-index 0000000..75ad734
+index 0000000..ef7e8c8
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -0,0 +1,975 @@
++++ b/drivers/gpu/drm/glamo/glamo-display.c
+@@ -0,0 +1,976 @@
 +/*
 + * SMedia Glamo 336x/337x display
 + *
@@ -1212,9 +1221,10 @@ index 0000000..75ad734
 +#include <linux/glamofb.h>
 +#include <linux/jbt6k74.h>
 +
-+#include "glamo-core.h"
++#include <linux/mfd/glamo-core.h>
++#include <linux/mfd/glamo-regs.h>
++
 +#include "glamo-drm-private.h"
-+#include "glamo-regs.h"
 +#include "glamo-kms-fb.h"
 +#include "glamo-display.h"
 +
@@ -2126,11 +2136,11 @@ index 0000000..75ad734
 +                                  gcrtc->current_fb);
 +      }
 +}
-diff --git a/drivers/mfd/glamo/glamo-display.h b/drivers/mfd/glamo/glamo-display.h
+diff --git a/drivers/gpu/drm/glamo/glamo-display.h b/drivers/gpu/drm/glamo/glamo-display.h
 new file mode 100644
 index 0000000..728bba5
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-display.h
++++ b/drivers/gpu/drm/glamo/glamo-display.h
 @@ -0,0 +1,41 @@
 +/* Smedia Glamo 336x/337x Display
 + *
@@ -2173,12 +2183,12 @@ index 0000000..728bba5
 +extern void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode);
 +
 +#endif /* __GLAMO_DISPLAY_H */
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
+diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
 new file mode 100644
-index 0000000..774eaff
+index 0000000..8a41b18
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -0,0 +1,423 @@
++++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+@@ -0,0 +1,424 @@
 +/* Smedia Glamo 336x/337x Graphics Driver
 + *
 + * Copyright (C) 2009 Openmoko, Inc. Jorge Luis Zapata <turran@openmoko.com>
@@ -2210,7 +2220,8 @@ index 0000000..774eaff
 +#include <drm/glamo_drm.h>
 +#include <linux/glamofb.h>
 +
-+#include "glamo-core.h"
++#include <linux/mfd/glamo-core.h>
++
 +#include "glamo-cmdq.h"
 +#include "glamo-buffer.h"
 +#include "glamo-drm-private.h"
@@ -2602,11 +2613,11 @@ index 0000000..774eaff
 +MODULE_AUTHOR(DRIVER_AUTHOR);
 +MODULE_DESCRIPTION(DRIVER_DESC);
 +MODULE_LICENSE("GPL");
-diff --git a/drivers/mfd/glamo/glamo-drm-private.h b/drivers/mfd/glamo/glamo-drm-private.h
+diff --git a/drivers/gpu/drm/glamo/glamo-drm-private.h b/drivers/gpu/drm/glamo/glamo-drm-private.h
 new file mode 100644
-index 0000000..75f2757
+index 0000000..602af4c
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-drm-private.h
++++ b/drivers/gpu/drm/glamo/glamo-drm-private.h
 @@ -0,0 +1,166 @@
 +/* Smedia Glamo 336x/337x DRM private bits
 + *
@@ -2644,7 +2655,7 @@ index 0000000..75f2757
 +#include <linux/spinlock.h>
 +#include <linux/wait.h>
 +
-+#include "glamo-core.h"
++#include <linux/mfd/glamo-core.h>
 +
 +
 +/* Memory to allocate for the framebuffer.
@@ -2774,12 +2785,12 @@ index 0000000..75f2757
 +
 +
 +#endif /* __GLAMO_DRMPRIV_H */
-diff --git a/drivers/mfd/glamo/glamo-fence.c b/drivers/mfd/glamo/glamo-fence.c
+diff --git a/drivers/gpu/drm/glamo/glamo-fence.c b/drivers/gpu/drm/glamo/glamo-fence.c
 new file mode 100644
-index 0000000..9119675
+index 0000000..56d6426
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-fence.c
-@@ -0,0 +1,330 @@
++++ b/drivers/gpu/drm/glamo/glamo-fence.c
+@@ -0,0 +1,331 @@
 +/*
 + * SMedia Glamo 336x/337x fence objects
 + *
@@ -2840,9 +2851,10 @@ index 0000000..9119675
 +#include <linux/spinlock.h>
 +#include <linux/lockdep.h>
 +
++#include <linux/mfd/glamo-core.h>
++#include <linux/mfd/glamo-regs.h>
++
 +#include "glamo-drm-private.h"
-+#include "glamo-regs.h"
-+#include "glamo-core.h"
 +#include "glamo-cmdq.h"
 +
 +
@@ -3110,11 +3122,11 @@ index 0000000..9119675
 +      wake_up_all(&gdrm->fence_queue);
 +      tasklet_kill(&gdrm->fence_tl);
 +}
-diff --git a/drivers/mfd/glamo/glamo-fence.h b/drivers/mfd/glamo/glamo-fence.h
+diff --git a/drivers/gpu/drm/glamo/glamo-fence.h b/drivers/gpu/drm/glamo/glamo-fence.h
 new file mode 100644
 index 0000000..deda995
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-fence.h
++++ b/drivers/gpu/drm/glamo/glamo-fence.h
 @@ -0,0 +1,34 @@
 +/*
 + * SMedia Glamo 336x/337x fence objects
@@ -3150,12 +3162,12 @@ index 0000000..deda995
 +                                      struct drm_file *file_priv);
 +
 +#endif /* __GLAMO_FENCE_H */
-diff --git a/drivers/mfd/glamo/glamo-kms-fb.c b/drivers/mfd/glamo/glamo-kms-fb.c
+diff --git a/drivers/gpu/drm/glamo/glamo-kms-fb.c b/drivers/gpu/drm/glamo/glamo-kms-fb.c
 new file mode 100644
-index 0000000..d76dd24
+index 0000000..cac524c
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-kms-fb.c
-@@ -0,0 +1,493 @@
++++ b/drivers/gpu/drm/glamo/glamo-kms-fb.c
+@@ -0,0 +1,494 @@
 +/*
 + * SMedia Glamo 336x/337x KMS Framebuffer
 + *
@@ -3216,7 +3228,8 @@ index 0000000..d76dd24
 +#include <drm/drm_crtc_helper.h>
 +#include <drm/drm_crtc.h>
 +
-+#include "glamo-core.h"
++#include <linux/mfd/glamo-core.h>
++
 +#include "glamo-drm-private.h"
 +#include "glamo-display.h"
 +#include "glamo-buffer.h"
@@ -3649,11 +3662,11 @@ index 0000000..d76dd24
 +{
 +      fb_set_suspend(gdrm->fb, 0);
 +}
-diff --git a/drivers/mfd/glamo/glamo-kms-fb.h b/drivers/mfd/glamo/glamo-kms-fb.h
+diff --git a/drivers/gpu/drm/glamo/glamo-kms-fb.h b/drivers/gpu/drm/glamo/glamo-kms-fb.h
 new file mode 100644
 index 0000000..1960e76
 --- /dev/null
-+++ b/drivers/mfd/glamo/glamo-kms-fb.h
++++ b/drivers/gpu/drm/glamo/glamo-kms-fb.h
 @@ -0,0 +1,41 @@
 +/*
 + * SMedia Glamo 336x/337x KMS framebuffer

diff --git a/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
index ace1650..ee330a0 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0002-usbhost.patch.patch
@@ -1,4 +1,4 @@
-From cbc005e5e709407bae373d006d06a4cf51fd3062 Mon Sep 17 00:00:00 2001
+From 65954829e9732060a734e977817dbaa611b6c42b Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:17:28 +0200
 Subject: [PATCH 2/4] usbhost.patch

diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
index c9afc89..4906f97 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-Work-on-Glamo-core-for-DRM.patch
@@ -1,24 +1,24 @@
-From 0c38c5d7bcce1b62534e76419ee04eea0fe50128 Mon Sep 17 00:00:00 2001
+From 21469ba33747fef2625bf20c72cbbe776d8c59b7 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Tue, 17 Nov 2009 23:45:29 +0100
-Subject: [PATCH 03/13] Work on Glamo-core for DRM
+Subject: [PATCH 3/8] Work on Glamo-core for DRM
 
 This adds modifications to the core of the Glamo driver to expose functionality
 to support DRM and KMS.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-core.c |   27 +++++++++++++++++++++------
- drivers/mfd/glamo/glamo-core.h |   32 ++++++++++++++++++++++----------
- drivers/mfd/glamo/glamo-regs.h |   24 ++++++++++++++++++++++++
+ drivers/mfd/glamo-core.c       |   27 +++++++++++++++++++++------
+ include/linux/mfd/glamo-core.h |   32 ++++++++++++++++++++++----------
+ include/linux/mfd/glamo-regs.h |   24 ++++++++++++++++++++++++
  include/linux/mfd/glamo.h      |    7 ++-----
  4 files changed, 69 insertions(+), 21 deletions(-)
 
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index 23073fe..f894c91 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -222,10 +222,25 @@ static struct resource glamo_fb_resources[] = {
+diff --git a/drivers/mfd/glamo-core.c b/drivers/mfd/glamo-core.c
+index 135856a..da32b77 100644
+--- a/drivers/mfd/glamo-core.c
++++ b/drivers/mfd/glamo-core.c
+@@ -221,10 +221,25 @@ static struct resource glamo_fb_resources[] = {
                .flags  = IORESOURCE_MEM,
        }, {
                .name   = "glamo-fb-mem",
@@ -47,7 +47,7 @@ index 23073fe..f894c91 100644
  };
  
  static struct resource glamo_mmc_resources[] = {
-@@ -236,9 +251,9 @@ static struct resource glamo_mmc_resources[] = {
+@@ -235,9 +250,9 @@ static struct resource glamo_mmc_resources[] = {
                .flags  = IORESOURCE_MEM
        }, {
                .name   = "glamo-mmc-mem",
@@ -60,10 +60,10 @@ index 23073fe..f894c91 100644
                .flags  = IORESOURCE_MEM
        }, {
                .start  = GLAMO_IRQ_MMC,
-diff --git a/drivers/mfd/glamo/glamo-core.h b/drivers/mfd/glamo/glamo-core.h
-index 17017b0..0adba96 100644
---- a/drivers/mfd/glamo/glamo-core.h
-+++ b/drivers/mfd/glamo/glamo-core.h
+diff --git a/include/linux/mfd/glamo-core.h b/include/linux/mfd/glamo-core.h
+index 34ec7c4..25bd94d 100644
+--- a/include/linux/mfd/glamo-core.h
++++ b/include/linux/mfd/glamo-core.h
 @@ -3,18 +3,30 @@
  
  #include <linux/mfd/glamo.h>
@@ -104,11 +104,11 @@ index 17017b0..0adba96 100644
 +#define GLAMO_OFFSET_MMC      (GLAMO_OFFSET_CURSOR + GLAMO_CURSOR_SIZE)
  
  enum glamo_pll {
-     GLAMO_PLL1,
-diff --git a/drivers/mfd/glamo/glamo-regs.h b/drivers/mfd/glamo/glamo-regs.h
+       GLAMO_PLL1,
+diff --git a/include/linux/mfd/glamo-regs.h b/include/linux/mfd/glamo-regs.h
 index 59848e1..8b2fd47 100644
---- a/drivers/mfd/glamo/glamo-regs.h
-+++ b/drivers/mfd/glamo/glamo-regs.h
+--- a/include/linux/mfd/glamo-regs.h
++++ b/include/linux/mfd/glamo-regs.h
 @@ -627,4 +627,28 @@ enum glamo_core_revisions {
        GLAMO_CORE_REV_A3               = 0x0003,
  };

diff --git a/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
index 8241a1f..dbff9c0 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0003-ar6000_delay.patch.patch
@@ -1,4 +1,4 @@
-From 3287722e641d6e21cb0e2a8fa13058467a5319e3 Mon Sep 17 00:00:00 2001
+From 32dcde00ad05fa148ba96f46427afe9af226ffb7 Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:18:02 +0200
 Subject: [PATCH 3/4] ar6000_delay.patch

diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
index 692896f..dee8a64 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-JBT6k74-work-for-KMS.patch
@@ -1,7 +1,7 @@
-From 2042106d96a13c2a15f1425fe9133257b1e0fbed Mon Sep 17 00:00:00 2001
+From 1cc704d6777a97bc55f3822c218fd49e12561347 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Sat, 21 Nov 2009 21:42:16 +0100
-Subject: [PATCH 04/13] JBT6k74 work for KMS
+Subject: [PATCH 4/8] JBT6k74 work for KMS
 
 This simplifies the JBT6k74 driver, and adds hooks for the Glamo driver to cooperate
 more closely with it.

diff --git a/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
index 185d9a1..a891167 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0004-save_regs.patch.patch
@@ -1,4 +1,4 @@
-From b166d6d4fb0f5ed66b785e0c662db5fbd2f86e8c Mon Sep 17 00:00:00 2001
+From 784ad85c80030910862e5b7f655eb69a6f980e4f Mon Sep 17 00:00:00 2001
 From: Radek Polak <psonek2@seznam.cz>
 Date: Fri, 9 Apr 2010 09:22:23 +0200
 Subject: [PATCH 4/4] save_regs.patch

diff --git a/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
deleted file mode 100644 (file)
index cf73609..0000000
--- a/recipes/linux/linux-openmoko-2.6.34/0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9cd5001fc2f4c817d5614b1ee5445d69af05d483 Mon Sep 17 00:00:00 2001
-From: Thomas White <taw@bitwiz.org.uk>
-Date: Thu, 4 Feb 2010 00:07:25 +0100
-Subject: [PATCH 05/13] Fix crash when reading Glamo registers via sysfs
-
-glamo-core didn't ioremap() some areas, so don't try to read them.
-
-Signed-off-by: Thomas White <taw@bitwiz.org.uk>
----
- drivers/mfd/glamo/glamo-core.c |    8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/mfd/glamo/glamo-core.c b/drivers/mfd/glamo/glamo-core.c
-index f894c91..a54106b 100644
---- a/drivers/mfd/glamo/glamo-core.c
-+++ b/drivers/mfd/glamo/glamo-core.c
-@@ -91,14 +91,14 @@ static const struct reg_range reg_range[] = {
- /*    { 0x0500, 0x300,        "ISP",          0 }, */
- /*    { 0x0800, 0x400,        "JPEG",         0 }, */
- /*    { 0x0c00, 0xcc,         "MPEG",         0 }, */
--      { 0x1100, 0xb2,         "LCD 1",        1 },
--      { 0x1200, 0x64,         "LCD 2",        1 },
--      { 0x1400, 0x42,         "MMC",          1 },
-+      { 0x1100, 0xb2,         "LCD 1",        0 },
-+      { 0x1200, 0x64,         "LCD 2",        0 },
-+      { 0x1400, 0x42,         "MMC",          0 },
- /*    { 0x1500, 0x080,        "MPU 0",        0 },
-       { 0x1580, 0x080,        "MPU 1",        0 },
-       { 0x1600, 0x080,        "Cmd Queue",    0 },
-       { 0x1680, 0x080,        "RISC CPU",     0 },*/
--      { 0x1700, 0x400,        "2D Unit",      1 },
-+      { 0x1700, 0x400,        "2D Unit",      0 },
- /*    { 0x1b00, 0x900,        "3D Unit",      0 }, */
- };
- 
--- 
-1.7.1
-

diff --git a/recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
similarity index 67%
rename from recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch
rename to recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
index ea57072..0351f50 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0006-Fix-dynamic-command-queue-allocation.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0005-Fix-dynamic-command-queue-allocation.patch
@@ -1,30 +1,22 @@
-From 752dfe99a5e2b361f740f2f986de93f5682b1a8d Mon Sep 17 00:00:00 2001
+From 2114f9008abe39b8ed914f650d50775e39f53cca Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 05:40:15 -0700
-Subject: [PATCH 06/13] Fix dynamic command queue allocation
+Subject: [PATCH 5/8] Fix dynamic command queue allocation
 
 (Not tested...)
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-cmdq.c    |   10 +++++++---
- drivers/mfd/glamo/glamo-cmdq.h    |    2 +-
- drivers/mfd/glamo/glamo-drm-drv.c |   17 +++++++----------
- 3 files changed, 15 insertions(+), 14 deletions(-)
+ drivers/gpu/drm/glamo/glamo-cmdq.c    |    9 ++++++---
+ drivers/gpu/drm/glamo/glamo-cmdq.h    |    2 +-
+ drivers/gpu/drm/glamo/glamo-drm-drv.c |   17 +++++++----------
+ 3 files changed, 14 insertions(+), 14 deletions(-)
 
-diff --git a/drivers/mfd/glamo/glamo-cmdq.c b/drivers/mfd/glamo/glamo-cmdq.c
-index 442963c..28c5268 100644
---- a/drivers/mfd/glamo/glamo-cmdq.c
-+++ b/drivers/mfd/glamo/glamo-cmdq.c
-@@ -57,6 +57,7 @@
- #include "glamo-core.h"
- #include "glamo-drm-private.h"
- #include "glamo-regs.h"
-+#include "glamo-buffer.h"
- 
- 
- #define GLAMO_CMDQ_SIZE (128 * 1024)    /* 128k ring buffer */
-@@ -495,10 +496,11 @@ int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
+diff --git a/drivers/gpu/drm/glamo/glamo-cmdq.c b/drivers/gpu/drm/glamo/glamo-cmdq.c
+index 3ce970e..4b0d55f 100644
+--- a/drivers/gpu/drm/glamo/glamo-cmdq.c
++++ b/drivers/gpu/drm/glamo/glamo-cmdq.c
+@@ -497,10 +497,11 @@ int glamo_cmdq_setup(struct glamodrm_handle *gdrm)
  }
  
  
@@ -37,7 +29,7 @@ index 442963c..28c5268 100644
        int ret = 0;
  
        obj = glamo_gem_object_alloc(dev, GLAMO_CMDQ_SIZE, 4);
-@@ -507,9 +509,10 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm)
+@@ -509,9 +510,10 @@ int glamo_cmdq_init(struct glamodrm_handle *gdrm)
                ret = -ENOMEM;
                goto out;
        }
@@ -50,7 +42,7 @@ index 442963c..28c5268 100644
  
        /* Set up registers */
        glamo_cmdq_setup(gdrm);
-@@ -521,6 +524,7 @@ out:
+@@ -523,6 +525,7 @@ out:
  
  int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm)
  {
@@ -58,10 +50,10 @@ index 442963c..28c5268 100644
        return 0;
  }
  
-diff --git a/drivers/mfd/glamo/glamo-cmdq.h b/drivers/mfd/glamo/glamo-cmdq.h
+diff --git a/drivers/gpu/drm/glamo/glamo-cmdq.h b/drivers/gpu/drm/glamo/glamo-cmdq.h
 index 510d195..6d7f184 100644
---- a/drivers/mfd/glamo/glamo-cmdq.h
-+++ b/drivers/mfd/glamo/glamo-cmdq.h
+--- a/drivers/gpu/drm/glamo/glamo-cmdq.h
++++ b/drivers/gpu/drm/glamo/glamo-cmdq.h
 @@ -38,7 +38,7 @@ extern int glamo_ioctl_cmdburst(struct drm_device *dev, void *data,
  extern void glamo_cmdq_blank(struct glamodrm_handle *gdrm,
                               struct drm_gem_object *obj);
@@ -71,11 +63,11 @@ index 510d195..6d7f184 100644
  extern int glamo_cmdq_shutdown(struct glamodrm_handle *gdrm);
  extern void glamo_cmdq_suspend(struct glamodrm_handle *gdrm);
  extern void glamo_cmdq_resume(struct glamodrm_handle *gdrm);
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
-index 774eaff..ee648c1 100644
---- a/drivers/mfd/glamo/glamo-drm-drv.c
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -128,7 +128,7 @@ static int glamodrm_load(struct drm_device *dev, unsigned long flags)
+diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+index 224c857..9f74983 100644
+--- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
++++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+@@ -129,7 +129,7 @@ static int glamodrm_load(struct drm_device *dev, unsigned long flags)
        gdrm = dev->dev_private;
  
        glamo_buffer_init(gdrm);
@@ -84,7 +76,7 @@ index 774eaff..ee648c1 100644
        glamo_fence_init(gdrm);
        glamo_display_init(dev);
  
-@@ -237,14 +237,14 @@ static int glamodrm_probe(struct platform_device *pdev)
+@@ -238,14 +238,14 @@ static int glamodrm_probe(struct platform_device *pdev)
        if ( !gdrm->vram ) {
                dev_err(&pdev->dev, "Unable to find VRAM.\n");
                rc = -ENOENT;
@@ -101,7 +93,7 @@ index 774eaff..ee648c1 100644
        }
  
        /* Find the LCD controller */
-@@ -316,10 +316,6 @@ out_release_lcd:
+@@ -317,10 +317,6 @@ out_release_lcd:
                           resource_size(gdrm->lcd_regs));
  out_release_vram:
        release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
@@ -112,7 +104,7 @@ index 774eaff..ee648c1 100644
  out_unmap_regs:
        iounmap(gdrm->reg_base);
  out_release_regs:
-@@ -349,9 +345,10 @@ static int glamodrm_remove(struct platform_device *pdev)
+@@ -350,9 +346,10 @@ static int glamodrm_remove(struct platform_device *pdev)
        /* Release VRAM */
        release_mem_region(gdrm->vram->start, resource_size(gdrm->vram));
  

diff --git a/recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch b/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
similarity index 77%
rename from recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch
rename to recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
index 1321d29..c47ebf1 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0007-Debug-statements-for-testing.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0006-Debug-statements-for-testing.patch
@@ -1,19 +1,19 @@
-From 6d0e40938fa71d6a3a1f3c9892251053bda3be6d Mon Sep 17 00:00:00 2001
+From cf82ca72810135babe7493bdd7c1cc63ed2ebac6 Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 05:40:33 -0700
-Subject: [PATCH 07/13] Debug statements for testing
+Subject: [PATCH 6/8] Debug statements for testing
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-display.c |    7 +++++++
- drivers/video/backlight/jbt6k74.c |    4 +++-
+ drivers/gpu/drm/glamo/glamo-display.c |    7 +++++++
+ drivers/video/backlight/jbt6k74.c     |    4 +++-
  2 files changed, 10 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/mfd/glamo/glamo-display.c b/drivers/mfd/glamo/glamo-display.c
-index 75ad734..57292ff 100644
---- a/drivers/mfd/glamo/glamo-display.c
-+++ b/drivers/mfd/glamo/glamo-display.c
-@@ -257,6 +257,8 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
+diff --git a/drivers/gpu/drm/glamo/glamo-display.c b/drivers/gpu/drm/glamo/glamo-display.c
+index a058b40..c54dd49 100644
+--- a/drivers/gpu/drm/glamo/glamo-display.c
++++ b/drivers/gpu/drm/glamo/glamo-display.c
+@@ -258,6 +258,8 @@ static int glamo_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
        u32 addr;
        u16 addr_low, addr_high;
  
@@ -22,7 +22,7 @@ index 75ad734..57292ff 100644
        if (!crtc->fb) {
                DRM_DEBUG("No FB bound\n");
                return -EINVAL;
-@@ -311,6 +313,8 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
+@@ -312,6 +314,8 @@ static int glamo_crtc_mode_set(struct drm_crtc *crtc,
                msleep(500);
        }
  
@@ -31,7 +31,7 @@ index 75ad734..57292ff 100644
        /* Rotate? */
        if ( (mode->hdisplay == 640) && (mode->vdisplay == 480) ) {
                rot = GLAMO_LCD_ROT_MODE_90;
-@@ -935,15 +939,18 @@ void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
+@@ -936,15 +940,18 @@ void glamo_lcd_power(struct glamodrm_handle *gdrm, int mode)
        struct glamo_crtc *gcrtc = to_glamo_crtc(crtc);
  
        if ( mode ) {

diff --git a/recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch b/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
similarity index 55%
rename from recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch
rename to recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
index 613f3a1..978545a 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0008-Fix-claim-of-2D-register-resource.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0007-Fix-claim-of-2D-register-resource.patch
@@ -1,18 +1,18 @@
-From 92118a72fdf779a20693cb7d01d1a12fc8e12ace Mon Sep 17 00:00:00 2001
+From 2f8fb0d0308960e53395428873549ae2961469ca Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Thu, 6 May 2010 08:37:04 -0700
-Subject: [PATCH 08/13] Fix claim of 2D register resource
+Subject: [PATCH 7/8] Fix claim of 2D register resource
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-drm-drv.c |    3 ++-
+ drivers/gpu/drm/glamo/glamo-drm-drv.c |    3 ++-
  1 files changed, 2 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
-index ee648c1..4f982ad 100644
---- a/drivers/mfd/glamo/glamo-drm-drv.c
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -272,7 +272,8 @@ static int glamodrm_probe(struct platform_device *pdev)
+diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+index 9f74983..2a7f600 100644
+--- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
++++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+@@ -273,7 +273,8 @@ static int glamodrm_probe(struct platform_device *pdev)
        }
  
        /* Find the 2D engine */

diff --git a/recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
similarity index 50%
rename from recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch
rename to recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
index 5937cb9..3c9b48b 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/0009-Use-unlocked_ioctl-rather-than-ioctl.patch
+++ b/recipes/linux/linux-openmoko-2.6.34/0008-Use-unlocked_ioctl-rather-than-ioctl.patch
@@ -1,20 +1,20 @@
-From ea9d004f7b0d5c93610a2abdcbdf54af2a871c4b Mon Sep 17 00:00:00 2001
+From 97f5e67992f766359987a876e61afacf3a8532cb Mon Sep 17 00:00:00 2001
 From: Thomas White <taw@bitwiz.org.uk>
 Date: Mon, 24 May 2010 21:49:14 +0200
-Subject: [PATCH 09/13] Use unlocked_ioctl rather than ioctl
+Subject: [PATCH 8/8] Use unlocked_ioctl rather than ioctl
 
 The arguments changed between 2.6.32 and 2.6.34.
 
 Signed-off-by: Thomas White <taw@bitwiz.org.uk>
 ---
- drivers/mfd/glamo/glamo-drm-drv.c |    2 +-
+ drivers/gpu/drm/glamo/glamo-drm-drv.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
-diff --git a/drivers/mfd/glamo/glamo-drm-drv.c b/drivers/mfd/glamo/glamo-drm-drv.c
-index 4f982ad..75b5233 100644
---- a/drivers/mfd/glamo/glamo-drm-drv.c
-+++ b/drivers/mfd/glamo/glamo-drm-drv.c
-@@ -179,7 +179,7 @@ static struct drm_driver glamodrm_drm_driver = {
+diff --git a/drivers/gpu/drm/glamo/glamo-drm-drv.c b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+index 2a7f600..36e6941 100644
+--- a/drivers/gpu/drm/glamo/glamo-drm-drv.c
++++ b/drivers/gpu/drm/glamo/glamo-drm-drv.c
+@@ -180,7 +180,7 @@ static struct drm_driver glamodrm_drm_driver = {
                .owner = THIS_MODULE,
                .open = drm_open,
                .release = drm_release,

diff --git a/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
index e966539..1ef24e5 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.34
-# Wed May 19 18:50:43 2010
+# Sat Jun 26 00:22:46 2010
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -245,7 +245,7 @@ CONFIG_S3C_BOOT_WATCHDOG=y
 CONFIG_S3C_BOOT_ERROR_RESET=y
 CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=2
-CONFIG_SAMSUNG_GPIO_EXTRA=0
+CONFIG_SAMSUNG_GPIO_EXTRA=64
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_ADC=y
 CONFIG_S3C_DEV_USB_HOST=y
@@ -262,7 +262,8 @@ CONFIG_CPU_LLSERIAL_S3C2440_ONLY=y
 CONFIG_CPU_LLSERIAL_S3C2440=y
 CONFIG_S3C2410_CLOCK=y
 CONFIG_S3C24XX_PWM=y
-CONFIG_S3C24XX_GPIO_EXTRA=0
+CONFIG_S3C24XX_GPIO_EXTRA=64
+CONFIG_S3C24XX_GPIO_EXTRA64=y
 CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
 
@@ -1247,6 +1248,7 @@ CONFIG_GPIO_SYSFS=y
 #
 # Memory mapped GPIO expanders:
 #
+CONFIG_GPIO_GLAMO=y
 # CONFIG_GPIO_IT8761E is not set
 
 #
@@ -1338,10 +1340,6 @@ CONFIG_PCF50633_ADC=y
 # CONFIG_EZX_PCAP is not set
 # CONFIG_AB4500_CORE is not set
 CONFIG_MFD_GLAMO=y
-# CONFIG_MFD_GLAMO_FB is not set
-CONFIG_MFD_GLAMO_GPIO=y
-CONFIG_MFD_GLAMO_MCI=y
-CONFIG_MFD_GLAMO_DRM=y
 CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_DEBUG is not set
 # CONFIG_REGULATOR_DUMMY is not set
@@ -1366,6 +1364,7 @@ CONFIG_DRM_KMS_HELPER=y
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_VIA is not set
 # CONFIG_DRM_SAVAGE is not set
+CONFIG_DRM_GLAMO=y
 # CONFIG_VGASTATE is not set
 CONFIG_VIDEO_OUTPUT_CONTROL=y
 CONFIG_FB=y
@@ -1398,6 +1397,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_METRONOME is not set
 # CONFIG_FB_MB862XX is not set
 # CONFIG_FB_BROADSHEET is not set
+# CONFIG_FB_GLAMO is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 # CONFIG_LCD_L4F00242T03 is not set
@@ -1744,6 +1744,7 @@ CONFIG_MMC_S3C=y
 CONFIG_MMC_S3C_PIO=y
 # CONFIG_MMC_S3C_DMA is not set
 # CONFIG_MMC_S3C_PIODMA is not set
+CONFIG_MMC_GLAMO=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y

diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
index 2f47140..73d8be4 100644 (file)
--- a/recipes/linux/linux-openmoko-2.6.34_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -3,7 +3,7 @@ require linux-openmoko.inc
 
 KERNEL_RELEASE="2.6.34"
 
-SRCREV = "5c40321e6e6a8ca8552c5c69d041d7f7f3205318"
+SRCREV = "4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2"
 OEV = "oe4"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 
@@ -20,11 +20,10 @@ SRC_URI = "\
   file://0002-Glamo-DRM-and-KMS-driver.patch \
   file://0003-Work-on-Glamo-core-for-DRM.patch \
   file://0004-JBT6k74-work-for-KMS.patch \
-  file://0005-Fix-crash-when-reading-Glamo-registers-via-sysfs.patch \
-  file://0006-Fix-dynamic-command-queue-allocation.patch \
-  file://0007-Debug-statements-for-testing.patch \
-  file://0008-Fix-claim-of-2D-register-resource.patch \
-  file://0009-Use-unlocked_ioctl-rather-than-ioctl.patch \
+  file://0005-Fix-dynamic-command-queue-allocation.patch \
+  file://0006-Debug-statements-for-testing.patch \
+  file://0007-Fix-claim-of-2D-register-resource.patch \
+  file://0008-Use-unlocked_ioctl-rather-than-ioctl.patch \
 # patches from Radek Polak used in qtmoko
   file://0001-accels.patch.patch \
   file://0002-usbhost.patch.patch \