[oe-commits] org.oe.dev merge of '1cc5e1375ebc4a5db05258a8915e819dbad6a77a'

crofton commit openembedded-commits at lists.openembedded.org
Fri Sep 14 19:51:20 UTC 2007


merge of '1cc5e1375ebc4a5db05258a8915e819dbad6a77a'
     and 'efe3244e3b15195443b88e716776b80bfb17043f'

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: e22359507956c45e7ed998bce3e90f6db8c81ecf
ViewMTN: http://monotone.openembedded.org/revision/info/e22359507956c45e7ed998bce3e90f6db8c81ecf
Files:
1
packages/exmap-console/exmap-console.inc
packages/free42
packages/free42/files
packages/gsm/files/fic-gta01
packages/termcap
conf/machine/include/tune-geodelx.conf
packages/free42/files/free42-bcd-gtk-only.patch
packages/free42/files/free42-dont-declare-sincos.patch
packages/free42/files/free42-vga-skin.patch
packages/free42/files/free42dec.desktop
packages/free42/free42-vga_1.4.36.bb
packages/gsm/files/fic-gta01/gsmd
packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch
packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch
packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch
packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch
packages/termcap/termcap_11.0.1.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/machine/alix.conf
packages/gnome/gconf-dbus_svn.bb
packages/gsm/libgsmd_svn.bb
packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb
packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch
packages/linux/linux-ezx-2.6.21/rokre6/defconfig
packages/linux/linux-ezx_2.6.21.bb
packages/tasks/task-openmoko-feed.bb
packages/vte/vte_0.16.8.bb
Diffs:

#
# mt diff -r1cc5e1375ebc4a5db05258a8915e819dbad6a77a -re22359507956c45e7ed998bce3e90f6db8c81ecf
#
# 
# 
# patch "packages/exmap-console/exmap-console.inc"
#  from [63d7774ca1ed640b50ead734368313117dad3a6c]
#    to [e377d685a9615554dd91e58878e366d0c7d3d0a3]
# 
============================================================
--- packages/exmap-console/exmap-console.inc	63d7774ca1ed640b50ead734368313117dad3a6c
+++ packages/exmap-console/exmap-console.inc	e377d685a9615554dd91e58878e366d0c7d3d0a3
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "Console based version of exmap, a memory usage analysis tool"
 HOMEPAGE = "http://projects.o-hand.com/exmap-console"
 SECTION = "devel"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel readline"
+DEPENDS = "virtual/kernel readline glib-2.0"
 
 SRC_URI = "http://projects.o-hand.com/sources/exmap-console/exmap-console-${PV}.tgz"
 


