armadeus-commitlog — Armadeus GIT commit logs

[Armadeus-commitlog] SF.net SVN: armadeus: [655] trunk/buildroot

[<jo...@us...>]

Revision: 655
          http://armadeus.svn.sourceforge.net/armadeus/?rev=655&view=rev
Author:   jorasse
Date:     2007-10-21 02:45:32 -0700 (Sun, 21 Oct 2007)

Log Message:
-----------
adapt Armadeus target menu look&feel to the new buildroot model

Modified Paths:
--------------
    trunk/buildroot/package/ch7024ctrl/Config.in
    trunk/buildroot/package/max5821ctrl/Config.in
    trunk/buildroot/target/device/armadeus/Config.in

Modified: trunk/buildroot/package/ch7024ctrl/Config.in
===================================================================
--- trunk/buildroot/package/ch7024ctrl/Config.in	2007-10-20 18:58:54 UTC (rev 654)
+++ trunk/buildroot/package/ch7024ctrl/Config.in	2007-10-21 09:45:32 UTC (rev 655)
@@ -1,6 +1,6 @@
 config BR2_PACKAGE_CH7024CTRL
 	bool "ch7024ctrl"
-	depends BR2_ARMADEUS_PACKAGE
+	depends BR2_TARGET_ARMADEUS
 	default n
 	help
 	  Build CH7024 control tool. It allows you to configure the Svideo output of the DevFull directly 

Modified: trunk/buildroot/package/max5821ctrl/Config.in
===================================================================
--- trunk/buildroot/package/max5821ctrl/Config.in	2007-10-20 18:58:54 UTC (rev 654)
+++ trunk/buildroot/package/max5821ctrl/Config.in	2007-10-21 09:45:32 UTC (rev 655)
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_MAX5821CTRL
 	bool "max5821ctrl"
-	depends BR2_ARMADEUS_PACKAGE
 	default y
 	help
 	  Build MAX5821 control tool. It allows you to set the I2C MAX5821 DAC directly 

Modified: trunk/buildroot/target/device/armadeus/Config.in
===================================================================
--- trunk/buildroot/target/device/armadeus/Config.in	2007-10-20 18:58:54 UTC (rev 654)
+++ trunk/buildroot/target/device/armadeus/Config.in	2007-10-21 09:45:32 UTC (rev 655)
@@ -1,19 +1,16 @@
-comment "Armadeus project Specific Device Support"
-	depends BR2_arm
-
-config BR2_TARGET_ARMADEUS
-	bool "Board support for the Armadeus development boards"
-	depends BR2_arm
+menuconfig BR2_TARGET_ARMADEUS
+	bool "Armadeus Device Support"
+	depends on BR2_arm
 	default n
-	select BR2_ARMADEUS_PACKAGE
 	help
 	  Armadeus arm based systems
 
+if BR2_TARGET_ARMADEUS
 
 choice
 	prompt "Armadeus target device"
 	default BR2_TARGET_ARMADEUS_APF9328
-	depends on BR2_TARGET_ARMADEUS
+	depends on BR2_arm && BR2_TARGET_ARMADEUS
 	help
 	  Armadeus target device 
 
@@ -54,24 +51,10 @@
 	default "64"		if BR2_TARGET_ARMADEUS_SDRAM_64
 
 
-config BR2_ARMADEUS_PACKAGE
-	bool "armadeus packages"
-	default n
-	depends BR2_TARGET_ARMADEUS
-	source package/max5821ctrl/Config.in
-	comment "---"
-
-config BR2_ARMADEUS_PACKAGE
-	bool "armadeus packages"
-	default n
-	depends BR2_TARGET_ARMADEUS
-	source package/ch7024ctrl/Config.in
-	comment "---"    
-    
 config BR2_PACKAGE_LINUX_ARM
 	bool "linux"
 	default n
-	depends BR2_TARGET_ARMADEUS
+	depends BR2_arm && BR2_TARGET_ARMADEUS
 	select BR2_TARGET_U-BOOT
 	help
 	    The Linux kernel.
@@ -102,9 +85,9 @@
 config BR2_TARGET_U-BOOT
 	bool "U-Boot"
 	default n
-	depends BR2_TARGET_ARMADEUS
+	depends BR2_arm && BR2_TARGET_ARMADEUS
 	help
 	  The U-Boot universal bootloader for embedded systems.
 
+endif
 
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [654] trunk

[<jo...@us...>]

Revision: 654
          http://armadeus.svn.sourceforge.net/armadeus/?rev=654&view=rev
Author:   jorasse
Date:     2007-10-20 11:58:54 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
- Changed reference server to download buildroot package
- fixed gcc patch to fix shared lib gcc deployement

Modified Paths:
--------------
    trunk/Makefile
    trunk/patches/030-buildroot-gcc.diff

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-10-20 18:03:20 UTC (rev 653)
+++ trunk/Makefile	2007-10-20 18:58:54 UTC (rev 654)
@@ -26,7 +26,7 @@
 
 BUILDROOT_NAME=buildroot
 BUILDROOT_FILE_PATH:=downloads
-BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots/
+BUILDROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
 BUILDROOT_VERSION:=20071006
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 

Modified: trunk/patches/030-buildroot-gcc.diff
===================================================================
--- trunk/patches/030-buildroot-gcc.diff	2007-10-20 18:03:20 UTC (rev 653)
+++ trunk/patches/030-buildroot-gcc.diff	2007-10-20 18:58:54 UTC (rev 654)
@@ -1,13 +1,13 @@
 diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk buildroot/toolchain/gcc/gcc-uclibc-3.x.mk
 --- buildrootref/toolchain/gcc/gcc-uclibc-3.x.mk	2007-10-15 22:41:00.000000000 +0200
 +++ buildroot/toolchain/gcc/gcc-uclibc-3.x.mk	2007-10-20 18:04:02.000000000 +0200
-@@ -327,8 +327,7 @@ endif
+@@ -327,8 +327,8 @@ endif
  	#
  	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
  	touch $@
--
+
 -$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s*
++$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
  ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
  	# These are in /lib, so...
  	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*
@@ -23,13 +23,13 @@
 diff -purN -x .svn -x '*~' buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk buildroot/toolchain/gcc/gcc-uclibc-4.x.mk
 --- buildrootref/toolchain/gcc/gcc-uclibc-4.x.mk	2007-10-15 22:41:00.000000000 +0200
 +++ buildroot/toolchain/gcc/gcc-uclibc-4.x.mk	2007-10-20 18:06:25.000000000 +0200
-@@ -340,14 +340,15 @@ endif
+@@ -340,14 +340,16 @@ endif
  	#
  	mkdir -p $(TARGET_DIR)/usr/lib $(TARGET_DIR)/usr/sbin
  	touch $@
--
+
 -$(GCC_BUILD_DIR2)/.libs_installed: $(GCC_BUILD_DIR2)/.installed
-+$(TARGET_DIR)/lib/libgcc_s*: $(STAGING_DIR)/usr/$(REAL_GNU_TARGET_NAME)/lib/libgcc_s*
++$(TARGET_DIR)/lib/libgcc_s*: $(GCC_BUILD_DIR2)/.installed
  ifeq ($(BR2_GCC_SHARED_LIBGCC),y)
  	# These are in /lib, so...
  	rm -rf $(TARGET_DIR)/usr/lib/libgcc_s*.so*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [653] trunk/patches/004-Buildroot-defconfig.diff

[<jo...@us...>]

Revision: 653
          http://armadeus.svn.sourceforge.net/armadeus/?rev=653&view=rev
Author:   jorasse
Date:     2007-10-20 11:03:20 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
added package Portmap

Modified Paths:
--------------
    trunk/patches/004-Buildroot-defconfig.diff

Modified: trunk/patches/004-Buildroot-defconfig.diff
===================================================================
--- trunk/patches/004-Buildroot-defconfig.diff	2007-10-20 17:31:12 UTC (rev 652)
+++ trunk/patches/004-Buildroot-defconfig.diff	2007-10-20 18:03:20 UTC (rev 653)
@@ -1,9 +1,9 @@
 --- buildroot/.defconfig.ori	2007-10-06 09:15:54.000000000 +0200
-+++ buildroot/.defconfig	2007-10-20 17:04:57.000000000 +0200
++++ buildroot/.defconfig	2007-10-20 19:58:01.000000000 +0200
 @@ -1,19 +1,150 @@
  #
  # Automatically generated make config: don't edit
-+# Sat Oct 20 17:04:57 2007
++# Sat Oct 20 19:58:01 2007
  #
  BR2_HAVE_DOT_CONFIG=y
 -# BR2_arm is not set
@@ -388,7 +388,7 @@
 +# BR2_PACKAGE_OPENSSL is not set
 +# BR2_PACKAGE_OPENVPN is not set
 +# BR2_PACKAGE_OPENSWAN is not set
-+# BR2_PACKAGE_PORTMAP is not set
++BR2_PACKAGE_PORTMAP=y
 +# BR2_PACKAGE_PPPD is not set
 +# BR2_PACKAGE_RP_PPPOE is not set
 +# BR2_PACKAGE_PPTP_LINUX is not set


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [652] trunk/patches

[<jo...@us...>]

Revision: 652
          http://armadeus.svn.sourceforge.net/armadeus/?rev=652&view=rev
Author:   jorasse
Date:     2007-10-20 10:31:12 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
fixed filename typo

Added Paths:
-----------
    trunk/patches/026-buildroot-jffs2root.diff

Removed Paths:
-------------
    trunk/patches/026-buildroot.jffs2root.diff

Copied: trunk/patches/026-buildroot-jffs2root.diff (from rev 651, trunk/patches/026-buildroot.jffs2root.diff)
===================================================================
--- trunk/patches/026-buildroot-jffs2root.diff	                        (rev 0)
+++ trunk/patches/026-buildroot-jffs2root.diff	2007-10-20 17:31:12 UTC (rev 652)
@@ -0,0 +1,15 @@
+diff -purN -x .svn -x '*~' buildrootref/target/jffs2/jffs2root.mk buildroot/target/jffs2/jffs2root.mk
+--- buildrootref/target/jffs2/jffs2root.mk	2007-10-15 22:41:05.000000000 +0200
++++ buildroot/target/jffs2/jffs2root.mk	2007-10-15 21:06:03.000000000 +0200
+@@ -57,7 +57,10 @@ endif
+ ifneq ($(BR2_HAVE_INFOPAGES),y)
+ 	@rm -rf $(TARGET_DIR)/usr/info
+ endif
+-	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
++	@test -d $(TARGET_DIR)/usr/share && \
++		rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
++		true
++#	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
+ 	$(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
+ 	# Use fakeroot to pretend all target binaries are owned by root
+ 	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))

Deleted: trunk/patches/026-buildroot.jffs2root.diff
===================================================================
--- trunk/patches/026-buildroot.jffs2root.diff	2007-10-20 17:18:22 UTC (rev 651)
+++ trunk/patches/026-buildroot.jffs2root.diff	2007-10-20 17:31:12 UTC (rev 652)
@@ -1,15 +0,0 @@
-diff -purN -x .svn -x '*~' buildrootref/target/jffs2/jffs2root.mk buildroot/target/jffs2/jffs2root.mk
---- buildrootref/target/jffs2/jffs2root.mk	2007-10-15 22:41:05.000000000 +0200
-+++ buildroot/target/jffs2/jffs2root.mk	2007-10-15 21:06:03.000000000 +0200
-@@ -57,7 +57,10 @@ endif
- ifneq ($(BR2_HAVE_INFOPAGES),y)
- 	@rm -rf $(TARGET_DIR)/usr/info
- endif
--	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
-+	@test -d $(TARGET_DIR)/usr/share && \
-+		rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share || \
-+		true
-+#	@rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share
- 	$(if $(TARGET_LDCONFIG),test -x $(TARGET_LDCONFIG) && $(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null)
- 	# Use fakeroot to pretend all target binaries are owned by root
- 	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(JFFS2_TARGET))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [651] trunk/patches/025-buildroot-armadeus.diff

[<jo...@us...>]

Revision: 651
          http://armadeus.svn.sourceforge.net/armadeus/?rev=651&view=rev
Author:   jorasse
Date:     2007-10-20 10:18:22 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
unexpected patch - shame on me!

Removed Paths:
-------------
    trunk/patches/025-buildroot-armadeus.diff

