merge of 11d8497b1833de1683f037417535cc4ba64608f3

     and 85921202b8fd4be54741cadc9cbf9c3768a9b23a

26 files changed, 2997 insertions, 1361 deletions

diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 850b2e5f00..1fa2c607f4 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -53,6 +53,8 @@ include conf/distro/preferred-e-versions.inc
 KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
 
+PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 72692a28f7..923953420a 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -14,7 +14,6 @@ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 #<>
 #<> We will set CVS DATE when things are known to work.
 #<>
-
 PREFERRED_PROVIDERS  =  "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS +=  "virtual/${TARGET_PREFIX}g++:gcc-cross"
@@ -57,9 +56,9 @@ PREFERRED_VERSION_glib-1.2 = "1.2.10"
 #<>Setting Preferred xserver-kdrive. Also choose diet-x11 as default libx11.
 #<>
 PREFERRED_VERSION_xserver-kdrive = "0.0+cvs20060312"
-PREFERRED_PROVIDER_libx11        = "diet-x11"
+PREFERRED_PROVIDER_libx11        = "x11"
 PREFERRED_PROVIDER_tslib         = "tslib"
-
+PREFRRED_VERSION_cairo           = "1.0.4"
 #<>
 #<>Other Specific stuff.
 #<>
@@ -67,7 +66,7 @@ PREFERRED_PROVIDER_tslib         = "tslib"
 #<>We want to be able to build this for all jornadas so
 #<>to not mess up the folders we need to make them dynamic.
 #<>It will use different folders depending on Arch (set in local.conf)
-INHERIT += "package_tar package_ipk multimachine"
+INHERIT += "package_ipk multimachine"
 BBINCLUDELOGS = "yes"
 IMAGE_FSTYPES = "tar.bz2"
 TARGET_OS = "linux"
@@ -87,7 +86,7 @@ QTE_VERSION = "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT = "yes"
 PREFERRED_PROVIDER_virtual/libqte2 = "qte-mt"
 PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie"
-OPIE_VERSION = "20060708"
+OPIE_VERSION = "20060709"
 include conf/distro/preferred-opie-cvs-versions.inc
 
 #<>
@@ -106,4 +105,3 @@ FULL_OPTIMIZATION = "-O1"
 #<>
 IMAGE_NAME = "${IMAGE_BASENAME}-Donkey-${MACHINE}"
 
-
diff --git a/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
index 9076355522..1b128ea6cb 100644
--- a/conf/machine/include/poodle-2.6.conf
+++ b/conf/machine/include/poodle-2.6.conf
@@ -35,9 +35,5 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
                              hostap-conf orinoco-conf"
 
 # Sound Modules
-###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm  \
-                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
-			     
-###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 "
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
+BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle "
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
index 8c91a7b29a..2433c5a748 100644
--- a/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -40,10 +40,8 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
 
 # Sound Modules
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss"
-BOOTSTRAP_EXTRA_SOUND 	  = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
-                             kernel-module-snd-pcm  \
-                             kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s"
 			     
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += " kernel-module-snd-soc-corgi "
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz "
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz "
+BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += " kernel-module-snd-soc-poodle "
diff --git a/packages/bitbake/bitbake_1.4.2.bb b/packages/bitbake/bitbake_1.4.2.bb
index 9f8f054355..0727eafd41 100644
--- a/packages/bitbake/bitbake_1.4.2.bb
+++ b/packages/bitbake/bitbake_1.4.2.bb
@@ -9,3 +9,9 @@ S = "${WORKDIR}/bitbake-${PV}"
 inherit distutils
 
 include bitbake-package.inc
