[oe-commits] org.oe.dev merge of 'b3a66a0251c3a47228fa0f4ce4cdc78856bb70f3'
hrw commit
openembedded-commits at lists.openembedded.org
Tue Oct 30 15:30:58 UTC 2007
merge of 'b3a66a0251c3a47228fa0f4ce4cdc78856bb70f3'
and 'b98d57aa4b2e59e402bec4959253416a68cbf4a2'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 651defa9295237cd8d3fc50ef043ba40c901030c
ViewMTN: http://monotone.openembedded.org/revision/info/651defa9295237cd8d3fc50ef043ba40c901030c
Files:
1
packages/tinymail/libtinymail-0.0.3
packages/tinymail/tmut
packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch
packages/tinymail/libtinymail.inc
packages/tinymail/libtinymail_0.0.3.bb
packages/tinymail/tmut/tmut-build-oe.patch
packages/tinymail/tmut_svn.bb
MAINTAINERS
conf/distro/include/sane-srcrevs.inc
packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch
packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch
packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch
packages/linux/linux-rp-2.6.22/tmio-ohci-r6.patch
packages/linux/linux-rp-2.6.22/tmio-tc6393-r8.patch
packages/linux/linux-rp-2.6.22/tosa-keyboard-r19.patch
packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1.patch
packages/linux/linux-rp-2.6.22/tosa-power-r18-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-pxaac97-r6-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10-fix-r0.patch
packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10.patch
packages/linux/linux-rp-2.6.22/usb-ohci-hooks-r2.patch
packages/linux/linux-rp-2.6.22/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.22/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0-fix-r0.patch
packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0.patch
packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch
packages/linux/linux-rp-2.6.23/tmio-fb-r6-fix-r0.patch
packages/linux/linux-rp-2.6.23/tmio-nand-r8.patch
packages/linux/linux-rp-2.6.23/tmio-tc6393-r8.patch
packages/linux/linux-rp-2.6.23/tosa-bluetooth-r8.patch
packages/linux/linux-rp-2.6.23/tosa-keyboard-r19.patch
packages/linux/linux-rp-2.6.23/tosa-lcdnoise-r1-fix-r0.patch
packages/linux/linux-rp-2.6.23/tosa-lcdnoise-r1.patch
packages/linux/linux-rp-2.6.23/tosa-power-r18-fix-r0.patch
packages/linux/linux-rp-2.6.23/tosa-power-r18.patch
packages/linux/linux-rp-2.6.23/tosa-pxaac97-r6-fix-r0.patch
packages/linux/linux-rp-2.6.23/tosa-tmio-lcd-r10-fix-r0.patch
packages/linux/linux-rp-2.6.23/tosa-tmio-lcd-r10.patch
packages/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch
packages/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch
packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch
packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch
packages/linux/linux-rp-2.6.22/defconfig-tosa
packages/linux/linux-rp-2.6.23/defconfig-tosa
packages/linux/linux-rp_2.6.22.bb
packages/linux/linux-rp_2.6.23.bb
Diffs:
#
# mt diff -rb3a66a0251c3a47228fa0f4ce4cdc78856bb70f3 -r651defa9295237cd8d3fc50ef043ba40c901030c
#
#
#
# add_dir "packages/tinymail/libtinymail-0.0.3"
#
# add_dir "packages/tinymail/tmut"
#
# add_file "packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch"
# content [c800b0de8526fd1902db23bcd320b49bb1412522]
#
# add_file "packages/tinymail/libtinymail.inc"
# content [d60f462104b4c87525de2640e36f1ec68fca497d]
#
# add_file "packages/tinymail/libtinymail_0.0.3.bb"
# content [d2635acd582c1d1f33e7d14c7db4069c3a400b31]
#
# add_file "packages/tinymail/tmut/tmut-build-oe.patch"
# content [be174ca107e9ce5a00212c491d0e7df2aad6bc8e]
#
# add_file "packages/tinymail/tmut_svn.bb"
# content [b85aab30cf2d64ebd9b2960044dc9f7b21e707d0]
#
# patch "MAINTAINERS"
# from [6fa14fef859cffdf7853b9a291310183a8dae80e]
# to [e05fb121d8d9d73708452efe2116dfd550479c52]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [19705f41b2d517ae6a7b1ff3b9f5d31e87517db3]
# to [a835061cd28e67fd932974157e60841e37658e85]
#
============================================================
--- packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch c800b0de8526fd1902db23bcd320b49bb1412522
+++ packages/tinymail/libtinymail-0.0.3/no-iconv-detect.patch c800b0de8526fd1902db23bcd320b49bb1412522
@@ -0,0 +1,18 @@
+--- m4/ticonv.m4~ 2007-10-30 13:57:32.000000000 +0100
++++ trunk/m4/ticonv.m4 2007-10-30 13:57:32.000000000 +0100
+@@ -76,15 +76,6 @@
+
+ CFLAGS="$CFLAGS -I$srcdir"
+
+-AC_MSG_CHECKING(preferred charset formats for system iconv)
+-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-#define CONFIGURE_IN
+-#include "iconv-detect.c"
+-]])],[
+- AC_MSG_RESULT(found)
+-],[
+- AC_MSG_RESULT(not found)
+-],[])
+
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
============================================================
--- packages/tinymail/libtinymail.inc d60f462104b4c87525de2640e36f1ec68fca497d
+++ packages/tinymail/libtinymail.inc d60f462104b4c87525de2640e36f1ec68fca497d
@@ -0,0 +1,54 @@
+DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile devices"
+SECTION = "x11/utils"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libgnomeui"
+
+EXTRA_OECONF=" --disable-gnome --with-platform=gpe --with-html-component=none"
+
+SRC_URI = "http://tinymail.org/files/releases/pre-releases/v${PV}/libtinymail-${PV}.tar.bz2 \
+ file://no-iconv-detect.patch;patch=1 \
+ file://iconv-detect.h \
+ file://gtk-doc.m4 \
+ file://gtk-doc.make"
+
+inherit pkgconfig autotools
+
+do_configure_prepend() {
+ mkdir -p m4
+ install ${WORKDIR}/gtk-doc.m4 ./m4/
+ install ${WORKDIR}/gtk-doc.make ./
+
+ cp ${WORKDIR}/iconv-detect.h ${S}/libtinymail-camel/camel-lite/
+}
+
+
+PACKAGES =+ "lib${PN}-gpe lib${PN}-gpe-dev \
+ tinymail-camel-lite tinymail-camel-lite-dev tinymail-camel-lite-dbg \
+ libtinymailui-gtk libtinymailui libtinymail-camel lib${PN}"
+
+FILES_lib${PN} = "${libdir}/lib*.so.*"
+FILES_libtinymailui = "${libdir}/libtinymailui*.so.*"
+FILES_libtinymailui-gtk = "${libdir}/libtinymailui-gtk*.so.*"
+
+FILES_libtinymail-camel = "${libdir}/libtinymail-camel*.so.*"
+
+FILES_lib${PN}-gpe = "${libdir}/libtinymail-gpe*.so.*"
+FILES_lib${PN}-gpe-dev = "${libdir}/libtinymail-gpe*.so \
+ ${libdir}/libtinymail-gpe*.a \
+ ${libdir}/libtinymail-gpe*.la"
+
+LEAD_SONAME_tinymail-camel-lite = "libcamel-lite"
+FILES_tinymail-camel-lite += "${libdir}/libcamel*.so.* \
+ ${libdir}/camel-lite-1.2/camel-providers/*.so \
+ ${libdir}/camel-lite-1.2/camel-providers/*.urls "
+FILES_tinymail-camel-lite-dev += "${libdir}/libcamel-lite*.so \
+ ${libdir}/libcamel-lite*.a \
+ ${libdir}/libcamel-lite*.la \
+ ${libdir}/camel-lite-1.2/camel-providers/*.la \
+ ${libdir}/camel-lite-1.2/camel-providers/*.a "
+FILES_tinymail-camel-lite-dbg += "${libdir}/camel-lite-1.2/camel-providers/.debug"
+
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/tinymail/libtinymail_0.0.3.bb d2635acd582c1d1f33e7d14c7db4069c3a400b31
+++ packages/tinymail/libtinymail_0.0.3.bb d2635acd582c1d1f33e7d14c7db4069c3a400b31
@@ -0,0 +1 @@
+require libtinymail.inc
============================================================
--- packages/tinymail/tmut/tmut-build-oe.patch be174ca107e9ce5a00212c491d0e7df2aad6bc8e
+++ packages/tinymail/tmut/tmut-build-oe.patch be174ca107e9ce5a00212c491d0e7df2aad6bc8e
@@ -0,0 +1,19 @@
+--- configure.ac~ 2007-10-30 14:56:46.000000000 +0100
++++ configure.ac 2007-10-30 14:56:46.000000000 +0100
+@@ -20,7 +20,7 @@
+ libtinymail-camel-1.0
+ libtinymailui-1.0
+ libtinymailui-gtk-1.0
+- libtinymail-gnome-desktop-1.0
++ libtinymail-gpe-1.0
+ )
+
+ AC_SUBST(TMUT_CFLAGS)
+--- src/Makefile.am~ 2007-10-30 14:57:00.000000000 +0100
++++ src/Makefile.am 2007-10-30 14:57:00.000000000 +0100
+@@ -1,4 +1,4 @@
+-INCLUDES = $(TMUT_CFLAGS) -DGNOMEDESKTOP
++INCLUDES = $(TMUT_CFLAGS) -DGPE
+
+ bin_PROGRAMS = tmut
+
============================================================
--- packages/tinymail/tmut_svn.bb b85aab30cf2d64ebd9b2960044dc9f7b21e707d0
+++ packages/tinymail/tmut_svn.bb b85aab30cf2d64ebd9b2960044dc9f7b21e707d0
@@ -0,0 +1,17 @@
+DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail"
+SECTION = "x11/utils"
+LICENSE = "LGPL"
+DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf-dbus libtinymail"
+PV = "0.0.0+svnr${SRCREV}"
+PR = "r0"
+
+SRCREV ?= "15"
+
+DEFAULT_PREFERENCE = "-1"
+
+
+SRC_URI = "svn://svn.tinymail.org/svn/tmut/;module=trunk;proto=http \
+ file://tmut-build-oe.patch;patch=1;pnum=0"
+
+inherit pkgconfig autotools
+S = "${WORKDIR}/trunk"
============================================================
--- MAINTAINERS 6fa14fef859cffdf7853b9a291310183a8dae80e
+++ MAINTAINERS e05fb121d8d9d73708452efe2116dfd550479c52
@@ -51,14 +51,15 @@ Website: http://fl0rian.wordpress.com
Person: Florian Boor
Mail: fb at kernelconcepts.de
Website: http://fl0rian.wordpress.com, http://www.kernelconcepts.de/~fuchs/
-Machines: nokia770, netvista, htcuniversal, netbook-pro, htctornado
+Machines: nokia770, netvista, htcuniversal, netbook-pro, htctornado, bd-neon
Distros:
Interests: GPEPhone, OpenSync, GPE, Matchbox, *dbus*, X, sqlite, Palm TX,
interests: phone devices
Recipes: gpe-*, libgpe*, libeventdb, libtododb, libcontactsdb, xserver-common
-Recipes: gomunicator, mbmerlin, prismstumbler gkdial, fbreader, networkmanager
+Recipes: gomunicator, mbmerlin, prismstumbler, gkdial, fbreader, networkmanager
Recipes: minimix, minilite, miniclipboard, gpephone*
Recipes: task-sdk-sbox, meta-sdk-sbox
+Recipes: tmut, tea
Person: Graeme Gregory
Mail: dp at xora.org.uk
============================================================
--- conf/distro/include/sane-srcrevs.inc 19705f41b2d517ae6a7b1ff3b9f5d31e87517db3
+++ conf/distro/include/sane-srcrevs.inc a835061cd28e67fd932974157e60841e37658e85
@@ -111,6 +111,7 @@ SRCREV_pn-sphyrna ?= "45"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
SRCREV_pn-sphyrna ?= "45"
+SRCREV_pn-tmut ?= "15"
SRCREV_pn-webkit-gtk ?= "27222"
SRCREV_pn-webkit-qt ?= "27222"
SRCREV_pn-webkit-qtopia ?= "27222"
@@ -121,4 +122,3 @@ SRCREV_pn-usbpath-native ?= "3108"
SRCREV_pn-libw100 ?= "47"
SRCREV_pn-usbpath ?= "3108"
SRCREV_pn-usbpath-native ?= "3108"
-
#
# mt diff -rb98d57aa4b2e59e402bec4959253416a68cbf4a2 -r651defa9295237cd8d3fc50ef043ba40c901030c
#
#
#
# add_file "packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch"
# content [bce11bf58c99c586b9c78700361fb4ca135be6cf]
#
# add_file "packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch"
# content [e5106d8a14de068a6fd8883dd0a8f425a3125f97]
#
# add_file "packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch"
# content [596e1bff5e1ef5701935799a0f3ec262c59e2e8d]
#
# add_file "packages/linux/linux-rp-2.6.22/tmio-ohci-r6.patch"
# content [d734298537a551afbd049fe54511e01360ae18c8]
#
# add_file "packages/linux/linux-rp-2.6.22/tmio-tc6393-r8.patch"
# content [98be5af39813e8a304deb78cf4799b0df03c7354]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-keyboard-r19.patch"
# content [d0ca4e3ed3b7becf99fdc4a8fe9d273c613ebd70]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1-fix-r0.patch"
# content [ed9053b082cf5aa3c7579d85423aeee17cc3763f]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-lcdnoise-r1.patch"
# content [6e0d9b1cbe6206c60347d7d6b464e18194a8e14d]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-power-r18-fix-r0.patch"
# content [89fc3dab3d4bd9d7350ad4f9b54557c82b950a3a]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-pxaac97-r6-fix-r0.patch"
# content [5b6e40ad29348d4ccb245bad26377d1837e34b2c]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10-fix-r0.patch"
# content [ca5a051c981dd10129b7637f8d942ed4ff70097b]
#
# add_file "packages/linux/linux-rp-2.6.22/tosa-tmio-lcd-r10.patch"
# content [20edb2d9d7bd50758dc30cf6930e8218cedcb6fc]
#
# add_file "packages/linux/linux-rp-2.6.22/usb-ohci-hooks-r2.patch"
# content [f9fbd2ec239d361d636f139ccb750a491d5519b7]
#
# add_file "packages/linux/linux-rp-2.6.22/wm9712-reset-loop-r2.patch"
# content [0b290ba982b52016fc8aecf9c473eef02fca6ce9]
#
# add_file "packages/linux/linux-rp-2.6.22/wm9712-suspend-cold-res-r2.patch"
# content [c8b1b11be47892cd758db47d7dfdc1b7c8c19fbf]
#
# add_file "packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0-fix-r0.patch"
# content [5d0565f13c2925b533cb84b84d260b2e6c3f9aae]
#
# add_file "packages/linux/linux-rp-2.6.22/wm97xx-lg13-r0.patch"
# content [e11aa53cf75e92e53ff92abe09a829f819261cc8]
#
# add_file "packages/linux/linux-rp-2.6.23/sharpsl-pm-postresume-r1.patch"
# content [6a76a147a723c84ea6857b3de318f1178bc8066c]
#
# add_file "packages/linux/linux-rp-2.6.23/tmio-fb-r6-fix-r0.patch"
# content [65ccd2da4cf3179bb870e7b0828a74b5219feaa9]
#
# add_file "packages/linux/linux-rp-2.6.23/tmio-nand-r8.patch"
# content [70e070eec847b8a121859a85d2d2919277bcf68a]
#
# add_file "packages/linux/linux-rp-2.6.23/tmio-tc6393-r8.patch"
# content [c221b3a71e979487c282653861c9d4122d8d9b8d]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-bluetooth-r8.patch"
# content [ffca1d2bfcc7ff240a1c8aec4446df3438fd4b55]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-keyboard-r19.patch"
# content [f576ef92dfa107007178e163641e72b9d1764a7e]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-lcdnoise-r1-fix-r0.patch"
# content [ab2e14df52d1b1138f009d68f2e421e61a724b07]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-lcdnoise-r1.patch"
# content [c5fac8724d07f0d6e2daa5dc8cc8fcfd80e7b2a3]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-power-r18-fix-r0.patch"
# content [7a2c0729a7771f4eeb399b1fc312bfffd2176867]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-power-r18.patch"
# content [a2a856927a7312a9d142661b7929ec219a7fa0ba]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-pxaac97-r6-fix-r0.patch"
# content [9d3c52d7e173fad800cd2296c485505bb61d9cf0]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-tmio-lcd-r10-fix-r0.patch"
# content [29ff73030ac73879a489b37cbb0d91a84de3c9e6]
#
# add_file "packages/linux/linux-rp-2.6.23/tosa-tmio-lcd-r10.patch"
# content [61a22778e277cc5c39eddb3ea7acb242f7b0c02e]
#
# add_file "packages/linux/linux-rp-2.6.23/wm9712-reset-loop-r2.patch"
# content [56896e4394314ee47e2377cac39ac6a7242993da]
#
# add_file "packages/linux/linux-rp-2.6.23/wm9712-suspend-cold-res-r2.patch"
# content [c328dcc9a78d6f15c6dd13cac159af8fa88b861a]
#
# add_file "packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0-fix-r0.patch"
# content [d886290352c04ebd99c91a97aed2826f7d5f3a34]
#
# add_file "packages/linux/linux-rp-2.6.23/wm97xx-lg13-r0.patch"
# content [3eb49bbe5f83379ae2ccebe21a634a1a9f3bf8cb]
#
# patch "packages/linux/linux-rp-2.6.22/defconfig-tosa"
# from [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# to [bbf2139d3571f734a14fb10a96c5b7bad07b9dbd]
#
# patch "packages/linux/linux-rp-2.6.23/defconfig-tosa"
# from [db15e2aa6464fd82b3b9a756eff0884b88791d0d]
# to [272e0564f3f53a7cf26b9c7eb99518cfd59d72fd]
#
# patch "packages/linux/linux-rp_2.6.22.bb"
# from [3f441b23ed325b64cf3bd4d2e6abf64510220957]
# to [35b07533548dccd8eb3b3c2e22e7874b0a277ca7]
#
# patch "packages/linux/linux-rp_2.6.23.bb"
# from [f1a824716660fb8192524425b6b587c0ba12ea25]
# to [8216c73b805fee4779b696cc9dd8eb98a12a5bfe]
#
============================================================
--- packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch bce11bf58c99c586b9c78700361fb4ca135be6cf
+++ packages/linux/linux-rp-2.6.22/sharpsl-pm-postresume-r1.patch bce11bf58c99c586b9c78700361fb4ca135be6cf
@@ -0,0 +1,30 @@
+ arch/arm/common/sharpsl_pm.c | 3 +++
+ include/asm-arm/hardware/sharpsl_pm.h | 1 +
+ 2 files changed, 4 insertions(+)
+
+Index: git/include/asm-arm/hardware/sharpsl_pm.h
+===================================================================
+--- git.orig/include/asm-arm/hardware/sharpsl_pm.h 2006-10-31 16:09:33.000000000 +0000
++++ git/include/asm-arm/hardware/sharpsl_pm.h 2006-11-07 22:08:41.000000000 +0000
+@@ -26,6 +26,7 @@ struct sharpsl_charger_machinfo {
+ void (*presuspend)(void);
+ void (*postsuspend)(void);
+ void (*earlyresume)(void);
++ void (*postresume)(void);
+ unsigned long (*read_devdata)(int);
+ #define SHARPSL_BATT_VOLT 1
+ #define SHARPSL_BATT_TEMP 2
+Index: git/arch/arm/common/sharpsl_pm.c
+===================================================================
+--- git.orig/arch/arm/common/sharpsl_pm.c 2006-11-07 22:03:48.000000000 +0000
++++ git/arch/arm/common/sharpsl_pm.c 2006-11-07 22:04:20.000000000 +0000
+@@ -584,6 +584,9 @@ static int corgi_pxa_pm_enter(suspend_st
+ if (sharpsl_pm.machinfo->earlyresume)
+ sharpsl_pm.machinfo->earlyresume();
+
++ if (sharpsl_pm.machinfo->postresume)
++ sharpsl_pm.machinfo->postresume();
++
+ dev_dbg(sharpsl_pm.dev, "SharpSL resuming...\n");
+
+ return 0;
============================================================
--- packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch e5106d8a14de068a6fd8883dd0a8f425a3125f97
+++ packages/linux/linux-rp-2.6.22/tmio-fb-r6-fix-r0.patch e5106d8a14de068a6fd8883dd0a8f425a3125f97
@@ -0,0 +1,45 @@
+From 302745ce6f3bab7b1a97de32339405ae3fd8eacb Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dbaryshkov at gmail.com>
+Date: Fri, 19 Oct 2007 00:05:54 +0400
+Subject: [PATCH] tmio-fb-r6.patch fixes
+
+---
+ drivers/video/tmiofb.c | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/video/tmiofb.c b/drivers/video/tmiofb.c
+index 10b0105..72eb76c 100644
+--- a/drivers/video/tmiofb.c
++++ b/drivers/video/tmiofb.c
+@@ -463,8 +463,8 @@ static int tmiofb_vblank (struct fb_info *fbi, struct fb_vblank *vblank)
+ #define FBIO_TMIO_ACC_WRITE 0x7C639300
+ #define FBIO_TMIO_ACC_SYNC 0x7C639301
+
+-static int tmiofb_ioctl (struct inode *inode, struct file *file,
+- unsigned int cmd, unsigned long arg, struct fb_info *fbi)
++static int tmiofb_ioctl (struct fb_info *fbi,
++ unsigned int cmd, unsigned long arg)
+ {
+ switch (cmd) {
+ case FBIOGET_VBLANK: {
+@@ -677,7 +677,7 @@ static struct fb_ops tmiofb_ops_acc = {
+ * 2000 0002 display start
+ * 2000 0004 line number match (0x1ff mask???)
+ */
+-static irqreturn_t tmiofb_irq (int irq, void *__fbi, struct pt_regs *r)
++static irqreturn_t tmiofb_irq (int irq, void *__fbi)
+ {
+ struct fb_info* fbi = __fbi;
+ struct tmiofb_par* par = fbi->par;
+@@ -762,7 +762,7 @@ static int __init tmiofb_probe (struct device *dev)
+ }
+ fbi->screen_base = par->sram;
+
+- retval = request_irq (irq->start, &tmiofb_irq, SA_INTERRUPT,
++ retval = request_irq (irq->start, &tmiofb_irq, IRQF_DISABLED,
+ TMIO_NAME_LCD, fbi);
+ if (retval)
+ goto err_request_irq;
+--
+1.4.4.4
+
============================================================
--- packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch 596e1bff5e1ef5701935799a0f3ec262c59e2e8d
+++ packages/linux/linux-rp-2.6.22/tmio-nand-r8.patch 596e1bff5e1ef5701935799a0f3ec262c59e2e8d
@@ -0,0 +1,594 @@
+ drivers/mtd/nand/Kconfig | 7 +
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/tmio.c | 554 +++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 562 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig
+index f1d60b6..b9c8796 100644
+--- a/drivers/mtd/nand/Kconfig
++++ b/drivers/mtd/nand/Kconfig
+@@ -69,6 +69,13 @@ config MTD_NAND_AMS_DELTA
+ help
+ Support for NAND flash on Amstrad E3 (Delta).
+
++config MTD_NAND_TMIO
++ tristate "NAND Flash device on Toshiba Mobile IO Controller"
++ depends on MTD_NAND && TOSHIBA_TC6393XB
++ help
++ Support for NAND flash connected to a Toshiba Mobile IO
++ Controller in some PDAs, including the Sharp SL6000x.
++
+ config MTD_NAND_TOTO
+ tristate "NAND Flash device on TOTO board"
+ depends on ARCH_OMAP && BROKEN
+diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile
+index edba1db..64f24e1 100644
+--- a/drivers/mtd/nand/Makefile
++++ b/drivers/mtd/nand/Makefile
+@@ -27,5 +27,6 @@ obj-$(CONFIG_MTD_NAND_AT91) += at91_nand.o
+ obj-$(CONFIG_MTD_NAND_CM_X270) += cmx270_nand.o
+ obj-$(CONFIG_MTD_NAND_BASLER_EXCITE) += excite_nandflash.o
+ obj-$(CONFIG_MTD_NAND_PLATFORM) += plat_nand.o
++obj-$(CONFIG_MTD_NAND_TMIO) += tmio.o
+
+ nand-objs := nand_base.o nand_bbt.o
+diff --git a/drivers/mtd/nand/tmio.c b/drivers/mtd/nand/tmio.c
+new file mode 100644
+index 0000000..d196553
+--- /dev/null
++++ b/drivers/mtd/nand/tmio.c
+@@ -0,0 +1,554 @@
++/*
++ * A device driver for NAND flash connected to a Toshiba Mobile IO
++ * controller. This is known to work with the following variants:
++ * TC6393XB revision 3
++ *
++ * Maintainer: Chris Humbert <mahadri+mtd at drigon.com>
++ *
++ * Copyright (C) 2005 Chris Humbert
++ * Copyright (C) 2005 Dirk Opfer
++ * Copyright (C) 2004 SHARP
++ * Copyright (C) 2002 Lineo Japan, Inc.
++ * Copyright (C) Ian Molton and Sebastian Carlier
++ *
++ * Based on Sharp's NAND driver, sharp_sl_tc6393.c
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2 as
++ * published by the Free Software Foundation.
++ */
++
++#include <linux/module.h>
++#include <linux/types.h>
++#include <linux/delay.h>
++#include <linux/wait.h>
++#include <linux/ioport.h>
++#include <linux/mtd/mtd.h>
++#include <linux/mtd/nand.h>
++#include <linux/mtd/nand_ecc.h>
++#include <linux/mtd/partitions.h>
++#include <asm/io.h>
++#include <asm/hardware/tmio.h>
++
++#include <linux/interrupt.h>
++
++#define mtd_printk(level, mtd, format, arg...) \
++ printk (level "%s: " format, mtd->name, ## arg)
++#define mtd_warn(mtd, format, arg...) \
++ mtd_printk (KERN_WARNING, mtd, format, ## arg)
++
++/*--------------------------------------------------------------------------*/
++
++/* tmio_nfcr.mode Register Command List */
++#define FCR_MODE_DATA 0x94 // Data Data_Mode
++#define FCR_MODE_COMMAND 0x95 // Data Command_Mode
++#define FCR_MODE_ADDRESS 0x96 // Data Address_Mode
++
++#define FCR_MODE_HWECC_CALC 0xB4 // HW-ECC Data
++#define FCR_MODE_HWECC_RESULT 0xD4 // HW-ECC Calculation Result Read_Mode
++#define FCR_MODE_HWECC_RESET 0xF4 // HW-ECC Reset
++
++#define FCR_MODE_POWER_ON 0x0C // Power Supply ON to SSFDC card
++#define FCR_MODE_POWER_OFF 0x08 // Power Supply OFF to SSFDC card
++
++#define FCR_MODE_LED_OFF 0x00 // LED OFF
++#define FCR_MODE_LED_ON 0x04 // LED ON
++
++#define FCR_MODE_EJECT_ON 0x68 // Ejection Demand from Penguin is Advanced
++#define FCR_MODE_EJECT_OFF 0x08 // Ejection Demand from Penguin is Not Advanced
++
++#define FCR_MODE_LOCK 0x6C // Operates By Lock_Mode. Ejection Switch is Invalid
++#define FCR_MODE_UNLOCK 0x0C // Operates By UnLock_Mode.Ejection Switch is Effective
++
++#define FCR_MODE_CONTROLLER_ID 0x40 // Controller ID Read
++#define FCR_MODE_STANDBY 0x00 // SSFDC card Changes Standby State
++
++#define FCR_MODE_WE 0x80
++#define FCR_MODE_ECC1 0x40
++#define FCR_MODE_ECC0 0x20
++#define FCR_MODE_CE 0x10
++#define FCR_MODE_PCNT1 0x08
++#define FCR_MODE_PCNT0 0x04
++#define FCR_MODE_ALE 0x02
++#define FCR_MODE_CLE 0x01
++
++#define FCR_STATUS_BUSY 0x80
++
++/*
++ * NAND Flash Host Controller Configuration Register
++ */
++struct tmio_nfhccr {
++ u8 x00[4];
++ u16 command; /* 0x04 Command */
++ u8 x01[0x0a];
++ u16 base[2]; /* 0x10 NAND Flash Control Reg Base Addr*/
++ u8 x02[0x29];
++ u8 intp; /* 0x3d Interrupt Pin */
++ u8 x03[0x0a];
++ u8 inte; /* 0x48 Interrupt Enable */
++ u8 x04;
++ u8 ec; /* 0x4a Event Control */
++ u8 x05;
++ u8 icc; /* 0x4c Internal Clock Control */
++ u8 x06[0x0e];
++ u8 eccc; /* 0x5b ECC Control */
++ u8 x07[4];
++ u8 nftc; /* 0x60 NAND Flash Transaction Control */
++ u8 nfm; /* 0x61 NAND Flash Monitor */
++ u8 nfpsc; /* 0x62 NAND Flash Power Supply Control */
++ u8 nfdc; /* 0x63 NAND Flash Detect Control */
++ u8 x08[0x9c];
++} __attribute__ ((packed));
++
++/*
++ * NAND Flash Control Register
++ */
++struct tmio_nfcr {
++union {
++ u8 u8; /* 0x00 Data Register */
++ u16 u16;
++ u32 u32;
++} __attribute__ ((packed));
++ u8 mode; /* 0x04 Mode Register */
++ u8 status; /* 0x05 Status Register */
++ u8 isr; /* 0x06 Interrupt Status Register */
++ u8 imr; /* 0x07 Interrupt Mask Register */
++} __attribute__ ((packed));
++
++struct tmio_nand {
++ struct mtd_info mtd;
++ struct nand_chip chip;
++
++ struct tmio_nfhccr __iomem * ccr;
++ struct tmio_nfcr __iomem * fcr;
++
++ unsigned int irq;
++
++ /* for tmio_nand_read_byte */
++ u8 read;
++ unsigned read_good:1;
++};
++
++#define mtd_to_tmio(m) container_of(m, struct tmio_nand, mtd)
++
++/*--------------------------------------------------------------------------*/
++
++static void tmio_nand_hwcontrol(struct mtd_info *mtd, int cmd,
++ unsigned int ctrl)
++{
++ struct tmio_nand *tmio = mtd_to_tmio (mtd);
++ struct tmio_nfcr __iomem *fcr = tmio->fcr;
++ struct nand_chip *chip = mtd->priv;
++
++ if (ctrl & NAND_CTRL_CHANGE) {
++ u8 mode;
++
++ if (ctrl & NAND_NCE) {
++ mode = FCR_MODE_DATA;
++
++ if (ctrl & NAND_CLE)
++ mode |= FCR_MODE_CLE;
++ else
++ mode &= ~FCR_MODE_CLE;
++
++ if (ctrl & NAND_ALE)
++ mode |= FCR_MODE_ALE;
++ else
++ mode &= ~FCR_MODE_ALE;
++ } else {
++ mode = FCR_MODE_STANDBY;
++ }
++
++ iowrite8 (mode, &fcr->mode);
++ tmio->read_good = 0;
++ }
++
++ if (cmd != NAND_CMD_NONE)
++ writeb(cmd, chip->IO_ADDR_W);
++}
++
++static int tmio_nand_dev_ready (struct mtd_info* mtd)
++{
++ struct tmio_nand* tmio = mtd_to_tmio (mtd);
++ struct tmio_nfcr __iomem * fcr = tmio->fcr;
++
++ return !(ioread8 (&fcr->status) & FCR_STATUS_BUSY);
++}
++
++static irqreturn_t tmio_irq (int irq, void *__tmio)
++{
++ struct tmio_nand* tmio = __tmio;
++ struct nand_chip* this = &tmio->chip;
++ struct tmio_nfcr __iomem * fcr = tmio->fcr;
++
++ /* disable RDYREQ interrupt */
++ iowrite8 (0x00, &fcr->imr);
++
++ if (unlikely (!waitqueue_active (&this->controller->wq)))
++ printk (KERN_WARNING TMIO_NAME_NAND ": spurious interrupt\n");
++
++ wake_up (&this->controller->wq);
++ return IRQ_HANDLED;
++}
++
++/*
++ * The TMIO core has a RDYREQ interrupt on the posedge of #SMRB.
++ * This interrupt is normally disabled, but for long operations like
++ * erase and write, we enable it to wake us up. The irq handler
++ * disables the interrupt.
++ */
++static int
++tmio_nand_wait (struct mtd_info *mtd, struct nand_chip *this)
++{
++ struct tmio_nand* tmio = mtd_to_tmio (mtd);
++ struct tmio_nfcr __iomem * fcr = tmio->fcr;
++ long timeout;
++
++ /* enable RDYREQ interrupt */
++ iowrite8 (0x0f, &fcr->isr);
++ iowrite8 (0x81, &fcr->imr);
++
++ timeout = wait_event_timeout (this->controller->wq, tmio_nand_dev_ready (mtd),
++ msecs_%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list