Deleted: trunk/patches/025-buildroot-armadeus.diff
===================================================================
--- trunk/patches/025-buildroot-armadeus.diff	2007-10-20 17:12:30 UTC (rev 650)
+++ trunk/patches/025-buildroot-armadeus.diff	2007-10-20 17:18:22 UTC (rev 651)
@@ -1,69 +0,0 @@
-diff -purN -x .svn -x '*~' buildrootref/target/device/armadeus/Config.in buildroot/target/device/armadeus/Config.in
---- buildrootref/target/device/armadeus/Config.in	2007-10-15 22:30:18.000000000 +0200
-+++ buildroot/target/device/armadeus/Config.in	2007-10-14 23:35:28.000000000 +0200
-@@ -68,7 +68,7 @@ config BR2_ARMADEUS_PACKAGE
- 	source package/ch7024ctrl/Config.in
- 	comment "---"    
-     
--config BR2_PACKAGE_LINUX
-+config BR2_PACKAGE_LINUX_ARM
- 	bool "linux"
- 	default n
- 	depends BR2_TARGET_ARMADEUS
-@@ -79,7 +79,7 @@ config BR2_PACKAGE_LINUX
- choice
- 	prompt "Linux kernel version"
- 	default BR2_PACKAGE_LINUX_VERSION_2_6_12
--	depends on BR2_PACKAGE_LINUX
-+	depends on BR2_PACKAGE_LINUX_ARM
- 	help
- 	    Linux kernel version you want to use with your Armadeus board.
- 	    If you plan to use MMC/SD cards then choose 2.6.18.1, otherwise 2.6.12
-diff -purN -x .svn -x '*~' buildrootref/target/device/armadeus/linux/linux.mk buildroot/target/device/armadeus/linux/linux.mk
---- buildrootref/target/device/armadeus/linux/linux.mk	2007-10-15 22:30:17.000000000 +0200
-+++ buildroot/target/device/armadeus/linux/linux.mk	2007-10-14 23:35:40.000000000 +0200
-@@ -173,6 +173,6 @@ endif
- 	-(cd $(BUILD_DIR); \
- 	diff -purN -x '*~' ref/linux-$(LINUX_VERSION) linux-$(LINUX_VERSION) > $(BUILD_DIR)/../newlinux.diff)
- 
--ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
-+ifeq ($(strip $(BR2_PACKAGE_LINUX_ARM)),y)
- TARGETS+=linux
- endif
-diff -purN -x .svn -x '*~' buildrootref/target/device/armadeus/Makefile.in buildroot/target/device/armadeus/Makefile.in
---- buildrootref/target/device/armadeus/Makefile.in	2007-10-15 22:30:18.000000000 +0200
-+++ buildroot/target/device/armadeus/Makefile.in	2007-10-14 23:28:34.000000000 +0200
-@@ -1,6 +1,7 @@
- # Override the default uClibc configuration
- ifeq ($(strip $(BR2_TARGET_ARMADEUS)),y)
- 
-+
- ARMADEUS_PATH=target/device/armadeus
- ARMADEUS_TARGET_NAME=$(strip $(subst ",, $(BR2_TARGET_ARMADEUS_NAME)))
- ARMADEUS_CONFIG_PATH=$(ARMADEUS_PATH)/$(ARMADEUS_TARGET_NAME)
-@@ -10,8 +11,11 @@ include target/device/armadeus/linux/lin
- include target/device/armadeus/rootfs/Makefile.in
- include target/device/armadeus/$(ARMADEUS_TARGET_NAME)/Makefile.in
- 
-+LINUX26_KCONFIG=$(ARMADEUS_CONFIG_PATH)/linux-$(BR2_PACKAGE_LINUX_VERSION).config
-+LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
-+DOWNLOAD_LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
- 
--BR2_PACKAGE_BUSYBOX_CONFIG=$(ARMADEUS_PATH)/busybox.config
--UCLIBC_CONFIG_FILE=$(ARMADEUS_PATH)/uClibc.config.$(ARCH)
-+#BR2_PACKAGE_BUSYBOX_CONFIG=$(ARMADEUS_PATH)/busybox.config
-+#UCLIBC_CONFIG_FILE=$(ARMADEUS_PATH)/uClibc.config.$(ARCH)
- endif
- 
-diff -purN -x .svn -x '*~' buildrootref/target/device/armadeus/rootfs/Makefile.in buildroot/target/device/armadeus/rootfs/Makefile.in
---- buildrootref/target/device/armadeus/rootfs/Makefile.in	2007-10-15 22:30:18.000000000 +0200
-+++ buildroot/target/device/armadeus/rootfs/Makefile.in	2007-10-15 21:20:14.000000000 +0200
-@@ -1,5 +1,5 @@
- # Armadeus target skeleton stuff, may be overridden
--TARGET_SKELETON=$(ARMADEUS_PATH)/rootfs/skel.tar.gz
--TARGET_SKEL_DIR=$(ARMADEUS_PATH)/rootfs/target_skeleton
--TARGET_DEVICE_TABLE=$(ARMADEUS_PATH)/rootfs/device_table.txt
-+TARGET_SKELETON_LINKS:=$(ARMADEUS_PATH)/rootfs/skel.tar.gz
-+TARGET_SKELETON:=$(ARMADEUS_PATH)/rootfs/target_skeleton
-+TARGET_DEVICE_TABLE:=$(ARMADEUS_PATH)/rootfs/device_table.txt
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [650] trunk

[<jo...@us...>]

Revision: 650
          http://armadeus.svn.sourceforge.net/armadeus/?rev=650&view=rev
Author:   jorasse
Date:     2007-10-20 10:12:30 -0700 (Sat, 20 Oct 2007)

Log Message:
-----------
updated to buildroot-20071006 ( phase 1 )

Modified Paths:
--------------
    trunk/Makefile
    trunk/buildroot/target/device/armadeus/Config.in
    trunk/buildroot/target/device/armadeus/Makefile.in
    trunk/buildroot/target/device/armadeus/busybox.config
    trunk/buildroot/target/device/armadeus/linux/linux.mk
    trunk/buildroot/target/device/armadeus/rootfs/Makefile.in
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile
    trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk
    trunk/buildroot/target/device/armadeus/uClibc.config.arm
    trunk/patches/001-buildroot.diff
    trunk/patches/002-buildroot-linuxdep.diff
    trunk/patches/004-Buildroot-defconfig.diff
    trunk/patches/005-buildroot-imxregs.diff
    trunk/patches/006-buildroot-lcd4linux.diff
    trunk/patches/007-buildroot-qt_opie.diff
    trunk/patches/008-buildroot-fpgaregs.diff
    trunk/patches/010-buildroot-uclibc.diff
    trunk/patches/012-buildroot-gdb-arm-corefile-support.diff
    trunk/patches/013-buildroot-strace-arm-support.diff
    trunk/patches/016-buildroot-prboom.diff
    trunk/patches/018-buildroot-allegro.diff
    trunk/patches/019-buildroot-lua.diff
    trunk/patches/020-buildroot-ipkg.diff
    trunk/patches/022-buildroot-alsa-lib-utils.diff
    trunk/target/linux/modules/Makefile

Added Paths:
-----------
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/bin/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/pts/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/home/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/lib/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/mmc/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/nfs/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/mnt/smb/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/opt/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/proc/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/sbin/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/tmp/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/bin/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/lib/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/usr/sbin/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
    trunk/patches/024-buildroot-mtd-utils.diff
    trunk/patches/025-buildroot-armadeus.diff
    trunk/patches/026-buildroot.jffs2root.diff
    trunk/patches/030-buildroot-gcc.diff

Removed Paths:
-------------
    trunk/buildroot/package/fbset/
    trunk/buildroot/package/samba/
    trunk/buildroot/package/tslib/
    trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S18portmap
    trunk/patches/003-Buildroot-fbset.diff
    trunk/patches/014-buildroot-samba.diff
    trunk/patches/023-buildroot-tslib.diff

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/Makefile	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,6 +1,6 @@
 # Makefile for armadeus
 #
-# Copyright (C) 2005-2006 by Eric Jarrige <jo...@so...>
+# Copyright (C) 2005-2006 by <jo...@ar...>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@
 
 BUILDROOT_NAME=buildroot
 BUILDROOT_FILE_PATH:=downloads
-BUILDROOT_SITE:=ftp://ftp2.armadeus.com/armadeus/download
-BUILDROOT_VERSION:=20061030
+BUILDROOT_SITE:=http://buildroot.uclibc.org/downloads/snapshots/
+BUILDROOT_VERSION:=20071006
 BUILDROOT_SOURCE:=buildroot-$(BUILDROOT_VERSION).tar.bz2
 
 PATCH_DIR=patches
@@ -35,20 +35,13 @@
 TAR_OPTIONS=--exclude=.svn -xf 
 
 #used only by cygwin to restore the rights on some rootfs directories
-BUILDROOT_ROOT_DIR=$(BUILDROOT_DIR)/build_arm_nofpu/root
+BUILDROOT_ROOT_DIR=$(BUILDROOT_DIR)/project_build_arm/root
 
 LINUX-REL=`grep "BR2_PACKAGE_LINUX_VERSION=" $(BUILDROOT_DIR)/.config | \
       sed "s/BR2_PACKAGE_LINUX_VERSION=\\"//" | sed "s/\\"//"`
-LINUX_DIR=$(BUILDROOT_DIR)/build_arm_nofpu/linux-$(LINUX-REL)
+LINUX_DIR=$(BUILDROOT_DIR)/build_arm/linux-$(LINUX-REL)
 
-UCLIBC-REL=`grep "UCLIBC_VER:=" $(BUILDROOT_DIR)/toolchain/uClibc/uclibc.mk | \
-      sed "s/UCLIBC_VER:=//"`
-UCLIBC_DIR=$(BUILDROOT_DIR)/toolchain_build_arm_nofpu/uClibc-$(UCLIBC-REL)
 
-BUSYBOX-REL=`grep "BUSYBOX_VER:=" $(BUILDROOT_DIR)/package/busybox/busybox.mk | \
-      sed "s/BUSYBOX_VER:=//"`
-BUSYBOX_DIR=$(BUILDROOT_DIR)/build_arm_nofpu/busybox-$(BUSYBOX-REL)
-
 all: buildroot
 
 help:
@@ -111,16 +104,7 @@
 menuconfig: $(BUILDROOT_DIR)/.unpacked
 	@$(MAKE) -C $(BUILDROOT_DIR) menuconfig
 
-uclibc-menuconfig:
-	@if [ -e "$(UCLIBC_DIR)/.unpacked" ] ; then \
-		$(MAKE) -C $(UCLIBC_DIR) menuconfig ; \
-	fi;
 
-busybox-menuconfig:
-	@if [ -e "$(BUSYBOX_DIR)/.unpacked" ] ; then \
-		$(MAKE) -C $(BUSYBOX_DIR) menuconfig ; \
-	fi;
-	
 linux-menuconfig:
 	@if [ -e "$(LINUX_DIR)/.unpacked" ] ; then \
 		$(MAKE) -C $(LINUX_DIR) menuconfig ; \

Modified: trunk/buildroot/target/device/armadeus/Config.in
===================================================================
--- trunk/buildroot/target/device/armadeus/Config.in	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/Config.in	2007-10-20 17:12:30 UTC (rev 650)
@@ -68,7 +68,7 @@
 	source package/ch7024ctrl/Config.in
 	comment "---"    
     
-config BR2_PACKAGE_LINUX
+config BR2_PACKAGE_LINUX_ARM
 	bool "linux"
 	default n
 	depends BR2_TARGET_ARMADEUS
@@ -79,7 +79,7 @@
 choice
 	prompt "Linux kernel version"
 	default BR2_PACKAGE_LINUX_VERSION_2_6_12
-	depends on BR2_PACKAGE_LINUX
+	depends on BR2_PACKAGE_LINUX_ARM
 	help
 	    Linux kernel version you want to use with your Armadeus board.
 	    If you plan to use MMC/SD cards then choose 2.6.18.1, otherwise 2.6.12

Modified: trunk/buildroot/target/device/armadeus/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/Makefile.in	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/Makefile.in	2007-10-20 17:12:30 UTC (rev 650)
@@ -10,6 +10,9 @@
 include target/device/armadeus/rootfs/Makefile.in
 include target/device/armadeus/$(ARMADEUS_TARGET_NAME)/Makefile.in
 
+LINUX26_KCONFIG=$(ARMADEUS_CONFIG_PATH)/linux-$(BR2_PACKAGE_LINUX_VERSION).config
+LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
+DOWNLOAD_LINUX26_VERSION=$(strip $(subst ",, $(BR2_PACKAGE_LINUX_VERSION)))
 
 BR2_PACKAGE_BUSYBOX_CONFIG=$(ARMADEUS_PATH)/busybox.config
 UCLIBC_CONFIG_FILE=$(ARMADEUS_PATH)/uClibc.config.$(ARCH)

Modified: trunk/buildroot/target/device/armadeus/busybox.config
===================================================================
--- trunk/buildroot/target/device/armadeus/busybox.config	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/busybox.config	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,7 +1,9 @@
 #
 # Automatically generated make config: don't edit
+# Busybox version: 1.7.2
+# Sat Oct 20 16:58:49 2007
 #
-HAVE_DOT_CONFIG=y
+CONFIG_HAVE_DOT_CONFIG=y
 
 #
 # Busybox Settings
@@ -10,23 +12,28 @@
 #
 # General Configuration
 #
-# CONFIG_NITPICK is not set
-# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_NITPICK=y
+CONFIG_DESKTOP=y
+CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
 CONFIG_SHOW_USAGE=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_COMPRESS_USAGE is not set
-# CONFIG_FEATURE_INSTALLER is not set
+CONFIG_FEATURE_INSTALLER=y
 # CONFIG_LOCALE_SUPPORT is not set
 CONFIG_GETOPT_LONG=y
 CONFIG_FEATURE_DEVPTS=y
-# CONFIG_FEATURE_CLEAN_UP is not set
+CONFIG_FEATURE_CLEAN_UP=y
+# CONFIG_FEATURE_PIDFILE is not set
 CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_FEATURE_SUID_CONFIG_QUIET is not set
 # CONFIG_SELINUX is not set
+# CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
+CONFIG_FEATURE_SYSLOG=y
+CONFIG_FEATURE_HAVE_RPC=y
 
 #
 # Build Options
@@ -36,19 +43,17 @@
 # CONFIG_FEATURE_FULL_LIBBUSYBOX is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
-# USING_CROSS_COMPILER is not set
-CROSS_COMPILER_PREFIX=""
-# CONFIG_BUILD_AT_ONCE is not set
+CONFIG_BUILD_AT_ONCE=y
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
-# CONFIG_DEBUG_PESSIMIZE is not set
-# CONFIG_NO_DEBUG_LIB is not set
+# CONFIG_WERROR is not set
+CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
 # CONFIG_EFENCE is not set
-CONFIG_DEBUG_YANK_SUSv2=y
+CONFIG_INCLUDE_SUSv2=y
 
 #
 # Installation Options
@@ -57,12 +62,26 @@
 CONFIG_INSTALL_APPLET_SYMLINKS=y
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
 # CONFIG_INSTALL_APPLET_DONT is not set
-PREFIX="./_install"
+CONFIG_PREFIX="/home/eric/arm/armaocto2/buildroot/project_build_arm/armadeus/root"
 
 #
 # Busybox Library Tuning
 #
+CONFIG_PASSWORD_MINLEN=6
 CONFIG_MD5_SIZE_VS_SPEED=2
+CONFIG_FEATURE_FAST_TOP=y
+# CONFIG_FEATURE_ETC_NETWORKS is not set
+CONFIG_FEATURE_EDITING=y
+CONFIG_FEATURE_EDITING_MAX_LEN=1024
+CONFIG_FEATURE_EDITING_FANCY_KEYS=y
+CONFIG_FEATURE_EDITING_VI=y
+CONFIG_FEATURE_EDITING_HISTORY=999
+CONFIG_FEATURE_EDITING_SAVEHISTORY=y
+CONFIG_FEATURE_TAB_COMPLETION=y
+# CONFIG_FEATURE_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_EDITING_FANCY_PROMPT=y
+CONFIG_MONOTONIC_SYSCALL=y
+CONFIG_IOCTL_HEX2STR_ERROR=y
 
 #
 # Applets
@@ -71,10 +90,10 @@
 #
 # Archival Utilities
 #
-# CONFIG_AR is not set
+CONFIG_AR=y
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 CONFIG_BUNZIP2=y
-# CONFIG_CPIO is not set
+CONFIG_CPIO=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
@@ -83,18 +102,20 @@
 CONFIG_GZIP=y
 # CONFIG_RPM2CPIO is not set
 # CONFIG_RPM is not set
+# CONFIG_FEATURE_RPM_BZ2 is not set
 CONFIG_TAR=y
 CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
-# CONFIG_FEATURE_TAR_LZMA is not set
-# CONFIG_FEATURE_TAR_FROM is not set
+CONFIG_FEATURE_TAR_LZMA=y
+CONFIG_FEATURE_TAR_FROM=y
 CONFIG_FEATURE_TAR_GZIP=y
 # CONFIG_FEATURE_TAR_COMPRESS is not set
 # CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set
+# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set
 CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
-# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set
+CONFIG_FEATURE_TAR_LONG_OPTIONS=y
 # CONFIG_UNCOMPRESS is not set
-# CONFIG_UNLZMA is not set
+CONFIG_UNLZMA=y
 # CONFIG_FEATURE_LZMA_FAST is not set
 CONFIG_UNZIP=y
 
@@ -112,13 +133,12 @@
 CONFIG_BASENAME=y
 # CONFIG_CAL is not set
 CONFIG_CAT=y
-# CONFIG_CATV is not set
+CONFIG_CATV=y
 CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
 CONFIG_CHROOT=y
-# CONFIG_CKSUM is not set
-CONFIG_CMP=y
+CONFIG_CKSUM=y
 # CONFIG_COMM is not set
 CONFIG_CP=y
 CONFIG_CUT=y
@@ -126,12 +146,8 @@
 CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_FEATURE_DD_SIGNAL_HANDLING=y
-# CONFIG_FEATURE_DD_IBS_OBS is not set
+CONFIG_FEATURE_DD_IBS_OBS=y
 CONFIG_DF=y
-CONFIG_DIFF=y
-CONFIG_FEATURE_DIFF_BINARY=y
-CONFIG_FEATURE_DIFF_DIR=y
-# CONFIG_FEATURE_DIFF_MINIMAL is not set
 CONFIG_DIRNAME=y
 CONFIG_DOS2UNIX=y
 CONFIG_UNIX2DOS=y
@@ -141,17 +157,19 @@
 CONFIG_FEATURE_FANCY_ECHO=y
 CONFIG_ENV=y
 # CONFIG_FEATURE_ENV_LONG_OPTIONS is not set
+# CONFIG_EXPAND is not set
+# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set
 CONFIG_EXPR=y
-# CONFIG_EXPR_MATH_SUPPORT_64 is not set
+CONFIG_EXPR_MATH_SUPPORT_64=y
 CONFIG_FALSE=y
-# CONFIG_FOLD is not set
+CONFIG_FOLD=y
 CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_FEATURE_FANCY_HEAD=y
 CONFIG_HOSTID=y
 CONFIG_ID=y
 CONFIG_INSTALL=y
-# CONFIG_FEATURE_INSTALL_LONG_OPTIONS is not set
-# CONFIG_LENGTH is not set
+CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y
+CONFIG_LENGTH=y
 CONFIG_LN=y
 CONFIG_LOGNAME=y
 CONFIG_LS=y
@@ -162,29 +180,33 @@
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
-# CONFIG_FEATURE_LS_COLOR_IS_DEFAULT is not set
+CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y
 CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
-# CONFIG_FEATURE_MKDIR_LONG_OPTIONS is not set
-# CONFIG_MKFIFO is not set
+CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y
+CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
-# CONFIG_FEATURE_MV_LONG_OPTIONS is not set
-# CONFIG_NICE is not set
-# CONFIG_NOHUP is not set
-# CONFIG_OD is not set
-# CONFIG_PRINTENV is not set
-# CONFIG_PRINTF is not set
+CONFIG_FEATURE_MV_LONG_OPTIONS=y
+CONFIG_NICE=y
+CONFIG_NOHUP=y
+CONFIG_OD=y
+CONFIG_PRINTENV=y
+CONFIG_PRINTF=y
 CONFIG_PWD=y
-# CONFIG_REALPATH is not set
+CONFIG_READLINK=y
+CONFIG_FEATURE_READLINK_FOLLOW=y
+CONFIG_REALPATH=y
 CONFIG_RM=y
 CONFIG_RMDIR=y
-# CONFIG_SEQ is not set
+CONFIG_SEQ=y
 CONFIG_SHA1SUM=y
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
 CONFIG_FEATURE_SORT_BIG=y
+# CONFIG_SPLIT is not set
+# CONFIG_FEATURE_SPLIT_FANCY is not set
 # CONFIG_STAT is not set
 # CONFIG_FEATURE_STAT_FORMAT is not set
 CONFIG_STTY=y
@@ -197,19 +219,21 @@
 CONFIG_TEST=y
 CONFIG_FEATURE_TEST_64=y
 CONFIG_TOUCH=y
-# CONFIG_TR is not set
-# CONFIG_FEATURE_TR_CLASSES is not set
-# CONFIG_FEATURE_TR_EQUIV is not set
+CONFIG_TR=y
+CONFIG_FEATURE_TR_CLASSES=y
+CONFIG_FEATURE_TR_EQUIV=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
 CONFIG_UNAME=y
+# CONFIG_UNEXPAND is not set
+# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set
 CONFIG_UNIQ=y
 CONFIG_USLEEP=y
 CONFIG_UUDECODE=y
 CONFIG_UUENCODE=y
-# CONFIG_WATCH is not set
 CONFIG_WC=y
-# CONFIG_WHO is not set
+# CONFIG_FEATURE_WC_LARGE is not set
+CONFIG_WHO=y
 CONFIG_WHOAMI=y
 CONFIG_YES=y
 
@@ -239,39 +263,46 @@
 CONFIG_CHVT=y
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADFONT is not set
-# CONFIG_LOADKMAP is not set
+CONFIG_DUMPKMAP=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
 CONFIG_RESET=y
-# CONFIG_SETCONSOLE is not set
+CONFIG_RESIZE=y
+CONFIG_FEATURE_RESIZE_PRINT=y
+CONFIG_SETCONSOLE=y
 # CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set
-# CONFIG_SETKEYCODES is not set
-# CONFIG_SETLOGCONS is not set
+CONFIG_SETKEYCODES=y
+CONFIG_SETLOGCONS=y
 
 #
 # Debian Utilities
 #
 CONFIG_MKTEMP=y
-# CONFIG_PIPE_PROGRESS is not set
-CONFIG_READLINK=y
-# CONFIG_FEATURE_READLINK_FOLLOW is not set
+CONFIG_PIPE_PROGRESS=y
 CONFIG_RUN_PARTS=y
-# CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS is not set
+CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
+# CONFIG_FEATURE_RUN_PARTS_FANCY is not set
 CONFIG_START_STOP_DAEMON=y
 CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y
-# CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS is not set
+CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y
 CONFIG_WHICH=y
 
 #
 # Editors
 #
-# CONFIG_AWK is not set
-# CONFIG_FEATURE_AWK_MATH is not set
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_CMP=y
+CONFIG_DIFF=y
+CONFIG_FEATURE_DIFF_BINARY=y
+CONFIG_FEATURE_DIFF_DIR=y
+# CONFIG_FEATURE_DIFF_MINIMAL is not set
 # CONFIG_ED is not set
-# CONFIG_PATCH is not set
+CONFIG_PATCH=y
 CONFIG_SED=y
 CONFIG_VI=y
+CONFIG_FEATURE_VI_MAX_LEN=1024
 CONFIG_FEATURE_VI_COLON=y
 CONFIG_FEATURE_VI_YANKMARK=y
 CONFIG_FEATURE_VI_SEARCH=y
@@ -282,6 +313,7 @@
 CONFIG_FEATURE_VI_SET=y
 CONFIG_FEATURE_VI_WIN_RESIZE=y
 CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+CONFIG_FEATURE_ALLOW_EXEC=y
 
 #
 # Finding Utilities
@@ -293,9 +325,21 @@
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_XDEV=y
-# CONFIG_FEATURE_FIND_NEWER is not set
+CONFIG_FEATURE_FIND_MAXDEPTH=y
+CONFIG_FEATURE_FIND_NEWER=y
 # CONFIG_FEATURE_FIND_INUM is not set
 CONFIG_FEATURE_FIND_EXEC=y
+CONFIG_FEATURE_FIND_USER=y
+CONFIG_FEATURE_FIND_GROUP=y
+CONFIG_FEATURE_FIND_NOT=y
+CONFIG_FEATURE_FIND_DEPTH=y
+CONFIG_FEATURE_FIND_PAREN=y
+CONFIG_FEATURE_FIND_SIZE=y
+CONFIG_FEATURE_FIND_PRUNE=y
+# CONFIG_FEATURE_FIND_DELETE is not set
+CONFIG_FEATURE_FIND_PATH=y
+CONFIG_FEATURE_FIND_REGEX=y
+# CONFIG_FEATURE_FIND_CONTEXT is not set
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_FGREP_ALIAS=y
@@ -312,12 +356,13 @@
 CONFIG_INIT=y
 # CONFIG_DEBUG_INIT is not set
 CONFIG_FEATURE_USE_INITTAB=y
-# CONFIG_FEATURE_INIT_SCTTY is not set
+CONFIG_FEATURE_INIT_SCTTY=y
+# CONFIG_FEATURE_INIT_SYSLOG is not set
 CONFIG_FEATURE_EXTRA_QUIET=y
 # CONFIG_FEATURE_INIT_COREDUMPS is not set
 CONFIG_FEATURE_INITRD=y
 CONFIG_HALT=y
-# CONFIG_MESG is not set
+CONFIG_MESG=y
 
 #
 # Login/Password Management Utilities
@@ -326,16 +371,26 @@
 # CONFIG_USE_BB_SHADOW is not set
 # CONFIG_USE_BB_PWD_GRP is not set
 CONFIG_ADDGROUP=y
+# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set
 CONFIG_DELGROUP=y
+# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set
 CONFIG_ADDUSER=y
 CONFIG_DELUSER=y
 CONFIG_GETTY=y
 CONFIG_FEATURE_UTMP=y
 CONFIG_FEATURE_WTMP=y
 CONFIG_LOGIN=y
+# CONFIG_PAM is not set
+# CONFIG_LOGIN_SCRIPTS is not set
+CONFIG_FEATURE_NOLOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
+CONFIG_FEATURE_PASSWD_WEAK_CHECK=y
+# CONFIG_CRYPTPW is not set
+# CONFIG_CHPASSWD is not set
 CONFIG_SU=y
+CONFIG_FEATURE_SU_SYSLOG=y
+CONFIG_FEATURE_SU_CHECKS_SHELLS=y
 CONFIG_SULOGIN=y
 CONFIG_VLOCK=y
 
@@ -343,13 +398,8 @@
 # Linux Ext2 FS Progs
 #
 CONFIG_CHATTR=y
-CONFIG_E2FSCK=y
 CONFIG_FSCK=y
 CONFIG_LSATTR=y
-CONFIG_MKE2FS=y
-CONFIG_TUNE2FS=y
-CONFIG_E2LABEL=y
-CONFIG_FINDFS=y
 
 #
 # Linux Module Utilities
@@ -358,13 +408,14 @@
 # CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
 # CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
 # CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
-# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set
+CONFIG_FEATURE_INSMOD_LOAD_MAP=y
+CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL=y
 CONFIG_RMMOD=y
 CONFIG_LSMOD=y
 CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
 CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
+CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
 
 #
 # Options common to multiple modutils
@@ -378,13 +429,14 @@
 # Linux System Utilities
 #
 CONFIG_DMESG=y
+CONFIG_FEATURE_DMESG_PRETTY=y
 CONFIG_FBSET=y
 CONFIG_FEATURE_FBSET_FANCY=y
 CONFIG_FEATURE_FBSET_READMODE=y
 CONFIG_FDFLUSH=y
 CONFIG_FDFORMAT=y
 CONFIG_FDISK=y
-FDISK_SUPPORT_LARGE_DISKS=y
+CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
 CONFIG_FEATURE_FDISK_WRITABLE=y
 # CONFIG_FEATURE_AIX_LABEL is not set
 # CONFIG_FEATURE_SGI_LABEL is not set
@@ -398,28 +450,32 @@
 CONFIG_GETOPT=y
 CONFIG_HEXDUMP=y
 CONFIG_HWCLOCK=y
-# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set
+CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
 CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y
-# CONFIG_IPCRM is not set
-# CONFIG_IPCS is not set
+CONFIG_IPCRM=y
+CONFIG_IPCS=y
 CONFIG_LOSETUP=y
 # CONFIG_MDEV is not set
 # CONFIG_FEATURE_MDEV_CONF is not set
 # CONFIG_FEATURE_MDEV_EXEC is not set
-# CONFIG_MKSWAP is not set
+# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set
+CONFIG_MKSWAP=y
 # CONFIG_FEATURE_MKSWAP_V0 is not set
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
 CONFIG_FEATURE_MOUNT_NFS=y
+CONFIG_FEATURE_MOUNT_CIFS=y
+CONFIG_FEATURE_MOUNT_FLAGS=y
+CONFIG_FEATURE_MOUNT_FSTAB=y
 CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
-# CONFIG_READPROFILE is not set
-# CONFIG_SETARCH is not set
+CONFIG_READPROFILE=y
+CONFIG_SETARCH=y
 CONFIG_SWAPONOFF=y
-# CONFIG_SWITCH_ROOT is not set
+CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
-# CONFIG_FEATURE_UMOUNT_ALL is not set
+CONFIG_FEATURE_UMOUNT_ALL=y
 
 #
 # Common options for mount/umount
@@ -432,10 +488,11 @@
 #
 CONFIG_ADJTIMEX=y
 # CONFIG_BBCONFIG is not set
-# CONFIG_CROND is not set
-# CONFIG_DEBUG_CROND_OPTION is not set
+CONFIG_CHRT=y
+CONFIG_CROND=y
+CONFIG_DEBUG_CROND_OPTION=y
 # CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set
-# CONFIG_CRONTAB is not set
+CONFIG_CRONTAB=y
 CONFIG_DC=y
 # CONFIG_DEVFSD is not set
 # CONFIG_DEVFSD_MODLOAD is not set
@@ -443,13 +500,14 @@
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
 CONFIG_EJECT=y
-# CONFIG_LAST is not set
+CONFIG_LAST=y
 CONFIG_LESS=y
+CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
 CONFIG_FEATURE_LESS_FLAGS=y
-# CONFIG_FEATURE_LESS_FLAGCS is not set
+CONFIG_FEATURE_LESS_FLAGCS=y
 # CONFIG_FEATURE_LESS_MARKS is not set
-# CONFIG_FEATURE_LESS_REGEXP is not set
+CONFIG_FEATURE_LESS_REGEXP=y
 CONFIG_HDPARM=y
 CONFIG_FEATURE_HDPARM_GET_IDENTITY=y
 # CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set
@@ -460,30 +518,36 @@
 CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
-# CONFIG_MOUNTPOINT is not set
+CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
+# CONFIG_RAIDAUTORUN is not set
+# CONFIG_READAHEAD is not set
 # CONFIG_RUNLEVEL is not set
 # CONFIG_RX is not set
 CONFIG_STRINGS=y
-# CONFIG_SETSID is not set
-# CONFIG_TASKSET is not set
+CONFIG_SETSID=y
+CONFIG_TASKSET=y
+CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
-# CONFIG_WATCHDOG is not set
+# CONFIG_TTYSIZE is not set
+CONFIG_WATCHDOG=y
 
 #
 # Networking Utilities
 #
-# CONFIG_FEATURE_IPV6 is not set
-# CONFIG_ARPING is not set
-# CONFIG_DNSD is not set
-# CONFIG_ETHER_WAKE is not set
+CONFIG_FEATURE_IPV6=y
+# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set
+# CONFIG_ARP is not set
+CONFIG_ARPING=y
+CONFIG_DNSD=y
+CONFIG_ETHER_WAKE=y
 # CONFIG_FAKEIDENTD is not set
 CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 # CONFIG_HTTPD is not set
-# CONFIG_FEATURE_HTTPD_WITHOUT_INETD is not set
+# CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 # CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
 # CONFIG_FEATURE_HTTPD_SETUID is not set
 # CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set
@@ -493,97 +557,107 @@
 # CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set
 # CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set
 # CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
-# CONFIG_FEATURE_IFCONFIG_SLIP is not set
+CONFIG_FEATURE_IFCONFIG_SLIP=y
 CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 CONFIG_IFUPDOWN=y
-# CONFIG_FEATURE_IFUPDOWN_IP is not set
+CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate"
+CONFIG_FEATURE_IFUPDOWN_IP=y
 CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y
+# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set
 CONFIG_FEATURE_IFUPDOWN_IPV4=y
-# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set
-# CONFIG_FEATURE_IFUPDOWN_IPX is not set
-# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set
+CONFIG_FEATURE_IFUPDOWN_IPV6=y
+CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set
 CONFIG_INETD=y
 CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y
 CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y
 CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y
 CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y
 CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y
-# CONFIG_FEATURE_INETD_RPC is not set
-# CONFIG_IP is not set
-# CONFIG_FEATURE_IP_ADDRESS is not set
-# CONFIG_FEATURE_IP_LINK is not set
-# CONFIG_FEATURE_IP_ROUTE is not set
-# CONFIG_FEATURE_IP_TUNNEL is not set
-# CONFIG_FEATURE_IP_SHORT_FORMS is not set
-# CONFIG_IPADDR is not set
-# CONFIG_IPLINK is not set
-# CONFIG_IPROUTE is not set
-# CONFIG_IPTUNNEL is not set
+CONFIG_FEATURE_INETD_RPC=y
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+CONFIG_FEATURE_IP_TUNNEL=y
+CONFIG_FEATURE_IP_RULE=y
+CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_IPADDR=y
+CONFIG_IPLINK=y
+CONFIG_IPROUTE=y
+CONFIG_IPTUNNEL=y
+CONFIG_IPRULE=y
 # CONFIG_IPCALC is not set
 # CONFIG_FEATURE_IPCALC_FANCY is not set
 # CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
-# CONFIG_NAMEIF is not set
+CONFIG_NAMEIF=y
 # CONFIG_NC is not set
-# CONFIG_NC_GAPING_SECURITY_HOLE is not set
+# CONFIG_NC_SERVER is not set
+# CONFIG_NC_EXTRA is not set
 CONFIG_NETSTAT=y
+# CONFIG_FEATURE_NETSTAT_WIDE is not set
 CONFIG_NSLOOKUP=y
 CONFIG_PING=y
+# CONFIG_PING6 is not set
+# CONFIG_PSCAN is not set
 CONFIG_FEATURE_FANCY_PING=y
-# CONFIG_PING6 is not set
-# CONFIG_FEATURE_FANCY_PING6 is not set
 CONFIG_ROUTE=y
+# CONFIG_SLATTACH is not set
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
-# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set
+CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 CONFIG_TELNETD=y
-CONFIG_FEATURE_TELNETD_INETD=y
+# CONFIG_FEATURE_TELNETD_STANDALONE is not set
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
+CONFIG_FEATURE_TFTP_BLOCKSIZE=y
 # CONFIG_DEBUG_TFTP is not set
-# CONFIG_TRACEROUTE is not set
+CONFIG_TRACEROUTE=y
 # CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set
 # CONFIG_FEATURE_TRACEROUTE_SOURCE_ROUTE is not set
 # CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set
-
-#
-# udhcp Server/Client
-#
-# CONFIG_APP_UDHCPD is not set
-# CONFIG_APP_UDHCPC is not set
-# CONFIG_APP_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCP_SYSLOG is not set
+CONFIG_APP_UDHCPD=y
+CONFIG_APP_DHCPRELAY=y
+CONFIG_APP_DUMPLEASES=y
+# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
+CONFIG_APP_UDHCPC=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
-# CONFIG_VCONFIG is not set
+# CONFIG_FEATURE_RFC3397 is not set
+CONFIG_VCONFIG=y
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
-# CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
 
 #
 # Process Utilities
 #
 CONFIG_FREE=y
-# CONFIG_FUSER is not set
+CONFIG_FUSER=y
 CONFIG_KILL=y
 CONFIG_KILLALL=y
+CONFIG_KILLALL5=y
+# CONFIG_NMETER is not set
 CONFIG_PIDOF=y
-# CONFIG_FEATURE_PIDOF_SINGLE is not set
-# CONFIG_FEATURE_PIDOF_OMIT is not set
+CONFIG_FEATURE_PIDOF_SINGLE=y
+CONFIG_FEATURE_PIDOF_OMIT=y
 CONFIG_PS=y
-# CONFIG_FEATURE_PS_WIDE is not set
+CONFIG_FEATURE_PS_WIDE=y
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
 CONFIG_TOP=y
 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
+CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
+# CONFIG_FEATURE_TOP_DECIMALS is not set
 CONFIG_UPTIME=y
+CONFIG_WATCH=y
 
 #
 # Shells
@@ -599,45 +673,77 @@
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-# CONFIG_ASH_READ_NCHARS is not set
-# CONFIG_ASH_READ_TIMEOUT is not set
+CONFIG_ASH_READ_NCHARS=y
+CONFIG_ASH_READ_TIMEOUT=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 CONFIG_ASH_MATH_SUPPORT_64=y
 # CONFIG_ASH_GETOPTS is not set
 CONFIG_ASH_BUILTIN_ECHO=y
 CONFIG_ASH_BUILTIN_TEST=y
-# CONFIG_ASH_CMDCMD is not set
+CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
 CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-# CONFIG_ASH_RANDOM_SUPPORT is not set
-# CONFIG_ASH_EXPAND_PRMT is not set
+CONFIG_ASH_RANDOM_SUPPORT=y
+CONFIG_ASH_EXPAND_PRMT=y
 CONFIG_HUSH=y
+# CONFIG_HUSH_HELP is not set
+CONFIG_HUSH_INTERACTIVE=y
+# CONFIG_HUSH_JOB is not set
+# CONFIG_HUSH_TICK is not set
+# CONFIG_HUSH_IF is not set
+# CONFIG_HUSH_LOOPS is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
 
 #
 # Bourne Shell Options
 #
-# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
-# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
-CONFIG_FEATURE_COMMAND_EDITING=y
-# CONFIG_FEATURE_COMMAND_EDITING_VI is not set
-CONFIG_FEATURE_COMMAND_HISTORY=15
-CONFIG_FEATURE_COMMAND_SAVEHISTORY=y
-CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
-# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
-CONFIG_FEATURE_SH_FANCY_PROMPT=y
+CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_CTTYHACK is not set
 
 #
 # System Logging Utilities
 #
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_ROTATE_LOGFILE=y
-# CONFIG_FEATURE_REMOTE_LOG is not set
+CONFIG_FEATURE_REMOTE_LOG=y
 # CONFIG_FEATURE_IPC_SYSLOG is not set
-CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0
+CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=
 # CONFIG_LOGREAD is not set
 # CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set
 CONFIG_KLOGD=y
 CONFIG_LOGGER=y
+
+#
+# Runit Utilities
+#
+# CONFIG_RUNSV is not set
+# CONFIG_RUNSVDIR is not set
+# CONFIG_SV is not set
+# CONFIG_SVLOGD is not set
+# CONFIG_CHPST is not set
+# CONFIG_SETUIDGID is not set
+# CONFIG_ENVUIDGID is not set
+# CONFIG_ENVDIR is not set
+# CONFIG_SOFTLIMIT is not set
+# CONFIG_CHCON is not set
+# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set
+# CONFIG_GETENFORCE is not set
+# CONFIG_GETSEBOOL is not set
+# CONFIG_LOAD_POLICY is not set
+# CONFIG_MATCHPATHCON is not set
+# CONFIG_RESTORECON is not set
+# CONFIG_RUNCON is not set
+# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set
+# CONFIG_SELINUXENABLED is not set
+# CONFIG_SETENFORCE is not set
+# CONFIG_SETFILES is not set
+# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set
+
+#
+# ipsvd utilities
+#
+# CONFIG_TCPSVD is not set
+# CONFIG_UDPSVD is not set

Modified: trunk/buildroot/target/device/armadeus/linux/linux.mk
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/linux.mk	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/linux/linux.mk	2007-10-20 17:12:30 UTC (rev 650)
@@ -32,7 +32,7 @@
 
 
 # File name for the Linux kernel binary
-LINUX_KERNEL=linux-kernel-$(LINUX_VERSION)-$(ARCH).bin
+LINUX_KERNEL=$(BINARIES_DIR)/linux-kernel-$(LINUX_VERSION)-$(ARCH).bin
 
 LINUX_PACKAGE_DIR:=$(ARMADEUS_PATH)/linux
 
@@ -173,6 +173,6 @@
 	-(cd $(BUILD_DIR); \
 	diff -purN -x '*~' ref/linux-$(LINUX_VERSION) linux-$(LINUX_VERSION) > $(BUILD_DIR)/../newlinux.diff)
 
-ifeq ($(strip $(BR2_PACKAGE_LINUX)),y)
+ifeq ($(strip $(BR2_PACKAGE_LINUX_ARM)),y)
 TARGETS+=linux
 endif

Modified: trunk/buildroot/target/device/armadeus/rootfs/Makefile.in
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/Makefile.in	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/rootfs/Makefile.in	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,5 +1,5 @@
 # Armadeus target skeleton stuff, may be overridden
-TARGET_SKELETON=$(ARMADEUS_PATH)/rootfs/skel.tar.gz
-TARGET_SKEL_DIR=$(ARMADEUS_PATH)/rootfs/target_skeleton
-TARGET_DEVICE_TABLE=$(ARMADEUS_PATH)/rootfs/device_table.txt
+TARGET_SKELETON_LINKS:=$(ARMADEUS_PATH)/rootfs/skel.tar.gz
+TARGET_SKELETON:=$(ARMADEUS_PATH)/rootfs/target_skeleton
+TARGET_DEVICE_TABLE:=$(ARMADEUS_PATH)/rootfs/device_table.txt
 

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link /tmp/log
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/dev/log
___________________________________________________________________
Name: svn:special
   + *

Deleted: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S18portmap
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S18portmap	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/init.d/S18portmap	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,53 +0,0 @@
-#!/bin/sh
-#
-# start/stop portmap daemon.
-
-test -f /sbin/portmap || exit 0
-
-OPTIONS=""
-
-case "$1" in
-    start)
-	pid=`pidof portmap`
-	if [ -n "$pid" ] ; then
-	  echo "Not starting portmap daemon.  Already running."
-	  exit 0
-	fi
-	echo -n "Starting portmap daemon:"
-	echo -n " portmap"
-	/sbin/portmap -- $OPTIONS
-	echo "."
-
-	sleep 1 # needs a short pause or pmap_set won't work. :(
-	if [ -f /var/run/portmap.upgrade-state ]; then
-	  echo -n "Restoring old RPC service information..."
-	  pmap_set </var/run/portmap.upgrade-state
-	  rm -f /var/run/portmap.upgrade-state
-	  echo "done."
-	else
-	  if [ -f /var/run/portmap.state ]; then
-	    pmap_set </var/run/portmap.state
-	    rm -f /var/run/portmap.state
-	  fi
-	fi
-
-	;;
-    stop)
-	;;
-    reload)
-	;;
-    force-reload)
-	$0 restart
-	;;
-    restart)
-	$0 stop
-	$0 start
-	;;
-    *)
-	echo "Usage: /etc/init.d/portmap {start|stop|reload|restart}"
-	exit 1
-	;;
-esac
-
-exit 0
-

Modified: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/inittab	2007-10-20 17:12:30 UTC (rev 650)
@@ -16,6 +16,7 @@
 # Startup the system
 null::sysinit:/bin/mount -o remount,rw /
 null::sysinit:/bin/mount -t proc proc /proc
+null::sysinit:/bin/mount -a
 null::sysinit:/bin/hostname -F /etc/hostname
 null::sysinit:/sbin/ifconfig lo 127.0.0.1 up
 null::sysinit:/sbin/route add -net 127.0.0.0 netmask 255.0.0.0 lo
@@ -28,7 +29,7 @@
 
 # Put a getty on the serial port
 #ttyS0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400,230400 vt100
-null::respawn:/sbin/getty -L ttySMX0 115200,57600,38400,230400 vt100
+ttySMX0::respawn:/sbin/getty -L ttySMX0 115200,57600,38400 vt100
 #null::respawn:/sbin/getty -L ttygserial 115200 vt100
 
 # Logging junk

Modified: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/etc/profile	2007-10-20 17:12:30 UTC (rev 650)
@@ -13,10 +13,8 @@
 
     if [ "$BASH" ]; then
 	export PS1="[\u@\h \W]\\$ "
-#	alias ll='/bin/ls --color=tty -laFh'
-#	alias ls='/bin/ls --color=tty -F'
-	alias ll='/bin/ls -laFh'
-	alias ls='/bin/ls -F'
+	alias ll='/bin/ls --color=tty -laFh'
+	alias ls='/bin/ls --color=tty -F'
 	export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:';
     else
       if [ "`id -u`" -eq 0 ]; then 

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lib/pcmcia
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/lock
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/log
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/pcmcia
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/run
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/spool
___________________________________________________________________
Name: svn:special
   + *

Added: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp	                        (rev 0)
+++ trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp	2007-10-20 17:12:30 UTC (rev 650)
@@ -0,0 +1 @@
+link ../tmp
\ No newline at end of file


Property changes on: trunk/buildroot/target/device/armadeus/rootfs/target_skeleton/var/tmp
___________________________________________________________________
Name: svn:special
   + *

Modified: trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk
===================================================================
--- trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/u-boot/u-boot.mk	2007-10-20 17:12:30 UTC (rev 650)
@@ -53,13 +53,21 @@
 	make -C $(U-BOOT_DIR) CROSS_COMPILE=$(TARGET_CROSS)
 	touch -c $(U-BOOT_DIR)/u-boot.bin
 
-u-boot: $(U-BOOT_DIR)/u-boot.bin $(U-BOOT_DIR)/u-boot.brec
-	cp $(U-BOOT_DIR)/u-boot.bin .
-	cp $(U-BOOT_DIR)/u-boot.brec .
+$(BINARIES_DIR)/u-boot.brec: $(U-BOOT_DIR)/u-boot.brec
+	mkdir -p $(BINARIES_DIR)
+	cp $(U-BOOT_DIR)/u-boot.brec $@
+
+$(BINARIES_DIR)/u-boot.bin: $(U-BOOT_DIR)/u-boot.bin
+	mkdir -p $(BINARIES_DIR)
+	cp $(U-BOOT_DIR)/u-boot.bin $@
+
+u-boot: $(BINARIES_DIR)/u-boot.bin $(BINARIES_DIR)/u-boot.brec
 	ln -fs $(U-BOOT_DIR)/tools/mkimage $(STAGING_DIR)/bin/mkimage
 
 u-boot-clean:
 	make -C $(U-BOOT_DIR) clean
+	rm -f $(BINARIES_DIR)/u-boot.bin
+	rm -f $(BINARIES_DIR)/u-boot.brec
 	rm -rf $(U-BOOT_DIR)/tools/mkbrecimage
 	rm -rf $(U-BOOT_DIR)/.configured
 

Modified: trunk/buildroot/target/device/armadeus/uClibc.config.arm
===================================================================
--- trunk/buildroot/target/device/armadeus/uClibc.config.arm	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/buildroot/target/device/armadeus/uClibc.config.arm	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,5 +1,6 @@
 #
 # Automatically generated make config: don't edit
+# Sat Oct 20 00:54:41 2007
 #
 # TARGET_alpha is not set
 TARGET_arm=y
@@ -8,8 +9,10 @@
 # TARGET_e1 is not set
 # TARGET_frv is not set
 # TARGET_h8300 is not set
+# TARGET_hppa is not set
 # TARGET_i386 is not set
 # TARGET_i960 is not set
+# TARGET_ia64 is not set
 # TARGET_m68k is not set
 # TARGET_microblaze is not set
 # TARGET_mips is not set
@@ -20,36 +23,49 @@
 # TARGET_sh64 is not set
 # TARGET_sparc is not set
 # TARGET_v850 is not set
+# TARGET_vax is not set
 # TARGET_x86_64 is not set
 
 #
 # Target Architecture Features and Options
 #
-HAVE_ELF=y
-ARCH_SUPPORTS_LITTLE_ENDIAN=y
 TARGET_ARCH="arm"
-ARCH_SUPPORTS_BIG_ENDIAN=y
+FORCE_OPTIONS_FOR_ARCH=y
+CONFIG_ARM_OABI=y
+# CONFIG_ARM_EABI is not set
+# USE_BX is not set
 # CONFIG_GENERIC_ARM is not set
 # CONFIG_ARM610 is not set
 # CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
 # CONFIG_ARM720T is not set
 CONFIG_ARM920T=y
 # CONFIG_ARM922T is not set
 # CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
 # CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
 # CONFIG_ARM_SA110 is not set
 # CONFIG_ARM_SA1100 is not set
 # CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
 ARCH_LITTLE_ENDIAN=y
-# ARCH_BIG_ENDIAN is not set
-# ARCH_HAS_NO_MMU is not set
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
 ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
 UCLIBC_HAS_FLOATS=y
-# HAS_FPU is not set
+# UCLIBC_HAS_FPU is not set
 UCLIBC_HAS_SOFT_FLOAT=y
 DO_C99_MATH=y
-KERNEL_SOURCE="/home/eric/arm/buildroot/toolchain_build_arm_nofpu/linux"
-C_SYMBOL_PREFIX=""
+KERNEL_HEADERS="/home/eric/arm/armaocto2/buildroot/toolchain_build_arm_nofpu/linux/include"
 HAVE_DOT_CONFIG=y
 
 #
@@ -58,28 +74,32 @@
 # HAVE_NO_PIC is not set
 DOPIC=y
 # HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
 HAVE_SHARED=y
-# ARCH_HAS_NO_LDSO is not set
-BUILD_UCLIBC_LDSO=y
 # FORCE_SHAREABLE_TEXT_SEGMENTS is not set
 LDSO_LDD_SUPPORT=y
 LDSO_CACHE_SUPPORT=y
 # LDSO_PRELOAD_FILE_SUPPORT is not set
 LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
 # LDSO_RUNPATH is not set
-# DL_FINI_CRT_COMPAT is not set
 UCLIBC_CTOR_DTOR=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
-PTHREADS_DEBUG_SUPPORT=y
+# PTHREADS_DEBUG_SUPPORT is not set
+LINUXTHREADS_OLD=y
 UCLIBC_HAS_LFS=y
-# UCLIBC_STATIC_LDCONFIG is not set
 # MALLOC is not set
 # MALLOC_SIMPLE is not set
 MALLOC_STANDARD=y
 MALLOC_GLIBC_COMPAT=y
 UCLIBC_DYNAMIC_ATEXIT=y
-HAS_SHADOW=y
+# COMPAT_ATEXIT is not set
+# UCLIBC_SUSV3_LEGACY is not set
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_HAS_SHADOW=y
+# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set
+UCLIBC_HAS___PROGNAME=y
 # UNIX98PTY_ONLY is not set
 ASSUME_DEVPTS=y
 UCLIBC_HAS_TM_EXTENSIONS=y
@@ -89,11 +109,20 @@
 UCLIBC_TZ_FILE_PATH="/etc/TZ"
 
 #
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
 # Networking Support
 #
 UCLIBC_HAS_IPV6=y
 UCLIBC_HAS_RPC=y
 UCLIBC_HAS_FULL_RPC=y
+UCLIBC_HAS_REENTRANT_RPC=y
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
 
 #
 # String and Stdio Support
@@ -134,14 +163,19 @@
 UCLIBC_HAS_SIGNUM_MESSAGES=y
 # UCLIBC_HAS_SYS_SIGLIST is not set
 UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
 
 #
 # Big and Tall
 #
 UCLIBC_HAS_REGEX=y
+UCLIBC_HAS_REGEX_OLD=y
+UCLIBC_HAS_FNMATCH=y
+UCLIBC_HAS_FNMATCH_OLD=y
 # UCLIBC_HAS_WORDEXP is not set
 UCLIBC_HAS_FTW=y
 UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
 
 #
 # Library Installation Options
@@ -151,18 +185,29 @@
 DEVEL_PREFIX="/usr/"
 
 #
-# uClibc security related options
+# Security options
 #
-# UCLIBC_SECURITY is not set
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+# UCLIBC_BUILD_NOEXECSTACK is not set
 
 #
 # uClibc development/debugging options
 #
-CROSS_COMPILER_PREFIX="/home/eric/arm/buildroot/build_arm_nofpu/staging_dir/bin/arm-linux-uclibc-"
+CROSS_COMPILER_PREFIX="/home/eric/arm/armaocto2/buildroot/build_arm/staging_dir/usr/bin/arm-linux-uclibc-"
+UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
+DOSTRIP=y
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
 WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
 # UCLIBC_MJN3_ONLY is not set

Modified: trunk/patches/001-buildroot.diff
===================================================================
--- trunk/patches/001-buildroot.diff	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/patches/001-buildroot.diff	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,10 +1,10 @@
-diff -purN -x .svn buildrootref/target/device/Config.in buildroot/target/device/Config.in
---- buildrootref/target/device/Config.in       2006-01-27 09:15:21.000000000 +0100
-+++ buildroot/target/device/Config.in  2006-01-27 16:32:13.000000000 +0100
-@@ -1,5 +1,6 @@
- menu "Board Support Options"
+--- buildrootref/target/device/Config.in	2007-10-13 17:36:33.000000000 +0200
++++ buildroot/target/device/Config.in	2007-10-13 17:38:47.000000000 +0200
+@@ -13,6 +13,7 @@
+ source "target/device/Soekris/Config.in"
+ source "target/device/Via/Config.in"
+ source "target/device/x86/Config.in"
++source "target/device/armadeus/Config.in"
  