+
+RDEPENDS += "python-shell python-lang python-textutils  python-pickle"
+
+PR = "r1"
+
+
diff --git a/packages/glib-2.0/glib-2.0_2.10.1.bb b/packages/glib-2.0/glib-2.0_2.10.1.bb
deleted file mode 100644
index 1f47883ef9..0000000000
--- a/packages/glib-2.0/glib-2.0_2.10.1.bb
+++ /dev/null
@@ -1,50 +0,0 @@
-DESCRIPTION = "GLib is a general-purpose utility library, \
-which provides many useful data types, macros, \
-type conversions, string utilities, file utilities, a main \
-loop abstraction, and so on. It works on many \
-UNIX-like platforms, Windows, OS/2 and BeOS."
-LICENSE = "LGPL"
-SECTION = "libs"
-PRIORITY = "optional"
-DEPENDS += "glib-2.0-native gtk-doc"
-DEPENDS += "virtual/libiconv virtual/libintl"
-PACKAGES =+ "glib-2.0-utils "
-PR = "r2"
-
-LEAD_SONAME = "libglib-2.0.*"
-FILES_glib-2.0-utils = "${bindir}/*"
-
-EXTRA_OECONF = "--disable-debug"
-
-DEFAULT_PREFERENCE="-1"
-
-SRC_URI = "http://download.gnome.org/sources/glib/2.10//glib-${PV}.tar.bz2 \
-           file://glibconfig-sysdefs.h \
-           file://configure-libtool.patch;patch=1"
-
-S = "${WORKDIR}/glib-${PV}"
-
-inherit autotools pkgconfig gettext
-
-python () {
-	if bb.data.getVar("USE_NLS", d, 1) == "no":
-		raise bb.parse.SkipPackage("${PN} requires native language support.")
-}
-
-acpaths = ""
-do_configure_prepend () {
-	install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h .
-}
-
-do_stage () {
-	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
-	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
-	autotools_stage_includes
-	install -d ${STAGING_INCDIR}/glib-2.0/glib
-	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
-	install -d ${STAGING_DATADIR}/aclocal
-	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
-	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
-}
diff --git a/packages/glib-2.0/glib-2.0_2.10.2.bb b/packages/glib-2.0/glib-2.0_2.8.6.bb
index 783c704674..eea05316b1 100644
--- a/packages/glib-2.0/glib-2.0_2.10.2.bb
+++ b/packages/glib-2.0/glib-2.0_2.8.6.bb
@@ -11,14 +11,14 @@ DEPENDS += "virtual/libiconv virtual/libintl"
 PACKAGES =+ "glib-2.0-utils "
 PR = "r1"
 
-DEFAULT_PREFERENCE = "-100"
-
 LEAD_SONAME = "libglib-2.0.*"
+FILES_${PN} = "${libdir}/lib*.so.*"
+FILES_${PN}-dev += "${libdir}/glib-2.0/include ${datadir}/glib-2.0/gettext"
 FILES_glib-2.0-utils = "${bindir}/*"
 
 EXTRA_OECONF = "--disable-debug"
 
-SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/glib-${PV}.tar.bz2 \
+SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.8/glib-${PV}.tar.bz2 \
            file://glibconfig-sysdefs.h \
            file://configure-libtool.patch;patch=1"
 
diff --git a/packages/gpe-timesheet/gpe-timesheet_0.31.bb b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
new file mode 100644
index 0000000000..ba97388877
--- /dev/null
+++ b/packages/gpe-timesheet/gpe-timesheet_0.31.bb
@@ -0,0 +1,10 @@
+LICENSE = "GPL"
+inherit autotools gpe
+
+DESCRIPTION = "GPE time tracker"
+GPE_TARBALL_SUFFIX = "bz2"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+DEPENDS = "libgpewidget gtk+ sqlite libtododb"
+SECTION = "gpe"
+RDEPENDS = "gpe-icons"
+PR = "r1"
diff --git a/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch
index a1bc077242..dd35dec53f 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/AsmArm-ArchSa1100-Jornada720.patch
@@ -1,13 +1,23 @@
---- linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h_orig	2006-07-02 23:42:42.000000000 +0000
-+++ linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h	2006-07-02 23:50:32.000000000 +0000
-@@ -19,9 +19,37 @@
+--- linux-2.6.17-vanilla/include/asm-arm/arch-sa1100/jornada720.h	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/include/asm-arm/arch-sa1100/jornada720.h	2006-07-10 17:06:11.000000000 +0000
+@@ -11,6 +11,8 @@
+ #error "include <asm/hardware.h> instead"
+ #endif
+ 
++#define jornada720_mcu_read() jornada720_mcu_byte(MCU_TxDummy)
++
+ #define SA1111_BASE             (0x40000000)
+ 
+ #define GPIO_JORNADA720_KEYBOARD	GPIO_GPIO(0)
+@@ -19,9 +21,38 @@
  #define GPIO_JORNADA720_KEYBOARD_IRQ	IRQ_GPIO0
  #define GPIO_JORNADA720_MOUSE_IRQ		IRQ_GPIO9
  
 +/* Epson 1356 LCD controll parameters */