#
# mt diff -refe3244e3b15195443b88e716776b80bfb17043f -re22359507956c45e7ed998bce3e90f6db8c81ecf
#
# 
# 
# add_dir "packages/free42"
# 
# add_dir "packages/free42/files"
# 
# add_dir "packages/gsm/files/fic-gta01"
# 
# add_dir "packages/termcap"
# 
# add_file "conf/machine/include/tune-geodelx.conf"
#  content [cb790563e96dcb829b7dd845a47129b0bd6255fe]
# 
# add_file "packages/free42/files/free42-bcd-gtk-only.patch"
#  content [5e700cd97adced79c681f2aa6e9bd8e4f89ff895]
# 
# add_file "packages/free42/files/free42-dont-declare-sincos.patch"
#  content [5e18862aa104d378555e3795e0d218cabe753e80]
# 
# add_file "packages/free42/files/free42-vga-skin.patch"
#  content [303f7bc3ae4924f88ea2694a9a1156f4f783bc97]
# 
# add_file "packages/free42/files/free42dec.desktop"
#  content [e1163c16c574864f887fa6786337cf60c2da4fac]
# 
# add_file "packages/free42/free42-vga_1.4.36.bb"
#  content [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
# 
# add_file "packages/gsm/files/fic-gta01/gsmd"
#  content [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch"
#  content [29ee8f5ee384b18b942b0ec97bbf2863060ff82a]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch"
#  content [b8385b3213943fc06356d7e77b7ecaffe8e3dfac]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-pcap.patch"
#  content [715f781fee89350333c1781d78b37a273e08564c]
# 
# add_file "packages/linux/linux-ezx-2.6.21/patches/e6-ts.patch"
#  content [94c28b6a622e7780a5b713495bdf60040bbf6a47]
# 
# add_file "packages/termcap/termcap_11.0.1.bb"
#  content [48cdc1c638e5a412fa3ee8a54c4e33907a4ccbb5]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [72eda7924347374e0ab868c3b35454bafd3d93d0]
#    to [5709f08bc2fb571ee70795901ea2c48568d7653a]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [d8a4aae44c305a13e168a2f3641648fe0671207d]
#    to [db2cb7f7e9a06a07e1f8adf006d23e857b02634b]
# 
# patch "conf/distro/openmoko.conf"
#  from [c246d427631dbd56b159221956899cc2f40f3b06]
#    to [0a270926afec0c57fe65b21d888d50f318f58085]
# 
# patch "conf/machine/alix.conf"
#  from [6ac777208694aa9b00784052d5baca787f429532]
#    to [f8fdaa68a61adeffcb530a174e2e182280770dd5]
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [7e4571428d559265f6ede4b261cd8d23c16ad8b7]
#    to [ac71d333e0e42e01c188b5c90a4374123f6b96b5]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [f40a2af6cf0a3f96d564ff62dd07830973d9154a]
#    to [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
# 
# patch "packages/gtk+/gdk-pixbuf-csource-native_2.10.14.bb"
#  from [7108300d1b93ae19d191325a41b16ac125504bd7]
#    to [6b749d9ef772b8e60588711e9d902b4292a7e84b]
# 
# patch "packages/linux/linux-ezx-2.6.21/patches/ezx-eoc.patch"
#  from [7ae0fbd7af5f0ed2b8633335ff8bca92accc11a0]
#    to [08a4e592d7b7f3c689b3e8366522a8364be174a7]
# 
# patch "packages/linux/linux-ezx-2.6.21/rokre6/defconfig"
#  from [4b0c0f319a6890f47528ab86421d62be1f3926c8]
#    to [e76c158c332dcdd6e636e5b628f7f86daac14a22]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [5d1ec4b9844eed9888871827926c283e7ba4f98c]
#    to [6e4787b56b3ece5bf65f590bc86d49ad31617a39]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [44daf5badff88f9c9cd129df8d27998b67606cb4]
#    to [732cc2b15ee798ca00f5bf1855e650be36e08741]
# 
# patch "packages/vte/vte_0.16.8.bb"
#  from [877f5cc30d4eaa0bb61c823b10a4536806cf11bf]
#    to [4642ff116b6101c8293be250f4507ca114aa02b7]
# 
============================================================
--- conf/machine/include/tune-geodelx.conf	cb790563e96dcb829b7dd845a47129b0bd6255fe
+++ conf/machine/include/tune-geodelx.conf	cb790563e96dcb829b7dd845a47129b0bd6255fe
@@ -0,0 +1,6 @@
+# Geode CPU has it's own target in GCC 4.3
+# in older versions k6-2 is closest
+#
+TARGET_CC_ARCH = "-march=k6-2"
+PACKAGE_ARCH = "geode"
+
============================================================
--- packages/free42/files/free42-bcd-gtk-only.patch	5e700cd97adced79c681f2aa6e9bd8e4f89ff895
+++ packages/free42/files/free42-bcd-gtk-only.patch	5e700cd97adced79c681f2aa6e9bd8e4f89ff895
@@ -0,0 +1,100 @@
+--- free42-orig/gtk/Makefile	2007-01-06 09:37:55.000000000 -0800
++++ free42gtk/gtk/Makefile	2007-09-02 23:54:34.000000000 -0700
+@@ -35,20 +35,14 @@
+ 	core_math2.o core_phloat.o core_sto_rcl.o core_tables.o \
+ 	core_variables.o
+ 
+-ifdef BCD_MATH
+ CXXFLAGS += -DBCD_MATH
+ SRCS += bcdfloat.cc bcd.cc bcdmath.cc
+ OBJS += bcdfloat.o bcd.o bcdmath.o
+ EXE = free42dec
+-else
+-EXE = free42bin
+-endif
+ 
+ $(EXE): $(OBJS)
+ 	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
+ 
+-$(SRCS): symlinks
+-
+ .cc.o:
+ 	$(CXX) $(CXXFLAGS) -c -o $@ $<
+ 
+@@ -64,74 +58,18 @@
+ keymap.cc: keymap2cc keymap.txt
+ 	./keymap2cc
+ 
+-symlinks:
+-	ln -s ../common/free42.h
+-	ln -s ../common/core_commands1.cc
+-	ln -s ../common/core_commands1.h
+-	ln -s ../common/core_commands2.cc
+-	ln -s ../common/core_commands2.h
+-	ln -s ../common/core_commands3.cc
+-	ln -s ../common/core_commands3.h
+-	ln -s ../common/core_commands4.cc
+-	ln -s ../common/core_commands4.h
+-	ln -s ../common/core_commands5.cc
+-	ln -s ../common/core_commands5.h
+-	ln -s ../common/core_commands6.cc
+-	ln -s ../common/core_commands6.h
+-	ln -s ../common/core_display.cc
+-	ln -s ../common/core_display.h
+-	ln -s ../common/core_globals.cc
+-	ln -s ../common/core_globals.h
+-	ln -s ../common/core_helpers.cc
+-	ln -s ../common/core_helpers.h
+-	ln -s ../common/core_keydown.cc
+-	ln -s ../common/core_keydown.h
+-	ln -s ../common/core_linalg1.cc
+-	ln -s ../common/core_linalg1.h
+-	ln -s ../common/core_linalg2.cc
+-	ln -s ../common/core_linalg2.h
+-	ln -s ../common/core_math1.cc
+-	ln -s ../common/core_math1.h
+-	ln -s ../common/core_math2.cc
+-	ln -s ../common/core_math2.h
+-	ln -s ../common/core_main.cc
+-	ln -s ../common/core_main.h
+-	ln -s ../common/core_phloat.cc
+-	ln -s ../common/core_phloat.h
+-	ln -s ../common/core_sto_rcl.cc
+-	ln -s ../common/core_sto_rcl.h
+-	ln -s ../common/core_tables.cc
+-	ln -s ../common/core_tables.h
+-	ln -s ../common/core_variables.cc
+-	ln -s ../common/core_variables.h
+-	ln -s ../common/shell.h
+-	ln -s ../common/shell_loadimage.cc
+-	ln -s ../common/shell_loadimage.h
+-	ln -s ../common/shell_spool.cc
+-	ln -s ../common/shell_spool.h
+-	ln -s ../common/skin2cc.cc
+-	ln -s ../common/skin2cc.conf
+-	ln -s ../common/keymap2cc.cc
+-	ln -s ../common/bcd.cc
+-	ln -s ../common/bcd.h
+-	ln -s ../common/bcdfloat.cc
+-	ln -s ../common/bcdfloat.h
+-	ln -s ../common/bcdmath.cc
+-	ln -s ../common/bcdmath.h
+-	touch symlinks
+-
+ clean: FORCE
+ 	rm -f `find . -type l` \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ cleaner: FORCE
+ 	rm -f `find . -type l` \
+ 		free42bin free42bin.exe free42dec free42dec.exe \
+ 		skin2cc skin2cc.exe skins.cc \
+ 		keymap2cc keymap2cc.exe keymap.cc \
+-		*.o *.d *.i *.ii *.s symlinks core.*
++		*.o *.d *.i *.ii *.s core.*
+ 
+ FORCE:
+ 
============================================================
--- packages/free42/files/free42-dont-declare-sincos.patch	5e18862aa104d378555e3795e0d218cabe753e80
+++ packages/free42/files/free42-dont-declare-sincos.patch	5e18862aa104d378555e3795e0d218cabe753e80
@@ -0,0 +1,11 @@
+--- free42-orig/common/free42.h	2007-01-06 09:37:50.000000000 -0800
++++ free42gtk/common/free42.h	2007-09-03 22:39:14.000000000 -0700
+@@ -150,7 +150,7 @@
+  * provided by MathLib.
+  */
+ #ifndef PALMOS
+-extern "C" void sincos(double x, double *sinx, double *cosx) HELPERS_SECT;
++
+ #endif
+ //#define NO_SINCOS 1
+ 
============================================================
--- packages/free42/files/free42-vga-skin.patch	303f7bc3ae4924f88ea2694a9a1156f4f783bc97
+++ packages/free42/files/free42-vga-skin.patch	303f7bc3ae4924f88ea2694a9a1156f4f783bc97
@@ -0,0 +1,12 @@
+--- free42-orig/common/skin2cc.conf	2006-03-22 11:33:35.000000000 -0800
++++ free42gtk/common/skin2cc.conf	2007-09-02 23:52:27.000000000 -0700
+@@ -1,4 +1,4 @@
+-skins/Standard
+-Standard
+-skins/Ehrling42sl
+-Realistic
++skins/Ehrling42ssv
++Portrait
++skins/42ct
++Landscape
+
============================================================
--- packages/free42/files/free42dec.desktop	e1163c16c574864f887fa6786337cf60c2da4fac
+++ packages/free42/files/free42dec.desktop	e1163c16c574864f887fa6786337cf60c2da4fac
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Free42
+Comment=RPN Calculator
+Exec=free42dec
+Icon=free42.xpm
+StartupNotify=true
+SingleInstance=true
+Terminal=false
+Type=Application
+Categories=Application
============================================================
--- packages/free42/free42-vga_1.4.36.bb	affee0392f2e9a5336abf00c6e4fd71d74c796cc
+++ packages/free42/free42-vga_1.4.36.bb	affee0392f2e9a5336abf00c6e4fd71d74c796cc
@@ -0,0 +1,44 @@
+DESCRIPTION = "Free42 RPN Calculator"
+SECTION = "openmoko/applications"
+DEPENDS = "gtk+"
+PV = "1.4.36"
+PR = "r1"
+
+SRC_URI = "http://home.planet.nl/~demun000/thomas_projects/free42/free42.tgz \
+           http://sense.net/zc/free42/42c_skins.tgz \
+           file://free42-bcd-gtk-only.patch;patch=1 \
+           file://free42-vga-skin.patch;patch=1 \
+           file://free42-dont-declare-sincos.patch;patch=1 \
+           file://free42dec.desktop"
+
+S = "${WORKDIR}/free42"
+
+TARGET_CXXFLAGS_append = " -fsigned-char"
+TARGET_CXXFLAGS_append += "-DVERSION=\\"${PV}\\" -DBCD_MATH"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/gtk-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_LIBDIR}/gtk-2.0/include"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/cairo"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/glib-2.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/pango-1.0"
+TARGET_CXXFLAGS_append += "-I${STAGING_INCDIR}/atk-1.0"
+
+do_compile() {
+        cp -fv ${S}/common/* ${S}/gtk
+        cp -fv ${S}/ppcskins/Ehrling42ssv.* ${S}/skins/ 
+        cp ${WORKDIR}/42ct.* ${S}/skins/
+        cd ${S}/gtk/
+        ${BUILD_CXX} -o skin2cc skin2cc.cc ${BUILD_CXXFLAGS}
+        ${BUILD_CXX} -o keymap2cc keymap2cc.cc ${BUILD_CXXFLAGS}
+        oe_runmake
+}
+
+do_install() {
+        install -d ${D}${bindir}
+        install -m 0755 ${S}/gtk/free42dec ${D}${bindir}/free42dec
+        install -d ${D}${datadir}/applications
+        install -m 0644 ${WORKDIR}/free42dec.desktop ${D}${datadir}/applications/
+        install -d ${D}${datadir}/pixmaps
+        install -m 0644 ${S}/gtk/icon.xpm ${D}${datadir}/pixmaps/free42.xpm
+}
+
+
============================================================
--- packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
@@ -0,0 +1,51 @@
+##!/bin/sh
+#
+# gsmd  This shell script starts and stops gsmd.
+#
+# chkconfig: 345 90 40
+# description: Gsmd manages access to a serial- or USB-connected GSM
+# processname: gsmd
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+    start)
+        stty -F "$GSM_DEV" -crtscts
+        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
+
+        echo -n "Starting GSM daemon: "
+        start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
+
+        if [ $? = 0 ]; then
+            echo "gsmd."
+        else
+            echo "(failed.)"
+        fi
+        ;;
+    stop)
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+        echo -n "Stopping GSM daemon: "
+        start-stop-daemon -K -x /usr/sbin/gsmd
+        stty -F "$GSM_DEV" -crtscts
+        echo "gsmd."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        exit
+        ;;
+    *)
+        echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
+
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch	29ee8f5ee384b18b942b0ec97bbf2863060ff82a
+++ packages/linux/linux-ezx-2.6.21/patches/e6-eoc.patch	29ee8f5ee384b18b942b0ec97bbf2863060ff82a
@@ -0,0 +1,82 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-07 22:15:52.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.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 e6_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 e6_eoc_platform_data = {
++	.init		= e6_eoc_init,
++};
++
++struct platform_device e6_eoc_device = {
++	.name		= "ezx-eoc",
++	.id		= -1,
++	.dev		= {
++		.platform_data = &e6_eoc_platform_data,
++	},
++};
++
+ static struct platform_device *devices[] __initdata = {
+ 	&e6_pcap_device,
+ 	&pcap_ts_device,
++	&e6_eoc_device,
+ };
+ 
++
+ static void __init e6_init(void)
+ {
+ 	set_pxa_fb_info(&e6_fb_info);
============================================================
--- packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch	b8385b3213943fc06356d7e77b7ecaffe8e3dfac
+++ packages/linux/linux-ezx-2.6.21/patches/e6-mci.patch	b8385b3213943fc06356d7e77b7ecaffe8e3dfac
@@ -0,0 +1,124 @@
+Index: linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c
+===================================================================
+--- linux-2.6.21.orig/arch/arm/mach-pxa/ezx-e6.c	2007-09-07 11:51:55.000000000 -0300
++++ linux-2.6.21/arch/arm/mach-pxa/ezx-e6.c	2007-09-07 11:54:52.000000000 -0300
+@@ -13,6 +13,8 @@
+ #include <linux/init.h>
+ #include <linux/platform_device.h>
+ #include <linux/fb.h>
++#include <linux/mmc/host.h>
++#include <linux/irq.h>
+ 
+ #include <asm/mach-types.h>
+ #include <asm/mach/arch.h>
+@@ -20,12 +22,102 @@
+ #include <asm/arch/pxafb.h>
+ #include <asm/arch/ezx.h>
+ #include <asm/arch/ezx-pcap.h>
++#include <asm/arch/mmc.h>
+ 
+ #include "generic.h"
+ 
+ extern void ezx_lcd_power(int, struct fb_var_screeninfo *);
+ extern void ezx_backlight_power(int);
+ 
++#ifdef CONFIG_EZX_PCAP
++extern int ezx_pcap_mmcsd_power(int);
++extern void ezx_pcap_mmcsd_voltage(u_int32_t);
++#else
++#define ezx_pcap_mmcsd_voltage(x) {}
++#define ezx_pcap_mmcsd_power(x) {}
++#endif
++
++static struct pxamci_platform_data e6_mci_platform_data;
++
++static u_int8_t mmc_voltage[] = {
++	[MMC_VDD_160] = 5,
++	[MMC_VDD_170] = 5,
++	[MMC_VDD_180] = 6,
++	[MMC_VDD_190] = 6,
++	[MMC_VDD_200] = 7,
++	[MMC_VDD_210] = 7,
++	[MMC_VDD_220] = 8,
++	[MMC_VDD_230] = 8,
++	[MMC_VDD_240] = 9,
++	[MMC_VDD_250] = 9,
++	[MMC_VDD_260] = 10,
++	[MMC_VDD_270] = 10,
++	[MMC_VDD_280] = 11,
++	[MMC_VDD_290] = 11,
++	[MMC_VDD_300] = 12,
++	[MMC_VDD_310] = 12,
++	[MMC_VDD_320] = 13,
++	[MMC_VDD_330] = 13,
++	[MMC_VDD_340] = 14,
++	[MMC_VDD_350] = 14,
++	[MMC_VDD_360] = 15,
++};
++
++static int e6_mci_init(struct device *dev,
++                       irqreturn_t (*ezx_detect_int)(int, void *),
++      %s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list