-+source "target/device/armadeus/Config.in"
- source "target/device/Soekris/Config.in"
- source "target/device/Hitachi/Config.in"
- source "target/device/AMD/Config.in"
+ # This must be last
+ source "target/generic/Config.in"

Modified: trunk/patches/002-buildroot-linuxdep.diff
===================================================================
--- trunk/patches/002-buildroot-linuxdep.diff	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/patches/002-buildroot-linuxdep.diff	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,12 +1,11 @@
-diff -purN buildrootref/target/jffs2/jffs2root.mk buildroot/target/jffs2/jffs2root.mk
---- buildrootref/target/jffs2/jffs2root.mk	2006-10-20 09:15:08.000000000 +0200
-+++ buildroot/target/jffs2/jffs2root.mk	2006-10-24 22:31:40.000000000 +0200
-@@ -39,7 +39,7 @@ endif
+--- buildrootref/target/jffs2/jffs2root.mk	2007-10-06 09:15:23.000000000 +0200
++++ buildroot/target/jffs2/jffs2root.mk	2007-10-13 17:41:40.000000000 +0200
+@@ -48,7 +48,7 @@
  # value of MKFS_JFFS2 to either the previously installed copy or the one
  # just built.
  #
 -$(JFFS2_TARGET): host-fakeroot makedevs mtd-host
 +$(JFFS2_TARGET): host-fakeroot makedevs mtd-host linux
- 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIP) 2>/dev/null || true;
+ 	-@find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
+ ifneq ($(BR2_HAVE_MANPAGES),y)
  	@rm -rf $(TARGET_DIR)/usr/man
- 	@rm -rf $(TARGET_DIR)/usr/share/man

Deleted: trunk/patches/003-Buildroot-fbset.diff
===================================================================
--- trunk/patches/003-Buildroot-fbset.diff	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/patches/003-Buildroot-fbset.diff	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,11 +0,0 @@
-diff -purN -x .svn -x '*~' buildrootref/package/Config.in buildroot/package/Config.in
---- buildrootref/package/Config.in	2006-10-26 22:47:34.000000000 +0200
-+++ buildroot/package/Config.in	2006-10-26 22:18:01.000000000 +0200
-@@ -48,6 +48,7 @@ source "package/ethtool/Config.in"
- source "package/expat/Config.in"
- source "package/e2fsprogs/Config.in"
- source "package/fakeroot/Config.in"
-+source "package/fbset/Config.in"
- source "package/file/Config.in"
- source "package/freetype/Config.in"
- source "package/gettext/Config.in"

Modified: trunk/patches/004-Buildroot-defconfig.diff
===================================================================
--- trunk/patches/004-Buildroot-defconfig.diff	2007-09-27 20:07:35 UTC (rev 649)
+++ trunk/patches/004-Buildroot-defconfig.diff	2007-10-20 17:12:30 UTC (rev 650)
@@ -1,156 +1,225 @@
---- buildroot/.defconfig.ori	2006-10-20 09:15:14.000000000 +0200
-+++ buildroot/.defconfig	2006-10-24 22:15:00.000000000 +0200
-@@ -2,55 +2,427 @@
+--- buildroot/.defconfig.ori	2007-10-06 09:15:54.000000000 +0200
++++ buildroot/.defconfig	2007-10-20 17:04:57.000000000 +0200
+@@ -1,19 +1,150 @@
+ #
  # Automatically generated make config: don't edit
++# Sat Oct 20 17:04:57 2007
  #
  BR2_HAVE_DOT_CONFIG=y
 -# BR2_arm is not set
++BR2_VERSION="0.10.0-svn"
 +# BR2_alpha is not set
 +BR2_arm=y
  # BR2_armeb is not set
++# BR2_avr32 is not set
  # BR2_cris is not set
 -BR2_i386=y
++# BR2_ia64 is not set
 +# BR2_i386 is not set
  # BR2_m68k is not set
  # BR2_mips is not set
  # BR2_mipsel is not set
 +# BR2_nios2 is not set
  # BR2_powerpc is not set
++# BR2_s390 is not set
  # BR2_sh is not set
 +# BR2_sh64 is not set
  # BR2_sparc is not set
 -BR2_ARCH="i386"
++# BR2_sparc64 is not set
 +# BR2_x86_64 is not set
 +# BR2_generic_arm is not set
++# BR2_arm7tdmi is not set
 +# BR2_arm610 is not set
 +# BR2_arm710 is not set
 +# BR2_arm720t is not set
 +BR2_arm920t=y
 +# BR2_arm922t is not set
 +# BR2_arm926t is not set
++# BR2_arm10t is not set
 +# BR2_arm1136jf_s is not set
++# BR2_arm1176jz_s is not set
++# BR2_arm1176jzf_s is not set
 +# BR2_sa110 is not set
 +# BR2_sa1100 is not set
 +# BR2_xscale is not set
++# BR2_iwmmxt is not set
 +BR2_ARM_TYPE="ARM920T"
 +BR2_ARM_OABI=y
 +# BR2_ARM_EABI is not set
 +BR2_ARCH="arm"
 +BR2_ENDIAN="LITTLE"
++BR2_GCC_TARGET_TUNE="arm920t"
 +
 +#
++# Target options
++#
++
++#
++# Project Options
++#
++BR2_PROJECT="armadeus"
++BR2_HOSTNAME="armadeus"
++BR2_BANNER="Welcome to the Armadeus development environment."
++
++#
++# Preset Devices
++#
++# BR2_TARGET_ARM is not set
++# BR2_TARGET_ATMEL is not set
++# BR2_TARGET_SHARP is not set
++
++#
++# Armadeus project Specific Device Support
++#
++BR2_TARGET_ARMADEUS=y
++BR2_TARGET_ARMADEUS_APF9328=y
++# BR2_TARGET_ARMADEUS_APM9328 is not set
++BR2_TARGET_ARMADEUS_NAME="apf9328"
++# BR2_TARGET_ARMADEUS_SDRAM_8 is not set
++BR2_TARGET_ARMADEUS_SDRAM_16=y
++# BR2_TARGET_ARMADEUS_SDRAM_32 is not set
++# BR2_TARGET_ARMADEUS_SDRAM_64 is not set
++BR2_TARGET_ARMADEUS_SDRAM_SIZE="16"
++BR2_ARMADEUS_PACKAGE=y
++# BR2_PACKAGE_MAX5821CTRL is not set
++
++#
++# ---
++#
++# BR2_PACKAGE_CH7024CTRL is not set
++
++#
++# ---
++#
++BR2_PACKAGE_LINUX_ARM=y
++# BR2_PACKAGE_LINUX_VERSION_2_6_12 is not set
++# BR2_PACKAGE_LINUX_VERSION_2_6_17 is not set
++BR2_PACKAGE_LINUX_VERSION_2_6_18_1=y
++BR2_PACKAGE_LINUX_VERSION="2.6.18.1"
++BR2_TARGET_U-BOOT=y
++
++#
++# Generic System Support
++#
++# BR2_TARGET_GENERIC_ACCESS_POINT is not set
++# BR2_TARGET_GENERIC_FIREWALL is not set
++# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
++
++#
 +# Build options
 +#
--BR2_WGET="wget --passive-ftp"
-+BR2_WGET="wget --passive-ftp --no-directories"
-+BR2_SVN="svn co"
-+BR2_ZCAT="zcat"
+ BR2_WGET="wget --passive-ftp"
++BR2_SVN_CO="svn co"
++BR2_SVN_UP="svn up"
++BR2_GIT="git clone"
++BR2_ZCAT="gzip -d -c"
++BR2_BZCAT="bzcat"
 +BR2_TAR_OPTIONS=""
-+BR2_DL_DIR="$(TOPDIR)/../downloads"
++BR2_DL_DIR="$(BASE_DIR)/../downloads"
++
++#
++# Mirrors and Download locations
++#
 +BR2_SOURCEFORGE_MIRROR="easynews"
++
++#
++# Atmel Mirrors
++#
++BR2_ATMEL_MIRROR="ftp://at91dist:distrib@81.80.104.162/AT91_Third_Party_Design_Flow/Linux_Host/"
++BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/"
 +BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 +BR2_TOPDIR_PREFIX=""
 +BR2_TOPDIR_SUFFIX=""
 +BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 +BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 +BR2_JLEVEL=1
++# BR2_PREFER_IMA is not set
++# BR2_DEPRECATED is not set
++BR2_STRIP_strip=y
++# BR2_STRIP_sstrip is not set
++# BR2_STRIP_none is not set
++# BR2_PREFER_STATIC_LIB is not set
++# BR2_HAVE_MANPAGES is not set
++# BR2_HAVE_INFOPAGES is not set
++BR2_UPDATE_CONFIG=y
++
++#
++# Toolchain
++#
++BR2_TOOLCHAIN_BUILDROOT=y
++# BR2_TOOLCHAIN_EXTERNAL is not set
++# BR2_TOOLCHAIN_EXTERNAL_SOURCE is not set
++BR2_TOOLCHAIN_SOURCE=y
  
  #
- # Toolchain Options
+ # Kernel Header Options
+@@ -25,8 +156,14 @@
+ # BR2_KERNEL_HEADERS_2_6_9 is not set
+ # BR2_KERNEL_HEADERS_2_6_11 is not set
+ # BR2_KERNEL_HEADERS_2_6_12 is not set
++# BR2_KERNEL_HEADERS_2_6_20_4 is not set
++# BR2_KERNEL_HEADERS_2_6_20 is not set
++# BR2_KERNEL_HEADERS_2_6_21_5 is not set
++# BR2_KERNEL_HEADERS_2_6_21 is not set
++# BR2_KERNEL_HEADERS_2_6_22_1 is not set
+ BR2_KERNEL_HEADERS_2_6_22=y
+-BR2_DEFAULT_KERNEL_HEADERS="2.6.22.8"
++# BR2_KERNEL_HEADERS_SNAP is not set
++BR2_DEFAULT_KERNEL_HEADERS="2.6.22.9"
+ 
  #
--BR2_KERNEL_HEADERS_2_4=y
--# BR2_KERNEL_HEADERS_2_6 is not set
--BR2_DEFAULT_KERNEL_HEADERS="2.4.27"
--BR2_UCLIBC_VERSION_SNAPSHOT=y
+ # uClibc Options
+@@ -34,7 +171,6 @@
+ # BR2_UCLIBC_VERSION_0_9_28_3 is not set
+ BR2_UCLIBC_VERSION_0_9_29=y
+ # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 -BR2_USE_UCLIBC_SNAPSHOT="snapshot"
-+
-+#
-+# Kernel Header Options
-+#
-+# BR2_KERNEL_HEADERS_2_4_25 is not set
-+# BR2_KERNEL_HEADERS_2_4_27 is not set
-+# BR2_KERNEL_HEADERS_2_4_29 is not set
-+# BR2_KERNEL_HEADERS_2_4_31 is not set
-+# BR2_KERNEL_HEADERS_2_6_9 is not set
-+# BR2_KERNEL_HEADERS_2_6_11 is not set
-+BR2_KERNEL_HEADERS_2_6_12=y
-+# BR2_KERNEL_HEADERS_2_6_18 is not set
-+BR2_DEFAULT_KERNEL_HEADERS="2.6.12"
-+
-+#
-+# uClibc Options
-+#
-+# BR2_UCLIBC_VERSION_SNAPSHOT is not set
+ BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
  # BR2_ENABLE_LOCALE is not set
--# BR2_BINUTILS_VERSION_2_14_90_0_6 is not set
--# BR2_BINUTILS_VERSION_2_14_90_0_7 is not set
-+# BR2_PTHREADS_NONE is not set
-+BR2_PTHREADS=y
-+# BR2_PTHREADS_OLD is not set
-+# BR2_PTHREADS_NATIVE is not set
-+
-+#
-+# Binutils Options
-+#
- # BR2_BINUTILS_VERSION_2_14_90_0_8 is not set
- # BR2_BINUTILS_VERSION_2_15 is not set
--# BR2_BINUTILS_VERSION_2_15_90_0_1 is not set
--# BR2_BINUTILS_VERSION_2_15_90_0_1_1 is not set
--# BR2_BINUTILS_VERSION_2_15_90_0_2 is not set
--# BR2_BINUTILS_VERSION_2_15_90_0_3 is not set
--# BR2_BINUTILS_VERSION_2_15_91_0_1 is not set
--BR2_BINUTILS_VERSION_2_15_91_0_2=y
--# BR2_BINUTILS_VERSION_2_15_92_0_2 is not set
--BR2_BINUTILS_VERSION="2.15.91.0.2"
--# BR2_GCC_VERSION_2_95 is not set
--# BR2_GCC_VERSION_3_3_3 is not set
--# BR2_GCC_VERSION_3_3_4 is not set
--# BR2_GCC_VERSION_3_4_0 is not set
--# BR2_GCC_VERSION_3_4_1 is not set
--BR2_GCC_VERSION_3_4_2=y
--BR2_GCC_VERSION="3.4.2"
--BR2_GCC_USE_SJLJ_EXCEPTIONS="--enable-sjlj-exceptions"
--BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-+# BR2_BINUTILS_VERSION_2_15_94_0_2_2 is not set
-+# BR2_BINUTILS_VERSION_2_16_1 is not set
-+# BR2_BINUTILS_VERSION_2_16_90_0_3 is not set
-+# BR2_BINUTILS_VERSION_2_16_91_0_5 is not set
-+# BR2_BINUTILS_VERSION_2_16_91_0_6 is not set
-+# BR2_BINUTILS_VERSION_2_16_91_0_7 is not set
+ # BR2_PTHREADS_NONE is not set
+@@ -42,35 +178,428 @@
+ BR2_PTHREADS_OLD=y
+ # BR2_PTHREADS_NATIVE is not set
+ # BR2_PTHREAD_DEBUG is not set
++# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+ 
+ #
+ # Binutils Options
+ #
 +# BR2_BINUTILS_VERSION_2_17 is not set
-+# BR2_BINUTILS_VERSION_2_17_50_0_2 is not set
-+# BR2_BINUTILS_VERSION_2_17_50_0_3 is not set
-+# BR2_BINUTILS_VERSION_2_17_50_0_4 is not set
-+BR2_BINUTILS_VERSION_2_17_50_0_5=y
-+BR2_BINUTILS_VERSION="2.17.50.0.5"
-+BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
-+
-+#
-+# Gcc Options
-+#
-+# BR2_GCC_VERSION_3_3_5 is not set
-+# BR2_GCC_VERSION_3_3_6 is not set
-+# BR2_GCC_VERSION_3_4_2 is not set
-+# BR2_GCC_VERSION_3_4_3 is not set
-+# BR2_GCC_VERSION_3_4_4 is not set
-+# BR2_GCC_VERSION_3_4_5 is not set
++# BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
+ BR2_BINUTILS_VERSION_2_18=y
+ # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
+ BR2_BINUTILS_VERSION="2.18"
+ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
+ 
+-
+ #
+-# Gcc Options
++# GCC Options
+ #
+-# BR2_GCC_VERSION_3_4_6 is not set
 +BR2_GCC_VERSION_3_4_6=y
-+# BR2_GCC_VERSION_4_0_0 is not set
-+# BR2_GCC_VERSION_4_0_1 is not set
-+# BR2_GCC_VERSION_4_0_2 is not set
-+# BR2_GCC_VERSION_4_0_3 is not set
-+# BR2_GCC_VERSION_4_1_0 is not set
-+# BR2_GCC_VERSION_4_1_1 is not set
-+# BR2_GCC_VERSION_4_2 is not set
-+# BR2_GCC_IS_SNAP is not set
+ # BR2_GCC_VERSION_4_0_4 is not set
+ # BR2_GCC_VERSION_4_1_2 is not set
+ # BR2_GCC_VERSION_4_2_0 is not set
+-BR2_GCC_VERSION_4_2_1=y
++# BR2_GCC_VERSION_4_2_1 is not set
+ # BR2_GCC_IS_SNAP is not set
+-BR2_GCC_VERSION="4.2.1"
++# BR2_GCC_SUPPORTS_SYSROOT is not set
++# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 +BR2_GCC_VERSION="3.4.6"
-+# BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
-+BR2_EXTRA_GCC_CONFIG_OPTIONS="--disable-libstdcxx-pch"
+ # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
+ BR2_EXTRA_GCC_CONFIG_OPTIONS=""
+-BR2_GCC_SHARED_LIBGCC=y
++# BR2_GCC_CROSS_CXX is not set
++# BR2_GCC_CROSS_FORTRAN is not set
  # BR2_INSTALL_LIBSTDCPP is not set
--BR2_HOST_CCACHE=y
--BR2_PACKAGE_CCACHE=y
 +# BR2_INSTALL_OBJC is not set
-+# BR2_GCC_SHARED_LIBGCC is not set
++# BR2_INSTALL_FORTRAN is not set
++BR2_GCC_SHARED_LIBGCC=y
 +
 +#
 +# Ccache Options
@@ -162,15 +231,16 @@
 +#
  # BR2_PACKAGE_GDB is not set
 -# BR2_PACKAGE_GDB_SERVER is not set
--# BR2_HOST_GDB is not set
+-# BR2_ENABLE_MULTILIB is not set
 +BR2_PACKAGE_GDB_SERVER=y
 +BR2_PACKAGE_GDB_HOST=y
 +# BR2_GDB_VERSION_6_2_1 is not set
 +# BR2_GDB_VERSION_6_3 is not set
 +# BR2_GDB_VERSION_6_4 is not set
-+BR2_GDB_VERSION_6_5=y
++# BR2_GDB_VERSION_6_5 is not set
++BR2_GDB_VERSION_6_6=y
 +# BR2_GDB_VERSION_SNAPSHOT is not set
-+BR2_GDB_VERSION="6.5"
++BR2_GDB_VERSION="6.6"
 +
 +#
 +# elf2flt
@@ -181,129 +251,196 @@
 +#
 +# Common Toolchain Options
 +#
-+# BR2_PACKAGE_SSTRIP_TARGET is not set
++BR2_PACKAGE_SSTRIP_TARGET=y
 +# BR2_PACKAGE_SSTRIP_HOST is not set
- BR2_ENABLE_MULTILIB=y
++BR2_ENABLE_MULTILIB=y
  BR2_LARGEFILE=y
++BR2_INET_IPV6=y
++BR2_INET_RPC=y
++BR2_USE_WCHAR=y
 +BR2_SOFT_FLOAT=y
  BR2_TARGET_OPTIMIZATION="-Os -pipe"
 +BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
-+
+ 
 +#
 +# Package Selection for the target
 +#
-+
-+#
-+# The default minimal system
-+#
 +BR2_PACKAGE_BUSYBOX=y
++# BR2_BUSYBOX_VERSION_1_2_2_1 is not set
++# BR2_BUSYBOX_VERSION_1_6_1 is not set
++# BR2_BUSYBOX_VERSION_1_7_0 is not set
++# BR2_BUSYBOX_VERSION_1_7_1 is not set
++BR2_BUSYBOX_VERSION_1_7_2=y
 +# BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
++BR2_BUSYBOX_VERSION="1.7.2"
 +BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
-+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox.config"
++BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.6.0.config"
+ BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
++# BR2_PACKAGE_BUSYBOX_SKELETON is not set
 +
 +#
 +# The minimum needed to build a uClibc development system
 +#
 +# BR2_PACKAGE_BASH is not set
 +# BR2_PACKAGE_BZIP2 is not set
-+# BR2_PACKAGE_COREUTILS is not set
 +# BR2_PACKAGE_DIFFUTILS is not set
-+# BR2_PACKAGE_ED is not set
-+# BR2_PACKAGE_FINDUTILS is not set
 +# BR2_PACKAGE_FLEX is not set
-+# BR2_PACKAGE_GAWK is not set
 +# BR2_PACKAGE_GCC_TARGET is not set
++# BR2_PACKAGE_MAKE is not set
+ 
++#
++# Other development stuff
++#
++# BR2_PACKAGE_AUTOCONF is not set
++# BR2_PACKAGE_AUTOMAKE is not set
++# BR2_PACKAGE_BISON is not set
 +# BR2_PACKAGE_CCACHE_TARGET is not set
-+# BR2_PACKAGE_GREP is not set
-+# BR2_PACKAGE_MAKE is not set
-+# BR2_PACKAGE_PATCH is not set
-+# BR2_PACKAGE_SED is not set
-+# BR2_PACKAGE_TAR is not set
++# BR2_PACKAGE_CVS is not set
++# BR2_PACKAGE_DISTCC is not set
++# BR2_PACKAGE_DMALLOC is not set
++# BR2_PACKAGE_EXPAT is not set
++# BR2_PACKAGE_FAKEROOT is not set
++BR2_HOST_FAKEROOT=y
++# BR2_PAC...
 
[truncated message content]

[Armadeus-commitlog] SF.net SVN: armadeus: [649] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff

[<th...@us...>]

Revision: 649
          http://armadeus.svn.sourceforge.net/armadeus/?rev=649&view=rev
Author:   thom25
Date:     2007-09-27 13:07:35 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
new armadeus TS driver

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff	2007-09-27 18:32:23 UTC (rev 648)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/073-linux-2.6.18-tsc2102.diff	2007-09-27 20:07:35 UTC (rev 649)
@@ -1,26 +1,192 @@
-From: Andrzej Zaborowski <ba...@za...>
-Date: Mon, 2 Apr 2007 17:15:00 +0000 (-0400)
-Subject: SPI: Add TSC2102 main SPI driver
-X-Git-Url: http://source.mvista.com/git/gitweb.cgi?p=linux-davinci-2.6.git;a=commitdiff;h=05f24ed7f2264675cd4c01bba62374d14db37fe9
-
-SPI: Add TSC2102 main SPI driver
-
-This adds a driver for the TSC2102 chip by Texas Instruments. This
-driver is responsible for all communication with the chip and doesn't
-export anything for user-space, but for other drivers controlling
-devices connected to the chip.
-
-Signed-off-by: Andrzej Zaborowski <ba...@za...>
----
-
---- a/drivers/spi/Kconfig
-+++ b/drivers/spi/Kconfig
-@@ -131,6 +131,12 @@
+diff -pNur ref/linux-2.6.18.1/include/linux/spi/tsc2102.h linux-2.6.18.1/include/linux/spi/tsc2102.h
+--- ref/linux-2.6.18.1/include/linux/spi/tsc2102.h	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18.1/include/linux/spi/tsc2102.h	2007-09-22 01:42:29.000000000 +0200
+@@ -0,0 +1,175 @@
++/*
++ * include/linux/spi/tsc2102.h
++ *
++ * TI TSC2102 Touchscreen, Audio and Battery control register definitions 
++ *
++ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...>
++ *
++ * This package is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This package is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this package; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
++ */
++
++#ifndef __LINUX_SPI_TSC2102_H
++#define __LINUX_SPI_TSC2102_H
++
++struct apm_power_info;
++struct tsc2102_config {
++	int use_internal;	/* Use internal reference voltage */
++	uint32_t monitor;	/* What inputs are relevant */
++	int temp_at25c;		/* Thermometer calibration data */
++	void (*apm_report)(struct apm_power_info *info, int *battery);
++				/* Report status to APM based on battery[] */
++	void *alsa_config;	/* .platform_data for the ALSA device */
++};
++
++#define TSC_BAT1	(1 << 0)
++#define TSC_BAT2	(1 << 1)
++#define TSC_AUX		(1 << 2)
++#define TSC_TEMP	(1 << 4)
++
++extern u16 tsc2102_read_sync(int page, u8 address);
++extern void tsc2102_reads_sync(int page, u8 startaddress, u16 *data,
++		int numregs);
++extern void tsc2102_write_sync(int page, u8 address, u16 data);
++
++typedef void (*tsc2102_touch_t)(int touching);
++typedef void (*tsc2102_coords_t)(int x, int y, int z1, int z2);
++typedef void (*tsc2102_ports_t)(int bat1, int bat2, int aux);
++typedef void (*tsc2102_temp_t)(int temp);
++extern int tsc2102_touch_cb(tsc2102_touch_t handler);
++extern int tsc2102_coords_cb(tsc2102_coords_t handler);
++extern int tsc2102_ports_cb(tsc2102_ports_t handler);
++extern int tsc2102_temp1_cb(tsc2102_temp_t handler);
++extern int tsc2102_temp2_cb(tsc2102_temp_t handler);
++
++#ifdef CONFIG_SOUND
++extern void tsc2102_set_volume(uint8_t left_ch, uint8_t right_ch);
++extern void tsc2102_set_mute(int left_ch, int right_ch);
++extern void tsc2102_get_mute(int *left_ch, int *right_ch);
++extern void tsc2102_dac_power(int state);
++extern int tsc2102_set_rate(int rate);
++extern void tsc2102_set_i2s_master(int state);
++extern void tsc2102_set_deemphasis(int enable);
++extern void tsc2102_set_bassboost(int enable);
++#endif
++
++extern void tsc2102_keyclick(int amplitude, int freq, int length);
++
++#define TSC2102_REG(pg, addr)		pg, addr
++
++/* Page 0, Touch Screen & Keypad Data registers */
++#define TSC2102_TS_X			TSC2102_REG(0, 0x00)
++#define TSC2102_TS_Y			TSC2102_REG(0, 0x01)
++#define TSC2102_TS_Z1			TSC2102_REG(0, 0x02)
++#define TSC2102_TS_Z2			TSC2102_REG(0, 0x03)
++#define TSC2102_TS_BAT1			TSC2102_REG(0, 0x05)
++#define TSC2102_TS_BAT2			TSC2102_REG(0, 0x06)
++#define TSC2102_TS_AUX			TSC2102_REG(0, 0x07)
++#define TSC2102_TS_TEMP1		TSC2102_REG(0, 0x09)
++#define TSC2102_TS_TEMP2		TSC2102_REG(0, 0x0a)
++
++/* Page 1, Touch Screen & Keypad Control registers */
++#define TSC2102_TS_ADC_CTRL		TSC2102_REG(1, 0x00)
++#define TSC2102_TS_STATUS_CTRL		TSC2102_REG(1, 0x01)
++#define TSC2102_TS_REF_CTRL		TSC2102_REG(1, 0x03)
++#define TSC2102_TS_RESET_CTRL		TSC2102_REG(1, 0x04)
++#define TSC2102_TS_CONFIG_CTRL		TSC2102_REG(1, 0x05)
++
++/* Page 2, Audio Control registers */
++#define TSC2102_AUDIO1_CTRL		TSC2102_REG(2, 0x00)
++#define TSC2102_DAC_GAIN_CTRL		TSC2102_REG(2, 0x02)
++#define TSC2102_AUDIO2_CTRL		TSC2102_REG(2, 0x04)
++#define TSC2102_DAC_POWER_CTRL		TSC2102_REG(2, 0x05)
++#define TSC2102_AUDIO3_CTRL		TSC2102_REG(2, 0x06)
++#define TSC2102_LCH_BASS_BOOST_N0	TSC2102_REG(2, 0x07)
++#define TSC2102_LCH_BASS_BOOST_N1	TSC2102_REG(2, 0x08)
++#define TSC2102_LCH_BASS_BOOST_N2	TSC2102_REG(2, 0x09)
++#define TSC2102_LCH_BASS_BOOST_N3	TSC2102_REG(2, 0x0a)
++#define TSC2102_LCH_BASS_BOOST_N4	TSC2102_REG(2, 0x0b)
++#define TSC2102_LCH_BASS_BOOST_N5	TSC2102_REG(2, 0x0c)
++#define TSC2102_LCH_BASS_BOOST_D1	TSC2102_REG(2, 0x0d)
++#define TSC2102_LCH_BASS_BOOST_D2	TSC2102_REG(2, 0x0e)
++#define TSC2102_LCH_BASS_BOOST_D4	TSC2102_REG(2, 0x0f)
++#define TSC2102_LCH_BASS_BOOST_D5	TSC2102_REG(2, 0x10)
++#define TSC2102_RCH_BASS_BOOST_N0	TSC2102_REG(2, 0x11)
++#define TSC2102_RCH_BASS_BOOST_N1	TSC2102_REG(2, 0x12)
++#define TSC2102_RCH_BASS_BOOST_N2	TSC2102_REG(2, 0x13)
++#define TSC2102_RCH_BASS_BOOST_N3	TSC2102_REG(2, 0x14)
++#define TSC2102_RCH_BASS_BOOST_N4	TSC2102_REG(2, 0x15)
++#define TSC2102_RCH_BASS_BOOST_N5	TSC2102_REG(2, 0x16)
++#define TSC2102_RCH_BASS_BOOST_D1	TSC2102_REG(2, 0x17)
++#define TSC2102_RCH_BASS_BOOST_D2	TSC2102_REG(2, 0x18)
++#define TSC2102_RCH_BASS_BOOST_D4	TSC2102_REG(2, 0x19)
++#define TSC2102_RCH_BASS_BOOST_D5	TSC2102_REG(2, 0x1a)
++#define TSC2102_PLL1_CTRL		TSC2102_REG(2, 0x1b)
++#define TSC2102_PLL2_CTRL		TSC2102_REG(2, 0x1c)
++#define TSC2102_AUDIO4_CTRL		TSC2102_REG(2, 0x1d)
++
++/* Field masks for Audio Control 1 */
++#define AC1_WLEN(ARG)			(((ARG) & 0x03) << 10)
++#define AC1_DATFM(ARG)			(((ARG) & 0x03) << 8)
++#define AC1_DACFS(ARG)			((ARG) & 0x3f)
++
++/* Field masks for TSC2102_DAC_GAIN_CTRL */
++#define DGC_DALMU			(1 << 15)
++#define DGC_DALVL(ARG)			(((ARG) & 0x7f) << 8)
++#define DGC_DARMU			(1 << 7)
++#define DGC_DARVL(ARG)			(((ARG) & 0x7f))
++
++/* Field formats for TSC2102_AUDIO2_CTRL */
++#define AC2_KCLEN			(1 << 15)
++#define AC2_KCLAC(ARG)			(((ARG) & 0x07) << 12)
++#define AC2_KCLFRQ(ARG)			(((ARG) & 0x07) << 8)
++#define AC2_KCLLN(ARG)			(((ARG) & 0x0f) << 4)
++#define AC2_DLGAF			(1 << 3)
++#define AC2_DRGAF			(1 << 2)
++#define AC2_DASTC			(1 << 1)
++
++/* Field masks for TSC2102_DAC_POWER_CTRL */
++#define CPC_PWDNC			(1 << 15)
++#define CPC_DAODRC			(1 << 12)
++#define CPC_DAPWDN			(1 << 10)
++#define CPC_VGPWDN			(1 << 8)
++#define CPC_DAPWDF			(1 << 6)
++#define CPC_BASSBC			(1 << 1)
++#define CPC_DEEMPF			(0x01)
++
++/* Field masks for TSC2101_AUDIO_CTRL_3 */
++#define AC3_DMSVOL(ARG)			(((ARG) & 0x03) << 14)
++#define AC3_REFFS			(1 << 13)
++#define AC3_DAXFM			(1 << 12)
++#define AC3_SLVMS			(1 << 11)
++#define AC3_DALOVF			(1 << 7)
++#define AC3_DAROVF			(1 << 6)
++#define AC3_REVID(ARG)			(((ARG) & 0x07))
++
++/* Field masks for TSC2102_PLL1_CTRL */
++#define PLL1_PLLEN			(1 << 15)
++#define PLL1_Q_VAL(ARG)			(((ARG) & 0x0f) << 11)
++#define PLL1_P_VAL(ARG)			(((ARG) & 0x07) << 8)
++#define PLL1_I_VAL(ARG)			(((ARG) & 0x3f) << 2)
++
++/* Field masks for TSC2102_PLL2_CTRL */
++#define PLL2_D_VAL(ARG)			(((ARG) & 0x3fff) << 2)
++
++/* Field masks for TSC2101_AUDIO_CTRL_4 */
++#define AC4_DASTPD			(1 << 14)
++
++struct tsc2102_rate_info_s {
++	u16 sample_rate;
++	u8 divisor;
++	u8 fs_44k;	/* 44.1 kHz Fsref if 1, 48 kHz if 0 */
++};
++
++#endif	/* __LINUX_SPI_TSC2102_H */
+diff -pNur test/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/spi/Kconfig armadeus/buildroot/build_arm_nofpu/linux-2.6.18.1/drivers/spi/Kconfig
+--- ref/linux-2.6.18.1/drivers/spi/Kconfig	2007-09-22 02:39:35.000000000 +0200
++++ linux-2.6.18.1/drivers/spi/Kconfig	2007-09-16 11:08:17.000000000 +0200
+@@ -131,6 +131,13 @@ comment "SPI Protocol Masters"
  #
  # Add new SPI protocol masters in alphabetical order above this line
  #
 +config SPI_TSC2102
 +    depends on SPI_MASTER
++    depends on HWMON = n || HWMON
 +    tristate "TSC2102 codec support"
 +    ---help---
 +      Say Y here if you want support for the TSC2102 chip.  It
@@ -28,9 +194,10 @@
  
  
  # (slave support would go here)