-+#define REGISTER_OFFSET ((unsigned char *) 0xf00000000)
-+#define DISP_MEM_OFFSET ((unsigned char *) 0xf10000000)
-+#define DISP_MEM_OFFSET_PHYS ((unsigned char *) 0x482000000)
++#define REGISTER_OFFSET ((unsigned char *) 0xf0000000/* 0 */)
++#define DISP_MEM_OFFSET ((unsigned char *) 0xf1000000/* 0 */)
++#define DISP_MEM_OFFSET_PHYS ((unsigned char *) 0x48200000/* 0 filip wtf? */)
++#define ALLOCATED_FB_MEM_SIZE 0x80000 /* display memory size (512kb) */
 +
 +#define MAX_BPP              16
 +#define MAX_XRES            640
@@ -34,7 +44,7 @@
  void jornada720_mcu_init(void);
 +int  jornada720_mcu_byte(int arg_data);
 +int  jornada720_mcu_start(int arg_data);
-+voide jornada720_mcu_end(void);
++void jornada720_mcu_end(void);
  void jornada_contrast(int arg_contrast);
  void jornada720_battery(void);
  int jornada720_getkey(unsigned char *data, int size);
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch
index c957971629..e0d50ced38 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Cpu-Sa1110-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c_orig	2006-07-02 20:44:56.000000000 +0000
-+++ linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c	2006-07-02 20:50:11.000000000 +0000
+--- linux-2.6.17-vanilla/arch/arm/mach-sa1100/cpu-sa1110.c	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/arm/mach-sa1100/cpu-sa1110.c	2006-07-10 17:06:11.000000000 +0000
 @@ -70,6 +70,17 @@
  	.cas_latency		= 3,
  };
