[oe-commits] org.oe.dev merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'

mickeyl commit openembedded-commits at lists.openembedded.org
Mon Sep 10 16:05:02 UTC 2007 

merge of '8f24f687fb1ef557bf1f1a9e66188d67dde2ea47'
     and 'bc1bceb6bfab051d162269a77df02ea351b62358'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: b953369d620df2ede89744d1f9a6a0671cda91b2
ViewMTN: http://monotone.openembedded.org/revision/info/b953369d620df2ede89744d1f9a6a0671cda91b2
Files:
1
packages/fxload
packages/fxload/files
conf/machine/rokre6.conf
packages/fxload/files/usbheader.patch
packages/fxload/fxload_0.0.20020411.bb
packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/asoc-fix-loopback.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/i2c-core-fix-a1200.patch
packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch
packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch
MAINTAINERS
conf/distro/angstrom-2007.1.conf
packages/ezx/ezxd_svn.bb
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
packages/linux/linux-ezx-2.6.21/a1200/defconfig
packages/linux/linux-ezx-2.6.21/e680/defconfig
packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch
packages/linux/linux-ezx-2.6.21/patches/a780-emu.patch
packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch
packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch
packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch
packages/linux/linux-ezx-2.6.21/patches/a780-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch
packages/linux/linux-ezx-2.6.21/patches/a780-vibrator.patch
packages/linux/linux-ezx-2.6.21/patches/asoc-pxa-ssp.patch
packages/linux/linux-ezx-2.6.21/patches/e680-emu.patch
packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch
packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch
packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch
packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch
packages/linux/linux-ezx-2.6.21/patches/e680-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-asoc.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-bp.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-emu.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-mtd-map.patch
packages/linux/linux-ezx-2.6.21/patches/ezx-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/pcap-ts.patch
packages/linux/linux-ezx-2.6.21/rokre2/defconfig
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/linux/linux.inc
packages/linux/linux_2.6.14.bb
packages/linux/linux_2.6.20.bb
packages/linux/linux_2.6.21+2.6.22-rc1.bb
packages/linux/linux_2.6.21.bb
packages/linux/linux_2.6.22+2.6.23-rc3.bb
packages/linux/linux_2.6.22+2.6.23-rc5.bb
packages/linux/linux_2.6.22.6.bb
packages/linux/linux_2.6.22.bb
packages/openmoko2/openmoko-terminal2_svn.bb
packages/tasks/task-openmoko-feed.bb
packages/libnotify/libnotify_0.4.2.bb
packages/libnotify/libnotify_0.4.3.bb
packages/notification-daemon/notification-daemon_0.3.5.bb
packages/notification-daemon/notification-daemon_0.3.7.bb
packages/libnotify/libnotify_0.4.4.bb
packages/notification-daemon/notification-daemon_0.3.6.bb
Diffs:

#
# mt diff -r8f24f687fb1ef557bf1f1a9e66188d67dde2ea47 -rb953369d620df2ede89744d1f9a6a0671cda91b2
#
# 
# 
# add_dir "packages/fxload"
# 
# add_dir "packages/fxload/files"
# 
# add_file "conf/machine/rokre6.conf"
#  content [ece99da8e7ed762f80283fa0d3bb0bff732d8418]
# 
# add_file "packages/fxload/files/usbheader.patch"
#  content [1c6d201a1d8d01849fb8e7bf1fd9994daaf9dd6f]
# 
# add_file "packages/fxload/fxload_0.0.20020411.bb"
#  content [8f5dc9164ba46b4d6cef2590eaf07f6d8cac2e4d]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch"
#  content [f77d63718749f790e05d457841ea6d193c0797cd]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/asoc-fix-loopback.patch"
#  content [cf0f0538d6fd2e3642e23be9aaab5902a9578cd0]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
#  content [7ae0fbd7af5f0ed2b8633335ff8bca92accc11a0]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/i2c-core-fix-a1200.patch"
#  content [7ec7be6ca9d7a6867be069bc460b05b7b0f852ad]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/mtdfix.patch"
#  content [4999f0af3186f5d8ef8c3d3abd2273375fae298e]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/pxa27x-udc-fix-a1200.patch"
#  content [ddc0a46af51fb941a7c75ad20385ff9471c649d2]
# 
# patch "MAINTAINERS"
#  from [6ee469099979d98a605357577f83edaf55f669fd]
#    to [2a084f5f3bee231871caabc70d598fdcd33c6214]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [50162eeaadb8f20ac2a2fe17c7fd64e32fd53e37]
#    to [48dc6f5b5cb8a75a3846b2ff07e32708ebb03c33]
# 
# patch "packages/ezx/ezxd_svn.bb"
#  from [a08a258ddc81759474347263c79a743e0fff813d]
#    to [b56176292b0c3556aa88055dc138488378e86453]
# 
# patch "packages/gsm/files/default"
#  from [d11d3c89b215d54d2e182754e1343c9a2fb716d2]
#    to [17a638c1cc8871a48e1059c2c096b6c8a9d148fe]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [367a54f8a664bfa37b00160037aa16f940344d46]
#    to [f586a1fade3bbd50750ea77934c2b6ecff0ebad5]
# 
# patch "packages/linux/linux-ezx-2.6.21/a1200/defconfig"
#  from [5e1971d2895f08cc848308ca0844d49ceb85fc74]
#    to [9e8c88b007bf864832fb39e66adebdb694fdefdf]
# 
# patch "packages/linux/linux-ezx-2.6.21/e680/defconfig"
#  from [e9f4dd7e96629ce9bd66356061a11aec1cd2590a]
#    to [8fc4aafdc2c2f6021e68572027e32c4dc64a893c]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-mci.patch"
#  from [13a39e72f023eb78f0bac083c2620b4a5478c3d7]
#    to [d985114c21b26cf97653aa96cdd3b435f8c5a02a]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-pcap.patch"
#  from [0f90a1491db64b28b6ce108c9f9cee0b7e41bfbc]
#    to [5e22bad433ed0b80267cd99383a1d0871cf5bc1e]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a1200-ts.patch"
#  from [5201373a1d7ad5ee6136bc4cb3e73812be57cc07]
#    to [f9f2a5e0463bcd8fc66b335e3d5b662e155cb5cc]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-emu.patch"
#  from [602876405e12900a39f64a98f3d5d0dba635fded]
#    to [766602839f3713c5f0d1c4f65b8216ae599cc01e]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-flip.patch"
#  from [afbeec5b33c72c4b26287a2bd6a8225f05f1541a]
#    to [29a766c5a2ce245e4554dcfcf18c3f2f74b5bf9d]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-kbd.patch"
#  from [dd29021aadd74127d9ff587efd2969a0ebfa9efc]
#    to [73a4b0dc8f087c7c5ac7bf250d1daba758d6dcf0]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-leds.patch"
#  from [84ae3313be349468651a6400df771099808ad2e2]
#    to [9c32a8f65838003aabb3489d974d63dcd2ee58ff]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-mci.patch"
#  from [42af411c050dcb390441653044e6ace32293ef1d]
#    to [07c29e9a71ecbbf0acc2f7c5f454916539981248]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-pcap.patch"
#  from [0054a06370574888fba742e1dbd258f902880e59]
#    to [1fec906b0befd6c0a5c3422d857dedb2c97b35aa]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-ts.patch"
#  from [dc8a4d515fdf17ea106e0617a01f1b1bc49fe563]
#    to [7b39c2bd7c332b889f31d46f8334d67f91475d66]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/a780-vibrator.patch"
#  from [712d0391f4a5f3dafc0feaca39b7c340d0695218]
#    to [5a2aa285b70a55da7f88699beb91007db0e03d13]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/asoc-pxa-ssp.patch"
#  from [9db4415e11942ffb94911eea3de1ca4fc4ae35aa]
#    to [418cda71378e8ea4557f480c3354e0dca0cbf2a8]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-emu.patch"
#  from [dc16d82460218bbf8e0653913ab8e7504c348920]
#    to [d89e08cb147551514d191320969bfeddd3238149]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-kbd.patch"
#  from [58e64fd44cb11e55e73fa11e1a3390b0146b6b4d]
#    to [12cd98a450ccd08e439ca97b9bdbb422aa8664a5]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-leds.patch"
#  from [5b72f0d0db4b6593deb052f28e5eb976bfd9e38a]
#    to [af6c8041e4e6bf4a2d427232204c9aba44d781a0]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-locksw.patch"
#  from [bc12298c37c1469c69c6a83808b64b3fa7789469]
#    to [1cf6aa50242f3d2a0c85f679cde0c794da8e002b]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-mci.patch"
#  from [45d9a695b9a4e437a2dff9e6cafdc32a830251a9]
#    to [3023cd5f891d849e2696b62619e312e27a205bbe]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-pcap.patch"
#  from [9d1d899a5c8081eab292a354118938026e691577]
#    to [4a93daf531ea5efcb13b76e22e817434f915f871]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/e680-ts.patch"
#  from [cd605df8c010fcd3047b4d198dc45b78ed10a9d3]
#    to [8051df6da0e38e21e0695a60eb7433ab166c3ba7]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-asoc.patch"
#  from [f6a1977a1ba4523b5c615222a4400044320bcefb]
#    to [0e9b29e1290395508a508a3d187576b407f289d4]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-bp.patch"
#  from [bb9396f5b9a6da4233d597edc460d6a2b8d120f1]
#    to [9ec6eff8d0c3541b4687c183a1134ea93fc7a632]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-emu.patch"
#  from [817e09bc6527cbc50e80a463f1b3840c8dc92fc2]
#    to [c54f3c12fa1ea2cac347ff0b0096910cfe15e281]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-mtd-map.patch"
#  from [2d161bf4075e1a6cac84b70f438c493a11297ed1]
#    to [c3b4abf6bb849db45ecc44daeb17386e5ff48303]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-pcap.patch"
#  from [60cd6cf7d9fca46f08e481a418a3947bcf0463c0]
#    to [e18b7e6b405e79f05f31ea9d6666f81b4e5ceecd]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/pcap-ts.patch"
#  from [5172548070cfe66605c7cca29e646ccd8caa6c41]
#    to [2244fd3c4bcf7060be8cef2c3749a8cfc0f45eb4]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre2/defconfig"
#  from [f4a6f1f07fd56b9da645a8355138f92701ac2e1f]
#    to [f33885ad5f8272ec233e9c5cb7c41d85f528ded1]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
#  from [66fa1989943d53225ef5dd187a85ec040f5161dc]
#    to [4b0c0f319a6890f47528ab86421d62be1f3926c8]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [3fba5817ee1b10b077d3b01f0616ad1732492df5]
#    to [5d1ec4b9844eed9888871827926c283e7ba4f98c]
# 
# patch "packages/linux/linux.inc"
#  from [18094dd2d248a8de080a6166f54618a19b22af04]
#    to [47bdad4587ba5a4eecb2eb3c827967a56828c9ae]
# 
# patch "packages/linux/linux_2.6.14.bb"
#  from [b82a29e8d88496dc90966389ceb094a394c9afcf]
#    to [3a3f0815f16b7bd08c9bff9d7278936026353fc1]
# 
# patch "packages/linux/linux_2.6.20.bb"
#  from [a44fd7ebbe1c782aa31e032459cfc089faa8824a]
#    to [c9c0fb4a79f677d6a06337462c943eddd2f07fae]
# 
# patch "packages/linux/linux_2.6.21+2.6.22-rc1.bb"
#  from [c49ff00b12fe1453b7e2ebaba5d987c524572d61]
#    to [e497912c37fad59b88aa9b2428490ac7d5196042]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [51078603e68d6aece27414a9061c93e670e9a7f2]
#    to [476d26ea7c5cbc48a8347d9c8d5297561b2ce2df]
# 
# patch "packages/linux/linux_2.6.22+2.6.23-rc3.bb"
#  from [f63ff8e509848ae02d7ff9d16a56f9b200db0082]
#    to [739d31f6db7320580075eb3efdba2b6930435618]
# 
# patch "packages/linux/linux_2.6.22+2.6.23-rc5.bb"
#  from [6d4248bc7410ed21d853179d369590bb0d7ba20c]
#    to [e60855cda933b78f1e64538dcd19ee73d05a728e]
# 
# patch "packages/linux/linux_2.6.22.6.bb"
#  from [497415bf6bade3adab18d538deb575786cca6f5f]
#    to [33440b039d1b3f79c8cee378f99b407bc4ea9b53]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [75d1a2f2d12313c50fdfb2b412412a7b675c00d0]
#    to [15c369e83250f745d423185a59b28e705bdcaeee]
# 
# patch "packages/openmoko2/openmoko-terminal2_svn.bb"
#  from [da52c56f8e0927a59933bf0c623e014b94717a23]
#    to [4d18a6322c47ded2056c9d675777eaf945db7b35]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [3e0c4deba5c39f74c4f4c2cfd0dc885a7958ef28]
#    to [44daf5badff88f9c9cd129df8d27998b67606cb4]
# 
============================================================
--- conf/machine/rokre6.conf	ece99da8e7ed762f80283fa0d3bb0bff732d8418
+++ conf/machine/rokre6.conf	ece99da8e7ed762f80283fa0d3bb0bff732d8418
@@ -0,0 +1,8 @@
+#@TYPE: Machine
+#@NAME: Motorola EZX ROKR E6
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E6
+
+require conf/machine/include/motorola-ezx-base.inc
+
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
============================================================
--- packages/fxload/files/usbheader.patch	1c6d201a1d8d01849fb8e7bf1fd9994daaf9dd6f
+++ packages/fxload/files/usbheader.patch	1c6d201a1d8d01849fb8e7bf1fd9994daaf9dd6f
@@ -0,0 +1,15 @@
+--- fxload-0.0.20020411.orig/ezusb.c
++++ fxload-0.0.20020411/ezusb.c
+@@ -29,7 +29,11 @@
+ # include  <sys/ioctl.h>
+
+ # include  <linux/version.h>
+-# include  <linux/usb.h>
++#if (LINUX_VERSION_CODE >= 132630)
++# include  <linux/usb/ch9.h>
++#else
++# include  <linux/usb_ch9.h>
++#endif
+ # include  <linux/usbdevice_fs.h>
+
+ # include "ezusb.h"
============================================================
--- packages/fxload/fxload_0.0.20020411.bb	8f5dc9164ba46b4d6cef2590eaf07f6d8cac2e4d
+++ packages/fxload/fxload_0.0.20020411.bb	8f5dc9164ba46b4d6cef2590eaf07f6d8cac2e4d
@@ -0,0 +1,19 @@
+DESCRIPTION = "fxload loads firmware into the ezusb chips"
+AUTHOR = "Stephen Williams, David Brownell"
+HOMEPAGE = "http://linux-hotplug.sourceforge.net/"
+SECTION = "admin"
+LICENSE = "GPL"
+DEPENDS = "linux-libc-headers"
+PR = "r1"
+
+SRC_URI = "http://dfn.dl.sourceforge.net/sourceforge/linux-hotplug/fxload-2002_04_11.tar.gz \
+           file://usbheader.patch;patch=1"
+
+S = "${WORKDIR}/fxload-2002_04_11"
+
+FILES_${PN} = "${base_sbindir}/fxload"
+
+do_install() {
+	mkdir -p ${D}/sbin/
+	cp ${S}/fxload ${D}/sbin/fxload
+}
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch	f77d63718749f790e05d457841ea6d193c0797cd
+++ packages/linux/linux-ezx-2.6.21/patches/a1200-eoc.patch	f77d63718749f790e05d457841ea6d193c0797cd
@@ -0,0 +1,82 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-a1200.c	2007-09-07 22:15:52.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-a1200.c	2007-09-09 13:29:56.000000000 -0300
+@@ -25,6 +25,7 @@
+ #include <asm/arch/mmc.h>
+ 
+ #include "generic.h"
++#include "ezx-eoc.h"
+ 
+ extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
+ extern void ezx_backlight_power(int);
+@@ -227,11 +228,69 @@
+ 	.resource       = pcap_ts_resources,
+ };
+ 
++
++/* EOC */
++static const unsigned int tab_init_eoc_reg[][2] =
++{
++    {POWER_IC_REG_EOC_INT_MASK,        0x00000FEF},
++    {POWER_IC_REG_EOC_POWER_CONTROL_0, 0x00000C00},
++    {POWER_IC_REG_EOC_POWER_CONTROL_1, 0x0000000C},
++    {POWER_IC_REG_EOC_CONN_CONTROL,    0x00021044},
++};
++
++static void dump_eoc_registers(void)
++{
++	int i, val = 0;
++
++	printk("========DUMP EOC=========\n");
++	for (i = 0; i < POWER_IC_REG_EOC_NUM; i++) {
++		eoc_reg_read(i, &val);
++		printk("eoc_registers[%d] = 0x%08X\n", i, val);
++	}
++	printk("========END DUMP=========\n");
++}
++
++/*
++ * FIXME: The same about the PCAP driver applies here.
++ * This is the initial state only.
++ * Which bits does the change to USB/UART/AUDIO mode?
++ * I think that this is causing the crash on pxa27x-udc
++ * you are setting the 'port connected' bit, and thats why
++ * you are getting interrupts early.
++ * --WM
++ */
++
++static int __init a1200_eoc_init(void)
++{
++    int i;
++
++    for (i = 0; i < sizeof(tab_init_eoc_reg)/sizeof(unsigned int)/2; i++)
++    {
++		eoc_reg_write(tab_init_eoc_reg[i][0], tab_init_eoc_reg[i][1]);
++    }
++	dump_eoc_registers();
++	return 0;
++}
++
++static struct ezx_eoc_platform_data a1200_eoc_platform_data = {
++	.init		= a1200_eoc_init,
++};
++
++struct platform_device a1200_eoc_device = {
++	.name		= "ezx-eoc",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &a1200_eoc_platform_data,
++	},
++};
++
+ static struct platform_device *devices[] __initdata = {
+ 	&a1200_pcap_device,
+ 	&pcap_ts_device,
++	&a1200_eoc_device,
+ };
+ 
++
+ static void __init a1200_init(void)
+ {
+ 	set_pxa_fb_info(&a1200_fb_info);
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/asoc-fix-loopback.patch	cf0f0538d6fd2e3642e23be9aaab5902a9578cd0
+++ packages/linux/linux-ezx-2.6.21/patches/asoc-fix-loopback.patch	cf0f0538d6fd2e3642e23be9aaab5902a9578cd0
@@ -0,0 +1,14 @@
+Index: linux-2.6.21/sound/soc/pxa/pxa2xx-pcm.c
+===================================================================
+--- linux-2.6.21.orig/sound/soc/pxa/pxa2xx-pcm.c	2007-09-02 22:30:56.000000000 -0300
++++ linux-2.6.21/sound/soc/pxa/pxa2xx-pcm.c	2007-09-02 22:36:26.000000000 -0300
+@@ -153,7 +153,8 @@
+ static int pxa2xx_pcm_prepare(struct snd_pcm_substream *substream)
+ {
+ 	struct pxa2xx_runtime_data *prtd = substream->runtime->private_data;
+-
++	/* no dma if on loopback */
++	if (!prtd->params) return 0;
+ 	DCSR(prtd->dma_ch) &= ~DCSR_RUN;
+ 	DCSR(prtd->dma_ch) = 0;
+ 	DCMD(prtd->dma_ch) = 0;
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch	7ae0fbd7af5f0ed2b8633335ff8bca92accc11a0
+++ packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch	7ae0fbd7af5f0ed2b8633335ff8bca92accc11a0
@@ -0,0 +1,342 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-eoc.c	2007-09-09 13:33:19.000000000 -0300
+@@ -0,0 +1,270 @@
++/*
++ *  EZX EOC Driver for Motorola EZX phones
++ *
++ *  Copyright (C) 2007 Alex Zhang <celeber2 at gmail.com>
++ *
++ *  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/kernel.h>
++#include <linux/init.h>
++#include <linux/i2c.h>
++#include <linux/platform_device.h>
++
++#include <asm/arch/hardware.h>
++#include <asm/arch/pxa-regs.h>
++#include <asm/arch/ezx.h>
++
++#include "ezx-eoc.h"
++
++#if 1
++#define EOC_DBG printk
++#else
++#define EOC_DBG(x, args...)
++#endif
++
++#define EOC_REG_ADDR_SIZE  1
++#define EOC_REG_DATA_SIZE  3
++
++struct ezx_eoc_platform_data *pdata;
++static int eoc_func = EOC_FUNC_USB_NET;
++static const char eoc_i2c_driver_name[] = "ezx-eoc";
++
++/* Addresses to scan */
++static unsigned short normal_i2c[] = {
++    0x17,        /* Address for version 2.0 and above  */
++   // 0x7C,      /* Address for versions prior too 2.0 */
++	I2C_CLIENT_END
++};
++
++/* I2C Magic */
++I2C_CLIENT_INSMOD;
++
++static int ezx_eoc_attach_adapter(struct i2c_adapter *adapter);
++static int ezx_eoc_detect(struct i2c_adapter *adapter, int address, int kind);
++static int ezx_eoc_detach_client(struct i2c_client *client);
++
++static struct i2c_client *eoc_i2c_client = NULL;
++
++static struct i2c_driver eoc_i2c_driver = {
++	.driver = {
++		.name	= (char *)eoc_i2c_driver_name,
++	},
++	.id		= I2C_DRIVERID_EEPROM,
++	.attach_adapter	= ezx_eoc_attach_adapter,
++	.detach_client	= ezx_eoc_detach_client,
++};
++
++int eoc_reg_read(int reg, unsigned int *reg_value)
++{
++    unsigned char reg_num = reg;
++    unsigned char value[EOC_REG_DATA_SIZE];
++    int retval;
++
++    struct i2c_msg msgs[2] =
++    {
++        { 0, 0, EOC_REG_ADDR_SIZE, &reg_num },
++        { 0, I2C_M_RD, EOC_REG_DATA_SIZE, value }
++    };
++
++    /* check if we have initialized */ /*not n%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -rbc1bceb6bfab051d162269a77df02ea351b62358 -rb953369d620df2ede89744d1f9a6a0671cda91b2
#
# 
# 
# delete "packages/libnotify/libnotify_0.4.2.bb"
# 
# delete "packages/libnotify/libnotify_0.4.3.bb"
# 
# delete "packages/notification-daemon/notification-daemon_0.3.5.bb"
# 
# add_file "packages/notification-daemon/notification-daemon_0.3.7.bb"
#  content [6f71c88888837c894369e739bf3eab65d9f5f03d]
# 
# patch "packages/libnotify/libnotify_0.4.4.bb"
#  from [584d039a2285c3cda12b007e11d028a9397f58b9]
#    to [0671a28418f54456746828c785a9e1f00bc9ac26]
# 
# patch "packages/notification-daemon/notification-daemon_0.3.6.bb"
#  from [2b7f4a18e862fcf7635cbed3b7e6f6c8a0dd99cf]
#    to [2efc86c41f88c4292c92ae24d1e2f2d067c39959]
# 
============================================================
--- packages/notification-daemon/notification-daemon_0.3.7.bb	6f71c88888837c894369e739bf3eab65d9f5f03d
+++ packages/notification-daemon/notification-daemon_0.3.7.bb	6f71c88888837c894369e739bf3eab65d9f5f03d
@@ -0,0 +1,19 @@
+DESCRIPTION = "A dbus service that listens to desktop notification requests and displays them"
+HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
+
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz"
+
+EXTRA_OECONF = "--disable-binreloc"
+
+inherit autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} = "\
+  ${libexecdir}/notification-daemon \
+  ${datadir}/dbus-1/services/ \
+  ${libdir}/notification-daemon-1.0/engines/libstandard.so \
+  ${sysconfdir}/gconf/schemas/notification-daemon.schemas \
+"
============================================================
--- packages/libnotify/libnotify_0.4.4.bb	584d039a2285c3cda12b007e11d028a9397f58b9
+++ packages/libnotify/libnotify_0.4.4.bb	0671a28418f54456746828c785a9e1f00bc9ac26
@@ -1,10 +1,11 @@
-DESCRIPTION =	"sends desktop notifications to a notification daemon"
-HOMEPAGE =	"http://www.galago-project.org/"
-LICENSE =	"LGPL"
-DEPENDS = 	"dbus gtk+"
-PR =		"r0"
+DESCRIPTION = "Send desktop notifications to a notification daemon"
+HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "libs"
+LICENSE = "LGPL"
+DEPENDS = "dbus gtk+"
+PR = "r0"
 
-SRC_URI =	"http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${PN}-${PV}.tar.gz"
 
 inherit autotools pkgconfig
 
============================================================
--- packages/notification-daemon/notification-daemon_0.3.6.bb	2b7f4a18e862fcf7635cbed3b7e6f6c8a0dd99cf
+++ packages/notification-daemon/notification-daemon_0.3.6.bb	2efc86c41f88c4292c92ae24d1e2f2d067c39959
@@ -1,16 +1,21 @@
-DESCRIPTION = "a dbus service that listens to desktop notification requests and displays them"
+DESCRIPTION = "A dbus service that listens to desktop notification requests and displays them"
 HOMEPAGE = "http://www.galago-project.org/"
+SECTION = "x11"
 LICENSE = "GPL"
 DEPENDS = "gettext dbus gtk+ libsexy gconf libwnck"
+PR = "r1"
 
-PACKAGES = "${PN}"
-FILES_${PN} = "${libexecdir}/notification-daemon \
-	${datadir}/dbus-1/services/notification-daemon.service \
-	${libdir}/notification-daemon-1.0/engines/libstandard.so \
-	${sysconfdir}/gconf/schemas/notification-daemon.schemas"
+SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
+           file://dbus-glib-tool-prefix.patch;patch=1"
 
-SRC_URI = "http://www.galago-project.org/files/releases/source/${PN}/${P}.tar.gz \
-	file://dbus-glib-tool-prefix.patch;patch=1"
-EXTRA_OECONF =	"--disable-binreloc"
+EXTRA_OECONF = "--disable-binreloc"
 
 inherit autotools pkgconfig
+
+PACKAGES = "${PN}"
+FILES_${PN} = "\
+  ${libexecdir}/notification-daemon \
+  ${datadir}/dbus-1/services \
+  ${libdir}/notification-daemon-1.0/engines/libstandard.so \
+  ${sysconfdir}/gconf/schemas/notification-daemon.schemas \
+"

More information about the Openembedded-commits mailing list