---- a/drivers/spi/Makefile
-+++ a/drivers/spi/Makefile
-@@ -21,6 +21,7 @@
+diff -pNur ref/linux-2.6.18.1/drivers/spi/Makefile linux-2.6.18.1/drivers/spi/Makefile
+--- ref/linux-2.6.18.1/drivers/spi/Makefile	2007-09-22 02:39:35.000000000 +0200
++++ linux-2.6.18.1/drivers/spi/Makefile	2007-09-16 11:08:16.000000000 +0200
+@@ -21,6 +21,7 @@ obj-$(CONFIG_SPI_S3C24XX)		+= spi_s3c24x
  # 	... add above this line ...
  
  # SPI protocol drivers (device/link on bus)
@@ -38,16 +205,19 @@
  # 	... add above this line ...
  
  # SPI slave controller drivers (upstream link)
---- /dev/null
-+++ b/drivers/spi/tsc2102.c
-@@ -0,0 +1,1198 @@
+diff -pNur ref/linux-2.6.18.1/drivers/spi/tsc2102.c linux-2.6.18.1/drivers/spi/tsc2102.c
+--- ref/linux-2.6.18.1/drivers/spi/tsc2102.c	1970-01-01 01:00:00.000000000 +0100
++++ linux-2.6.18.1/drivers/spi/tsc2102.c	2007-09-22 01:42:55.000000000 +0200
+@@ -0,0 +1,1103 @@
 +/*
 + * drivers/spi/tsc2102.c
 + *
 + * TSC2102 interface driver.
++ * Copyright (C) 2007 Armadeus systems (nc)
++ * 			-> fix dead locks, reorganize state machine
++ *			-> fix scheduling while atomic and hwmon support			
++ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...> 
 + *
-+ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...>
-+ *
 + * This package is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
 + * the Free Software Foundation; either version 2 of the License, or
@@ -94,7 +264,10 @@
 +#define TSC2102_ADC_T1_CONTROL		0x2bf4
 +#define TSC2102_ADC_T2_CONTROL		0x33f4
 +#define TSC2102_ADC_DAV			0x4000
-+#define TSC2102_ADC_INT_REF		0x0016
++#define TSC2102_ADC_PEN			0x0000
++#define TSC2102_ADC_INT_REF_125		0x0016
++#define TSC2102_ADC_INT_REF_250		0x0017
++#define TSC2102_ADC_REF			TSC2102_ADC_INT_REF_250 /*2.5V*/
 +#define TSC2102_ADC_EXT_REF		0x0002
 +#define TSC2102_CONFIG_TIMES		0x0008
 +#define TSC2102_RESET			0xbb00
@@ -129,14 +302,14 @@
 +
 +struct tsc2102_dev {
 +	struct tsc2102_config *pdata;
-+	spinlock_t lock, lock_sync;
-+	struct clk *bclk_ck;
++	spinlock_t lock;
++	struct mutex lock_sync;
++//	struct clk *bclk_ck;  TODO add clock mechanism to i.MX ???
 +
-+	int state;			/* 0: TS, 1: Portscan, 2-3: Temps */
++	int state;			/* Scan modes */
 +	struct timer_list ts_timer;	/* Busy-wait for PEN UP */
 +	struct timer_list mode_timer;	/* Change .state every some time */
-+	int pendown;
-+	int data_pending;
++	int touch_in_progress;
 +	uint16_t status, adc_status, adc_data[4];
 +	tsc2102_touch_t touch_cb;
 +	tsc2102_coords_t coords_cb;
@@ -350,7 +523,9 @@
 +}
 +
 +tsc2102_cb_register_func(touch_cb, tsc2102_touch_t)
++EXPORT_SYMBOL(tsc2102_touch_cb);
 +tsc2102_cb_register_func(coords_cb, tsc2102_coords_t)
++EXPORT_SYMBOL(tsc2102_coords_cb);
 +tsc2102_cb_register_func(ports_cb, tsc2102_ports_t)
 +tsc2102_cb_register_func(temp1_cb, tsc2102_temp_t)
 +tsc2102_cb_register_func(temp2_cb, tsc2102_temp_t)
@@ -388,242 +563,153 @@
 +}
 +#endif
 +
-+static void tsc2102_complete_dummy(struct tsc2102_dev *dev)
-+{
-+}
++static void tsc2102_complete_dummy(struct tsc2102_dev *dev){}
 +
 +static inline void tsc2102_touchscreen_mode(struct tsc2102_dev *dev)
 +{
++	spin_lock_irq(&dev->lock);
++	dev->touch_in_progress = 1;
++
 +	/* Scan X, Y, Z1, Z2, chip controlled, 12-bit, 16 samples, 500 usec */
 +	tsc2102_write_async(&dev->req_mode,
 +			TSC2102_TS_ADC_CTRL, TSC2102_ADC_TS_CONTROL,
 +			tsc2102_complete_dummy);
++	spin_unlock_irq(&dev->lock);
 +}
 +
-+static inline void tsc2102_portscan_mode(struct tsc2102_dev *dev)
++static void tsc2102_end_current_conversion(struct tsc2102_dev *dev)
 +{
++	spin_lock_irq(&dev->lock);
++	dev->touch_in_progress = 0;
++	dev->state++;
++	switch (dev->state) {
 +	/* Scan BAT1, BAT2, AUX, 12-bit, 16 samples, 500 usec */
-+	tsc2102_write_async(&dev->req_mode,
-+			TSC2102_TS_ADC_CTRL, TSC2102_ADC_SCAN_CONTROL,
-+			tsc2102_complete_dummy);
-+}
-+
-+static inline void tsc2102_temp1_mode(struct tsc2102_dev *dev)
-+{
++	case 0: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
++		break;
 +	/* Scan TEMP1, 12-bit, 16 samples, 500 usec */
-+	tsc2102_write_async(&dev->req_mode,
-+			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T1_CONTROL,
-+			tsc2102_complete_dummy);
-+}
-+
-+static inline void tsc2102_temp2_mode(struct tsc2102_dev *dev)
-+{
++	case 1: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_T1_CONTROL,	tsc2102_complete_dummy);	
++		break;
 +	/* Scan TEMP2, 12-bit, 16 samples, 500 usec */
-+	tsc2102_write_async(&dev->req_mode,
-+			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T2_CONTROL,
-+			tsc2102_complete_dummy);
-+}
-+
-+static void tsc2102_mode(struct tsc2102_dev *dev)
-+{
-+	switch (dev->state) {
-+	case 0:
-+		tsc2102_touchscreen_mode(dev);
++	case 2:	tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_T2_CONTROL,	tsc2102_complete_dummy);		
 +		break;
-+	case 1:
-+		tsc2102_portscan_mode(dev);
-+		break;
-+	case 2:
-+		tsc2102_temp1_mode(dev);
-+		break;
-+	case 3:
-+		tsc2102_temp2_mode(dev);
-+		break;
-+	default:
++	default: 
++		tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
 +		dev->state = 0;
-+		tsc2102_touchscreen_mode(dev);
 +		break;
 +	}
++	spin_unlock_irq(&dev->lock);
++	mod_timer(&dev->mode_timer, jiffies +
++			msecs_to_jiffies(dev->mode_msecs));
 +}
 +
-+/* Lock is held when this is called.  */
-+static void tsc2102_new_mode(struct tsc2102_dev *dev)
++static void tsc2102_mode(unsigned long data)
 +{
-+	/* Abort current conversion if any */
++	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
++	spin_lock_irq(&dev->lock);
++
 +	tsc2102_write_async(&dev->req_stopadc,
 +			TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST,
-+			tsc2102_complete_dummy);
++			tsc2102_end_current_conversion);
 +
-+	dev->state ++;
-+	tsc2102_mode(dev);
++	spin_unlock_irq(&dev->lock);
 +}
 +
-+static void tsc2102_check_status(struct tsc2102_dev *dev);
++/* Read touch screen data */
++static void tsc2102_TS_data_report(struct tsc2102_dev *dev)
++{
++	if (dev->coords_cb)
++		dev->coords_cb(
++				dev->adc_data[0], dev->adc_data[1],
++				dev->adc_data[2], dev->adc_data[3]);
++}
 +
-+/* TSC has new data for us availiable.  */
-+static irqreturn_t tsc2102_handler(int irq, void *dev_id)
++static void tsc2102_pressure_report(struct tsc2102_dev *dev)
 +{
-+	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
 +	spin_lock_irq(&dev->lock);
++	mod_timer(&dev->mode_timer, jiffies +
++			msecs_to_jiffies(dev->mode_msecs));
 +
-+	if (!dev->data_pending)
-+		tsc2102_check_status(dev);
++	tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
++			dev->adc_data, 4, tsc2102_TS_data_report);
 +
-+	dev->data_pending ++;
-+
++	if ( dev->adc_status & TSC2102_ADC_PSTCM) {
++		mod_timer(&dev->ts_timer, jiffies +
++				msecs_to_jiffies(dev->ts_msecs));
++	}
 +	spin_unlock_irq(&dev->lock);
-+	return IRQ_HANDLED;
 +}
 +
-+static void tsc2102_data_report(struct tsc2102_dev *dev)
++static void tsc2102_scan_data_report(struct tsc2102_dev *dev)
 +{
-+	if (dev->status & TSC2102_TS_DAV) {
-+		if (dev->coords_cb)
-+			dev->coords_cb(
-+					dev->adc_data[0], dev->adc_data[1],
-+					dev->adc_data[2], dev->adc_data[3]);
-+	}
-+
-+	if (dev->status & TSC2102_PS_DAV) {
-+		if (dev->ports_cb)
-+			dev->ports_cb(dev->adc_data[0],
-+					dev->adc_data[1], dev->adc_data[2]);
-+		dev->bat[0] = dev->adc_data[0];
-+		dev->bat[1] = dev->adc_data[1];
-+		dev->aux[0] = dev->adc_data[2];
-+	}
-+
-+	if (dev->status & TSC2102_T1_DAV) {
-+		if (dev->temp1_cb)
-+			dev->temp1_cb(*dev->adc_data);
-+		dev->temp[0] = *dev->adc_data;
-+	}
-+
-+	if (dev->status & TSC2102_T2_DAV) {
-+		if (dev->temp2_cb)
-+			dev->temp2_cb(*dev->adc_data);
-+		dev->temp[1] = *dev->adc_data;
-+	}
-+
++	mod_timer(&dev->mode_timer, jiffies +
++		msecs_to_jiffies(dev->mode_msecs));
 +	spin_lock_irq(&dev->lock);
++	switch (dev->state)
++	{
++		case 0: if (dev->ports_cb)
++				dev->ports_cb(dev->adc_data[0],
++						dev->adc_data[1], dev->adc_data[2]);
++			dev->bat[0] = dev->adc_data[0];
++			dev->bat[1] = dev->adc_data[1];
++			dev->aux[0] = dev->adc_data[2];
++			break;
++		
++		case 1: if (dev->temp1_cb)
++				dev->temp1_cb(*dev->adc_data);
++			dev->temp[0] = *dev->adc_data;
++			break;
 +
-+	dev->data_pending --;
-+
-+	/*
-+	 * This may happen if the registers were successfully read and a
-+	 * new conversion was started and completed by the TSC before the
-+	 * completion for SPI read was called.
-+	 */
-+	if (dev->data_pending)
-+		tsc2102_check_status(dev);
-+
-+	if (dev->status & (TSC2102_PS_DAV | TSC2102_T1_DAV | TSC2102_T2_DAV))
-+		tsc2102_new_mode(dev);
-+
++		case 2: if (dev->temp2_cb)
++				dev->temp2_cb(*dev->adc_data);
++			dev->temp[1] = *dev->adc_data;
++			break;
++		default: break;
++	}
++	tsc2102_touchscreen_mode(dev);
 +	spin_unlock_irq(&dev->lock);
 +}
 +
-+static void tsc2102_status_report(struct tsc2102_dev *dev)
++/* TSC has new data for us available.  */
++static irqreturn_t tsc2102_handler(int irq, void *dev_id, struct pt_regs *regs)
 +{
-+	/*
-+	 * Read all converted data from corresponding registers
-+	 * so that the ADC can move on to a new conversion.
-+	 */
-+	if (dev->status & TSC2102_TS_DAV) {
-+		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
-+				dev->adc_data, 4, tsc2102_data_report);
-+		if (!dev->pendown) {
-+			dev->pendown = 1;
-+			if (dev->touch_cb)
-+				dev->touch_cb(1);
++	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
 +
-+			mod_timer(&dev->ts_timer, jiffies +
-+				msecs_to_jiffies(dev->ts_msecs));
-+		}
-+	}
++	mod_timer(&dev->mode_timer, jiffies +
++		msecs_to_jiffies(dev->mode_msecs));
 +
-+	if (dev->status & TSC2102_PS_DAV) {
-+		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
-+				dev->adc_data, 3, tsc2102_data_report);
++	spin_lock_irq(&dev->lock);
++	if( dev->touch_in_progress ){
++		tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
++				&dev->adc_status, tsc2102_pressure_report);
 +	}
-+
-+	if (dev->status & TSC2102_T1_DAV) {
-+		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
-+				dev->adc_data, tsc2102_data_report);
++	else{
++		switch(dev->state){
++			case 0: tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
++					dev->adc_data, 3, tsc2102_scan_data_report);
++				break;
++			case 1: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
++					dev->adc_data, tsc2102_scan_data_report);
++				break;
++			case 2: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
++					dev->adc_data, tsc2102_scan_data_report);
++				break;
++			default: break;
++		}
 +	}
-+
-+	if (dev->status & TSC2102_T2_DAV) {
-+		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
-+				dev->adc_data, tsc2102_data_report);
-+	}
-+
-+	if (!(dev->status & (TSC2102_TS_DAV | TSC2102_PS_DAV |
-+					TSC2102_T1_DAV | TSC2102_T2_DAV))) {
-+		spin_lock_irq(&dev->lock);
-+		dev->data_pending --;
-+		spin_unlock_irq(&dev->lock);
-+
-+		WARN_ON(!dev->state);
-+	}
-+}
-+
-+static void tsc2102_check_status(struct tsc2102_dev *dev)
-+{
-+	tsc2102_read_async(&dev->req_status, TSC2102_TS_STATUS_CTRL,
-+			&dev->status, tsc2102_status_report);
-+}
-+
-+static void tsc2102_mode_timer(unsigned long data)
-+{
-+	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
-+	spin_lock_irq(&dev->lock);
-+
-+	BUG_ON(dev->state);
-+
-+	tsc2102_new_mode(dev);
-+
-+	mod_timer(&dev->mode_timer, jiffies +
-+			msecs_to_jiffies(dev->mode_msecs));
 +	spin_unlock_irq(&dev->lock);
++	return IRQ_HANDLED;
 +}
 +
-+/*
-+ * There are at least three ways to check for pen-up:
-+ *	- the PINT/DAV pin state,
-+ *	- reading PSTCM bit in ADC Control register (D15, offset 0x00),
-+ *	- reading ADST bit in ADC Control register (D14, offset 0x00),
-+ *		ADC idle would indicate no screen touch.
-+ * Unfortunately none of them seems to be 100% accurate and you will
-+ * find they are totally inconsistent, i.e. you get to see any arbitrary
-+ * combination of values in these three bits.  So we will busy-wait
-+ * for a moment when all three indicate a pen-up, using a timer, before
-+ * we report a pen-up.
-+ */
-+static void tsc2102_pressure_report(struct tsc2102_dev *dev)
-+{
-+	if (!dev->pendown)
-+		return;
-+
-+	if (dev->state ||
-+			(dev->adc_status & TSC2102_ADC_PSTCM) ||
-+			!(dev->adc_status & TSC2102_ADC_ADST)) {
-+		mod_timer(&dev->ts_timer, jiffies +
-+				msecs_to_jiffies(dev->ts_msecs));
-+	} else {
-+		dev->pendown = 0;
-+		if (dev->touch_cb)
-+			dev->touch_cb(0);
-+	}
-+}
-+
 +static void tsc2102_pressure(unsigned long data)
 +{
 +	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
-+
-+	BUG_ON(!dev->pendown);
-+
-+	tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
-+			&dev->adc_status, tsc2102_pressure_report);
++	if (dev->touch_cb){
++		dev->touch_cb(0);
++	}
 +}
 +
 +#ifdef CONFIG_SOUND
@@ -639,22 +725,20 @@
 +	if (right_ch == 0x00 || right_ch == 0x7f)
 +		right_ch ^= 0x7f;
 +
-+	spin_lock(&tsc.lock_sync);
-+
++	mutex_lock(&tsc.lock_sync);
 +	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
 +
 +	val &= 0x8080;	/* Preserve mute-bits */
 +	val |= (left_ch << 8) | right_ch;
 +
 +	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
-+
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
 +void tsc2102_set_mute(int left_ch, int right_ch)
 +{
 +	u16 val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
 +
@@ -663,17 +747,17 @@
 +
 +	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
 +
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
 +void tsc2102_get_mute(int *left_ch, int *right_ch)
 +{
 +	u16 val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
 +
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +
 +	*left_ch = !!(val & (1 << 15));
 +	*right_ch = !!(val & (1 << 7));
@@ -682,7 +766,7 @@
 +void tsc2102_set_deemphasis(int enable)
 +{
 +	u16 val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
 +
 +	if (enable)
@@ -691,13 +775,13 @@
 +		val |= TSC2102_DEEMPF;
 +
 +	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
 +void tsc2102_set_bassboost(int enable)
 +{
 +	u16 val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
 +
 +	if (enable)
@@ -706,7 +790,7 @@
 +		val |= TSC2102_BASSBC;
 +
 +	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
 +/*	{rate, dsor, fsref}	*/
@@ -752,7 +836,7 @@
 +		return -EINVAL;
 +	}
 +
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	tsc2102_write_sync(TSC2102_AUDIO1_CTRL, tsc2102_rates[i].divisor);
 +
@@ -770,7 +854,7 @@
 +		tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_48K);
 +	}
 +
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +	return 0;
 +}
 +
@@ -779,7 +863,7 @@
 + */
 +void tsc2102_dac_power(int state)
 +{
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	if (state) {
 +		/* 16-bit words, DSP mode, sample at Fsref */
@@ -803,13 +887,13 @@
 +		tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_OFF);
 +	}
 +
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
 +void tsc2102_set_i2s_master(int state)
 +{
 +	uint16_t val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	val = tsc2102_read_sync(TSC2102_AUDIO3_CTRL);
 +
@@ -818,7 +902,7 @@
 +	else
 +		tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val & ~TSC2102_SLVMS);
 +
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +#endif	/* CONFIG_SOUND */
 +
@@ -827,9 +911,9 @@
 +	/* Reset the chip */
 +	tsc2102_write_sync(TSC2102_TS_RESET_CTRL, TSC2102_RESET);
 +
-+	/* Reference mode, 100 usec delay, 1.25 V reference */
++	/* Reference mode, 100 usec delay, 2.5V reference */
 +	if (dev->pdata->use_internal)
-+		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_INT_REF);
++		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_REF);
 +	else
 +		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_EXT_REF);
 +
@@ -839,7 +923,10 @@
 +	/* PINT/DAV acts as DAV */
 +	tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_DAV);
 +
-+	tsc2102_mode(dev);
++	/* Init mode state machine */
++	dev->state = 0; 
++	dev->touch_in_progress = 0;
++	/* Start mode timer */
 +	mod_timer(&dev->mode_timer, jiffies +
 +			msecs_to_jiffies(dev->mode_msecs));
 +	return 0;
@@ -867,7 +954,7 @@
 +void tsc2102_keyclick(int amplitude, int freq, int length)
 +{
 +	u16 val;
-+	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +	val = tsc2102_read_sync(TSC2102_AUDIO2_CTRL);
 +	val &= 0x800f;
 +
@@ -900,17 +987,17 @@
 +	val |= 0x8000;
 +
 +	tsc2102_write_sync(TSC2102_AUDIO2_CTRL, val);
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +}
 +
-+#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
 +#define TSC2102_INPUT(devname, field)	\
 +static ssize_t show_ ## devname(struct device *dev,	\
 +		struct device_attribute *devattr, char *buf)	\
 +{	\
 +	struct tsc2102_dev *devhwmon = dev_get_drvdata(dev);	\
 +	int value = devhwmon->field;	\
-+	return sprintf(buf, "%i\n", value);	\
++	return sprintf(buf, "%i\n", value); \
 +}	\
 +static DEVICE_ATTR(devname ## _input, S_IRUGO, show_ ## devname, NULL);
 +
@@ -924,29 +1011,19 @@
 +		struct device_attribute *devattr, char *buf)
 +{
 +	struct tsc2102_dev *devhwmon = dev_get_drvdata(dev);
-+	int t1, t2;
-+	int value, diff;
++	int value;
 +
-+	t1 = devhwmon->temp[0];
-+	t2 = devhwmon->temp[1];
-+
 +	/*
 +	 * Use method #2 (differential) to calculate current temperature.
-+	 * The difference between TEMP2 and TEMP1 input values is
-+	 * multiplied by a constant to obtain current temperature.
-+	 * To find this constant we use the values measured at 25 C as
-+	 * thermometer calibration data.
-+	 *
-+	 * 298150 is 25 degrees Celcius represented in Kelvins and
-+	 * multiplied by 1000 for fixed point precision (273.15 + 25).
-+	 * 273150 is zero degrees Celcius.
++	 * The approximation curve is: y = ax + b
++	 * where b = 185 and a = 0.61 (taken from TSC datasheet page 15)
++	 * the result (x) is in degree Celcius
++	 * As it is the silicium temperature, a compensation factor can specified to
++	 * estimate the ambient temperature.
 +	 */
-+	diff = devhwmon->pdata->temp_at25c[1] - devhwmon->pdata->temp_at25c[0];
-+	BUG_ON(diff == 0);
-+	value = (t2 - t1) * 298150 / diff;	/* This is in Kelvins now */
++	value = (devhwmon->temp[1] - devhwmon->temp[0] - 185)*1639 ;	/* Celcius millidegree */
 +
-+	t1 = value - 273150;			/* Celcius millidegree */
-+	return sprintf(buf, "%i\n", t1);
++	return sprintf(buf, "%i\n", value - devhwmon->pdata->temp_at25c);
 +}
 +static DEVICE_ATTR(temp1_input, S_IRUGO, show_temp1, NULL);
 +#endif	/* CONFIG_HWMON */
@@ -970,20 +1047,20 @@
 +	if (!dev)
 +		return 0;
 +
-+	spin_lock(&dev->lock_sync);
++	mutex_lock(&dev->lock_sync);
 +
 +	del_timer(&dev->mode_timer);
 +	del_timer(&dev->ts_timer);
 +
-+	if (dev->pendown && dev->touch_cb)
++	if (dev->touch_cb)
 +		dev->touch_cb(0);
 +
 +	/* Abort current conversion and power down the ADC */
 +	tsc2102_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
 +
 +	dev->spi->dev.power.power_state = state;
++	mutex_unlock(&dev->lock_sync);
 +
-+	spin_unlock(&dev->lock_sync);
 +	return 0;
 +}
 +
@@ -998,16 +1075,13 @@
 +	if (!dev)
 +		return 0;
 +
-+	spin_lock(&dev->lock_sync);
++	mutex_lock(&dev->lock_sync);
 +
 +	dev->spi->dev.power.power_state = PMSG_ON;
 +
-+	dev->state = 0;
-+	dev->pendown = 0;
-+
 +	err = tsc2102_configure(dev);
 +
-+	spin_unlock(&dev->lock_sync);
++	mutex_unlock(&dev->lock_sync);
 +	return err;
 +}
 +#else
@@ -1029,7 +1103,7 @@
 +{
 +	struct tsc2102_config *pdata = spi->dev.platform_data;
 +	struct spi_transfer *spi_buffer;
-+	int err = 0;
++	int err = -EINVAL;
 +
 +	if (!pdata) {
 +		printk(KERN_ERR "TSC2102: Platform data not supplied\n");
@@ -1042,11 +1116,8 @@
 +	}
 +
 +	tsc.pdata = pdata;
-+	tsc.state = 0;
-+	tsc.pendown = 0;
-+	tsc.data_pending = 0;
-+	tsc.ts_msecs = 20;
-+	tsc.mode_msecs = 1000;
++	tsc.ts_msecs = 30;
++	tsc.mode_msecs = 500;
 +	tsc.spi = spi;
 +
 +	/* Allocate enough struct spi_transfer's for all requests */
@@ -1064,21 +1135,23 @@
 +	tsc2102_request_alloc(&tsc, &tsc.req_mode, 1, 1, &spi_buffer);
 +
 +	spin_lock_init(&tsc.lock);
-+	spin_lock(&tsc.lock_sync);
++	mutex_init(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
 +
 +	/* Get the BCLK - assuming the rate is at 12000000 */
-+	tsc.bclk_ck = clk_get(0, "bclk");
++#ifdef IMX_CLOCK_CONFIG
++	tsc.bclk_ck = clk_get(0, "bclk"); TODO add clock mechanism to i.MX ???
 +	if (!tsc.bclk_ck) {
 +		printk(KERN_ERR "Unable to get the clock BCLK\n");
 +		err = -EPERM;
 +		goto done;
 +	}
-+
++ 
 +	clk_enable(tsc.bclk_ck);
++#endif //IMX_CLOCK_CONFIG
 +
-+	if (request_irq(spi->irq, tsc2102_handler, IRQF_SAMPLE_RANDOM |
-+				IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
-+		printk(KERN_ERR "Could not allocate touchscreen IRQ!\n");
++	if (request_irq(spi->irq, tsc2102_handler, IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
++		printk(KERN_ERR "Could not allocate touchscreen IRQ (n %d)\n", spi->irq);
 +		err = -EINVAL;
 +		goto err_clk;
 +	}
@@ -1086,7 +1159,7 @@
 +	setup_timer(&tsc.ts_timer,
 +			tsc2102_pressure, (unsigned long) &tsc);
 +	setup_timer(&tsc.mode_timer,
-+			tsc2102_mode_timer, (unsigned long) &tsc);
++			tsc2102_mode, (unsigned long) &tsc);
 +
 +	/* Set up the communication bus */
 +	dev_set_drvdata(&spi->dev, &tsc);
@@ -1099,7 +1172,7 @@
 +
 +	/* Now try to detect the chip, make first contact */
 +	if (tsc2102_get_revision() != 0x1) {
-+		printk(KERN_ERR "No TI TSC2102 chip found!\n");
++		printk(KERN_ERR "No TI TSC2102 chip found! Bad revision: %x\n", tsc2102_get_revision());
 +		goto err_timer;
 +	}
 +
@@ -1120,7 +1193,7 @@
 +	if (err)
 +		goto err_ts;
 +
-+#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
 +	tsc.hwmondev = hwmon_device_register(&spi->dev);
 +	if (IS_ERR(tsc.hwmondev)) {
 +		printk(KERN_ERR "tsc2102_hwmon: Device registration failed\n");
@@ -1163,34 +1236,34 @@
 +	del_timer(&tsc.mode_timer);
 +	dev_set_drvdata(&spi->dev, NULL);
 +err_clk:
-+	clk_disable(tsc.bclk_ck);
-+	clk_put(tsc.bclk_ck);
++/*	clk_disable(tsc.bclk_ck); TODO add clock mechanism to i.MX ???
++	clk_put(tsc.bclk_ck);*/
 +done:
-+	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
++
 +	return err;
 +}
 +
 +static int tsc2102_remove(struct spi_device *spi)
 +{
 +	struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
++	mutex_lock(&dev->lock_sync);
 +
-+	spin_lock(&dev->lock_sync);
-+
 +	platform_device_unregister(&tsc2102_ts_device);
 +	platform_device_unregister(&tsc2102_alsa_device);
 +
 +	dev_set_drvdata(&spi->dev, NULL);
 +
 +	/* Release the BCLK */
-+	clk_disable(dev->bclk_ck);
-+	clk_put(dev->bclk_ck);
++/*	clk_disable(dev->bclk_ck); TODO add clock mechanism to i.MX ???
++	clk_put(dev->bclk_ck); */
 +
 +	del_timer(&tsc.mode_timer);
 +	del_timer(&tsc.ts_timer);
 +
 +	kfree(tsc.transfers);
 +
-+#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
 +	hwmon_device_unregister(dev->hwmondev);
 +#endif
 +
@@ -1198,7 +1271,7 @@
 +	apm_get_power_status = 0;
 +#endif
 +
-+	spin_unlock(&dev->lock_sync);
++	mutex_unlock(&dev->lock_sync);
 +
 +	return 0;
 +}
@@ -1239,181 +1312,4 @@
 +MODULE_AUTHOR("Andrzej Zaborowski");
 +MODULE_DESCRIPTION("Interface driver for TI TSC2102 chips.");
 +MODULE_LICENSE("GPL");
---- /dev/null
-+++ b/include/linux/spi/tsc2102.h
-@@ -0,0 +1,175 @@
-+/*
-+ * include/linux/spi/tsc2102.h
-+ *
-+ * TI TSC2102 Touchscreen, Audio and Battery control register definitions 
-+ *
-+ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...>
-+ *
-+ * This package is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License as published by
-+ * the Free Software Foundation; either version 2 of the License, or
-+ * (at your option) any later version.
-+ *
-+ * This package is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ * GNU General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this package; if not, write to the Free Software
-+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-+ */
-+
-+#ifndef __LINUX_SPI_TSC2102_H
-+#define __LINUX_SPI_TSC2102_H
-+
-+struct apm_power_info;
-+struct tsc2102_config {
-+	int use_internal;	/* Use internal reference voltage */
-+	uint32_t monitor;	/* What inputs are relevant */
-+	int temp_at25c[2];	/* Thermometer calibration data */
-+	void (*apm_report)(struct apm_power_info *info, int *battery);
-+				/* Report status to APM based on battery[] */
-+	void *alsa_config;	/* .platform_data for the ALSA device */
-+};
-+
-+#define TSC_BAT1	(1 << 0)
-+#define TSC_BAT2	(1 << 1)
-+#define TSC_AUX		(1 << 2)
-+#define TSC_TEMP	(1 << 4)
-+
-+extern u16 tsc2102_read_sync(int page, u8 address);
-+extern void tsc2102_reads_sync(int page, u8 startaddress, u16 *data,
-+		int numregs);
-+extern void tsc2102_write_sync(int page, u8 address, u16 data);
-+
-+typedef void (*tsc2102_touch_t)(int touching);
-+typedef void (*tsc2102_coords_t)(int x, int y, int z1, int z2);
-+typedef void (*tsc2102_ports_t)(int bat1, int bat2, int aux);
-+typedef void (*tsc2102_temp_t)(int temp);
-+extern int tsc2102_touch_cb(tsc2102_touch_t handler);
-+extern int tsc2102_coords_cb(tsc2102_coords_t handler);
-+extern int tsc2102_ports_cb(tsc2102_ports_t handler);
-+extern int tsc2102_temp1_cb(tsc2102_temp_t handler);
-+extern int tsc2102_temp2_cb(tsc2102_temp_t handler);
-+
-+#ifdef CONFIG_SOUND
-+extern void tsc2102_set_volume(uint8_t left_ch, uint8_t right_ch);
-+extern void tsc2102_set_mute(int left_ch, int right_ch);
-+extern void tsc2102_get_mute(int *left_ch, int *right_ch);
-+extern void tsc2102_dac_power(int state);
-+extern int tsc2102_set_rate(int rate);
-+extern void tsc2102_set_i2s_master(int state);
-+extern void tsc2102_set_deemphasis(int enable);
-+extern void tsc2102_set_bassboost(int enable);
-+#endif
-+
-+extern void tsc2102_keyclick(int amplitude, int freq, int length);
-+
-+#define TSC2102_REG(pg, addr)		pg, addr
-+
-+/* Page 0, Touch Screen & Keypad Data registers */
-+#define TSC2102_TS_X			TSC2102_REG(0, 0x00)
-+#define TSC2102_TS_Y			TSC2102_REG(0, 0x01)
-+#define TSC2102_TS_Z1			TSC2102_REG(0, 0x02)
-+#define TSC2102_TS_Z2			TSC2102_REG(0, 0x03)
-+#define TSC2102_TS_BAT1			TSC2102_REG(0, 0x05)
-+#define TSC2102_TS_BAT2			TSC2102_REG(0, 0x06)
-+#define TSC2102_TS_AUX			TSC2102_REG(0, 0x07)
-+#define TSC2102_TS_TEMP1		TSC2102_REG(0, 0x09)
-+#define TSC2102_TS_TEMP2		TSC2102_REG(0, 0x0a)
-+
-+/* Page 1, Touch Screen & Keypad Control registers */
-+#define TSC2102_TS_ADC_CTRL		TSC2102_REG(1, 0x00)
-+#define TSC2102_TS_STATUS_CTRL		TSC2102_REG(1, 0x01)
-+#define TSC2102_TS_REF_CTRL		TSC2102_REG(1, 0x03)
-+#define TSC2102_TS_RESET_CTRL		TSC2102_REG(1, 0x04)
-+#define TSC2102_TS_CONFIG_CTRL		TSC2102_REG(1, 0x05)
-+
-+/* Page 2, Audio Control registers */
-+#define TSC2102_AUDIO1_CTRL		TSC2102_REG(2, 0x00)
-+#define TSC2102_DAC_GAIN_CTRL		TSC2102_REG(2, 0x02)
-+#define TSC2102_AUDIO2_CTRL		TSC2102_REG(2, 0x04)
-+#define TSC2102_DAC_POWER_CTRL		TSC2102_REG(2, 0x05)
-+#define TSC2102_AUDIO3_CTRL		TSC2102_REG(2, 0x06)
-+#define TSC2102_LCH_BASS_BOOST_N0	TSC2102_REG(2, 0x07)
-+#define TSC2102_LCH_BASS_BOOST_N1	TSC2102_REG(2, 0x08)
-+#define TSC2102_LCH_BASS_BOOST_N2	TSC2102_REG(2, 0x09)
-+#define TSC2102_LCH_BASS_BOOST_N3	TSC2102_REG(2, 0x0a)
-+#define TSC2102_LCH_BASS_BOOST_N4	TSC2102_REG(2, 0x0b)
-+#define TSC2102_LCH_BASS_BOOST_N5	TSC2102_REG(2, 0x0c)
-+#define TSC2102_LCH_BASS_BOOST_D1	TSC2102_REG(2, 0x0d)
-+#define TSC2102_LCH_BASS_BOOST_D2	TSC2102_REG(2, 0x0e)
-+#define TSC2102_LCH_BASS_BOOST_D4	TSC2102_REG(2, 0x0f)
-+#define TSC2102_LCH_BASS_BOOST_D5	TSC2102_REG(2, 0x10)
-+#define TSC2102_RCH_BASS_BOOST_N0	TSC2102_REG(2, 0x11)
-+#define TSC2102_RCH_BASS_BOOST_N1	TSC2102_REG(2, 0x12)
-+#define TSC2102_RCH_BASS_BOOST_N2	TSC2102_REG(2, 0x13)
-+#define TSC2102_RCH_BASS_BOOST_N3	TSC2102_REG(2, 0x14)
-+#define TSC2102_RCH_BASS_BOOST_N4	TSC2102_REG(2, 0x15)
-+#define TSC2102_RCH_BASS_BOOST_N5	TSC2102_REG(2, 0x16)
-+#define TSC2102_RCH_BASS_BOOST_D1	TSC2102_REG(2, 0x17)
-+#define TSC2102_RCH_BASS_BOOST_D2	TSC2102_REG(2, 0x18)
-+#define TSC2102_RCH_BASS_BOOST_D4	TSC2102_REG(2, 0x19)
-+#define TSC2102_RCH_BASS_BOOST_D5	TSC2102_REG(2, 0x1a)
-+#define TSC2102_PLL1_CTRL		TSC2102_REG(2, 0x1b)
-+#define TSC2102_PLL2_CTRL		TSC2102_REG(2, 0x1c)
-+#define TSC2102_AUDIO4_CTRL		TSC2102_REG(2, 0x1d)
-+
-+/* Field masks for Audio Control 1 */
-+#define AC1_WLEN(ARG)			(((ARG) & 0x03) << 10)
-+#define AC1_DATFM(ARG)			(((ARG) & 0x03) << 8)
-+#define AC1_DACFS(ARG)			((ARG) & 0x3f)
-+
-+/* Field masks for TSC2102_DAC_GAIN_CTRL */
-+#define DGC_DALMU			(1 << 15)
-+#define DGC_DALVL(ARG)			(((ARG) & 0x7f) << 8)
-+#define DGC_DARMU			(1 << 7)
-+#define DGC_DARVL(ARG)			(((ARG) & 0x7f))
-+
-+/* Field formats for TSC2102_AUDIO2_CTRL */
-+#define AC2_KCLEN			(1 << 15)
-+#define AC2_KCLAC(ARG)			(((ARG) & 0x07) << 12)
-+#define AC2_KCLFRQ(ARG)			(((ARG) & 0x07) << 8)
-+#define AC2_KCLLN(ARG)			(((ARG) & 0x0f) << 4)
-+#define AC2_DLGAF			(1 << 3)
-+#define AC2_DRGAF			(1 << 2)
-+#define AC2_DASTC			(1 << 1)
-+
-+/* Field masks for TSC2102_DAC_POWER_CTRL */
-+#define CPC_PWDNC			(1 << 15)
-+#define CPC_DAODRC			(1 << 12)
-+#define CPC_DAPWDN			(1 << 10)
-+#define CPC_VGPWDN			(1 << 8)
-+#define CPC_DAPWDF			(1 << 6)
-+#define CPC_BASSBC			(1 << 1)
-+#define CPC_DEEMPF			(0x01)
-+
-+/* Field masks for TSC2101_AUDIO_CTRL_3 */
-+#define AC3_DMSVOL(ARG)			(((ARG) & 0x03) << 14)
-+#define AC3_REFFS			(1 << 13)
-+#define AC3_DAXFM			(1 << 12)
-+#define AC3_SLVMS			(1 << 11)
-+#define AC3_DALOVF			(1 << 7)
-+#define AC3_DAROVF			(1 << 6)
-+#define AC3_REVID(ARG)			(((ARG) & 0x07))
-+
-+/* Field masks for TSC2102_PLL1_CTRL */
-+#define PLL1_PLLEN			(1 << 15)
-+#define PLL1_Q_VAL(ARG)			(((ARG) & 0x0f) << 11)
-+#define PLL1_P_VAL(ARG)			(((ARG) & 0x07) << 8)
-+#define PLL1_I_VAL(ARG)			(((ARG) & 0x3f) << 2)
-+
-+/* Field masks for TSC2102_PLL2_CTRL */
-+#define PLL2_D_VAL(ARG)			(((ARG) & 0x3fff) << 2)
-+
-+/* Field masks for TSC2101_AUDIO_CTRL_4 */
-+#define AC4_DASTPD			(1 << 14)
-+
-+struct tsc2102_rate_info_s {
-+	u16 sample_rate;
-+	u8 divisor;
-+	u8 fs_44k;	/* 44.1 kHz Fsref if 1, 48 kHz if 0 */
-+};
-+
-+#endif	/* __LINUX_SPI_TSC2102_H */
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [648] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff

[<th...@us...>]

Revision: 648
          http://armadeus.svn.sourceforge.net/armadeus/?rev=648&view=rev
Author:   thom25
Date:     2007-09-27 11:32:23 -0700 (Thu, 27 Sep 2007)

Log Message:
-----------
remove armadeus patch. new driver is created

Removed Paths:
-------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff

Deleted: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff	2007-09-23 20:12:09 UTC (rev 647)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff	2007-09-27 18:32:23 UTC (rev 648)
@@ -1,782 +0,0 @@
---- linux-2.6.18.1/drivers/input/touchscreen/tsc2102_ts.c	2007-08-02 00:49:55.000000000 +0200
-+++ linux-2.6.18.1.mod/drivers/input/touchscreen/tsc2102_ts.c	2007-07-01 19:24:12.000000000 +0200
-@@ -42,8 +42,8 @@
- 	}
- 
- 	input_report_key(dev, BTN_TOUCH, touching);
--
--	do_poke_blanked_console = 1;
-+	//printk("Touch: %d\n", touching);
-+	//do_poke_blanked_console = 1; Unknown symbol in 2.6.18.1
- }
- 
- static void tsc2102_coords(int x, int y, int z1, int z2)
---- linux-2.6.18.1/drivers/spi/Kconfig	2007-09-16 07:52:11.000000000 +0200
-+++ linux-2.6.18.1.mod/drivers/spi/Kconfig	2007-09-16 06:36:48.000000000 +0200
-@@ -133,6 +133,7 @@ comment "SPI Protocol Masters"
- #
- config SPI_TSC2102
-     depends on SPI_MASTER
-+    depends on HWMON = n || HWMON
-     tristate "TSC2102 codec support"
-     ---help---
-       Say Y here if you want support for the TSC2102 chip.  It
---- linux-2.6.18.1/drivers/spi/tsc2102.c	2007-09-16 07:52:11.000000000 +0200
-+++ linux-2.6.18.1.mod/drivers/spi/tsc2102.c	2007-09-16 07:09:23.000000000 +0200
-@@ -2,8 +2,10 @@
-  * drivers/spi/tsc2102.c
-  *
-  * TSC2102 interface driver.
-- *
-- * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...>
-+ * Copyright (C) 2007 Armadeus systems (nc)
-+ * 			-> fix dead locks, reorganize state machine
-+ *			-> fix scheduling while atomic and hwmon support			
-+ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...> 
-  *
-  * This package is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -51,7 +53,10 @@
- #define TSC2102_ADC_T1_CONTROL		0x2bf4
- #define TSC2102_ADC_T2_CONTROL		0x33f4
- #define TSC2102_ADC_DAV			0x4000
--#define TSC2102_ADC_INT_REF		0x0016
-+#define TSC2102_ADC_PEN			0x0000
-+#define TSC2102_ADC_INT_REF_125		0x0016
-+#define TSC2102_ADC_INT_REF_250		0x0017
-+#define TSC2102_ADC_REF			TSC2102_ADC_INT_REF_250 /*2.5V*/
- #define TSC2102_ADC_EXT_REF		0x0002
- #define TSC2102_CONFIG_TIMES		0x0008
- #define TSC2102_RESET			0xbb00
-@@ -86,14 +91,14 @@ struct tsc2102_spi_req {
- 
- struct tsc2102_dev {
- 	struct tsc2102_config *pdata;
--	spinlock_t lock, lock_sync;
--	struct clk *bclk_ck;
-+	spinlock_t lock;
-+	struct mutex lock_sync;
-+//	struct clk *bclk_ck;  TODO add clock mechanism to i.MX ???
- 
--	int state;			/* 0: TS, 1: Portscan, 2-3: Temps */
-+	int state;			/* Scan modes */
- 	struct timer_list ts_timer;	/* Busy-wait for PEN UP */
- 	struct timer_list mode_timer;	/* Change .state every some time */
--	int pendown;
--	int data_pending;
-+	int touch_in_progress;
- 	uint16_t status, adc_status, adc_data[4];
- 	tsc2102_touch_t touch_cb;
- 	tsc2102_coords_t coords_cb;
-@@ -307,7 +312,9 @@ int tsc2102_ ## cb(cb_t handler)	\
- }
- 
- tsc2102_cb_register_func(touch_cb, tsc2102_touch_t)
-+EXPORT_SYMBOL(tsc2102_touch_cb);
- tsc2102_cb_register_func(coords_cb, tsc2102_coords_t)
-+EXPORT_SYMBOL(tsc2102_coords_cb);
- tsc2102_cb_register_func(ports_cb, tsc2102_ports_t)
- tsc2102_cb_register_func(temp1_cb, tsc2102_temp_t)
- tsc2102_cb_register_func(temp2_cb, tsc2102_temp_t)
-@@ -345,242 +352,153 @@ static void tsc2102_print_dav(void)
- }
- #endif
- 
--static void tsc2102_complete_dummy(struct tsc2102_dev *dev)
--{
--}
-+static void tsc2102_complete_dummy(struct tsc2102_dev *dev){}
- 
- static inline void tsc2102_touchscreen_mode(struct tsc2102_dev *dev)
- {
-+	spin_lock_irq(&dev->lock);
-+	dev->touch_in_progress = 1;
-+
- 	/* Scan X, Y, Z1, Z2, chip controlled, 12-bit, 16 samples, 500 usec */
- 	tsc2102_write_async(&dev->req_mode,
- 			TSC2102_TS_ADC_CTRL, TSC2102_ADC_TS_CONTROL,
- 			tsc2102_complete_dummy);
-+	spin_unlock_irq(&dev->lock);
- }
- 
--static inline void tsc2102_portscan_mode(struct tsc2102_dev *dev)
--{
--	/* Scan BAT1, BAT2, AUX, 12-bit, 16 samples, 500 usec */
--	tsc2102_write_async(&dev->req_mode,
--			TSC2102_TS_ADC_CTRL, TSC2102_ADC_SCAN_CONTROL,
--			tsc2102_complete_dummy);
--}
--
--static inline void tsc2102_temp1_mode(struct tsc2102_dev *dev)
--{
--	/* Scan TEMP1, 12-bit, 16 samples, 500 usec */
--	tsc2102_write_async(&dev->req_mode,
--			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T1_CONTROL,
--			tsc2102_complete_dummy);
--}
--
--static inline void tsc2102_temp2_mode(struct tsc2102_dev *dev)
--{
--	/* Scan TEMP2, 12-bit, 16 samples, 500 usec */
--	tsc2102_write_async(&dev->req_mode,
--			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T2_CONTROL,
--			tsc2102_complete_dummy);
--}
--
--static void tsc2102_mode(struct tsc2102_dev *dev)
-+static void tsc2102_end_current_conversion(struct tsc2102_dev *dev)
- {
-+	spin_lock_irq(&dev->lock);
-+	dev->touch_in_progress = 0;
-+	dev->state++;
- 	switch (dev->state) {
--	case 0:
--		tsc2102_touchscreen_mode(dev);
--		break;
--	case 1:
--		tsc2102_portscan_mode(dev);
-+	/* Scan BAT1, BAT2, AUX, 12-bit, 16 samples, 500 usec */
-+	case 0: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
-+			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
- 		break;
--	case 2:
--		tsc2102_temp1_mode(dev);
-+	/* Scan TEMP1, 12-bit, 16 samples, 500 usec */
-+	case 1: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
-+			TSC2102_ADC_T1_CONTROL,	tsc2102_complete_dummy);	
- 		break;
--	case 3:
--		tsc2102_temp2_mode(dev);
-+	/* Scan TEMP2, 12-bit, 16 samples, 500 usec */
-+	case 2:	tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
-+			TSC2102_ADC_T2_CONTROL,	tsc2102_complete_dummy);		
- 		break;
--	default:
-+	default: 
-+		tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
-+			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
- 		dev->state = 0;
--		tsc2102_touchscreen_mode(dev);
- 		break;
- 	}
-+	spin_unlock_irq(&dev->lock);
-+	mod_timer(&dev->mode_timer, jiffies +
-+			msecs_to_jiffies(dev->mode_msecs));
- }
- 
--/* Lock is held when this is called.  */
--static void tsc2102_new_mode(struct tsc2102_dev *dev)
-+static void tsc2102_mode(unsigned long data)
- {
--	/* Abort current conversion if any */
-+	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
-+	spin_lock_irq(&dev->lock);
-+
- 	tsc2102_write_async(&dev->req_stopadc,
- 			TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST,
--			tsc2102_complete_dummy);
-+			tsc2102_end_current_conversion);
- 
--	dev->state ++;
--	tsc2102_mode(dev);
-+	spin_unlock_irq(&dev->lock);
- }
- 
--static void tsc2102_check_status(struct tsc2102_dev *dev);
--
--/* TSC has new data for us availiable.  */
--static irqreturn_t tsc2102_handler(int irq, void *dev_id)
-+/* Read touch screen data */
-+static void tsc2102_TS_data_report(struct tsc2102_dev *dev)
- {
--	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
--	spin_lock_irq(&dev->lock);
--
--	if (!dev->data_pending)
--		tsc2102_check_status(dev);
--
--	dev->data_pending ++;
--
--	spin_unlock_irq(&dev->lock);
--	return IRQ_HANDLED;
-+	if (dev->coords_cb)
-+		dev->coords_cb(
-+				dev->adc_data[0], dev->adc_data[1],
-+				dev->adc_data[2], dev->adc_data[3]);
- }
- 
--static void tsc2102_data_report(struct tsc2102_dev *dev)
-+static void tsc2102_pressure_report(struct tsc2102_dev *dev)
- {
--	if (dev->status & TSC2102_TS_DAV) {
--		if (dev->coords_cb)
--			dev->coords_cb(
--					dev->adc_data[0], dev->adc_data[1],
--					dev->adc_data[2], dev->adc_data[3]);
--	}
--
--	if (dev->status & TSC2102_PS_DAV) {
--		if (dev->ports_cb)
--			dev->ports_cb(dev->adc_data[0],
--					dev->adc_data[1], dev->adc_data[2]);
--		dev->bat[0] = dev->adc_data[0];
--		dev->bat[1] = dev->adc_data[1];
--		dev->aux[0] = dev->adc_data[2];
--	}
--
--	if (dev->status & TSC2102_T1_DAV) {
--		if (dev->temp1_cb)
--			dev->temp1_cb(*dev->adc_data);
--		dev->temp[0] = *dev->adc_data;
--	}
--
--	if (dev->status & TSC2102_T2_DAV) {
--		if (dev->temp2_cb)
--			dev->temp2_cb(*dev->adc_data);
--		dev->temp[1] = *dev->adc_data;
--	}
--
- 	spin_lock_irq(&dev->lock);
-+	mod_timer(&dev->mode_timer, jiffies +
-+			msecs_to_jiffies(dev->mode_msecs));
- 
--	dev->data_pending --;
--
--	/*
--	 * This may happen if the registers were successfully read and a
--	 * new conversion was started and completed by the TSC before the
--	 * completion for SPI read was called.
--	 */
--	if (dev->data_pending)
--		tsc2102_check_status(dev);
--
--	if (dev->status & (TSC2102_PS_DAV | TSC2102_T1_DAV | TSC2102_T2_DAV))
--		tsc2102_new_mode(dev);
--
--	spin_unlock_irq(&dev->lock);
--}
-+	tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
-+			dev->adc_data, 4, tsc2102_TS_data_report);
- 
--static void tsc2102_status_report(struct tsc2102_dev *dev)
--{
--	/*
--	 * Read all converted data from corresponding registers
--	 * so that the ADC can move on to a new conversion.
--	 */
--	if (dev->status & TSC2102_TS_DAV) {
--		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
--				dev->adc_data, 4, tsc2102_data_report);
--		if (!dev->pendown) {
--			dev->pendown = 1;
--			if (dev->touch_cb)
--				dev->touch_cb(1);
--
--			mod_timer(&dev->ts_timer, jiffies +
-+	if ( dev->adc_status & TSC2102_ADC_PSTCM) {
-+		mod_timer(&dev->ts_timer, jiffies +
- 				msecs_to_jiffies(dev->ts_msecs));
--		}
--	}
--
--	if (dev->status & TSC2102_PS_DAV) {
--		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
--				dev->adc_data, 3, tsc2102_data_report);
- 	}
--
--	if (dev->status & TSC2102_T1_DAV) {
--		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
--				dev->adc_data, tsc2102_data_report);
--	}
--
--	if (dev->status & TSC2102_T2_DAV) {
--		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
--				dev->adc_data, tsc2102_data_report);
--	}
--
--	if (!(dev->status & (TSC2102_TS_DAV | TSC2102_PS_DAV |
--					TSC2102_T1_DAV | TSC2102_T2_DAV))) {
--		spin_lock_irq(&dev->lock);
--		dev->data_pending --;
--		spin_unlock_irq(&dev->lock);
--
--		WARN_ON(!dev->state);
--	}
--}
--
--static void tsc2102_check_status(struct tsc2102_dev *dev)
--{
--	tsc2102_read_async(&dev->req_status, TSC2102_TS_STATUS_CTRL,
--			&dev->status, tsc2102_status_report);
-+	spin_unlock_irq(&dev->lock);
- }
- 
--static void tsc2102_mode_timer(unsigned long data)
-+static void tsc2102_scan_data_report(struct tsc2102_dev *dev)
- {
--	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
-+	mod_timer(&dev->mode_timer, jiffies +
-+		msecs_to_jiffies(dev->mode_msecs));
- 	spin_lock_irq(&dev->lock);
-+	switch (dev->state)
-+	{
-+		case 0: if (dev->ports_cb)
-+				dev->ports_cb(dev->adc_data[0],
-+						dev->adc_data[1], dev->adc_data[2]);
-+			dev->bat[0] = dev->adc_data[0];
-+			dev->bat[1] = dev->adc_data[1];
-+			dev->aux[0] = dev->adc_data[2];
-+			break;
-+		
-+		case 1: if (dev->temp1_cb)
-+				dev->temp1_cb(*dev->adc_data);
-+			dev->temp[0] = *dev->adc_data;
-+			break;
- 
--	BUG_ON(dev->state);
--
--	tsc2102_new_mode(dev);
--
--	mod_timer(&dev->mode_timer, jiffies +
--			msecs_to_jiffies(dev->mode_msecs));
-+		case 2: if (dev->temp2_cb)
-+				dev->temp2_cb(*dev->adc_data);
-+			dev->temp[1] = *dev->adc_data;
-+			break;
-+		default: break;
-+	}
-+	tsc2102_touchscreen_mode(dev);
- 	spin_unlock_irq(&dev->lock);
- }
- 
--/*
-- * There are at least three ways to check for pen-up:
-- *	- the PINT/DAV pin state,
-- *	- reading PSTCM bit in ADC Control register (D15, offset 0x00),
-- *	- reading ADST bit in ADC Control register (D14, offset 0x00),
-- *		ADC idle would indicate no screen touch.
-- * Unfortunately none of them seems to be 100% accurate and you will
-- * find they are totally inconsistent, i.e. you get to see any arbitrary
-- * combination of values in these three bits.  So we will busy-wait
-- * for a moment when all three indicate a pen-up, using a timer, before
-- * we report a pen-up.
-- */
--static void tsc2102_pressure_report(struct tsc2102_dev *dev)
-+/* TSC has new data for us available.  */
-+static irqreturn_t tsc2102_handler(int irq, void *dev_id, struct pt_regs *regs)
- {
--	if (!dev->pendown)
--		return;
-+	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
- 
--	if (dev->state ||
--			(dev->adc_status & TSC2102_ADC_PSTCM) ||
--			!(dev->adc_status & TSC2102_ADC_ADST)) {
--		mod_timer(&dev->ts_timer, jiffies +
--				msecs_to_jiffies(dev->ts_msecs));
--	} else {
--		dev->pendown = 0;
--		if (dev->touch_cb)
--			dev->touch_cb(0);
-+	mod_timer(&dev->mode_timer, jiffies +
-+		msecs_to_jiffies(dev->mode_msecs));
-+
-+	spin_lock_irq(&dev->lock);
-+	if( dev->touch_in_progress ){
-+		tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
-+				&dev->adc_status, tsc2102_pressure_report);
-+	}
-+	else{
-+		switch(dev->state){
-+			case 0: tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
-+					dev->adc_data, 3, tsc2102_scan_data_report);
-+				break;
-+			case 1: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
-+					dev->adc_data, tsc2102_scan_data_report);
-+				break;
-+			case 2: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
-+					dev->adc_data, tsc2102_scan_data_report);
-+				break;
-+			default: break;
-+		}
- 	}
-+	spin_unlock_irq(&dev->lock);
-+	return IRQ_HANDLED;
- }
- 
- static void tsc2102_pressure(unsigned long data)
- {
- 	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
--
--	BUG_ON(!dev->pendown);
--
--	tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
--			&dev->adc_status, tsc2102_pressure_report);
-+	if (dev->touch_cb){
-+		dev->touch_cb(0);
-+	}
- }
- 
- #ifdef CONFIG_SOUND
-@@ -596,22 +514,20 @@ void tsc2102_set_volume(uint8_t left_ch,
- 	if (right_ch == 0x00 || right_ch == 0x7f)
- 		right_ch ^= 0x7f;
- 
--	spin_lock(&tsc.lock_sync);
--
-+	mutex_lock(&tsc.lock_sync);
- 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
- 
- 	val &= 0x8080;	/* Preserve mute-bits */
- 	val |= (left_ch << 8) | right_ch;
- 
- 	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
--
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
- void tsc2102_set_mute(int left_ch, int right_ch)
- {
- 	u16 val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
- 
-@@ -620,17 +536,17 @@ void tsc2102_set_mute(int left_ch, int r
- 
- 	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
- 
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
- void tsc2102_get_mute(int *left_ch, int *right_ch)
- {
- 	u16 val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
- 
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- 
- 	*left_ch = !!(val & (1 << 15));
- 	*right_ch = !!(val & (1 << 7));
-@@ -639,7 +555,7 @@ void tsc2102_get_mute(int *left_ch, int 
- void tsc2102_set_deemphasis(int enable)
- {
- 	u16 val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
- 
- 	if (enable)
-@@ -648,13 +564,13 @@ void tsc2102_set_deemphasis(int enable)
- 		val |= TSC2102_DEEMPF;
- 
- 	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
- void tsc2102_set_bassboost(int enable)
- {
- 	u16 val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
- 
- 	if (enable)
-@@ -663,7 +579,7 @@ void tsc2102_set_bassboost(int enable)
- 		val |= TSC2102_BASSBC;
- 
- 	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
- /*	{rate, dsor, fsref}	*/
-@@ -709,7 +625,7 @@ int tsc2102_set_rate(int rate)
- 		return -EINVAL;
- 	}
- 
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	tsc2102_write_sync(TSC2102_AUDIO1_CTRL, tsc2102_rates[i].divisor);
- 
-@@ -727,7 +643,7 @@ int tsc2102_set_rate(int rate)
- 		tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_48K);
- 	}
- 
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- 	return 0;
- }
- 
-@@ -736,7 +652,7 @@ int tsc2102_set_rate(int rate)
-  */
- void tsc2102_dac_power(int state)
- {
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	if (state) {
- 		/* 16-bit words, DSP mode, sample at Fsref */
-@@ -760,13 +676,13 @@ void tsc2102_dac_power(int state)
- 		tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_OFF);
- 	}
- 
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
- void tsc2102_set_i2s_master(int state)
- {
- 	uint16_t val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	val = tsc2102_read_sync(TSC2102_AUDIO3_CTRL);
- 
-@@ -775,7 +691,7 @@ void tsc2102_set_i2s_master(int state)
- 	else
- 		tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val & ~TSC2102_SLVMS);
- 
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- #endif	/* CONFIG_SOUND */
- 
-@@ -784,9 +700,9 @@ static int tsc2102_configure(struct tsc2
- 	/* Reset the chip */
- 	tsc2102_write_sync(TSC2102_TS_RESET_CTRL, TSC2102_RESET);
- 
--	/* Reference mode, 100 usec delay, 1.25 V reference */
-+	/* Reference mode, 100 usec delay, 2.5V reference */
- 	if (dev->pdata->use_internal)
--		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_INT_REF);
-+		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_REF);
- 	else
- 		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_EXT_REF);
- 
-@@ -796,7 +712,10 @@ static int tsc2102_configure(struct tsc2
- 	/* PINT/DAV acts as DAV */
- 	tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_DAV);
- 
--	tsc2102_mode(dev);
-+	/* Init mode state machine */
-+	dev->state = 0; 
-+	dev->touch_in_progress = 0;
-+	/* Start mode timer */
- 	mod_timer(&dev->mode_timer, jiffies +
- 			msecs_to_jiffies(dev->mode_msecs));
- 	return 0;
-@@ -824,7 +743,7 @@ int tsc2102_get_revision(void)
- void tsc2102_keyclick(int amplitude, int freq, int length)
- {
- 	u16 val;
--	spin_lock(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 	val = tsc2102_read_sync(TSC2102_AUDIO2_CTRL);
- 	val &= 0x800f;
- 
-@@ -857,17 +776,17 @@ void tsc2102_keyclick(int amplitude, int
- 	val |= 0x8000;
- 
- 	tsc2102_write_sync(TSC2102_AUDIO2_CTRL, val);
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
- }
- 
--#ifdef CONFIG_HWMON
-+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
- #define TSC2102_INPUT(devname, field)	\
- static ssize_t show_ ## devname(struct device *dev,	\
- 		struct device_attribute *devattr, char *buf)	\
- {	\
- 	struct tsc2102_dev *devhwmon = dev_get_drvdata(dev);	\
- 	int value = devhwmon->field;	\
--	return sprintf(buf, "%i\n", value);	\
-+	return sprintf(buf, "%i\n", value); \
- }	\
- static DEVICE_ATTR(devname ## _input, S_IRUGO, show_ ## devname, NULL);
- 
-@@ -927,20 +846,20 @@ tsc2102_suspend(struct spi_device *spi, 
- 	if (!dev)
- 		return 0;
- 
--	spin_lock(&dev->lock_sync);
-+	mutex_lock(&dev->lock_sync);
- 
- 	del_timer(&dev->mode_timer);
- 	del_timer(&dev->ts_timer);
- 
--	if (dev->pendown && dev->touch_cb)
-+	if (dev->touch_cb)
- 		dev->touch_cb(0);
- 
- 	/* Abort current conversion and power down the ADC */
- 	tsc2102_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
- 
- 	dev->spi->dev.power.power_state = state;
-+	mutex_unlock(&dev->lock_sync);
- 
--	spin_unlock(&dev->lock_sync);
- 	return 0;
- }
- 
-@@ -955,16 +874,13 @@ static int tsc2102_resume(struct spi_dev
- 	if (!dev)
- 		return 0;
- 
--	spin_lock(&dev->lock_sync);
-+	mutex_lock(&dev->lock_sync);
- 
- 	dev->spi->dev.power.power_state = PMSG_ON;
- 
--	dev->state = 0;
--	dev->pendown = 0;
--
- 	err = tsc2102_configure(dev);
- 
--	spin_unlock(&dev->lock_sync);
-+	mutex_unlock(&dev->lock_sync);
- 	return err;
- }
- #else
-@@ -986,7 +902,7 @@ static int tsc2102_probe(struct spi_devi
- {
- 	struct tsc2102_config *pdata = spi->dev.platform_data;
- 	struct spi_transfer *spi_buffer;
--	int err = 0;
-+	int err = -EINVAL;
- 
- 	if (!pdata) {
- 		printk(KERN_ERR "TSC2102: Platform data not supplied\n");
-@@ -999,11 +915,8 @@ static int tsc2102_probe(struct spi_devi
- 	}
- 
- 	tsc.pdata = pdata;
--	tsc.state = 0;
--	tsc.pendown = 0;
--	tsc.data_pending = 0;
--	tsc.ts_msecs = 20;
--	tsc.mode_msecs = 1000;
-+	tsc.ts_msecs = 30;
-+	tsc.mode_msecs = 500;
- 	tsc.spi = spi;
- 
- 	/* Allocate enough struct spi_transfer's for all requests */
-@@ -1021,21 +934,23 @@ static int tsc2102_probe(struct spi_devi
- 	tsc2102_request_alloc(&tsc, &tsc.req_mode, 1, 1, &spi_buffer);
- 
- 	spin_lock_init(&tsc.lock);
--	spin_lock(&tsc.lock_sync);
-+	mutex_init(&tsc.lock_sync);
-+	mutex_lock(&tsc.lock_sync);
- 
- 	/* Get the BCLK - assuming the rate is at 12000000 */
--	tsc.bclk_ck = clk_get(0, "bclk");
-+#ifdef IMX_CLOCK_CONFIG
-+	tsc.bclk_ck = clk_get(0, "bclk"); TODO add clock mechanism to i.MX ???
- 	if (!tsc.bclk_ck) {
- 		printk(KERN_ERR "Unable to get the clock BCLK\n");
- 		err = -EPERM;
- 		goto done;
- 	}
--
-+ 
- 	clk_enable(tsc.bclk_ck);
-+#endif //IMX_CLOCK_CONFIG
- 
--	if (request_irq(spi->irq, tsc2102_handler, IRQF_SAMPLE_RANDOM |
--				IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
--		printk(KERN_ERR "Could not allocate touchscreen IRQ!\n");
-+	if (request_irq(spi->irq, tsc2102_handler, IRQF_DISABLED | IRQF_SHARED | IRQF_SAMPLE_RANDOM | IRQF_TRIGGER_FALLING, "tsc2102", &tsc)) {
-+		printk(KERN_ERR "Could not allocate touchscreen IRQ (n %d)\n", spi->irq);
- 		err = -EINVAL;
- 		goto err_clk;
- 	}
-@@ -1043,7 +958,7 @@ static int tsc2102_probe(struct spi_devi
- 	setup_timer(&tsc.ts_timer,
- 			tsc2102_pressure, (unsigned long) &tsc);
- 	setup_timer(&tsc.mode_timer,
--			tsc2102_mode_timer, (unsigned long) &tsc);
-+			tsc2102_mode, (unsigned long) &tsc);
- 
- 	/* Set up the communication bus */
- 	dev_set_drvdata(&spi->dev, &tsc);
-@@ -1056,7 +971,7 @@ static int tsc2102_probe(struct spi_devi
- 
- 	/* Now try to detect the chip, make first contact */
- 	if (tsc2102_get_revision() != 0x1) {
--		printk(KERN_ERR "No TI TSC2102 chip found!\n");
-+		printk(KERN_ERR "No TI TSC2102 chip found! Bad revision: %x\n", tsc2102_get_revision());
- 		goto err_timer;
- 	}
- 
-@@ -1077,7 +992,7 @@ static int tsc2102_probe(struct spi_devi
- 	if (err)
- 		goto err_ts;
- 
--#ifdef CONFIG_HWMON
-+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
- 	tsc.hwmondev = hwmon_device_register(&spi->dev);
- 	if (IS_ERR(tsc.hwmondev)) {
- 		printk(KERN_ERR "tsc2102_hwmon: Device registration failed\n");
-@@ -1120,18 +1035,18 @@ err_timer:
- 	del_timer(&tsc.mode_timer);
- 	dev_set_drvdata(&spi->dev, NULL);
- err_clk:
--	clk_disable(tsc.bclk_ck);
--	clk_put(tsc.bclk_ck);
-+/*	clk_disable(tsc.bclk_ck); TODO add clock mechanism to i.MX ???
-+	clk_put(tsc.bclk_ck);*/
- done:
--	spin_unlock(&tsc.lock_sync);
-+	mutex_unlock(&tsc.lock_sync);
-+
- 	return err;
- }
- 
- static int tsc2102_remove(struct spi_device *spi)
- {
- 	struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
--
--	spin_lock(&dev->lock_sync);
-+	mutex_lock(&dev->lock_sync);
- 
- 	platform_device_unregister(&tsc2102_ts_device);
- 	platform_device_unregister(&tsc2102_alsa_device);
-@@ -1139,15 +1054,15 @@ static int tsc2102_remove(struct spi_dev
- 	dev_set_drvdata(&spi->dev, NULL);
- 
- 	/* Release the BCLK */
--	clk_disable(dev->bclk_ck);
--	clk_put(dev->bclk_ck);
-+/*	clk_disable(dev->bclk_ck); TODO add clock mechanism to i.MX ???
-+	clk_put(dev->bclk_ck); */
- 
- 	del_timer(&tsc.mode_timer);
- 	del_timer(&tsc.ts_timer);
- 
- 	kfree(tsc.transfers);
- 
--#ifdef CONFIG_HWMON
-+#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
- 	hwmon_device_unregister(dev->hwmondev);
- #endif
- 
-@@ -1155,7 +1070,7 @@ static int tsc2102_remove(struct spi_dev
- 	apm_get_power_status = 0;
- #endif
- 
--	spin_unlock(&dev->lock_sync);
-+	mutex_unlock(&dev->lock_sync);
- 
- 	return 0;
- }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [647] trunk/firmware/led/led_top.bin

[<th...@us...>]

Revision: 647
          http://armadeus.svn.sourceforge.net/armadeus/?rev=647&view=rev
Author:   thom25
Date:     2007-09-23 13:12:09 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
add led_top.bin

Added Paths:
-----------
    trunk/firmware/led/led_top.bin

Added: trunk/firmware/led/led_top.bin
===================================================================
(Binary files differ)


Property changes on: trunk/firmware/led/led_top.bin
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [646] trunk/target/linux/modules/isp1761/host

[<ar...@us...>]

Revision: 646
          http://armadeus.svn.sourceforge.net/armadeus/?rev=646&view=rev
Author:   artemys
Date:     2007-09-23 11:57:38 -0700 (Sun, 23 Sep 2007)

Log Message:
-----------
[LINUX] Remove some temp files from the isp1761 commit

Removed Paths:
-------------
    trunk/target/linux/modules/isp1761/host/.tmp_versions/
    trunk/target/linux/modules/isp1761/host/Module.symvers

Deleted: trunk/target/linux/modules/isp1761/host/Module.symvers
===================================================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [644] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff

[<th...@us...>]

Revision: 644
          http://armadeus.svn.sourceforge.net/armadeus/?rev=644&view=rev
Author:   thom25
Date:     2007-09-19 06:45:18 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Fix dead lock
Fix scheduling while atomic problem
Change sequencer
Allow scan of inputs (BAT1, BAT2, AUX and TEMP)
Fix problem with HWMON flag

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff	2007-09-18 09:22:07 UTC (rev 643)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/076-linux-2.6.18-tsc2102-armadeus-patch.diff	2007-09-19 13:45:18 UTC (rev 644)
@@ -11,28 +11,64 @@
  }
  
  static void tsc2102_coords(int x, int y, int z1, int z2)
---- linux-2.6.18.1/drivers/spi/tsc2102.c	2007-08-05 23:03:42.000000000 +0200
-+++ linux-2.6.18.1.mod/drivers/spi/tsc2102.c	2007-08-05 22:39:44.000000000 +0200
-@@ -51,7 +51,8 @@
+--- linux-2.6.18.1/drivers/spi/Kconfig	2007-09-16 07:52:11.000000000 +0200
++++ linux-2.6.18.1.mod/drivers/spi/Kconfig	2007-09-16 06:36:48.000000000 +0200
+@@ -133,6 +133,7 @@ comment "SPI Protocol Masters"
+ #
+ config SPI_TSC2102
+     depends on SPI_MASTER
++    depends on HWMON = n || HWMON
+     tristate "TSC2102 codec support"
+     ---help---
+       Say Y here if you want support for the TSC2102 chip.  It
+--- linux-2.6.18.1/drivers/spi/tsc2102.c	2007-09-16 07:52:11.000000000 +0200
++++ linux-2.6.18.1.mod/drivers/spi/tsc2102.c	2007-09-16 07:09:23.000000000 +0200
+@@ -2,8 +2,10 @@
+  * drivers/spi/tsc2102.c
+  *
+  * TSC2102 interface driver.
+- *
+- * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...>
++ * Copyright (C) 2007 Armadeus systems (nc)
++ * 			-> fix dead locks, reorganize state machine
++ *			-> fix scheduling while atomic and hwmon support			
++ * Copyright (c) 2005 Andrzej Zaborowski  <ba...@za...> 
+  *
+  * This package is free software; you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+@@ -51,7 +53,10 @@
  #define TSC2102_ADC_T1_CONTROL		0x2bf4
  #define TSC2102_ADC_T2_CONTROL		0x33f4
  #define TSC2102_ADC_DAV			0x4000
 -#define TSC2102_ADC_INT_REF		0x0016
-+#define TSC2102_ADC_INT_REF_125	0x0016
-+#define TSC2102_ADC_INT_REF_250	0x0017
++#define TSC2102_ADC_PEN			0x0000
++#define TSC2102_ADC_INT_REF_125		0x0016
++#define TSC2102_ADC_INT_REF_250		0x0017
++#define TSC2102_ADC_REF			TSC2102_ADC_INT_REF_250 /*2.5V*/
  #define TSC2102_ADC_EXT_REF		0x0002
  #define TSC2102_CONFIG_TIMES		0x0008
  #define TSC2102_RESET			0xbb00
-@@ -87,7 +88,7 @@
+@@ -86,14 +91,14 @@ struct tsc2102_spi_req {
+ 
  struct tsc2102_dev {
  	struct tsc2102_config *pdata;
- 	spinlock_t lock, lock_sync;
+-	spinlock_t lock, lock_sync;
 -	struct clk *bclk_ck;
++	spinlock_t lock;
++	struct mutex lock_sync;
 +//	struct clk *bclk_ck;  TODO add clock mechanism to i.MX ???
  
- 	int state;			/* 0: TS, 1: Portscan, 2-3: Temps */
+-	int state;			/* 0: TS, 1: Portscan, 2-3: Temps */
++	int state;			/* Scan modes */
  	struct timer_list ts_timer;	/* Busy-wait for PEN UP */
-@@ -307,7 +308,9 @@
+ 	struct timer_list mode_timer;	/* Change .state every some time */
+-	int pendown;
+-	int data_pending;
++	int touch_in_progress;
+ 	uint16_t status, adc_status, adc_data[4];
+ 	tsc2102_touch_t touch_cb;
+ 	tsc2102_coords_t coords_cb;
+@@ -307,7 +312,9 @@ int tsc2102_ ## cb(cb_t handler)	\
  }
  
  tsc2102_cb_register_func(touch_cb, tsc2102_touch_t)
@@ -42,97 +78,578 @@
  tsc2102_cb_register_func(ports_cb, tsc2102_ports_t)
  tsc2102_cb_register_func(temp1_cb, tsc2102_temp_t)
  tsc2102_cb_register_func(temp2_cb, tsc2102_temp_t)
-@@ -411,22 +414,25 @@
- 			TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST,
+@@ -345,242 +352,153 @@ static void tsc2102_print_dav(void)
+ }
+ #endif
+ 
+-static void tsc2102_complete_dummy(struct tsc2102_dev *dev)
+-{
+-}
++static void tsc2102_complete_dummy(struct tsc2102_dev *dev){}
+ 
+ static inline void tsc2102_touchscreen_mode(struct tsc2102_dev *dev)
+ {
++	spin_lock_irq(&dev->lock);
++	dev->touch_in_progress = 1;
++
+ 	/* Scan X, Y, Z1, Z2, chip controlled, 12-bit, 16 samples, 500 usec */
+ 	tsc2102_write_async(&dev->req_mode,
+ 			TSC2102_TS_ADC_CTRL, TSC2102_ADC_TS_CONTROL,
  			tsc2102_complete_dummy);
++	spin_unlock_irq(&dev->lock);
+ }
  
+-static inline void tsc2102_portscan_mode(struct tsc2102_dev *dev)
+-{
+-	/* Scan BAT1, BAT2, AUX, 12-bit, 16 samples, 500 usec */
+-	tsc2102_write_async(&dev->req_mode,
+-			TSC2102_TS_ADC_CTRL, TSC2102_ADC_SCAN_CONTROL,
+-			tsc2102_complete_dummy);
+-}
+-
+-static inline void tsc2102_temp1_mode(struct tsc2102_dev *dev)
+-{
+-	/* Scan TEMP1, 12-bit, 16 samples, 500 usec */
+-	tsc2102_write_async(&dev->req_mode,
+-			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T1_CONTROL,
+-			tsc2102_complete_dummy);
+-}
+-
+-static inline void tsc2102_temp2_mode(struct tsc2102_dev *dev)
+-{
+-	/* Scan TEMP2, 12-bit, 16 samples, 500 usec */
+-	tsc2102_write_async(&dev->req_mode,
+-			TSC2102_TS_ADC_CTRL, TSC2102_ADC_T2_CONTROL,
+-			tsc2102_complete_dummy);
+-}
+-
+-static void tsc2102_mode(struct tsc2102_dev *dev)
++static void tsc2102_end_current_conversion(struct tsc2102_dev *dev)
+ {
++	spin_lock_irq(&dev->lock);
++	dev->touch_in_progress = 0;
++	dev->state++;
+ 	switch (dev->state) {
+-	case 0:
+-		tsc2102_touchscreen_mode(dev);
+-		break;
+-	case 1:
+-		tsc2102_portscan_mode(dev);
++	/* Scan BAT1, BAT2, AUX, 12-bit, 16 samples, 500 usec */
++	case 0: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
+ 		break;
+-	case 2:
+-		tsc2102_temp1_mode(dev);
++	/* Scan TEMP1, 12-bit, 16 samples, 500 usec */
++	case 1: tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_T1_CONTROL,	tsc2102_complete_dummy);	
+ 		break;
+-	case 3:
+-		tsc2102_temp2_mode(dev);
++	/* Scan TEMP2, 12-bit, 16 samples, 500 usec */
++	case 2:	tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_T2_CONTROL,	tsc2102_complete_dummy);		
+ 		break;
+-	default:
++	default: 
++		tsc2102_write_async(&dev->req_mode, TSC2102_TS_ADC_CTRL, 
++			TSC2102_ADC_SCAN_CONTROL, tsc2102_complete_dummy);
+ 		dev->state = 0;
+-		tsc2102_touchscreen_mode(dev);
+ 		break;
+ 	}
++	spin_unlock_irq(&dev->lock);
++	mod_timer(&dev->mode_timer, jiffies +
++			msecs_to_jiffies(dev->mode_msecs));
+ }
+ 
+-/* Lock is held when this is called.  */
+-static void tsc2102_new_mode(struct tsc2102_dev *dev)
++static void tsc2102_mode(unsigned long data)
+ {
+-	/* Abort current conversion if any */
++	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
++	spin_lock_irq(&dev->lock);
++
+ 	tsc2102_write_async(&dev->req_stopadc,
+ 			TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST,
+-			tsc2102_complete_dummy);
++			tsc2102_end_current_conversion);
+ 
 -	dev->state ++;
-+	//dev->state ++;
- 	tsc2102_mode(dev);
+-	tsc2102_mode(dev);
++	spin_unlock_irq(&dev->lock);
  }
  
- static void tsc2102_check_status(struct tsc2102_dev *dev);
- 
+-static void tsc2102_check_status(struct tsc2102_dev *dev);
+-
 -/* TSC has new data for us availiable.  */
 -static irqreturn_t tsc2102_handler(int irq, void *dev_id)
-+/* TSC has new data for us available.  */
-+static irqreturn_t tsc2102_handler(int irq, void *dev_id, struct pt_regs *regs)
++/* Read touch screen data */
++static void tsc2102_TS_data_report(struct tsc2102_dev *dev)
  {
- 	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
- 	spin_lock_irq(&dev->lock);
- 
+-	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
+-	spin_lock_irq(&dev->lock);
+-
 -	if (!dev->data_pending)
-+    if (!dev->data_pending) 
-+	{
-+		dev->data_pending = 1;
- 		tsc2102_check_status(dev);
+-		tsc2102_check_status(dev);
 -
 -	dev->data_pending ++;
-+	}
-+ 
-+// 	dev->data_pending ++;
+-
+-	spin_unlock_irq(&dev->lock);
+-	return IRQ_HANDLED;
++	if (dev->coords_cb)
++		dev->coords_cb(
++				dev->adc_data[0], dev->adc_data[1],
++				dev->adc_data[2], dev->adc_data[3]);
+ }
  
- 	spin_unlock_irq(&dev->lock);
- 	return IRQ_HANDLED;
-@@ -464,7 +470,7 @@
- 
+-static void tsc2102_data_report(struct tsc2102_dev *dev)
++static void tsc2102_pressure_report(struct tsc2102_dev *dev)
+ {
+-	if (dev->status & TSC2102_TS_DAV) {
+-		if (dev->coords_cb)
+-			dev->coords_cb(
+-					dev->adc_data[0], dev->adc_data[1],
+-					dev->adc_data[2], dev->adc_data[3]);
+-	}
+-
+-	if (dev->status & TSC2102_PS_DAV) {
+-		if (dev->ports_cb)
+-			dev->ports_cb(dev->adc_data[0],
+-					dev->adc_data[1], dev->adc_data[2]);
+-		dev->bat[0] = dev->adc_data[0];
+-		dev->bat[1] = dev->adc_data[1];
+-		dev->aux[0] = dev->adc_data[2];
+-	}
+-
+-	if (dev->status & TSC2102_T1_DAV) {
+-		if (dev->temp1_cb)
+-			dev->temp1_cb(*dev->adc_data);
+-		dev->temp[0] = *dev->adc_data;
+-	}
+-
+-	if (dev->status & TSC2102_T2_DAV) {
+-		if (dev->temp2_cb)
+-			dev->temp2_cb(*dev->adc_data);
+-		dev->temp[1] = *dev->adc_data;
+-	}
+-
  	spin_lock_irq(&dev->lock);
++	mod_timer(&dev->mode_timer, jiffies +
++			msecs_to_jiffies(dev->mode_msecs));
  
 -	dev->data_pending --;
-+	dev->data_pending=0; // --
- 
- 	/*
- 	 * This may happen if the registers were successfully read and a
-@@ -474,8 +480,8 @@
- 	if (dev->data_pending)
- 		tsc2102_check_status(dev);
- 
+-
+-	/*
+-	 * This may happen if the registers were successfully read and a
+-	 * new conversion was started and completed by the TSC before the
+-	 * completion for SPI read was called.
+-	 */
+-	if (dev->data_pending)
+-		tsc2102_check_status(dev);
+-
 -	if (dev->status & (TSC2102_PS_DAV | TSC2102_T1_DAV | TSC2102_T2_DAV))
 -		tsc2102_new_mode(dev);
-+// 	if (dev->status & (TSC2102_PS_DAV | TSC2102_T1_DAV | TSC2102_T2_DAV))
-+// 		tsc2102_new_mode(dev);
+-
+-	spin_unlock_irq(&dev->lock);
+-}
++	tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
++			dev->adc_data, 4, tsc2102_TS_data_report);
  
- 	spin_unlock_irq(&dev->lock);
+-static void tsc2102_status_report(struct tsc2102_dev *dev)
+-{
+-	/*
+-	 * Read all converted data from corresponding registers
+-	 * so that the ADC can move on to a new conversion.
+-	 */
+-	if (dev->status & TSC2102_TS_DAV) {
+-		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
+-				dev->adc_data, 4, tsc2102_data_report);
+-		if (!dev->pendown) {
+-			dev->pendown = 1;
+-			if (dev->touch_cb)
+-				dev->touch_cb(1);
+-
+-			mod_timer(&dev->ts_timer, jiffies +
++	if ( dev->adc_status & TSC2102_ADC_PSTCM) {
++		mod_timer(&dev->ts_timer, jiffies +
+ 				msecs_to_jiffies(dev->ts_msecs));
+-		}
+-	}
+-
+-	if (dev->status & TSC2102_PS_DAV) {
+-		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
+-				dev->adc_data, 3, tsc2102_data_report);
+ 	}
+-
+-	if (dev->status & TSC2102_T1_DAV) {
+-		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
+-				dev->adc_data, tsc2102_data_report);
+-	}
+-
+-	if (dev->status & TSC2102_T2_DAV) {
+-		tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
+-				dev->adc_data, tsc2102_data_report);
+-	}
+-
+-	if (!(dev->status & (TSC2102_TS_DAV | TSC2102_PS_DAV |
+-					TSC2102_T1_DAV | TSC2102_T2_DAV))) {
+-		spin_lock_irq(&dev->lock);
+-		dev->data_pending --;
+-		spin_unlock_irq(&dev->lock);
+-
+-		WARN_ON(!dev->state);
+-	}
+-}
+-
+-static void tsc2102_check_status(struct tsc2102_dev *dev)
+-{
+-	tsc2102_read_async(&dev->req_status, TSC2102_TS_STATUS_CTRL,
+-			&dev->status, tsc2102_status_report);
++	spin_unlock_irq(&dev->lock);
  }
-@@ -486,6 +492,7 @@
- 	 * Read all converted data from corresponding registers
- 	 * so that the ADC can move on to a new conversion.
- 	 */
-+
- 	if (dev->status & TSC2102_TS_DAV) {
- 		tsc2102_reads_async(&dev->req_adc, TSC2102_TS_X,
- 				dev->adc_data, 4, tsc2102_data_report);
-@@ -517,7 +524,7 @@
- 	if (!(dev->status & (TSC2102_TS_DAV | TSC2102_PS_DAV |
- 					TSC2102_T1_DAV | TSC2102_T2_DAV))) {
- 		spin_lock_irq(&dev->lock);
--		dev->data_pending --;
-+		dev->data_pending=0; //--
- 		spin_unlock_irq(&dev->lock);
  
- 		WARN_ON(!dev->state);
-@@ -539,8 +546,8 @@
+-static void tsc2102_mode_timer(unsigned long data)
++static void tsc2102_scan_data_report(struct tsc2102_dev *dev)
+ {
+-	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
++	mod_timer(&dev->mode_timer, jiffies +
++		msecs_to_jiffies(dev->mode_msecs));
+ 	spin_lock_irq(&dev->lock);
++	switch (dev->state)
++	{
++		case 0: if (dev->ports_cb)
++				dev->ports_cb(dev->adc_data[0],
++						dev->adc_data[1], dev->adc_data[2]);
++			dev->bat[0] = dev->adc_data[0];
++			dev->bat[1] = dev->adc_data[1];
++			dev->aux[0] = dev->adc_data[2];
++			break;
++		
++		case 1: if (dev->temp1_cb)
++				dev->temp1_cb(*dev->adc_data);
++			dev->temp[0] = *dev->adc_data;
++			break;
  
- 	tsc2102_new_mode(dev);
- 
+-	BUG_ON(dev->state);
+-
+-	tsc2102_new_mode(dev);
+-
 -	mod_timer(&dev->mode_timer, jiffies +
 -			msecs_to_jiffies(dev->mode_msecs));
-+/*	mod_timer(&dev->mode_timer, jiffies +
-+			msecs_to_jiffies(dev->mode_msecs));*/
++		case 2: if (dev->temp2_cb)
++				dev->temp2_cb(*dev->adc_data);
++			dev->temp[1] = *dev->adc_data;
++			break;
++		default: break;
++	}
++	tsc2102_touchscreen_mode(dev);
  	spin_unlock_irq(&dev->lock);
  }
  
-@@ -786,7 +793,7 @@
+-/*
+- * There are at least three ways to check for pen-up:
+- *	- the PINT/DAV pin state,
+- *	- reading PSTCM bit in ADC Control register (D15, offset 0x00),
+- *	- reading ADST bit in ADC Control register (D14, offset 0x00),
+- *		ADC idle would indicate no screen touch.
+- * Unfortunately none of them seems to be 100% accurate and you will
+- * find they are totally inconsistent, i.e. you get to see any arbitrary
+- * combination of values in these three bits.  So we will busy-wait
+- * for a moment when all three indicate a pen-up, using a timer, before
+- * we report a pen-up.
+- */
+-static void tsc2102_pressure_report(struct tsc2102_dev *dev)
++/* TSC has new data for us available.  */
++static irqreturn_t tsc2102_handler(int irq, void *dev_id, struct pt_regs *regs)
+ {
+-	if (!dev->pendown)
+-		return;
++	struct tsc2102_dev *dev = (struct tsc2102_dev *) dev_id;
  
- 	/* Reference mode, 100 usec delay, 1.25 V reference */
+-	if (dev->state ||
+-			(dev->adc_status & TSC2102_ADC_PSTCM) ||
+-			!(dev->adc_status & TSC2102_ADC_ADST)) {
+-		mod_timer(&dev->ts_timer, jiffies +
+-				msecs_to_jiffies(dev->ts_msecs));
+-	} else {
+-		dev->pendown = 0;
+-		if (dev->touch_cb)
+-			dev->touch_cb(0);
++	mod_timer(&dev->mode_timer, jiffies +
++		msecs_to_jiffies(dev->mode_msecs));
++
++	spin_lock_irq(&dev->lock);
++	if( dev->touch_in_progress ){
++		tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
++				&dev->adc_status, tsc2102_pressure_report);
++	}
++	else{
++		switch(dev->state){
++			case 0: tsc2102_reads_async(&dev->req_adc, TSC2102_TS_BAT1,
++					dev->adc_data, 3, tsc2102_scan_data_report);
++				break;
++			case 1: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP1,
++					dev->adc_data, tsc2102_scan_data_report);
++				break;
++			case 2: tsc2102_read_async(&dev->req_adc, TSC2102_TS_TEMP2,
++					dev->adc_data, tsc2102_scan_data_report);
++				break;
++			default: break;
++		}
+ 	}
++	spin_unlock_irq(&dev->lock);
++	return IRQ_HANDLED;
+ }
+ 
+ static void tsc2102_pressure(unsigned long data)
+ {
+ 	struct tsc2102_dev *dev = (struct tsc2102_dev *) data;
+-
+-	BUG_ON(!dev->pendown);
+-
+-	tsc2102_read_async(&dev->req_pressure, TSC2102_TS_ADC_CTRL,
+-			&dev->adc_status, tsc2102_pressure_report);
++	if (dev->touch_cb){
++		dev->touch_cb(0);
++	}
+ }
+ 
+ #ifdef CONFIG_SOUND
+@@ -596,22 +514,20 @@ void tsc2102_set_volume(uint8_t left_ch,
+ 	if (right_ch == 0x00 || right_ch == 0x7f)
+ 		right_ch ^= 0x7f;
+ 
+-	spin_lock(&tsc.lock_sync);
+-
++	mutex_lock(&tsc.lock_sync);
+ 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
+ 
+ 	val &= 0x8080;	/* Preserve mute-bits */
+ 	val |= (left_ch << 8) | right_ch;
+ 
+ 	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
+-
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+ void tsc2102_set_mute(int left_ch, int right_ch)
+ {
+ 	u16 val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 
+ 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
+ 
+@@ -620,17 +536,17 @@ void tsc2102_set_mute(int left_ch, int r
+ 
+ 	tsc2102_write_sync(TSC2102_DAC_GAIN_CTRL, val);
+ 
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+ void tsc2102_get_mute(int *left_ch, int *right_ch)
+ {
+ 	u16 val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 
+ 	val = tsc2102_read_sync(TSC2102_DAC_GAIN_CTRL);
+ 
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ 
+ 	*left_ch = !!(val & (1 << 15));
+ 	*right_ch = !!(val & (1 << 7));
+@@ -639,7 +555,7 @@ void tsc2102_get_mute(int *left_ch, int 
+ void tsc2102_set_deemphasis(int enable)
+ {
+ 	u16 val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
+ 
+ 	if (enable)
+@@ -648,13 +564,13 @@ void tsc2102_set_deemphasis(int enable)
+ 		val |= TSC2102_DEEMPF;
+ 
+ 	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+ void tsc2102_set_bassboost(int enable)
+ {
+ 	u16 val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 	val = tsc2102_read_sync(TSC2102_DAC_POWER_CTRL);
+ 
+ 	if (enable)
+@@ -663,7 +579,7 @@ void tsc2102_set_bassboost(int enable)
+ 		val |= TSC2102_BASSBC;
+ 
+ 	tsc2102_write_sync(TSC2102_DAC_POWER_CTRL, val);
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+ /*	{rate, dsor, fsref}	*/
+@@ -709,7 +625,7 @@ int tsc2102_set_rate(int rate)
+ 		return -EINVAL;
+ 	}
+ 
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 
+ 	tsc2102_write_sync(TSC2102_AUDIO1_CTRL, tsc2102_rates[i].divisor);
+ 
+@@ -727,7 +643,7 @@ int tsc2102_set_rate(int rate)
+ 		tsc2102_write_sync(TSC2102_PLL2_CTRL, TSC2102_PLL2_48K);
+ 	}
+ 
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ 	return 0;
+ }
+ 
+@@ -736,7 +652,7 @@ int tsc2102_set_rate(int rate)
+  */
+ void tsc2102_dac_power(int state)
+ {
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 
+ 	if (state) {
+ 		/* 16-bit words, DSP mode, sample at Fsref */
+@@ -760,13 +676,13 @@ void tsc2102_dac_power(int state)
+ 		tsc2102_write_sync(TSC2102_PLL1_CTRL, TSC2102_PLL1_OFF);
+ 	}
+ 
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+ void tsc2102_set_i2s_master(int state)
+ {
+ 	uint16_t val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 
+ 	val = tsc2102_read_sync(TSC2102_AUDIO3_CTRL);
+ 
+@@ -775,7 +691,7 @@ void tsc2102_set_i2s_master(int state)
+ 	else
+ 		tsc2102_write_sync(TSC2102_AUDIO3_CTRL, val & ~TSC2102_SLVMS);
+ 
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ #endif	/* CONFIG_SOUND */
+ 
+@@ -784,9 +700,9 @@ static int tsc2102_configure(struct tsc2
+ 	/* Reset the chip */
+ 	tsc2102_write_sync(TSC2102_TS_RESET_CTRL, TSC2102_RESET);
+ 
+-	/* Reference mode, 100 usec delay, 1.25 V reference */
++	/* Reference mode, 100 usec delay, 2.5V reference */
  	if (dev->pdata->use_internal)
 -		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_INT_REF);
-+		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_INT_REF_250);
++		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_REF);
  	else
  		tsc2102_write_sync(TSC2102_TS_REF_CTRL, TSC2102_ADC_EXT_REF);
  
-@@ -986,7 +993,7 @@
+@@ -796,7 +712,10 @@ static int tsc2102_configure(struct tsc2
+ 	/* PINT/DAV acts as DAV */
+ 	tsc2102_write_sync(TSC2102_TS_STATUS_CTRL, TSC2102_ADC_DAV);
+ 
+-	tsc2102_mode(dev);
++	/* Init mode state machine */
++	dev->state = 0; 
++	dev->touch_in_progress = 0;
++	/* Start mode timer */
+ 	mod_timer(&dev->mode_timer, jiffies +
+ 			msecs_to_jiffies(dev->mode_msecs));
+ 	return 0;
+@@ -824,7 +743,7 @@ int tsc2102_get_revision(void)
+ void tsc2102_keyclick(int amplitude, int freq, int length)
  {
+ 	u16 val;
+-	spin_lock(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
+ 	val = tsc2102_read_sync(TSC2102_AUDIO2_CTRL);
+ 	val &= 0x800f;
+ 
+@@ -857,17 +776,17 @@ void tsc2102_keyclick(int amplitude, int
+ 	val |= 0x8000;
+ 
+ 	tsc2102_write_sync(TSC2102_AUDIO2_CTRL, val);
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
+ }
+ 
+-#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+ #define TSC2102_INPUT(devname, field)	\
+ static ssize_t show_ ## devname(struct device *dev,	\
+ 		struct device_attribute *devattr, char *buf)	\
+ {	\
+ 	struct tsc2102_dev *devhwmon = dev_get_drvdata(dev);	\
+ 	int value = devhwmon->field;	\
+-	return sprintf(buf, "%i\n", value);	\
++	return sprintf(buf, "%i\n", value); \
+ }	\
+ static DEVICE_ATTR(devname ## _input, S_IRUGO, show_ ## devname, NULL);
+ 
+@@ -927,20 +846,20 @@ tsc2102_suspend(struct spi_device *spi, 
+ 	if (!dev)
+ 		return 0;
+ 
+-	spin_lock(&dev->lock_sync);
++	mutex_lock(&dev->lock_sync);
+ 
+ 	del_timer(&dev->mode_timer);
+ 	del_timer(&dev->ts_timer);
+ 
+-	if (dev->pendown && dev->touch_cb)
++	if (dev->touch_cb)
+ 		dev->touch_cb(0);
+ 
+ 	/* Abort current conversion and power down the ADC */
+ 	tsc2102_write_sync(TSC2102_TS_ADC_CTRL, TSC2102_ADC_ADST);
+ 
+ 	dev->spi->dev.power.power_state = state;
++	mutex_unlock(&dev->lock_sync);
+ 
+-	spin_unlock(&dev->lock_sync);
+ 	return 0;
+ }
+ 
+@@ -955,16 +874,13 @@ static int tsc2102_resume(struct spi_dev
+ 	if (!dev)
+ 		return 0;
+ 
+-	spin_lock(&dev->lock_sync);
++	mutex_lock(&dev->lock_sync);
+ 
+ 	dev->spi->dev.power.power_state = PMSG_ON;
+ 
+-	dev->state = 0;
+-	dev->pendown = 0;
+-
+ 	err = tsc2102_configure(dev);
+ 
+-	spin_unlock(&dev->lock_sync);
++	mutex_unlock(&dev->lock_sync);
+ 	return err;
+ }
+ #else
+@@ -986,7 +902,7 @@ static int tsc2102_probe(struct spi_devi
+ {
  	struct tsc2102_config *pdata = spi->dev.platform_data;
  	struct spi_transfer *spi_buffer;
 -	int err = 0;
@@ -140,12 +657,27 @@
  
  	if (!pdata) {
  		printk(KERN_ERR "TSC2102: Platform data not supplied\n");
-@@ -1021,21 +1028,23 @@
+@@ -999,11 +915,8 @@ static int tsc2102_probe(struct spi_devi
+ 	}
+ 
+ 	tsc.pdata = pdata;
+-	tsc.state = 0;
+-	tsc.pendown = 0;
+-	tsc.data_pending = 0;
+-	tsc.ts_msecs = 20;
+-	tsc.mode_msecs = 1000;
++	tsc.ts_msecs = 30;
++	tsc.mode_msecs = 500;
+ 	tsc.spi = spi;
+ 
+ 	/* Allocate enough struct spi_transfer's for all requests */
+@@ -1021,21 +934,23 @@ static int tsc2102_probe(struct spi_devi
  	tsc2102_request_alloc(&tsc, &tsc.req_mode, 1, 1, &spi_buffer);
  
  	spin_lock_init(&tsc.lock);
-+	spin_lock_init(&tsc.lock_sync); // If think its better no ?
- 	spin_lock(&tsc.lock_sync);
+-	spin_lock(&tsc.lock_sync);
++	mutex_init(&tsc.lock_sync);
++	mutex_lock(&tsc.lock_sync);
  
  	/* Get the BCLK - assuming the rate is at 12000000 */
 -	tsc.bclk_ck = clk_get(0, "bclk");
@@ -169,8 +701,17 @@
  		err = -EINVAL;
  		goto err_clk;
  	}
-@@ -1056,7 +1065,7 @@
+@@ -1043,7 +958,7 @@ static int tsc2102_probe(struct spi_devi
+ 	setup_timer(&tsc.ts_timer,
+ 			tsc2102_pressure, (unsigned long) &tsc);
+ 	setup_timer(&tsc.mode_timer,
+-			tsc2102_mode_timer, (unsigned long) &tsc);
++			tsc2102_mode, (unsigned long) &tsc);
  
+ 	/* Set up the communication bus */
+ 	dev_set_drvdata(&spi->dev, &tsc);
+@@ -1056,7 +971,7 @@ static int tsc2102_probe(struct spi_devi
+ 
  	/* Now try to detect the chip, make first contact */
  	if (tsc2102_get_revision() != 0x1) {
 -		printk(KERN_ERR "No TI TSC2102 chip found!\n");
@@ -178,7 +719,16 @@
  		goto err_timer;
  	}
  
-@@ -1120,10 +1129,11 @@
+@@ -1077,7 +992,7 @@ static int tsc2102_probe(struct spi_devi
+ 	if (err)
+ 		goto err_ts;
+ 
+-#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+ 	tsc.hwmondev = hwmon_device_register(&spi->dev);
+ 	if (IS_ERR(tsc.hwmondev)) {
+ 		printk(KERN_ERR "tsc2102_hwmon: Device registration failed\n");
+@@ -1120,18 +1035,18 @@ err_timer:
  	del_timer(&tsc.mode_timer);
  	dev_set_drvdata(&spi->dev, NULL);
  err_clk:
@@ -187,12 +737,22 @@
 +/*	clk_disable(tsc.bclk_ck); TODO add clock mechanism to i.MX ???
 +	clk_put(tsc.bclk_ck);*/
  done:
- 	spin_unlock(&tsc.lock_sync);
+-	spin_unlock(&tsc.lock_sync);
++	mutex_unlock(&tsc.lock_sync);
 +
  	return err;
  }
  
-@@ -1139,8 +1149,8 @@
+ static int tsc2102_remove(struct spi_device *spi)
+ {
+ 	struct tsc2102_dev *dev = dev_get_drvdata(&spi->dev);
+-
+-	spin_lock(&dev->lock_sync);
++	mutex_lock(&dev->lock_sync);
+ 
+ 	platform_device_unregister(&tsc2102_ts_device);
+ 	platform_device_unregister(&tsc2102_alsa_device);
+@@ -1139,15 +1054,15 @@ static int tsc2102_remove(struct spi_dev
  	dev_set_drvdata(&spi->dev, NULL);
  
  	/* Release the BCLK */
@@ -203,3 +763,20 @@
  
  	del_timer(&tsc.mode_timer);
  	del_timer(&tsc.ts_timer);
+ 
+ 	kfree(tsc.transfers);
+ 
+-#ifdef CONFIG_HWMON
++#if defined(CONFIG_HWMON) || defined(CONFIG_HWMON_MODULE)
+ 	hwmon_device_unregister(dev->hwmondev);
+ #endif
+ 
+@@ -1155,7 +1070,7 @@ static int tsc2102_remove(struct spi_dev
+ 	apm_get_power_status = 0;
+ #endif
+ 
+-	spin_unlock(&dev->lock_sync);
++	mutex_unlock(&dev->lock_sync);
+ 
+ 	return 0;
+ }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [643] trunk/target/packages/ch7024ctrl/ch7024.c

[<th...@us...>]

Revision: 643
          http://armadeus.svn.sourceforge.net/armadeus/?rev=643&view=rev
Author:   thom25
Date:     2007-09-18 02:22:07 -0700 (Tue, 18 Sep 2007)

Log Message:
-----------
force reset of the DAC after paramter changing. This avoid flicking color effects

Modified Paths:
--------------
    trunk/target/packages/ch7024ctrl/ch7024.c

Modified: trunk/target/packages/ch7024ctrl/ch7024.c
===================================================================
--- trunk/target/packages/ch7024ctrl/ch7024.c	2007-09-12 21:45:30 UTC (rev 642)
+++ trunk/target/packages/ch7024ctrl/ch7024.c	2007-09-18 09:22:07 UTC (rev 643)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-//#include <linux/i2c.h> 
+#include <linux/i2c.h> 
 #include <linux/i2c-dev.h>
  
 #include <sys/ioctl.h>
@@ -192,6 +192,10 @@
         if(nb>=8) 
             write_byte (fd, addr4, val4);
     }
+    /* power down to reset the dac after parameter changing*/
+    write_byte (fd, POWER_STATE_CMD, 0xFF);
+    /* power on the dac after parameter changing*/
+    write_byte (fd, POWER_STATE_CMD, 0x00);
     if(fd_conf != NULL)
         fclose(fd_conf);
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [642] trunk/buildroot/package/slideshow

[<ar...@us...>]

Revision: 642
          http://armadeus.svn.sourceforge.net/armadeus/?rev=642&view=rev
Author:   artemys
Date:     2007-09-12 14:45:30 -0700 (Wed, 12 Sep 2007)

Log Message:
-----------
[PACKAGES] Patches slideshow package to prevent it to stop when all images have been shown (now it should loop)

Added Paths:
-----------
    trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch
    trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch

Removed Paths:
-------------
    trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch

Copied: trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch (from rev 638, trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch)
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-01-add-arm-cross-compile.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -0,0 +1,26 @@
+--- slideshow/Makefile	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/Makefile	2007-09-05 12:08:56.000000000 +0200
+@@ -1,6 +1,12 @@
++ifeq ($(ARCH), arm)
++CFLAGS = -O2 `sh ../SDL-1.2.11/sdl-config --cflags`
++LFLAGS = `sh ../SDL-1.2.11/sdl-config --libs` -lSDL_image
++CC = arm-linux-g++
++else
+ CFLAGS = -O2 -march=i586 `sdl-config --cflags`
+ LFLAGS = `sdl-config --libs` -lSDL_image
+ CC = g++
++endif
+ EXE = slideshow
+ OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
+ 
+--- slideshow/SDLFont.h	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/SDLFont.h	2007-09-05 12:11:17.000000000 +0200
+@@ -34,7 +34,7 @@
+ // The value of the top-left pixel in the font bitmap will be
+ //  considered transparent.  Anything else is opaque.
+ 
+-#include <SDL/SDL.h>
++#include "SDL.h"
+ 
+ class SDLFont
+ {

Added: trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-02-restart-after-end.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -0,0 +1,73 @@
+--- slideshow/slideshow.cpp	2003-12-08 22:17:38.000000000 +0100
++++ slideshow.mod/slideshow.cpp	2007-09-08 19:05:10.000000000 +0200
+@@ -196,43 +196,48 @@
+ 			SDL_FillRect(m_sdl, &rc, SDL_MapRGB(m_sdl->format, 0, 255, 0));
+ 			SDL_UpdateRects(m_sdl, 1, &rc);
+ 		}
+-
+-		user_command cmd = wait_for_command();
+-
++
++		user_command cmd = wait_for_command();
++
+ 		switch(cmd)
+-		{
+-		case c_quit:
+-			stop_timer();
+-			return true;
+-		case c_first_slide:
++		{
++		case c_quit:
++			stop_timer();
++			return true;
++		case c_first_slide:
+ 			stop_timer();
+ 			m_image_index = 0;
+ 			break;
+ 		case c_last_slide:
+-			stop_timer();
++			stop_timer();
+ 			m_image_index = m_file_list->count() - 1;
+-			break;
++			break;
+ 		case c_prev_slide:
+-			stop_timer();
++			stop_timer();
+ 			if ( m_image_index > 0 )
+ 				m_image_index--;
+ 			break;
+ 		case c_next_slide:
+-			stop_timer();
+-			// fall through
+-		case c_timer_advance:
+-			if ( m_image_index < m_file_list->count() - 1 )
++			stop_timer();
++			// fall through
++		case c_timer_advance:
++			if ( m_image_index <= m_file_list->count() - 1 )
+ 				m_image_index++;
+-			break;
+-		case c_redraw:
+ 			break;
+-		}
++		case c_redraw:
++			break;
++		}
+ 
+ 		// stop the auto-advance when the last picture is about to be shown
+-		if ( m_image_index == m_file_list->count() - 1 )
+-			stop_timer();
+-	}
+-
++		if ( m_image_index == m_file_list->count() /*- 1*/ )
++		{
++			//stop_timer();
++			m_image_index = 0;
++			m_prev_image_index = -1;
++		}
++
++	}
++
+ 	return true;
+ }
+ 

Deleted: trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	2007-09-11 20:54:23 UTC (rev 641)
+++ trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	2007-09-12 21:45:30 UTC (rev 642)
@@ -1,26 +0,0 @@
---- slideshow/Makefile	2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/Makefile	2007-09-05 12:08:56.000000000 +0200
-@@ -1,6 +1,12 @@
-+ifeq ($(ARCH), arm)
-+CFLAGS = -O2 `sh ../SDL-1.2.11/sdl-config --cflags`
-+LFLAGS = `sh ../SDL-1.2.11/sdl-config --libs` -lSDL_image
-+CC = arm-linux-g++
-+else
- CFLAGS = -O2 -march=i586 `sdl-config --cflags`
- LFLAGS = `sdl-config --libs` -lSDL_image
- CC = g++
-+endif
- EXE = slideshow
- OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
- 
---- slideshow/SDLFont.h	2003-11-29 21:08:54.000000000 +0100
-+++ slideshow.mod/SDLFont.h	2007-09-05 12:11:17.000000000 +0200
-@@ -34,7 +34,7 @@
- // The value of the top-left pixel in the font bitmap will be
- //  considered transparent.  Anything else is opaque.
- 
--#include <SDL/SDL.h>
-+#include "SDL.h"
- 
- class SDLFont
- {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [641] trunk/buildroot/package/alsa-driver/Config.in

[<jo...@us...>]

Revision: 641
          http://armadeus.svn.sourceforge.net/armadeus/?rev=641&view=rev
Author:   jorasse
Date:     2007-09-11 13:54:23 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
[alsa-driver] commited build chain but audio driver still unusable

Added Paths:
-----------
    trunk/buildroot/package/alsa-driver/Config.in

Added: trunk/buildroot/package/alsa-driver/Config.in
===================================================================
--- trunk/buildroot/package/alsa-driver/Config.in	                        (rev 0)
+++ trunk/buildroot/package/alsa-driver/Config.in	2007-09-11 20:54:23 UTC (rev 641)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ALSA_DRIVER
+	bool "alsa-driver"
+	default n
+	help
+	  Advanced Linux Sound Architecture
+
+	  http://www.alsa-project.org/
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [640] trunk/buildroot

[<jo...@us...>]

Revision: 640
          http://armadeus.svn.sourceforge.net/armadeus/?rev=640&view=rev
Author:   jorasse
Date:     2007-09-11 13:41:29 -0700 (Tue, 11 Sep 2007)

Log Message:
-----------
[alsa-driver] commited build chain but audio driver still unusable

Modified Paths:
--------------
    trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch
    trunk/buildroot/package/alsa-driver/alsa-driver.mk
    trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config
    trunk/buildroot/target/device/armadeus/rootfs/device_table.txt

Added Paths:
-----------
    trunk/buildroot/package/alsa-driver/depmod.pl

Removed Paths:
-------------
    trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch

Modified: trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch	2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch	2007-09-11 20:41:29 UTC (rev 640)
@@ -1,25 +1,35 @@
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/acinclude.m4 alsa-driver-1.0.14.mod/acinclude.m4
---- alsa-driver-1.0.14/acinclude.m4	2007-06-04 09:28:55.000000000 +0200
-+++ alsa-driver-1.0.14.mod/acinclude.m4	2007-08-06 20:08:44.000000000 +0200
-@@ -186,6 +186,7 @@
+--- alsa-driver-1.0.14.ref/acinclude.m4	2007-06-04 09:28:55.000000000 +0200
++++ alsa-driver-1.0.14/acinclude.m4	2007-09-09 22:53:57.000000000 +0200
+@@ -186,6 +186,8 @@ AC_DEFUN([ALSA_TOPLEVEL_INIT], [
  	CONFIG_SND_AOA_SOUNDBUS_I2S=""
  	CONFIG_ARM=""
  	CONFIG_SND_SA11XX_UDA1341=""
++	CONFIG_SND_IMX_SSI=""
 +	CONFIG_SND_IMX_TSC2102=""
  	CONFIG_ARCH_SA1100=""
  	CONFIG_L3=""
  	CONFIG_SND_ARMAACI=""
-@@ -1962,6 +1963,18 @@
+@@ -299,7 +301,7 @@ AC_ARG_WITH(cards,
+   [                          usb-usx2y, usb-caiaq, vxpocket, pdaudiocf, ]
+   [                          sun-amd7930, sun-cs4231, sun-dbri, harmony, soc, ]
+   [                          at91-soc, at91-soc-eti-b1-wm8731, pxa2xx-soc, ]
+-  [                          pxa2xx-soc-corgi, pxa2xx-soc-spitz, ]
++  [                          pxa2xx-soc-corgi, pxa2xx-soc-spitz, imx-tsc2102, ]
+   [                          pxa2xx-soc-poodle, pxa2xx-soc-tosa, s3c24xx-soc, ]
+   [                          soc-pcm-sh7760, sh7760-ac97 ],
+   cards="$withval", cards="all")
+@@ -1962,6 +1964,19 @@ for card in $SELECTED_CARDS; do
        probed=0
      fi
    fi
-+  if test "$card" = "all" -o "$card" = "imx-tsc"; then
++  if test "$card" = "all" -o "$card" = "imx-tsc2102"; then
 +    if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
 +      ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-+      ( test "$CONFIG_ARCH_SA1100" = "y" -o "$CONFIG_ARCH_SA1100" = "m" ); then
++      ( test "$CONFIG_ARCH_IMX" = "y" -o "$CONFIG_ARCH_IMX" = "m" ); then
 +      CONFIG_SND_TIMER="m"
 +      CONFIG_SND_PCM="m"
 +      CONFIG_SND_IMX_TSC2102="m"
++      CONFIG_SND_IMX_SSI="m"
 +      probed=1
 +    elif test -z "$probed"; then
 +      probed=0
@@ -28,20 +38,24 @@
    if test "$card" = "all" -o "$card" = "armaaci"; then
      if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
        ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-@@ -2928,6 +2941,9 @@
+@@ -2928,6 +2943,12 @@ fi
  if test -n "$CONFIG_SND_SA11XX_UDA1341"; then
    AC_DEFINE(CONFIG_SND_SA11XX_UDA1341_MODULE)
  fi
++if test -n "$CONFIG_SND_IMX_SSI"; then
++  AC_DEFINE(CONFIG_SND_IMX_SSI_MODULE)
++fi
 +if test -n "$CONFIG_SND_IMX_TSC2102"; then
 +  AC_DEFINE(CONFIG_SND_IMX_TSC2102_MODULE)
 +fi
  if test -n "$CONFIG_SND_ARMAACI"; then
    AC_DEFINE(CONFIG_SND_ARMAACI_MODULE)
  fi
-@@ -3306,6 +3322,7 @@
+@@ -3306,6 +3327,8 @@ AC_SUBST(CONFIG_SND_AOA_SOUNDBUS)
  AC_SUBST(CONFIG_SND_AOA_SOUNDBUS_I2S)
  AC_SUBST(CONFIG_ARM)
  AC_SUBST(CONFIG_SND_SA11XX_UDA1341)
++AC_SUBST(CONFIG_SND_IMX_SSI)
 +AC_SUBST(CONFIG_SND_IMX_TSC2102)
  AC_SUBST(CONFIG_ARCH_SA1100)
  AC_SUBST(CONFIG_L3)
@@ -49,68 +63,41 @@
 diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/arm/Kconfig alsa-driver-1.0.14.mod/alsa-kernel/arm/Kconfig
 --- alsa-driver-1.0.14/alsa-kernel/arm/Kconfig	2007-06-04 09:28:52.000000000 +0200
 +++ alsa-driver-1.0.14.mod/alsa-kernel/arm/Kconfig	2007-08-07 11:56:04.000000000 +0200
-@@ -33,4 +33,11 @@
+@@ -33,4 +33,20 @@
  	  Say Y or M if you want to support any AC97 codec attached to
  	  the PXA2xx AC97 interface.
  
++config SND_IMX_SSI
++	tristate "SSI support"
++	---help---
++	  Say Y to get the SSI services API available on IMX1 platform. 
++
 +config SND_IMX_TSC2102
-+	tristate "TSC2102 driver for the i.MXL"
-+	depends on ARCH_IMX && SND
++	tristate "IMX TSC2102 sound system"
++	depends on ARCH_IMX && IMX1_SSI
++	default N
++	select SND_PCM
++	select SND_IMX1_SSI
 +	help
-+	  Say Y or M if you want to support TSC2102 codec attached to
-+	  the i.MXL SSI interface.
++	  Say Y here to include support for TSC2102 chip with audio feature.
 +
++	  To compile this driver as a module, choose M here: the module
++	  will be called snd-tsc2102.
  endmenu
 diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/arm/Makefile alsa-driver-1.0.14.mod/alsa-kernel/arm/Makefile
 --- alsa-driver-1.0.14/alsa-kernel/arm/Makefile	2007-06-04 09:28:52.000000000 +0200
 +++ alsa-driver-1.0.14.mod/alsa-kernel/arm/Makefile	2007-08-08 11:39:22.000000000 +0200
-@@ -12,4 +12,12 @@
+@@ -12,4 +12,10 @@
  snd-pxa2xx-pcm-objs		:= pxa2xx-pcm.o
  
  obj-$(CONFIG_SND_PXA2XX_AC97)	+= snd-pxa2xx-ac97.o
-+#obj-m	+= snd-pxa2xx-ac97.o
  snd-pxa2xx-ac97-objs		:= pxa2xx-ac97.o
 +
-+#obj-$(CONFIG_SND_IMX_TSC2102)	+= snd-imx-tsc.o
-+obj-m	+= snd-imx-tsc.o
-+snd-imx-tsc-objs		:= imx-tsc2102.o
++obj-$(CONFIG_SND_IMX_TSC2102)	+= snd-imx-tsc2102.o
++snd-imx-tsc2102-objs		:= imx-tsc2102.o
 +
-+obj-m   += snd-imx1-ssi.o
++obj-$(CONFIG_SND_IMX_SSI)   += snd-imx1-ssi.o
 +snd-imx1-ssi-objs                := imx1-ssi.o
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/Kconfig alsa-driver-1.0.14.mod/alsa-kernel/Kconfig
---- alsa-driver-1.0.14/alsa-kernel/Kconfig	2007-06-04 09:28:52.000000000 +0200
-+++ alsa-driver-1.0.14.mod/alsa-kernel/Kconfig	2007-08-07 11:53:32.000000000 +0200
-@@ -32,7 +32,7 @@
- 	  Kernel patches and supporting utilities to do that are in the pcsp
- 	  package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
- 
--source "sound/oss/dmasound/Kconfig"
-+#source "sound/oss/dmasound/Kconfig"
- 
- if !M68K
- 
-@@ -91,7 +91,7 @@
- 	help
- 	  Say 'Y' or 'M' to enable Open Sound System drivers.
- 
--source "sound/oss/Kconfig"
-+#source "sound/oss/Kconfig"
- 
- endmenu
- 
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/Makefile alsa-driver-1.0.14.mod/alsa-kernel/Makefile
---- alsa-driver-1.0.14/alsa-kernel/Makefile	2007-06-04 09:28:52.000000000 +0200
-+++ alsa-driver-1.0.14.mod/alsa-kernel/Makefile	2007-08-07 12:03:05.000000000 +0200
-@@ -5,7 +5,8 @@
- obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
- obj-$(CONFIG_SOUND_PRIME) += oss/
- obj-$(CONFIG_DMASOUND) += oss/
--obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
-+#obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
-+obj-y += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
- obj-$(CONFIG_SND_AOA) += aoa/
- 
- # This one must be compilable even if sound is configured out
 diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/arm/imx1-ssi.c alsa-driver-1.0.14.mod/arm/imx1-ssi.c
 --- alsa-driver-1.0.14/arm/imx1-ssi.c	1970-01-01 01:00:00.000000000 +0100
 +++ alsa-driver-1.0.14.mod/arm/imx1-ssi.c	2007-08-07 10:40:54.000000000 +0200
@@ -123,26 +110,9 @@
 @@ -0,0 +1,2 @@
 +#include "../alsa-kernel/arm/imx-tsc2102.c"
 +EXPORT_NO_SYMBOLS;
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/configure alsa-driver-1.0.14.mod/configure
---- alsa-driver-1.0.14/configure	2007-06-04 09:29:01.000000000 +0200
-+++ alsa-driver-1.0.14.mod/configure	2007-08-06 20:11:32.000000000 +0200
-@@ -836,6 +836,7 @@
- CONFIG_SND_AOA_SOUNDBUS
- CONFIG_SND_AOA_SOUNDBUS_I2S
- CONFIG_SND_SA11XX_UDA1341
-+CONFIG_SND_IMX_TSC2102
- CONFIG_SND_ARMAACI
- CONFIG_ARM_AMBA
- CONFIG_SND_PXA2XX_PCM
-@@ -4356,6 +4357,7 @@
- 	CONFIG_SND_AOA_SOUNDBUS_I2S=""
- 	CONFIG_ARM=""
- 	CONFIG_SND_SA11XX_UDA1341=""
-+	CONFIG_SND_IMX_TSC2102=""
- 	CONFIG_ARCH_SA1100=""
- 	CONFIG_L3=""
- 	CONFIG_SND_ARMAACI=""
-@@ -7343,6 +7345,7 @@
+--- alsa-driver-1.0.14.ref/configure.in	2007-06-04 09:28:51.000000000 +0200
++++ alsa-driver-1.0.14/configure.in	2007-09-09 22:47:35.000000000 +0200
+@@ -825,6 +825,7 @@ CONFIG_L3=
  CONFIG_ARM=
  CONFIG_ARCH_SA1100=
  CONFIG_ARCH_PXA=
@@ -150,18 +120,7 @@
  CONFIG_PPC=
  CONFIG_SPARC32=
  CONFIG_SPARC64=
-@@ -7360,8 +7363,8 @@
-   KERNDIR=$CONFIG_SND_KERNELDIR
- fi
- if test "$cross_compiling" = yes; then
--  { echo "$as_me:$LINENO: result: unknown" >&5
--echo "${ECHO_T}unknown" >&6; };processor=""
-+  { echo "$as_me:$LINENO: result: imx" >&5
-+echo "${ECHO_T}unknown" >&6; };processor="imx"
- 
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -7447,6 +7450,8 @@
+@@ -918,6 +919,8 @@ int main(void) {
  	fprintf(file, "sa1100");
  #elif defined(CONFIG_ARCH_PXA)
  	fprintf(file, "pxa");
@@ -170,16 +129,8 @@
  #elif defined(CONFIG_ARM_AMBA)
  	fprintf(file, "amba");
  #elif defined(CONFIG_PARISC)
-@@ -7502,7 +7507,6 @@
- 
- 
- CFLAGS="$ac_save_CFLAGS"
--rm -f processor.id
- c_opts=""
- KLD=ld
- ARCH=
-@@ -7734,6 +7738,14 @@
-     CONFIG_ARCH_PXA=y
+@@ -1166,6 +1168,14 @@ EOF
+     CONFIG_ARCH_SA1100=y
      test "$CONFIG_ISA" = "probe" && CONFIG_ISA=
      ;;
 +  imx)
@@ -190,93 +141,51 @@
 +    CONFIG_ARCH_IMX=y
 +    test "$CONFIG_ISA" = "probe" && CONFIG_ISA=
 +    ;;
-   amba)
+   pxa)
      ARCH=arm
-     c_opts="-O2 -mapcs-32 -march=armv4 -Wa,-mxscale -mshort-load-bytes -msoft-float"
-@@ -14464,6 +14476,18 @@
-       probed=0
-     fi
-   fi
-+  if test "$card" = "all" -o "$card" = "imx-tsc"; then
-+    if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
-+      ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-+      ( test "$CONFIG_ARCH_IMX" = "y" -o "$CONFIG_ARCH_IMX" = "m" ); then
-+      CONFIG_SND_TIMER="m"
-+      CONFIG_SND_PCM="m"
-+      CONFIG_SND_IMX_TSC2102="m"
-+      probed=1
-+    elif test -z "$probed"; then
-+      probed=0
-+    fi
-+  fi
-   if test "$card" = "all" -o "$card" = "armaaci"; then
-     if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
-       ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-@@ -15889,6 +15913,12 @@
- _ACEOF
- 
- fi
-+if test -n "$CONFIG_SND_IMX_TSC2102"; then
-+  cat >>confdefs.h <<\_ACEOF
-+#define CONFIG_SND_IMX_TSC2102_MODULE 1
-+_ACEOF
-+
-+fi
- if test -n "$CONFIG_SND_ARMAACI"; then
-   cat >>confdefs.h <<\_ACEOF
- #define CONFIG_SND_ARMAACI_MODULE 1
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/configure.in alsa-driver-1.0.14.mod/configure.in
---- alsa-driver-1.0.14/configure.in	2007-06-04 09:28:51.000000000 +0200
-+++ alsa-driver-1.0.14.mod/configure.in	2007-08-06 19:22:43.000000000 +0200
-@@ -918,6 +918,8 @@
- 	fprintf(file, "sa1100");
- #elif defined(CONFIG_ARCH_PXA)
- 	fprintf(file, "pxa");
-+#elif defined(CONFIG_ARCH_IMX)
-+	fprintf(file, "imx");
- #elif defined(CONFIG_ARM_AMBA)
- 	fprintf(file, "amba");
- #elif defined(CONFIG_PARISC)
-@@ -941,7 +943,6 @@
-   AC_MSG_RESULT(unknown);processor=""
- )
- CFLAGS="$ac_save_CFLAGS"
--rm -f processor.id
- c_opts=""
- KLD=ld
- ARCH=
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/toplevel.config alsa-driver-1.0.14.mod/toplevel.config
---- alsa-driver-1.0.14/toplevel.config	2007-08-08 18:33:37.000000000 +0200
-+++ alsa-driver-1.0.14.mod/toplevel.config	2007-08-07 12:52:01.000000000 +0200
-@@ -182,8 +182,10 @@
- CONFIG_SND_AOA_TOONIE=
- CONFIG_SND_AOA_SOUNDBUS=
- CONFIG_SND_AOA_SOUNDBUS_I2S=
--CONFIG_ARM=
-+CONFIG_ARM=y
-+CONFIG_MACH_APF9328=y
- CONFIG_SND_SA11XX_UDA1341=
-+CONFIG_SND_IMX_TSC2102=m
- CONFIG_ARCH_SA1100=
- CONFIG_L3=
- CONFIG_SND_ARMAACI=
-@@ -191,6 +193,7 @@
- CONFIG_SND_PXA2XX_PCM=
- CONFIG_SND_PXA2XX_AC97=
- CONFIG_ARCH_PXA=
-+CONFIG_ARCH_IMX=y
- CONFIG_SND_S3C2410=
- CONFIG_ARCH_S3C2410=
- CONFIG_I2C_SENSOR=
+     c_opts="-O2 -mapcs-32 -march=armv4 -Wa,-mxscale -mtune=strongarm -mshort-load-bytes -msoft-float"
+@@ -1334,6 +1344,7 @@ AC_SUBST(CONFIG_ALPHA)
+ AC_SUBST(CONFIG_L3)
+ AC_SUBST(CONFIG_ARM)
+ AC_SUBST(CONFIG_ARCH_SA1100)
++AC_SUBST(CONFIG_ARCH_IMX)
+ AC_SUBST(CONFIG_ARCH_PXA)
+ AC_SUBST(CONFIG_PPC)
+ AC_SUBST(CONFIG_SPARC32)
 diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/toplevel.config.in alsa-driver-1.0.14.mod/toplevel.config.in
 --- alsa-driver-1.0.14/toplevel.config.in	2007-06-04 09:28:55.000000000 +0200
 +++ alsa-driver-1.0.14.mod/toplevel.config.in	2007-08-06 20:02:26.000000000 +0200
-@@ -184,6 +184,7 @@
+@@ -184,6 +184,8 @@
  CONFIG_SND_AOA_SOUNDBUS_I2S=@CONFIG_SND_AOA_SOUNDBUS_I2S@
  CONFIG_ARM=@CONFIG_ARM@
  CONFIG_SND_SA11XX_UDA1341=@CONFIG_SND_SA11XX_UDA1341@
++CONFIG_SND_IMX_SSI=@CONFIG_SND_IMX_SSI@
 +CONFIG_SND_IMX_TSC2102=@CONFIG_SND_IMX_TSC2102@
  CONFIG_ARCH_SA1100=@CONFIG_ARCH_SA1100@
  CONFIG_L3=@CONFIG_L3@
  CONFIG_SND_ARMAACI=@CONFIG_SND_ARMAACI@
-Binary files alsa-driver-1.0.14/utils/mod-deps and alsa-driver-1.0.14.mod/utils/mod-deps differ
+diff -purN alsa-driver-1.0.14.ref/include/config1.h.in alsa-driver-1.0.14/include/config1.h.in
+--- alsa-driver-1.0.14.ref/include/config1.h.in	2007-06-04 09:28:55.000000000 +0200
++++ alsa-driver-1.0.14/include/config1.h.in	2007-09-09 21:37:12.000000000 +0200
+@@ -188,6 +188,8 @@
+ #undef CONFIG_L3_MODULE
+ #undef CONFIG_SND_ARMAACI_MODULE
+ #undef CONFIG_ARM_AMBA_MODULE
++#undef CONFIG_SND_IMX_SSI_MODULE
++#undef CONFIG_SND_IMX_TSC2102_MODULE
+ #undef CONFIG_SND_PXA2XX_PCM_MODULE
+ #undef CONFIG_SND_PXA2XX_AC97_MODULE
+ #undef CONFIG_ARCH_PXA_MODULE
+diff -purN alsa-driver-1.0.14.ref/scripts/ksync.conf alsa-driver-1.0.14/scripts/ksync.conf
+--- alsa-driver-1.0.14.ref/scripts/ksync.conf	2007-06-04 09:28:54.000000000 +0200
++++ alsa-driver-1.0.14/scripts/ksync.conf	2007-09-09 21:01:42.000000000 +0200
+@@ -49,6 +49,8 @@ comment.map.alsa-driver::= \
+ 	/arm/devdma.[ch]:"ARM DMA routines" \
+ 	/arm/aaci.[ch]:"ARM AACI PL041 driver" \
+ 	/arm/sa11xx-uda1341.c:"SA11xx UDA1341 driver" \
++	/arm/imx1-ssi.*:"ARM imx ssi driver" \
++	/arm/imx-tsc2102.*:"ARM imx driver" \
+ 	/arm/pxa2xx.*:"ARM PXA2XX driver" \
+ 	/arm/s3c24xx-iis.[ch]:"ARM S3C24XX IIS driver" \
+ 	/arm:ERROR \
+

Deleted: trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch	2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch	2007-09-11 20:41:29 UTC (rev 640)
@@ -1,11 +0,0 @@
---- alsa-driver-1.0.14/Rules.make	2007-06-04 09:28:51.000000000 +0200
-+++ alsa-driver-1.0.14.working/Rules.make	2007-08-01 12:47:03.000000000 +0200
-@@ -158,7 +158,7 @@
- 
- $(ld-multi-used-m) : %.o: $(ld-multi-objs-m)
- 	rm -f $@
--	$(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs) $(extra-$(basename $@)-objs), $^)
-+	arm-linux-ld $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs) $(extra-$(basename $@)-objs), $^)
- 
- #
- # This make dependencies quickly

Modified: trunk/buildroot/package/alsa-driver/alsa-driver.mk
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver.mk	2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver.mk	2007-09-11 20:41:29 UTC (rev 640)
@@ -20,52 +20,58 @@
 	toolchain/patch-kernel.sh $(ALSA_DRIVER_DIR) package/alsa-driver/ alsa-driver-armadeus\*.patch
 	# Copy our custom drivers (until they are integrated in alsa mainline)
 	cp -f package/alsa-driver/imx* $(ALSA_DRIVER_DIR)/alsa-kernel/arm/
-#	$(CONFIG_UPDATE) $(ALSA_DRIVER_DIR)
 	touch $@
 
 $(ALSA_DRIVER_DIR)/.configured: $(ALSA_DRIVER_DIR)/.unpacked
 	(cd $(ALSA_DRIVER_DIR); rm -rf config.cache; \
+		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(TARGET_CONFIGURE_OPTS) \
 		CFLAGS="$(TARGET_CFLAGS)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
+		aclocal; \
+		autoconf; \
 		./configure \
+		--prefix=$(STAGING_DIR) \
 		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+		--with-kernel=$(LINUX_DIR) \
+		--with-moddir=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra \
 		--disable-docs \
 		--with-sequencer=yes \
 		--with-isapnp=no \
-		--with-oss=yes \
-		--with-kernel=${BUILD_DIR}/linux-2.6.18.1 \
-		--with-kernel-version=2.6.18.1 \
-		--with-cards=all \
-	);
+		--with-oss=no \
+		--disable-old-api \
+		--with-redhat=no \
+		--with-suse=no \
+		--with-cross=arm-linux- \
+		--with-debug=full \
+		--with-kernel-version=$(LINUX_VERSION) \
+		--with-cards=all ;\
+		$(MAKE) dep \
+	);	
 	touch $@
 
-$(ALSA_DRIVER_DIR)/modules/snd-imx-tsc.o: $(ALSA_DRIVER_DIR)/.configured
+$(ALSA_DRIVER_DIR)/modules/snd.ko: $(ALSA_DRIVER_DIR)/.configured
 	(export PATH=${PATH}:${STAGING_DIR}/bin ; \
-		$(MAKE) -C $(ALSA_DRIVER_DIR) \
+		$(MAKE) -C $(ALSA_DRIVER_DIR);  \
 	);
+	touch -c $@
 
-# $(STAGING_DIR)/$(ALSA_DRIVER_TARGET_BINARY): $(ALSA_DRIVER_DIR)/src/.libs/$(ALSA_DRIVER_BINARY)
-# 	$(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_DRIVER_DIR) install
-# 	$(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libasound.la
-# 
-# $(TARGET_DIR)/$(ALSA_DRIVER_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_DRIVER_TARGET_BINARY)
-# 	mkdir -p $(TARGET_DIR)/usr/share/alsa
-# 	mkdir -p $(TARGET_DIR)/usr/lib/alsa-lib
-# 	cp -dpf  $(STAGING_DIR)/lib/libasound.so*  $(TARGET_DIR)/usr/lib/
-# 	cp -rdpf $(STAGING_DIR)/usr/share/alsa/*   $(TARGET_DIR)/usr/share/alsa/
-# 	cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/
-# 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libasound.so*
-# 	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/alsa-lib/*.so
-# 	touch -c $@
+$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra/acore/snd.ko: $(ALSA_DRIVER_DIR)/modules/snd.ko
+	(export PATH=${PATH}:${STAGING_DIR}/bin ; \
+		$(MAKE) PATH=$(TARGET_PATH) -C $(ALSA_DRIVER_DIR) TARGET_DIR=$(TARGET_DIR) \
+			DEPMOD=`which true` install-modules; \
+	);
+	touch -c $@
 
-alsa-driver: uclibc linux $(ALSA_DRIVER_DIR)/modules/snd-imx-tsc.o
+$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra/acore/snd.ko
+	package/alsa-driver/depmod.pl \
+		-b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
+		-k $(LINUX_DIR)/vmlinux \
+		-F $(LINUX_DIR)/System.map \
+		> $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
 
+alsa-driver: uclibc linux $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+
 alsa-driver-clean:
 	rm -f $(TARGET_DIR)/$(ALSA_DRIVER_TARGET_BINARY)
 	-$(MAKE) -C $(ALSA_DRIVER_DIR) clean
@@ -80,4 +86,4 @@
 #############################################################
 ifeq ($(strip $(BR2_PACKAGE_ALSA_DRIVER)),y)
 TARGETS+=alsa-driver
-endif
\ No newline at end of file
+endif

Added: trunk/buildroot/package/alsa-driver/depmod.pl
===================================================================
--- trunk/buildroot/package/alsa-driver/depmod.pl	                        (rev 0)
+++ trunk/buildroot/package/alsa-driver/depmod.pl	2007-09-11 20:41:29 UTC (rev 640)
@@ -0,0 +1,237 @@
+#!/usr/bin/perl -w
+# vi: set ts=4:
+# Copyright (c) 2001 David Schleef <ds...@sc...>
+# Copyright (c) 2001 Erik Andersen <and...@co...>
+# Copyright (c) 2001 Stuart Hughes <st...@li...>
+# Copyright (c) 2002 Steven J. Hill <sh...@br...>
+# This program is free software; you can redistribute it and/or modify it
+# under the same terms as Perl itself.
+
+# TODO -- use strict mode...
+#use strict;
+
+use Getopt::Long;
+use File::Find;
+
+
+# Set up some default values
+
+my $basedir="";
+my $kernel;
+my $kernelsyms;
+my $stdout=0;
+my $verbose=0;
+
+
+# get command-line options
+
+my %opt;
+
+GetOptions(
+	\%opt,
+	"help|h",
+	"basedir|b=s" => \$basedir,
+	"kernel|k=s" => \$kernel,
+	"kernelsyms|F=s" => \$kernelsyms,
+	"stdout|n" => \$stdout,
+	"verbose|v" => \$verbose,
+);
+
+if (defined $opt{help}) {
+	print
+	"  $0 [OPTION]... [basedir]\n",
+	"     -h --help\t\tShow this help screen\n",
+	"     -b --basedir\tModules base directory (defaults to /lib/modules)\n",
+	"     -k --kernel\tKernel binary for the target\n",
+	"     -F --kernelsyms\tKernel symbol file\n",
+	"     -n --stdout\tWrite to stdout instead of <basedir>/modules.dep\n",
+	"     -v --verbose\tPrint out lots of debugging stuff\n",
+	;
+	exit 1;
+}
+
+if($basedir !~ m-/lib/modules-) {
+    warn "WARNING: base directory does not match ..../lib/modules\n";
+}
+
+# Find the list of .o files living under $basedir
+#if ($verbose) { printf "Locating all modules\n"; }
+my($ofile) = "";
+my($file) = "";
+my(@liblist) = ();
+find sub {
+	if ( -f $_  && ! -d $_ ) {
+		$file = $File::Find::name;
+		if ( $file =~ /.o$/ ) {
+			push(@liblist, $file);
+			if ($verbose) { printf "$file\n"; }
+		}
+	}
+}, $basedir;
+if ($verbose) { printf "Finished locating modules\n"; }
+
+foreach $obj ( @liblist, $kernel ){
+    # turn the input file name into a target tag name
+    # vmlinux is a special that is only used to resolve symbols
+    if($obj =~ /vmlinux/) {
+        $tgtname = "vmlinux";
+    } else {
+        ($tgtname) = $obj =~ m-(/lib/modules/.*)$-;
+    }
+
+    warn "MODULE = $tgtname\n" if $verbose;
+
+    # get a list of symbols
+	@output=`nm $obj`;
+	$ksymtab=grep m/ __ksymtab/, @output;
+
+    # gather the exported symbols
+	if($ksymtab){
+        # explicitly exported
+        foreach ( @output ) {
+            / __ksymtab_(.*)$/ and do {
+                warn "sym = $1\n" if $verbose;
+                $exp->{$1} = $tgtname;
+            };
+        }
+	} else {
+        # exporting all symbols
+        foreach ( @output) {
+            / [ABCDGRST] (.*)$/ and do {
+                warn "syma = $1\n" if $verbose;
+                $exp->{$1} = $tgtname;
+            };
+        }
+	}
+    # gather the unresolved symbols
+    foreach ( @output ) {
+        !/ __this_module/ && / U (.*)$/ and do {
+            warn "und = $1\n" if $verbose;
+            push @{$dep->{$tgtname}}, $1;
+        };
+    }
+}
+
+
+# reduce dependancies: remove unresolvable and resolved from vmlinux
+# remove duplicates
+foreach $module (keys %$dep) {
+    $mod->{$module} = {};
+    foreach (@{$dep->{$module}}) {
+        if( $exp->{$_} ) {
+            warn "resolved symbol $_ in file $exp->{$_}\n" if $verbose;
+            next if $exp->{$_} =~ /vmlinux/;
+            $mod->{$module}{$exp->{$_}} = 1;
+        } else {
+            warn "unresolved symbol $_ in file $module\n";
+        }
+    }
+}
+
+# resolve the dependancies for each module
+if ($stdout == 1) {
+	foreach $module ( keys %$mod ) {
+		print "$module:\t";
+		@sorted = sort bydep keys %{$mod->{$module}};
+		print join(" \\\n\t",@sorted);
+		print "\n\n";
+	}
+} else {
+	open(OFILE, ">$basedir/modules.dep");
+	foreach $module ( keys %$mod ) {
+		print OFILE "$module:\t";
+		@sorted = sort bydep keys %{$mod->{$module}};
+		print OFILE join(" \\\n\t",@sorted);
+		print OFILE "\n\n";
+	}
+}
+
+
+sub bydep
+{
+    foreach my $f ( keys %{$mod->{$b}} ) {
+        if($f eq $a) {
+            return 1;
+        }
+    }
+    return -1;
+}
+
+
+
+__END__
+
+=head1 NAME
+
+depmod.pl - a cross platform script to generate kernel module dependency
+		lists which can then be used by modprobe.
+
+=head1 SYNOPSIS
+
+depmod.pl [OPTION]... [basedir]...
+
+Example:
+
+	depmod.pl -F linux/System.map target/lib/modules
+
+=head1 DESCRIPTION
+
+The purpose of this script is to automagically generate a list of of kernel
+module dependancies.  This script produces dependancy lists that should be
+identical to the depmod program from the modutils package.  Unlike the depmod
+binary, however, depmod.pl is designed to be run on your host system, not
+on your target system.
+
+This script was written by David Schleef <ds...@sc...> to be used in
+conjunction with the BusyBox modprobe applet.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-h --help>
+
+This displays the help message.
+
+=item B<-b --basedir>
+
+The base directory uner which the target's modules will be found.  This
+defaults to the /lib/modules directory.
+
+=item B<-k --kernel>
+
+Kernel binary for the target.  You must either supply a kernel binary
+or a kernel symbol file (using the -F option).
+
+=item B<-F --kernelsyms>
+
+Kernel symbol file for the target.  You must supply either a kernel symbol file
+kernel binary for the target (using the -k option).
+
+=item B<-n --stdout>
+
+Write to stdout instead of modules.dep.  This is currently hard coded...
+kernel binary for the target (using the -k option).
+
+=item B<--verbose>
+
+Be verbose (not implemented)
+
+=back
+
+=head1 COPYRIGHT
+
+Copyright (c) 2001 David Schleef <ds...@sc...>
+Copyright (c) 2001 Erik Andersen <and...@co...>
+Copyright (c) 2001 Stuart Hughes <st...@li...>
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 AUTHOR
+
+David Schleef <ds...@sc...>
+
+=cut
+
+# $Id: depmod.pl,v 1.1 2004/12/08 01:34:41 andersen Exp $
+


Property changes on: trunk/buildroot/package/alsa-driver/depmod.pl
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config	2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config	2007-09-11 20:41:29 UTC (rev 640)
@@ -737,9 +737,19 @@
 #
 # Sound
 #
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
 
 #
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y

Modified: trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/device_table.txt	2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/target/device/armadeus/rootfs/device_table.txt	2007-09-11 20:41:29 UTC (rev 640)
@@ -34,6 +34,7 @@
 #<name>		<type>	<mode>	<uid>	<gid>	<major>	<minor>	<start>	<inc>	<count>
 /dev		d	755	0	0	-	-	-	-	-
 /dev/pts	d	755	0	0	-	-	-	-	-
+/dev/snd	d	755	0	0	-	-	-	-	-
 /tmp		d	1777	0	0	-	-	-	-	-
 /etc		d	755	0	0	-	-	-	-	-
 /home/default	d	2755	1000	1000	-	-	-	-	-
@@ -90,6 +91,17 @@
 #/dev/dsp1	c	666	0	29	14	19	-	-	-
 #/dev/sndstat	c	666	0	29	14	6	-	-	-
 
+/dev/audio	c	666	0	29	14	4	-	-	-
+/dev/audio1	c	666	0	29	14	20	-	-	-
+/dev/dsp	c	666	0	29	14	3	-	-	-
+/dev/dsp1	c	666	0	29	14	19	-	-	-
+/dev/sndstat	c	666	0	29	14	6	-	-	-
+/dev/snd/controlC0	c	666	0	29	116	0	-	-	-
+/dev/snd/pcmC0D0p	c	666	0	29	116	16	-	-	-
+/dev/snd/pcmC0D1p	c	666	0	29	116	17	-	-	-
+/dev/snd/pcmC0D0c	c	666	0	29	116	24	-	-	-
+/dev/snd/timer		c	666	0	29	116	33	-	-	-
+
 # User-mode Linux stuff
 /dev/ubda	b	640	0	0	98	0	0	0	-
 /dev/ubda	b	640	0	0	98	1	1	1	15


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [639] trunk/buildroot/package/slideshow/slideshow.mk

[<ar...@us...>]

Revision: 639
          http://armadeus.svn.sourceforge.net/armadeus/?rev=639&view=rev
Author:   artemys
Date:     2007-09-07 14:50:01 -0700 (Fri, 07 Sep 2007)

Log Message:
-----------
[BUILDROOT] Slideshow tool is now installed in rootfs when built

Modified Paths:
--------------
    trunk/buildroot/package/slideshow/slideshow.mk

Modified: trunk/buildroot/package/slideshow/slideshow.mk
===================================================================
--- trunk/buildroot/package/slideshow/slideshow.mk	2007-09-06 10:04:39 UTC (rev 638)
+++ trunk/buildroot/package/slideshow/slideshow.mk	2007-09-07 21:50:01 UTC (rev 639)
@@ -7,7 +7,7 @@
 SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
 SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
 SLIDESHOW_CAT:=zcat
-SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow/
+SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow
 
 $(DL_DIR)/$(SLIDESHOW_SOURCE):
 	$(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
@@ -23,25 +23,17 @@
 	toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
 	touch $@
 
-$(SLIDESHOW_DIR)/src/slideshow: $(SLIDESHOW_DIR)/.configured
+$(SLIDESHOW_DIR)/slideshow: $(SLIDESHOW_DIR)/.configured
 	export PATH=$(STAGING_DIR)/bin::$$PATH; $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
 
-$(STAGING_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/src/slideshow
-	$(MAKE) -C $(SLIDESHOW_DIR) install
+$(TARGET_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/slideshow
+	cp -dpf $< $(TARGET_DIR)/usr/bin
+	-$(STRIP) --strip-unneeded $@
 
-# $(TARGET_DIR)/usr/games/prboom: $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom
-# 	mkdir -p $(TARGET_DIR)/usr/games/
-# 	mkdir -p $(TARGET_DIR)/usr/share/games/doom/
-# 	cp -dpf $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom $@
-# 	cp -dpf $(SLIDESHOW_DIR)/data/*.wad $(TARGET_DIR)/usr/share/games/doom/ 
-# 	-$(STRIP) --strip-unneeded $@
+SLIDESHOW slideshow: sdl sdl_image $(TARGET_DIR)/usr/bin/slideshow
 
-SLIDESHOW slideshow: sdl sdl_image $(STAGING_DIR)/usr/bin/slideshow
-
 slideshow-clean:
-#	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SLIDESHOW_DIR) uninstall
-#	rm -rf $(TARGET_DIR)/usr/share/games/doom/
-#	rm -rf $(TARGET_DIR)/usr/games/
+	rm -f $(TARGET_DIR)/usr/bin/slideshow
 	-$(MAKE) -C $(SLIDESHOW_DIR) clean
  
 slideshow-dirclean:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [638] trunk/firmware/PS2

[<th...@us...>]

Revision: 638
          http://armadeus.svn.sourceforge.net/armadeus/?rev=638&view=rev
Author:   thom25
Date:     2007-09-06 03:04:39 -0700 (Thu, 06 Sep 2007)

Log Message:
-----------
fix read bug

Modified Paths:
--------------
    trunk/firmware/PS2/PS2.ise
    trunk/firmware/PS2/PS2_top.vhd
    trunk/firmware/PS2/ps2_top.bit

Modified: trunk/firmware/PS2/PS2.ise
===================================================================
(Binary files differ)

Modified: trunk/firmware/PS2/PS2_top.vhd
===================================================================
--- trunk/firmware/PS2/PS2_top.vhd	2007-09-05 11:05:41 UTC (rev 637)
+++ trunk/firmware/PS2/PS2_top.vhd	2007-09-06 10:04:39 UTC (rev 638)
@@ -153,7 +153,7 @@
       case AddrxDI is
         when "0000000000000" =>
           DataOutRAMxD <= "00" & data_count(1 downto 0) & "0000" & "00" & valid & overflow & full & almost_full & empty & almost_empty;
-        when "0000000000001" =>
+        when "0000000000010" =>
           DataOutRAMxD <= "00000000" & dout;
           if readAccessPulse = '0' then
             readAccessPulseFiFo <= '0';

Modified: trunk/firmware/PS2/ps2_top.bit
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [637] trunk/buildroot/package

[<ar...@us...>]

Revision: 637
          http://armadeus.svn.sourceforge.net/armadeus/?rev=637&view=rev
Author:   artemys
Date:     2007-09-05 04:05:41 -0700 (Wed, 05 Sep 2007)

Log Message:
-----------
[BUILDROOT] Add SDL Perigee Slideshow tool in Buildroot (not configurable with menuconfig yet: I have to test it before ;-) )

Added Paths:
-----------
    trunk/buildroot/package/slideshow/
    trunk/buildroot/package/slideshow/Config.in
    trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch
    trunk/buildroot/package/slideshow/slideshow.mk

Added: trunk/buildroot/package/slideshow/Config.in
===================================================================
--- trunk/buildroot/package/slideshow/Config.in	                        (rev 0)
+++ trunk/buildroot/package/slideshow/Config.in	2007-09-05 11:05:41 UTC (rev 637)
@@ -0,0 +1,9 @@
+config BR2_PACKAGE_SLIDESHOW
+	bool "Slideshow"
+	depends on BR2_PACKAGE_SDL && BR2_PACKAGE_SDL_IMAGE
+	default n
+	help
+
+	  Perigee Slideshow is a command line program that searches a directory for supported graphic files and displays them in a slideshow
+
+	  http://www.xmission.com/~jstanley/slideshow.html

Added: trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch
===================================================================
--- trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow-add-arm-cross-compile.patch	2007-09-05 11:05:41 UTC (rev 637)
@@ -0,0 +1,26 @@
+--- slideshow/Makefile	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/Makefile	2007-09-05 12:08:56.000000000 +0200
+@@ -1,6 +1,12 @@
++ifeq ($(ARCH), arm)
++CFLAGS = -O2 `sh ../SDL-1.2.11/sdl-config --cflags`
++LFLAGS = `sh ../SDL-1.2.11/sdl-config --libs` -lSDL_image
++CC = arm-linux-g++
++else
+ CFLAGS = -O2 -march=i586 `sdl-config --cflags`
+ LFLAGS = `sdl-config --libs` -lSDL_image
+ CC = g++
++endif
+ EXE = slideshow
+ OBJ = file_list.o fontdata.o main.o SDLFont.o slideshow.o
+ 
+--- slideshow/SDLFont.h	2003-11-29 21:08:54.000000000 +0100
++++ slideshow.mod/SDLFont.h	2007-09-05 12:11:17.000000000 +0200
+@@ -34,7 +34,7 @@
+ // The value of the top-left pixel in the font bitmap will be
+ //  considered transparent.  Anything else is opaque.
+ 
+-#include <SDL/SDL.h>
++#include "SDL.h"
+ 
+ class SDLFont
+ {

Added: trunk/buildroot/package/slideshow/slideshow.mk
===================================================================
--- trunk/buildroot/package/slideshow/slideshow.mk	                        (rev 0)
+++ trunk/buildroot/package/slideshow/slideshow.mk	2007-09-05 11:05:41 UTC (rev 637)
@@ -0,0 +1,57 @@
+#############################################################
+#
+# Slideshow
+#
+#############################################################
+SLIDESHOW_VERSION:=1.1
+SLIDESHOW_SOURCE:=slideshow-source-$(SLIDESHOW_VERSION).zip
+SLIDESHOW_SITE:=http://www.xmission.com/~jstanley/
+SLIDESHOW_CAT:=zcat
+SLIDESHOW_DIR:=$(BUILD_DIR)/slideshow/
+
+$(DL_DIR)/$(SLIDESHOW_SOURCE):
+	$(WGET) -P $(DL_DIR) $(SLIDESHOW_SITE)/$(SLIDESHOW_SOURCE)
+
+slideshow-source: $(DL_DIR)/$(SLIDESHOW_SOURCE)
+
+$(SLIDESHOW_DIR)/.unpacked: $(DL_DIR)/$(SLIDESHOW_SOURCE)
+	unzip $(DL_DIR)/$(SLIDESHOW_SOURCE) -d $(BUILD_DIR)
+	touch $@
+
+$(SLIDESHOW_DIR)/.configured: $(SLIDESHOW_DIR)/.unpacked
+	echo "Patching...."
+	toolchain/patch-kernel.sh $(SLIDESHOW_DIR) package/slideshow/ slideshow-\*.patch
+	touch $@
+
+$(SLIDESHOW_DIR)/src/slideshow: $(SLIDESHOW_DIR)/.configured
+	export PATH=$(STAGING_DIR)/bin::$$PATH; $(MAKE) -C $(SLIDESHOW_DIR) ARCH=arm
+
+$(STAGING_DIR)/usr/bin/slideshow: $(SLIDESHOW_DIR)/src/slideshow
+	$(MAKE) -C $(SLIDESHOW_DIR) install
+
+# $(TARGET_DIR)/usr/games/prboom: $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom
+# 	mkdir -p $(TARGET_DIR)/usr/games/
+# 	mkdir -p $(TARGET_DIR)/usr/share/games/doom/
+# 	cp -dpf $(STAGING_DIR)/usr/games/$(GNU_TARGET_NAME)-prboom $@
+# 	cp -dpf $(SLIDESHOW_DIR)/data/*.wad $(TARGET_DIR)/usr/share/games/doom/ 
+# 	-$(STRIP) --strip-unneeded $@
+
+SLIDESHOW slideshow: sdl sdl_image $(STAGING_DIR)/usr/bin/slideshow
+
+slideshow-clean:
+#	$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(SLIDESHOW_DIR) uninstall
+#	rm -rf $(TARGET_DIR)/usr/share/games/doom/
+#	rm -rf $(TARGET_DIR)/usr/games/
+	-$(MAKE) -C $(SLIDESHOW_DIR) clean
+ 
+slideshow-dirclean:
+	rm -rf $(SLIDESHOW_DIR)
+ 
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_SLIDESHOW)),y)
+TARGETS+=slideshow
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [636] trunk/target/packages/ch7024ctrl/ch7024.c

[<th...@us...>]

Revision: 636
          http://armadeus.svn.sourceforge.net/armadeus/?rev=636&view=rev
Author:   thom25
Date:     2007-09-03 07:48:18 -0700 (Mon, 03 Sep 2007)

Log Message:
-----------
compilation error fixed

Modified Paths:
--------------
    trunk/target/packages/ch7024ctrl/ch7024.c

Modified: trunk/target/packages/ch7024ctrl/ch7024.c
===================================================================
--- trunk/target/packages/ch7024ctrl/ch7024.c	2007-09-02 22:05:08 UTC (rev 635)
+++ trunk/target/packages/ch7024ctrl/ch7024.c	2007-09-03 14:48:18 UTC (rev 636)
@@ -30,7 +30,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <linux/i2c.h> 
+//#include <linux/i2c.h> 
 #include <linux/i2c-dev.h>
  
 #include <sys/ioctl.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [635] trunk/buildroot/package/ch7024ctrl/Config.in

[<th...@us...>]

Revision: 635
          http://armadeus.svn.sourceforge.net/armadeus/?rev=635&view=rev
Author:   thom25
Date:     2007-09-02 15:05:08 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
avoid default selection

Modified Paths:
--------------
    trunk/buildroot/package/ch7024ctrl/Config.in

Modified: trunk/buildroot/package/ch7024ctrl/Config.in
===================================================================
--- trunk/buildroot/package/ch7024ctrl/Config.in	2007-09-02 21:34:57 UTC (rev 634)
+++ trunk/buildroot/package/ch7024ctrl/Config.in	2007-09-02 22:05:08 UTC (rev 635)
@@ -1,7 +1,7 @@
 config BR2_PACKAGE_CH7024CTRL
 	bool "ch7024ctrl"
 	depends BR2_ARMADEUS_PACKAGE
-	default y
+	default n
 	help
 	  Build CH7024 control tool. It allows you to configure the Svideo output of the DevFull directly 
 	  from Linux userspace (command ch7024).


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [634] trunk/software/uboot_recover/uboot_recover.py

[<th...@us...>]

Revision: 634
          http://armadeus.svn.sourceforge.net/armadeus/?rev=634&view=rev
Author:   thom25
Date:     2007-09-02 14:34:57 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
add correct path to ttysx

Modified Paths:
--------------
    trunk/software/uboot_recover/uboot_recover.py

Modified: trunk/software/uboot_recover/uboot_recover.py
===================================================================
--- trunk/software/uboot_recover/uboot_recover.py	2007-09-02 21:17:50 UTC (rev 633)
+++ trunk/software/uboot_recover/uboot_recover.py	2007-09-02 21:34:57 UTC (rev 634)
@@ -32,7 +32,7 @@
     print "APF Recover Tool"
     print "Do not forget to place the bootstrap jumper !!"
     print "and be sure to have a u-boot.bin file in current dir"
-    port = raw_input('Enter serial port number or name to use (ttySx under Linux and COMx under Windows: ')
+    port = raw_input('Enter serial port number or name to use (/dev/ttySx under Linux and COMx under Windows: ')
     input = raw_input('Enter RAM size (default 16): ')
     if input.isdigit():
         ramSize = int( input )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [633] trunk/software/uboot_recover

[<th...@us...>]

Revision: 633
          http://armadeus.svn.sourceforge.net/armadeus/?rev=633&view=rev
Author:   thom25
Date:     2007-09-02 14:17:50 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
add possibility to erase or not the environment variables

Modified Paths:
--------------
    trunk/software/uboot_recover/bootloader.py
    trunk/software/uboot_recover/uboot_recover.py

Modified: trunk/software/uboot_recover/bootloader.py
===================================================================
--- trunk/software/uboot_recover/bootloader.py	2007-09-02 20:03:42 UTC (rev 632)
+++ trunk/software/uboot_recover/bootloader.py	2007-09-02 21:17:50 UTC (rev 633)
@@ -144,24 +144,26 @@
         except:
             pass
 
-    def loadFlashbin( self, fileName, address ) :
+    def loadFlashbin( self, fileName, address, eraseAll ) :
         #a=glob.glob(fileName)[0]
         self.fastloadRam( fileName,"08001000");   
-        self.Flashbin(address, '%x' % os.path.getsize(fileName),"08001000")
+        self.Flashbin(address, '%x' % os.path.getsize(fileName),"08001000", eraseAll)
         #self.Flashbin(address, '%x' % os.stat(a)[6],"08001000")
 
-    def Flashbin( self, address, size, fileRamPosition ):
+    def Flashbin( self, address, size, fileRamPosition, eraseAll ):
         # erase the whole flash
         self.put("00220004", "00000D01", "l")  # Configure CS0 as 16bits wide bus
         self.put("10000000", "0060", "w")  # Clear block lock bit
         self.put("10000000", "00D0", "w")  # Clear block lock bit
+
         self.eraseFlashBlock("10000000")
         self.eraseFlashBlock("10020000")
-        self.eraseFlashBlock("10040000")
-        self.eraseFlashBlock("10080000")
-        self.eraseFlashBlock("10100000")
-        self.eraseFlashBlock("10200000")
-        self.eraseFlashBlock("10400000")	
+        if eraseAll == 'y':
+            self.eraseFlashBlock("10040000")
+            self.eraseFlashBlock("10080000")
+            self.eraseFlashBlock("10100000")
+            self.eraseFlashBlock("10200000")
+            self.eraseFlashBlock("10400000")	
 
         # load FlashBurner program
         self.loadbin( "flashprogrammer.bin","08000400")   

Modified: trunk/software/uboot_recover/uboot_recover.py
===================================================================
--- trunk/software/uboot_recover/uboot_recover.py	2007-09-02 20:03:42 UTC (rev 632)
+++ trunk/software/uboot_recover/uboot_recover.py	2007-09-02 21:17:50 UTC (rev 633)
@@ -45,7 +45,8 @@
     ser.flush()
     apfBootloader = imxlBootloader(ser, ramSize)
     apfBootloader.sync()
-    apfBootloader.loadFlashbin("u-boot.bin", "10000000")
+    eraseAll = raw_input('Would you like to erase the environment variables? y/n: ')
+    apfBootloader.loadFlashbin("u-boot.bin", "10000000", eraseAll)
     print "uBoot successfully recovered !"
     del ser
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [632] trunk/target/packages/ch7024ctrl/ch424x283.conf

[<th...@us...>]

Revision: 632
          http://armadeus.svn.sourceforge.net/armadeus/?rev=632&view=rev
Author:   thom25
Date:     2007-09-02 13:03:42 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
fix stability bug

Modified Paths:
--------------
    trunk/target/packages/ch7024ctrl/ch424x283.conf

Modified: trunk/target/packages/ch7024ctrl/ch424x283.conf
===================================================================
--- trunk/target/packages/ch7024ctrl/ch424x283.conf	2007-09-02 18:20:37 UTC (rev 631)
+++ trunk/target/packages/ch7024ctrl/ch424x283.conf	2007-09-02 20:03:42 UTC (rev 632)
@@ -5,7 +5,7 @@
 10:01	11:09	12:40	13:A8
 14:00	15:27	16:00	17:04
 18:F0	19:1B	1A:00	1B:00
-1C:90	1D:8C	1E:05	1F:A0
+1C:90	1D:9E	1E:05	1F:A0
 20:00	21:30	22:00	23:80
 24:00	25:00	26:00	27:00
 28:0E	29:96	2A:00	2B:10


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [631] trunk/buildroot/package

[<th...@us...>]

Revision: 631
          http://armadeus.svn.sourceforge.net/armadeus/?rev=631&view=rev
Author:   thom25
Date:     2007-09-02 11:20:37 -0700 (Sun, 02 Sep 2007)

Log Message:
-----------
add ch7024 controller

Added Paths:
-----------
    trunk/buildroot/package/ch7024ctrl/
    trunk/buildroot/package/ch7024ctrl/Config.in
    trunk/buildroot/package/ch7024ctrl/ch70241ctrl.mk

Added: trunk/buildroot/package/ch7024ctrl/Config.in
===================================================================
--- trunk/buildroot/package/ch7024ctrl/Config.in	                        (rev 0)
+++ trunk/buildroot/package/ch7024ctrl/Config.in	2007-09-02 18:20:37 UTC (rev 631)
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CH7024CTRL
+	bool "ch7024ctrl"
+	depends BR2_ARMADEUS_PACKAGE
+	default y
+	help
+	  Build CH7024 control tool. It allows you to configure the Svideo output of the DevFull directly 
+	  from Linux userspace (command ch7024).
+

Added: trunk/buildroot/package/ch7024ctrl/ch70241ctrl.mk
===================================================================
--- trunk/buildroot/package/ch7024ctrl/ch70241ctrl.mk	                        (rev 0)
+++ trunk/buildroot/package/ch7024ctrl/ch70241ctrl.mk	2007-09-02 18:20:37 UTC (rev 631)
@@ -0,0 +1,42 @@
+#############################################################
+#
+# ch7024 tool
+#
+#############################################################
+
+CH7024CTRL_VER:=1.0
+CH7024CTRL_SOURCE:=$(BUILD_DIR)/../../target/packages/ch7024ctrl
+CH7024CTRL_DIR:=$(BUILD_DIR)/ch7024ctrl-$(CH7024CTRL_VER)
+CH7024CTRL_CAT:=zcat
+CH7024CTRL_BINARY:=ch7024
+CH7024CTRL_TARGET_BINARY:=usr/bin/ch7024
+
+$(CH7024CTRL_DIR)/ch7024.c:
+	set
+	mkdir -p $(CH7024CTRL_DIR)/
+	cp $(CH7024CTRL_SOURCE)/* $(CH7024CTRL_DIR)/
+
+$(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY): $(CH7024CTRL_DIR)/ch7024.c $(CH7024CTRL_DIR)/ch7024.h
+	$(TARGET_CONFIGURE_OPTS) $(MAKE) CC=$(TARGET_CC) -C $(CH7024CTRL_DIR)
+
+$(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY): $(CH7024CTRL_DIR)/$(CH7024CTRL_BINARY)
+	install -D $< $@
+	$(STRIP) $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
+
+ch7024ctrl: uclibc $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
+
+ch7024ctrl-clean:
+	rm -f $(TARGET_DIR)/$(CH7024CTRL_TARGET_BINARY)
+	-$(MAKE) -C $(CH7024CTRL_DIR) clean
+
+ch7024ctrl-dirclean:
+	rm -rf $(CH7024CTRL_DIR)
+
+#############################################################
+#
+# Toplevel Makefile options
+#
+#############################################################
+ifeq ($(strip $(BR2_PACKAGE_CH7024CTRL)),y)
+TARGETS+=ch7024ctrl
+endif


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Armadeus-commitlog] SF.net SVN: armadeus: [630] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff

[<th...@us...>]

Revision: 630
          http://armadeus.svn.sourceforge.net/armadeus/?rev=630&view=rev
Author:   thom25
Date:     2007-08-30 07:19:51 -0700 (Thu, 30 Aug 2007)

Log Message:
-----------
fix bug 1742417. change MTFT paramaters for timings imrpovements. Allow timing compatibility with CH7024

Modified Paths:
--------------
    trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff

Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff	2007-08-30 13:59:53 UTC (rev 629)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.18.1/021-linux-2.6.18-apf9328.diff	2007-08-30 14:19:51 UTC (rev 630)
@@ -1336,13 +1336,13 @@
 +
 +    .hsync_len  = 30,
 +    .vsync_len  = 3,
-+    .left_margin    = 24,
-+    .upper_margin   = 1,
-+    .right_margin   = 38,
-+    .lower_margin   = 23,
++    .left_margin    = 1,
++    .upper_margin   = 20,
++    .right_margin   = 68,
++    .lower_margin   = 20,
 +
 +    .pcr        = PCR_TFT | PCR_COLOR | PCR_PBSIZ_8 | PCR_BPIX_16 | PCR_FLMPOL | PCR_LPPOL |
-+                  PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(6),
++                  PCR_SCLKIDLE | PCR_SCLK_SEL | PCR_PCD(7),
 +    .pwmr = 0x000001ff,    // Contrast with PWM @ Line_Pulse, max by default
 +    .dmacr = DMACR_BURST | DMACR_HM(8) | DMACR_TM(4),
 +    .backlight_power = apf9328_lcd_backlight_power,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.