@@ -18,14 +18,12 @@
  static struct sdram_params samsung_k4s641632d_tc75 __initdata = {
  	.rows			= 14,
  	.tck			= 9,
-@@ -349,6 +360,11 @@
+@@ -349,6 +360,9 @@
  	if (machine_is_h3100())
  		sdram = &samsung_km416s4030ct;
  
-+        #if 0
-+        if (machine_is_jornada720())
-+	        sdram = &samsung_k4s281632b_1h;
-+	#endif	
++   if (machine_is_jornada720())
++		sdram = &samsung_k4s281632b_1h;
 +
  	if (sdram) {
  		printk(KERN_DEBUG "SDRAM: tck: %d trcd: %d trp: %d"
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch
index 61784c4040..d51252ca4c 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Arch-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/arch/arm/Kconfig_orig	2006-07-02 20:41:49.000000000 +0000
-+++ linux-2.6.17/arch/arm/Kconfig	2006-07-02 20:42:57.000000000 +0000
+--- linux-2.6.17-vanilla/arch/arm/Kconfig	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/arm/Kconfig	2006-07-10 17:06:11.000000000 +0000
 @@ -669,7 +669,7 @@
  
  config CPU_FREQ_SA1110
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch
index a66aec2e98..b9c632447c 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Keyboard-Jornada720.patch
@@ -1,12 +1,12 @@
---- linux-2.6.17/drivers/input/keyboard/Kconfig_orig	2006-07-02 23:14:40.000000000 +0000
-+++ linux-2.6.17/drivers/input/keyboard/Kconfig	2006-07-02 23:16:12.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/input/keyboard/Kconfig	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/Kconfig	2006-07-10 17:06:11.000000000 +0000
 @@ -183,4 +183,10 @@
  	  This driver implements support for HIL-keyboards attached
  	  to your machine, so normally you should say Y here.
  
 +config KEYBOARD_JORNADA720
 +        tristate "HP Jornada 720 Keyboard Support"
-+	depends on SA110_JORNADA720
++	depends on SA1100_JORNADA720
 +	default y
 +	help
 +	    Say yes here if you want Jornada 720 keyboard support.
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch
index 9b7fac44d5..b48a22885c 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Touchscreen-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/drivers/input/touchscreen/Kconfig_orig	2006-07-02 23:31:00.000000000 +0000
-+++ linux-2.6.17/drivers/input/touchscreen/Kconfig	2006-07-02 23:32:53.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/input/touchscreen/Kconfig	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/Kconfig	2006-07-10 17:06:11.000000000 +0000
 @@ -108,4 +108,11 @@
  	  To compile this driver as a module, choose M here: the
  	  module will be called hp680_ts_input.
@@ -9,6 +9,6 @@
 +	depends on SA1100_JORNADA720
 +	help
 +	  Say Y here if you are using a HP Jornada 710/720/728 handheld
-+	  and want to user the touchscreen.
++	  and want to use the touchscreen.
 +	  
  endif
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch
index aafcb90ecc..2f144a7593 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Kconfig-Video-Jornada720.patch
@@ -1,6 +1,6 @@
---- linux-2.6.17/drivers/video/Kconfig_orig	2006-07-02 23:34:29.000000000 +0000
-+++ linux-2.6.17/drivers/video/Kconfig	2006-07-02 23:38:36.000000000 +0000
-@@ -613,6 +613,17 @@
+--- linux-2.6.17-vanilla/drivers/video/Kconfig	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/video/Kconfig	2006-07-10 17:06:11.000000000 +0000
+@@ -613,6 +613,16 @@
  	  framebuffer.  Product specs at
  	  <http://www.erd.epson.com/vdc/html/products.htm>.
  
@@ -10,7 +10,6 @@
 +	select FB_CFB_FILLRECT
 +	select FB_CFB_COPYAREA
 +	select FB_CFB_IMAGEBLIT
-+	select FB_SOFT_CURSOR
 +	help
 +	Support for the 1356 framebuffer device on the HP Jornada
 +	710/720/728 hanheld pc.
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch
index cbbb98f2bb..89a81c899e 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Mach-Sa1100-Jornada720.patch
@@ -1,9 +1,11 @@
---- linux-2.6.17/arch/arm/mach-sa1100/jornada720.c_orig	2006-07-02 20:54:55.000000000 +0000
-+++ linux-2.6.17/arch/arm/mach-sa1100/jornada720.c	2006-07-02 23:12:58.000000000 +0000
-@@ -22,11 +22,139 @@
+--- linux-2.6.17-vanilla/arch/arm/mach-sa1100/jornada720.c	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/arch/arm/mach-sa1100/jornada720.c	2006-07-10 17:06:11.000000000 +0000
+@@ -22,11 +22,170 @@
  #include <asm/mach/map.h>
  #include <asm/mach/serial_sa1100.h>
  
++#include <asm/arch/jornada720.h>
++
 +#include <linux/lcd.h>
 +#include <linux/backlight.h>
 +#include <linux/fb.h>
@@ -43,14 +45,15 @@
 +               printk("jornada 720_mcu_byte: timed out\n");
 +	       return -1;
 +      }
-+      Ser4SSDR = MCU_rEVERSE(arg_data) << 8;
++      Ser4SSDR = MCU_REVERSE(arg_data) << 8;
 +      udelay(100);
 +      while ((Ser4SSSR & SSSR_RNE) == 0);
 +      i = Ser4SSDR;
 +      if (i > 0xff)
-+            printk("jornada720 mcu_byte: read %x\n". i):
++            printk("jornada720 mcu_byte: read %x\n", i);
 +      return MCU_REVERSE(i & 0xff) & 0xff;
 +}
++
 +              
 +int jornada720_mcu_start(int arg_data)
 +{
@@ -83,23 +86,23 @@
 +void jornada720_mcu_init(void)
 +{
 +
-+     int i;
++     /*int i;
 +     
 +     if (state) {
 +                 PPSR &= ~PPC_LDD1;
 +                 PPDR &= PPC_LDD1;
 +     }
-+     else {
++     else { */
 +                 PPSR |= PPC_LDD1;
-+     }
-+     return 0;
++     /*}
++     return 0;*/
 +}
 +
-+static int jornada720_backlight_get_power(struct backlight_device *bd)
++/*static int jornada720_backlight_get_power(struct backlight_device *bd)
 +{
 +
 +     return  ~(PPSR&PPC_LDD1);
-+}
++}*/
 +
 +static int jornada720_backlight_get_brightness(struct  backlight_device *bd)
 +{
@@ -112,7 +115,8 @@
 +
 +static int jornada720_backlight_set_brightness(struct backlight_device *bd)
 +{
-+     int brightness = 255 - value;
++	/* TODO: should it be substracted? */
++     int brightness = 255 - bd->props->brightness;
 +     jornada720_mcu_start(MCU_SetBrightness);
 +     jornada720_mcu_byte(brightness);
 +     jornada720_mcu_end();
@@ -121,33 +125,60 @@
 +
 +static struct backlight_properties jornada720_backlight_properties = {
 +       .owner                   =  THIS_MODULE,
-+       .set_power               =  jornada720_backlight_set_power,
-+       .get_power               =  jornada720_backlight_get_power,
 +       .get_brightness          =  jornada720_backlight_get_brightness,
-+       .set_brightness          =  jornada720_backlight_set_brightness,
++       .update_status           =  jornada720_backlight_set_brightness,
 +       .max_brightness          =  255,
++};
++
++static int jornada720_lcd_set_power(struct lcd_device *ld, int power)
++{
++	return 0;
++}
++
++static int jornada720_lcd_get_power(struct lcd_device *ld)
++{
++	return 1;
 +}
 +
-+static struct lcd_properties jornada 720_lcd_properties = {
++static int jornada720_lcd_get_contrast(struct lcd_device *ld)
++{
++	int contrast;
++
++	jornada720_mcu_start(MCU_GetContrast);
++	contrast = jornada720_mcu_read();
++	jornada720_mcu_end();
++
++	return contrast;
++}
++
++static int jornada720_lcd_set_contrast(struct lcd_device *ld, int contrast)
++{
++	jornada720_mcu_start(MCU_SetContrast);
++	jornada720_mcu_byte(contrast);
++	jornada720_mcu_end();
++	return 0;
++}
++
++static struct lcd_properties jornada720_lcd_properties = {
 +       .owner                   = THIS_MODULE,
 +       .set_power               = jornada720_lcd_set_power,
 +       .get_power               = jornada720_lcd_get_power,
 +       .set_contrast            = jornada720_lcd_set_contrast,
-+       .get_contrast            = jornada720_lcd_set_contrast,
++       .get_contrast            = jornada720_lcd_get_contrast,
 +       .max_contrast            = 255,
-+}
++};
 +
  static struct resource sa1111_resources[] = {
  	[0] = {
  		.start		= 0x40000000,
-@@ -77,6 +205,10 @@
+@@ -77,6 +236,10 @@
  		PPDR |= PPC_LDD3 | PPC_LDD4;
  
  		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 +
 +                jornada720_mcu_init();
 +		backlight_device_register("e1356fb", 0, &jornada720_backlight_properties);
-+		ldc_device_register("e1356fb", 0, &jornada720_lcd_properties);
++		lcd_device_register("e1356fb", 0, &jornada720_lcd_properties);
  	}
  	return ret;
  }
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch
index b1e2ab10e7..fc4e82c172 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Keyboard-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/drivers/input/keyboard/Makefile_orig	2006-07-02 23:22:40.000000000 +0000
-+++ linux-2.6.17/drivers/input/keyboard/Makefile	2006-07-02 23:23:03.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/input/keyboard/Makefile	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/Makefile	2006-07-10 17:06:11.000000000 +0000
 @@ -15,4 +15,4 @@
  obj-$(CONFIG_KEYBOARD_SPITZ)		+= spitzkbd.o
  obj-$(CONFIG_KEYBOARD_HIL)		+= hil_kbd.o
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch
index deabd5cded..879fc8b311 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Touchscreen-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/drivers/input/touchscreen/Makefile_orig	2006-07-02 23:28:02.000000000 +0000
-+++ linux-2.6.17/drivers/input/touchscreen/Makefile	2006-07-02 23:29:42.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/input/touchscreen/Makefile	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/Makefile	2006-07-10 17:06:11.000000000 +0000
 @@ -12,3 +12,4 @@
  obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
  obj-$(CONFIG_TOUCHSCREEN_MK712)	+= mk712.o
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch
index ae53cce9f3..147604a1b3 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Makefile-Video-Jornada720.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/drivers/video/Makefile_orig	2006-07-02 23:39:37.000000000 +0000
-+++ linux-2.6.17/drivers/video/Makefile	2006-07-02 23:40:15.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/video/Makefile	2006-06-18 01:49:35.000000000 +0000
++++ linux-2.6.17/drivers/video/Makefile	2006-07-10 17:06:11.000000000 +0000
 @@ -75,6 +75,7 @@
  obj-$(CONFIG_FB_SUN3)             += sun3fb.o
  obj-$(CONFIG_FB_HIT)              += hitfb.o
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch
index 7516f06dc9..2c3c93c74e 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Epson1356fb.patch
@@ -1,6 +1,6 @@
---- linux-2.6.17/drivers/video/epson1356fb.c_orig	2006-07-03 00:20:43.000000000 +0000
-+++ linux-2.6.17/drivers/video/epson1356fb.c	2006-07-03 00:16:37.000000000 +0000
-@@ -0,0 +1,341 @@
+--- linux-2.6.17-vanilla/drivers/video/epson1356fb.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/video/epson1356fb.c	2006-07-10 17:06:11.000000000 +0000
+@@ -0,0 +1,345 @@
 +/*
 + * linux/drivers/video/epson1356fb.c -- Epson 1356 LCD Controller Frame Buffer Device
 + *
@@ -34,8 +34,12 @@
 +#include <linux/dma-mapping.h>
 +
 +#include <asm/uaccess.h>
++#include <asm/hardware.h>
++
 +#include <asm/arch/jornada720.h>
 +
++#include "console/fbcon.h"
++
 +u32 pseudo_pal[16];
 +
 +struct fb_info fb_info;
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch
index d75cc7cd85..7259647021 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_kbd.patch
@@ -1,6 +1,6 @@
---- linux-2.6.17/drivers/input/keyboard/jornada720_kbd.c_orig	2006-07-03 00:18:52.000000000 +0000
-+++ linux-2.6.17/drivers/input/keyboard/jornada720_kbd.c	2006-07-03 00:16:36.000000000 +0000
-@@ -0,0 +1,97 @@
+--- linux-2.6.17-vanilla/drivers/input/keyboard/jornada720_kbd.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/input/keyboard/jornada720_kbd.c	2006-07-10 17:06:11.000000000 +0000
+@@ -0,0 +1,98 @@
 +/*
 + * Jornada 720 keyboard interface
 + */
@@ -25,7 +25,7 @@
 +
 +static char jornada720_kbd_name[] = "Jornada 720 keyboard";
 +
-+static struct input_dev dev;
++static struct input_dev *dev;
 +
 +static unsigned char jornada720_normal_keymap[128] = {
 +	0, 1, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 87, KEY_VOLUMEUP, KEY_VOLUMEDOWN, KEY_MUTE,
@@ -55,12 +55,12 @@
 +		keycode = jornada720_normal_keymap[key];
 +
 +		if (mcu_data < 128) {
-+			input_report_key(&dev, keycode, 1);
-+			input_sync(&dev);
++			input_report_key(dev, keycode, 1);
++			input_sync(dev);
 +		}
 +		else {
-+			input_report_key(&dev, keycode, 0);
-+			input_sync(&dev);
++			input_report_key(dev, keycode, 0);
++			input_sync(dev);
 +		}
 +	}
 +
@@ -74,25 +74,26 @@
 +	int i;
 +	printk("jorada720_kbd: Jornada 720 keyboard\n");
 +	
-+	init_input_dev(&dev);
-+	dev.evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
-+	dev.keybit[LONG(KEY_SUSPEND)] |= BIT(KEY_SUSPEND);
++	/*init_input_dev(&dev);*/
++	dev = input_allocate_device();
++	dev->evbit[0] = BIT(EV_KEY) | BIT(EV_REP);
++	dev->keybit[LONG(KEY_SUSPEND)] |= BIT(KEY_SUSPEND);
 +	
 +	for ( i=0 ; i<=128 ; i++ ) {
 +		if (!(jornada720_normal_keymap[i])) {
 +		}
 +		else
-+			set_bit(jornada720_normal_keymap[i], dev.keybit);
++			set_bit(jornada720_normal_keymap[i], dev->keybit);
 +	}
 +	
-+	dev.name = jornada720_kbd_name;
++	dev->name = jornada720_kbd_name;
 +
 +	if (request_irq(GPIO_JORNADA720_KEYBOARD_IRQ, jornada720_keyboard_interrupt, SA_INTERRUPT, "Jornada720 Keyboard", NULL))
 +		printk("Unable to grab Jornada 720 keyboard IRQ!\n");
 +		
 +	set_irq_type(GPIO_JORNADA720_KEYBOARD_IRQ, IRQT_FALLING);
 +			
-+	input_register_device(&dev);
++	input_register_device(dev);
 +	
 +	return 0;
 +}
diff --git a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch
index 6cfab690f3..b565d1077b 100644
--- a/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch
+++ b/packages/linux/linux-jlime-arm-2.6.17/Newfile-Jornada720_ts.patch
@@ -1,5 +1,5 @@
---- linux-2.6.17/drivers/input/touchscreen/jornada720_ts.c_orig	2006-07-03 00:17:18.000000000 +0000
-+++ linux-2.6.17/drivers/input/touchscreen/jornada720_ts.c	2006-07-03 00:16:37.000000000 +0000
+--- linux-2.6.17-vanilla/drivers/input/touchscreen/jornada720_ts.c	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.17/drivers/input/touchscreen/jornada720_ts.c	2006-07-10 17:06:11.000000000