merge of 'ae8724641e6c8131ac3706e49cd36a7e993fc697'

     and 'e74e0c0ff5084d996f1c4b3b2c87244159a057ee'

3 files changed, 63 insertions, 11 deletions

diff --git a/packages/linux/linux-2.6.24/time.h.patch b/packages/linux/linux-2.6.24/time.h.patch
new file mode 100644
index 0000000000..fd22f3a01d
--- /dev/null
+++ b/packages/linux/linux-2.6.24/time.h.patch
@@ -0,0 +1,25 @@
+....since some architectures don't support __udivdi3() (and
+ we don't want to use that, anyway).
+ 
+ Signed-off-by: Segher Boessenkool 
+ ---
+ include/linux/time.h | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+
+Index: linux-2.6.24/include/linux/time.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/time.h	2008-06-23 11:17:09.021841180 +0200
++++ linux-2.6.24/include/linux/time.h	2008-06-23 11:18:34.445167140 +0200
+@@ -173,6 +173,11 @@
+ {
+ 	ns += a->tv_nsec;
+ 	while(unlikely(ns >= NSEC_PER_SEC)) {
++		/* The following asm() prevents the compiler from
++		 * optimising this loop into a modulo operation.
++		 */
++		asm("" : "+r"(ns));
++
+ 		ns -= NSEC_PER_SEC;
+ 		a->tv_sec++;
+ 	}
diff --git a/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2
index 156b87cdbd..e47d99288f 100644
--- a/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch
+++ b/packages/linux/linux/simpad/linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2
@@ -1,6 +1,6 @@
 diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/arm/mach-sa1100/simpad.c
---- linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c	2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/arch/arm/mach-sa1100/simpad.c	2008-02-20 21:10:00.000000000 +0100
+--- linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c	2008-10-04 21:47:24.000000000 +0200
++++ linux-2.6.24/arch/arm/mach-sa1100/simpad.c	2008-10-04 22:01:20.000000000 +0200
 @@ -1,5 +1,15 @@
  /*
   * linux/arch/arm/mach-sa1100/simpad.c
@@ -154,7 +154,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
  static void __init simpad_map_io(void)
  {
  	sa1100_map_io();
-@@ -144,13 +216,12 @@
+@@ -144,23 +216,45 @@
  
  	set_cs3_bit (EN1 | EN0 | LED2_ON | DISPLAY_ON | RS232_ON |
  		      ENABLE_5V | RESET_SIMCARD | DECT_POWER_ON);
@@ -166,11 +166,37 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
  	sa1100_register_uart(1, 1);  /* DECT             */
  
 -	// Reassign UART 1 pins
-+	/* Reassign UART 1 pins */
++	/* Reassign UART 1 pins */	
++	/* TEST SOME OLD KERNEL STUFF INSTEAD
  	GAFR |= GPIO_UART_TXD | GPIO_UART_RXD;
  	GPDR |= GPIO_UART_TXD | GPIO_LDD13 | GPIO_LDD15;
  	GPDR &= ~GPIO_UART_RXD;
-@@ -160,7 +231,6 @@
+ 	PPAR |= PPAR_UPR;
++	*/
++	
++		// txd and rxd use their alternate function
++	GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD);
++
++	// the control lines are gpio
++	GAFR &= ~(GPIO_UART1_RTS | GPIO_UART1_CTS | GPIO_UART1_DCD);
++	GAFR &= ~(GPIO_UART1_DSR | GPIO_UART1_DTR);
++	GAFR &= ~(GPIO_UART3_RTS | GPIO_UART3_CTS | GPIO_UART3_DCD);
++	GAFR &= ~(GPIO_UART3_DSR | GPIO_UART3_DTR);
++
++	// txd, rts and dtr are outputs
++	GPDR |= GPIO_UART_TXD;
++	GPDR |= GPIO_UART1_RTS | GPIO_UART3_RTS;
++	GPDR |= GPIO_UART1_DTR | GPIO_UART3_DTR;
++
++	// cts, dcd, dsr and rxd are inputs
++	GPDR &= ~(GPIO_UART1_CTS | GPIO_UART3_CTS);
++	GPDR &= ~(GPIO_UART1_DCD | GPIO_UART3_DCD);
++	GPDR &= ~(GPIO_UART1_DSR | GPIO_UART3_DSR);
++	GPDR &= ~GPIO_UART_RXD;
++
++	PPAR |= PPAR_UPR;
+ 
+ 	/*
  	 * Set up registers for sleep mode.
  	 */
  
@@ -178,7 +204,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
  	PWER = PWER_GPIO0| PWER_RTC;
  	PGSR = 0x818;
  	PCFR = 0;
-@@ -171,9 +241,10 @@
+@@ -171,9 +265,10 @@
  	sa11x0_set_mcp_data(&simpad_mcp_data);
  }
  
@@ -190,7 +216,7 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
  	set_cs3(0x800);        /* only SD_MEDIAQ */
  
  	/* disable internal oscillator, float CS lines */
-@@ -191,31 +262,52 @@
+@@ -191,31 +286,52 @@
  	while(1);
  
  	local_irq_enable(); /* we won't ever call it */
@@ -248,8 +274,8 @@ diff -Nur linux-2.6.24.vanilla/arch/arm/mach-sa1100/simpad.c linux-2.6.24/arch/a
  	if(ret)
  		printk(KERN_WARNING "simpad: Unable to register mq200 framebuffer device");
 diff -Nur linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h
---- linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h	2008-01-24 23:58:37.000000000 +0100
-+++ linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h	2008-02-20 21:10:00.000000000 +0100
+--- linux-2.6.24.vanilla/include/asm-arm/arch-sa1100/simpad.h	2008-10-04 21:47:17.000000000 +0200
++++ linux-2.6.24/include/asm-arm/arch-sa1100/simpad.h	2008-10-04 22:00:57.000000000 +0200
 @@ -12,11 +12,12 @@
  #define __ASM_ARCH_SIMPAD_H
  
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 7fd2f457e4..7c92cb2ed0 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -10,10 +10,11 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
 DEFAULT_PREFERENCE_ts72xx = "1"
 DEFAULT_PREFERENCE_cs-e9302 = "1"
 
-PR = "r14"
+PR = "r16"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+	   file://time.h.patch;patch=1 \
            file://defconfig"
 
 # Moved away temporarely until committed properly (work in progress).
@@ -27,7 +28,7 @@ SRC_URI_append_simpad = "\
            file://linux-2.6.24-SIMpad-cs3-simpad.patch;patch=1 \
            file://linux-2.6.24-SIMpad-mq200.patch;patch=1 \
            file://linux-2.6.24-SIMpad-pcmcia.patch;patch=1 \
-           file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch;patch=1 \
+           file://linux-2.6.24-SIMpad-serial-gpio_keys-and-cs3-ro.patch.v2;patch=1 \ 
            file://linux-2.6.24-SIMpad-ucb1x00-switches.patch;patch=1 \
            file://linux-2.6.24-SIMpad-ucb1x00-ts-supend-and-accuracy.patch;patch=1 \
            file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \