Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev

48 files changed, 14157 insertions, 768 deletions

diff --git a/recipes/chicken/chicken.inc b/recipes/chicken/chicken.inc
index f0126a9c16..9aebc4f5d5 100644
--- a/recipes/chicken/chicken.inc
+++ b/recipes/chicken/chicken.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.call-with-current-continuation.org/"
 SECTION = "interpreters"
 PRIORITY = "optional"
 LICENSE = "BSD"
-INC_PR = "r1"
+INC_PR = "r2"
 
 SRC_URI = "http://chicken.wiki.br/releases/${PV}/chicken-${PV}.tar.gz"
 
@@ -13,14 +13,21 @@ PARALLEL_MAKE = ""
 # Required environment values
 export PLATFORM="linux"
 export PREFIX="${prefix}"
-export LIBRARIAN="${TARGET_PREFIX}"
+export HOSTSYSTEM="${HOST_SYS}"
 export TARGETSYSTEM="${TARGET_SYS}"
+export INSTALL_PROGRAM_SHARED_LIBRARY_OPTIONS="-m 755"
+export INSTALL_PROGRAM_STATIC_LIBRARY_OPTIONS="-m 644"
+export INSTALL_PROGRAM_EXECUTABLE_OPTIONS="-m 755"
+export INSTALL_PROGRAM_FILE_OPTIONS="-m 644"
 
 do_compile() {
 	case ${TARGET_ARCH} in
 	i*86)
 		ARCH=x86
 		;;
+	x86_64)
+		ARCH=x86-64
+		;;
 	*)
 		echo "Check ARCH value for ${TARGET_ARCH}"
 		exit 1
@@ -35,6 +42,9 @@ do_install() {
 	i*86)
 		ARCH=x86
 		;;
+	x86_64)
+		ARCH=x86-64
+		;;
 	*)
 		echo "Check ARCH value for ${TARGET_ARCH}"
 		exit 1
diff --git a/recipes/gdb/gdb_7.0.bb b/recipes/gdb/gdb_7.0.bb
index 9a4684409b..c3aa49d0e4 100644
--- a/recipes/gdb/gdb_7.0.bb
+++ b/recipes/gdb/gdb_7.0.bb
@@ -3,3 +3,6 @@ LICENSE = "GPLv3"
 
 SRC_URI += "\
             file://gdb-6.8-fix-compile-karmic.patch;patch=1"
+
+# Work-around problems while creating libbfd.a
+EXTRA_OECONF += "--enable-static"
diff --git a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
index 33d0be4aa2..9dca7cb6b6 100644
--- a/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gecko-mediaplayer_0.9.8.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 DEPENDS = "firefox gtk+ gconf dbus-glib"
 RDEPENDS = "firefox gnome-mplayer"
 
-PR = "r3"
+PR = "r4"
 
 inherit autotools
 
@@ -17,13 +17,14 @@ SRC_URI = "http://gecko-mediaplayer.googlecode.com/files/${P}.tar.gz \
 MOZILLA_HOME = "firefox-3.5.4"
 
 do_install_append() {
-	ln -sf ${libdir}/mozilla ${D}${libdir}/${MOZILLA_HOME}
+	install -d ${D}${libdir}/${MOZILLA_HOME}/extensions/
 	cp -dpR ${WORKDIR}/extens* ${D}${libdir}/mozilla/
+	ln -sf ${libdir}/mozilla/extensions/flash@alwaysinnovating.com ${D}${libdir}/${MOZILLA_HOME}/extensions/
 }
 
 PACKAGES =+ "${PN}-firefox-hack"
 RDEPENDS_${PN}-firefox-hack = "${PN}"
-FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions"
+FILES_${PN}-firefox-hack = "${libdir}/mozilla/extensions ${libdir}/${MOZILLA_HOME}"
 
 FILES_${PN} += "${sysconfdir}/* \
                 ${libdir}/mozilla/* ${libdir}/${MOZILLA_HOME}"
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
index b8aa30d52e..95b46176af 100644
--- a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
@@ -4,4 +4,4 @@ SRC_URI += "file://gnome-mplayer-svn.diff;patch=1;pnum=0 \
             file://default.patch;patch=1 \
 "
 
-PR = "r8"
+PR = "r9"
diff --git a/recipes/gnome/gdm-2.28.0/gdm b/recipes/gnome/gdm-2.28.0/gdm
index fed9c06ad7..43eae95177 100755
--- a/recipes/gnome/gdm-2.28.0/gdm
+++ b/recipes/gnome/gdm-2.28.0/gdm
@@ -32,10 +32,21 @@ DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 case "$1" in
   start)
 	# make needed directories in volatile
+
+	if [ -e /var/log/gdm ] ; then 
+		rm -rf /var/log/gdm
+	fi
+
 	mkdir -m 01770 /var/log/gdm
 	chown gdm:gdm /var/log/gdm
+
+	if [ -e /tmp/.ICE-unix ] ; then 
+		rm -rf /tmp/.ICE-unix
+	fi
+
 	mkdir -m 01777 /tmp/.ICE-unix
 	chown root:root /tmp/.ICE-unix
+
         CONFIGURED_DAEMON=$(basename "$(cat $DEFAULT_DISPLAY_MANAGER_FILE 2> /dev/null)")
         if grep -wqs text /proc/cmdline; then
             echo "Not starting GNOME Display Manager (gdm); found 'text' in kernel commandline."
diff --git a/recipes/gnome/gdm_2.28.0.bb b/recipes/gnome/gdm_2.28.0.bb
index 683773a3ab..1fc5e74f73 100644
--- a/recipes/gnome/gdm_2.28.0.bb
+++ b/recipes/gnome/gdm_2.28.0.bb
@@ -1,12 +1,14 @@
 DESCRIPTION = "Graphical login manager"
 LICENSE = "GPL"
 
-DEPENDS = "libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
+DEPENDS = "tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ libglade libgnomecanvas librsvg libxml2 libart-lgpl xrdb"
 
-PR = "r1"
+PR = "r3"
 
 inherit gnome update-rc.d
 
+RDEPENDS_${PN} += "grep"
+
 SRC_URI += " \
             file://cross-xdetection.diff;patch=1 \
             file://%gconf-tree.xml \
diff --git a/recipes/gnome/gnome-icon-theme_2.28.0.bb b/recipes/gnome/gnome-icon-theme_2.28.0.bb
index 7e5c7b3af8..38f212927f 100644
--- a/recipes/gnome/gnome-icon-theme_2.28.0.bb
+++ b/recipes/gnome/gnome-icon-theme_2.28.0.bb
@@ -3,11 +3,11 @@ SECTION = "x11/gnome"
 DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native"
 RDEPENDS = "hicolor-icon-theme"
 RRECOMMENDS = "librsvg-gtk"
+PACKAGE_ARCH = "all"
+PR = "r1"
 
 FILES_${PN} += "${datadir}/*"
 
 EXTRA_OECONF = "--disable-hicolor-check"
 
 inherit gnome
-
-
diff --git a/recipes/libpar2/libpar2_0.2.bb b/recipes/libpar2/libpar2_0.2.bb
new file mode 100644
index 0000000000..c9a110f457
--- /dev/null
+++ b/recipes/libpar2/libpar2_0.2.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "A tool to apply the data-recovery capability concepts of RAID-like systems \
+to the posting & recovery of multi-part archives on Usenet."
+SECTION = "libs"
+LICENSE = "GPL"
+HOMEPAGE = "http://parchive.sourceforge.net/"
+DEPENDS = "libsigc++-2.0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/parchive/libpar2/libpar2-${PV}.tar.gz"
+
+inherit autotools_stage pkgconfig
diff --git a/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch
new file mode 100644
index 0000000000..8ac3707ad3
--- /dev/null
+++ b/recipes/linux/linux-omap-2.6.29/musb/0030-musb-fifo.patch
@@ -0,0 +1,26 @@
+diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c
+index d3b8e0e..cee974e 100644
+--- a/drivers/usb/musb/musb_core.c
++++ b/drivers/usb/musb/musb_core.c
+@@ -1103,15 +1103,12 @@ static struct fifo_cfg __initdata mode_4_cfg[] = {
+ { .hw_ep_num =  8, .style = FIFO_RX,   .maxpacket = 512, },
+ { .hw_ep_num =  9, .style = FIFO_TX,   .maxpacket = 512, },
+ { .hw_ep_num =  9, .style = FIFO_RX,   .maxpacket = 512, },
+-{ .hw_ep_num = 10, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 10, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 11, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 11, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 12, .style = FIFO_TX,   .maxpacket = 256, },
+-{ .hw_ep_num = 12, .style = FIFO_RX,   .maxpacket = 64, },
+-{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 4096, },
+-{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 1024, },
+-{ .hw_ep_num = 15, .style = FIFO_RXTX, .maxpacket = 1024, },
++{ .hw_ep_num = 10, .style = FIFO_TX,   .maxpacket = 512, },
++{ .hw_ep_num = 10, .style = FIFO_RX,   .maxpacket = 512, },
++{ .hw_ep_num = 11, .style = FIFO_RXTX, .maxpacket = 512, },
++{ .hw_ep_num = 12, .style = FIFO_RXTX, .maxpacket = 4096,},
++{ .hw_ep_num = 13, .style = FIFO_RXTX, .maxpacket = 512, },
++{ .hw_ep_num = 14, .style = FIFO_RXTX, .maxpacket = 512, },
+ };
+ 
+ 
diff --git a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c b/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
deleted file mode 100644
index c7867bef2f..0000000000
--- a/recipes/linux/linux-omap-pm-2.6.29/omap3-touchbook/board-omap3beagle.c
+++ /dev/null
@@ -1,744 +0,0 @@
-/*
- * linux/arch/arm/mach-omap2/board-omap3beagle.c
- *
- * Copyright (C) 2008 Texas Instruments
- *
- * Modified from mach-omap2/board-3430sdp.c
- *
- * Initial code: Syed Mohammed Khasim
- *
- * 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/platform_device.h>
-#include <linux/delay.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/io.h>
-#include <linux/leds.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mtd/nand.h>
-
-#include <mach/mcspi.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/ads7846.h>
-#include <linux/mma7455l.h>
-
-#include <mach/dmtimer.h>
-#include <linux/backlight.h>
-
-#include <linux/regulator/machine.h>
-#include <linux/i2c/twl4030.h>
-#include <linux/omapfb.h>
-
-#include <mach/hardware.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/flash.h>
-
-#include <mach/board.h>
-#include <mach/usb.h>
-#include <mach/common.h>
-#include <mach/gpmc.h>
-#include <mach/nand.h>
-#include <mach/mux.h>
-#include <mach/omap-pm.h>
-#include <mach/clock.h>
-#include <mach/display.h>
-
-#include "twl4030-generic-scripts.h"
-#include "mmc-twl4030.h"
-#include "pm.h"
-#include "omap3-opp.h"
-
-
-#define GPMC_CS0_BASE  0x60
-#define GPMC_CS_SIZE   0x30
-
-#define NAND_BLOCK_SIZE		SZ_128K
-
-#define OMAP3_AC_GPIO		136 //Int1 DRDY
-#define OMAP3_TS_GPIO		162
-#define TB_BL_PWM_TIMER		9
-#define TB_KILL_POWER_GPIO	168
-
-static struct mtd_partition omap3beagle_nand_partitions[] = {
-	/* All the partition sizes are listed in terms of NAND block size */
-	{
-		.name		= "X-Loader",
-		.offset		= 0,
-		.size		= 4 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
-	},
-	{
-		.name		= "U-Boot",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x80000 */
-		.size		= 15 * NAND_BLOCK_SIZE,
-		.mask_flags	= MTD_WRITEABLE,	/* force read-only */
-	},
-	{
-		.name		= "U-Boot Env",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x260000 */
-		.size		= 1 * NAND_BLOCK_SIZE,
-	},
-	{
-		.name		= "Kernel",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x280000 */
-		.size		= 32 * NAND_BLOCK_SIZE,
-	},
-	{
-		.name		= "File System",
-		.offset		= MTDPART_OFS_APPEND,	/* Offset = 0x680000 */
-		.size		= MTDPART_SIZ_FULL,
-	},
-};
-
-static struct omap_nand_platform_data omap3beagle_nand_data = {
-	.options	= NAND_BUSWIDTH_16,
-	.parts		= omap3beagle_nand_partitions,
-	.nr_parts	= ARRAY_SIZE(omap3beagle_nand_partitions),
-	.dma_channel	= -1,		/* disable DMA in OMAP NAND driver */
-	.nand_setup	= NULL,
-	.dev_ready	= NULL,
-};
-
-static struct resource omap3beagle_nand_resource = {
-	.flags		= IORESOURCE_MEM,
-};
-
-static struct platform_device omap3beagle_nand_device = {
-	.name		= "omap2-nand",
-	.id		= -1,
-	.dev		= {
-		.platform_data	= &omap3beagle_nand_data,
-	},
-	.num_resources	= 1,
-	.resource	= &omap3beagle_nand_resource,
-};
-
-#include "sdram-micron-mt46h32m32lf-6.h"
-
-static struct omap_uart_config omap3_beagle_uart_config __initdata = {
-	.enabled_uarts	= ((1 << 0) | (1 << 1) | (1 << 2)),
-};
-
-static struct twl4030_usb_data beagle_usb_data = {
-	.usb_mode	= T2_USB_MODE_ULPI,
-};
-
-static struct twl4030_hsmmc_info mmc[] = {
-	{
-		.mmc		= 1,
-		.wires		= 8,
-		.gpio_wp	= 29,
-	},
-	{}	/* Terminator */
-};
-
-static struct regulator_consumer_supply beagle_vmmc1_supply = {
-	.supply			= "vmmc",
-};
-
-static struct regulator_consumer_supply beagle_vsim_supply = {
-	.supply			= "vmmc_aux",
-};
-
-static struct gpio_led gpio_leds[];
-
-static int beagle_twl_gpio_setup(struct device *dev,
-		unsigned gpio, unsigned ngpio)
-{
-	/* gpio + 0 is "mmc0_cd" (input/IRQ) */
-	omap_cfg_reg(AH8_34XX_GPIO29);
-	mmc[0].gpio_cd = gpio + 0;
-	twl4030_mmc_init(mmc);
-
-	/* link regulators to MMC adapters */
-	beagle_vmmc1_supply.dev = mmc[0].dev;
-	beagle_vsim_supply.dev = mmc[0].dev;
-
-	/* REVISIT: need ehci-omap hooks for external VBUS
-	 * power switch and overcurrent detect
-	 */
-
-#if 0 /* TODO: This needs to be modified to not rely on u-boot */
-	gpio_request(gpio + 1, "EHCI_nOC");
-	gpio_direction_input(gpio + 1);
-
-	/* TWL4030_GPIO_MAX + 0 == ledA, EHCI nEN_USB_PWR (out, active low) */
-	gpio_request(gpio + TWL4030_GPIO_MAX, "nEN_USB_PWR");
-	gpio_direction_output(gpio + TWL4030_GPIO_MAX, 1);
-
-	/* TWL4030_GPIO_MAX + 1 == ledB, PMU_STAT (out, active low LED) */
-	gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
-#endif
-	return 0;
-}
-
-static struct twl4030_gpio_platform_data beagle_gpio_data = {
-	.gpio_base	= OMAP_MAX_GPIO_LINES,
-	.irq_base	= TWL4030_GPIO_IRQ_BASE,
-	.irq_end	= TWL4030_GPIO_IRQ_END,
-	.use_leds	= true,
-	.pullups	= BIT(1),
-	.pulldowns	= BIT(2) | BIT(6) | BIT(7) | BIT(8) | BIT(13)
-				| BIT(15) | BIT(16) | BIT(17),
-	.setup		= beagle_twl_gpio_setup,
-};
-
-static struct platform_device omap3_beagle_lcd_device = {
-	.name		= "omap3beagle_lcd",
-	.id		= -1,
-};
-
-static struct regulator_consumer_supply beagle_vdac_supply = {
-	.supply		= "vdac",
-	.dev		= &omap3_beagle_lcd_device.dev,
-};
-
-static struct regulator_consumer_supply beagle_vdvi_supply = {
-	.supply		= "vdvi",
-	.dev		= &omap3_beagle_lcd_device.dev,
-};
-
-/* VMMC1 for MMC1 pins CMD, CLK, DAT0..DAT3 (20 mA, plus card == max 220 mA) */
-static struct regulator_init_data beagle_vmmc1 = {
-	.constraints = {
-		.min_uV			= 1850000,
-		.max_uV			= 3150000,
-		.valid_modes_mask	= REGULATOR_MODE_NORMAL
-					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
-					| REGULATOR_CHANGE_MODE
-					| REGULATOR_CHANGE_STATUS,
-	},
-	.num_consumer_supplies	= 1,
-	.consumer_supplies	= &beagle_vmmc1_supply,
-};
-
-/* VSIM for MMC1 pins DAT4..DAT7 (2 mA, plus card == max 50 mA) */
-static struct regulator_init_data beagle_vsim = {
-	.constraints = {
-		.min_uV			= 1800000,
-		.max_uV			= 3000000,
-		.valid_modes_mask	= REGULATOR_MODE_NORMAL
-					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_VOLTAGE
-					| REGULATOR_CHANGE_MODE
-					| REGULATOR_CHANGE_STATUS,
-	},
-	.num_consumer_supplies	= 1,
-	.consumer_supplies	= &beagle_vsim_supply,
-};
-
-/* VDAC for DSS driving S-Video (8 mA unloaded, max 65 mA) */
-static struct regulator_init_data beagle_vdac = {
-	.constraints = {
-		.min_uV			= 1800000,
-		.max_uV			= 1800000,
-		.valid_modes_mask	= REGULATOR_MODE_NORMAL
-					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_MODE
-					| REGULATOR_CHANGE_STATUS,
-	},
-	.num_consumer_supplies	= 1,
-	.consumer_supplies	= &beagle_vdac_supply,
-};
-
-/* VPLL2 for digital video outputs */
-static struct regulator_init_data beagle_vpll2 = {
-	.constraints = {
-		.name			= "VDVI",
-		.min_uV			= 1800000,
-		.max_uV			= 1800000,
-		.valid_modes_mask	= REGULATOR_MODE_NORMAL
-					| REGULATOR_MODE_STANDBY,
-		.valid_ops_mask		= REGULATOR_CHANGE_MODE
-					| REGULATOR_CHANGE_STATUS,
-	},
-	.num_consumer_supplies	= 1,
-	.consumer_supplies	= &beagle_vdvi_supply,
-};
-
-static const struct twl4030_resconfig beagle_resconfig[] = {
-	/* disable regulators that u-boot left enabled; the
-	 * devices' drivers should be managing these.
-	 */
-	{ .resource = RES_VAUX3, },	/* not even connected! */
-	{ .resource = RES_VMMC1, },
-	{ .resource = RES_VSIM, },
-	{ .resource = RES_VPLL2, },
-	{ .resource = RES_VDAC, },
-	{ .resource = RES_VUSB_1V5, },
-	{ .resource = RES_VUSB_1V8, },
-	{ .resource = RES_VUSB_3V1, },
-	{ 0, },
-};
-
-static struct twl4030_power_data beagle_power_data = {
-	.resource_config	= beagle_resconfig,
-	/* REVISIT can't use GENERIC3430_T2SCRIPTS_DATA;
-	 * among other things, it makes reboot fail.
-	 */
-};
-
-static struct twl4030_bci_platform_data touchbook_bci_data = {
-	.tblsize		= 0,
-	.no_backup_battery	= 1,
-};
-
-static struct twl4030_platform_data beagle_twldata = {
-	.irq_base	= TWL4030_IRQ_BASE,
-	.irq_end	= TWL4030_IRQ_END,
-
-	/* platform_data for children goes here */
-	.usb		= &beagle_usb_data,
-	.gpio		= &beagle_gpio_data,
-	.power		= &beagle_power_data,
-	.vmmc1		= &beagle_vmmc1,
-	.vsim		= &beagle_vsim,
-	.vdac		= &beagle_vdac,
-	.vpll2		= &beagle_vpll2,
-
-	/* TouchBook BCI */
-	.bci		= &touchbook_bci_data,
-};
-
-static struct i2c_board_info __initdata beagle_i2c_boardinfo[] = {
-	{
-		I2C_BOARD_INFO("twl4030", 0x48),
-		.flags = I2C_CLIENT_WAKE,
-		.irq = INT_34XX_SYS_NIRQ,
-		.platform_data = &beagle_twldata,
-	},
-};
-
-static struct i2c_board_info __initdata touchBook_i2c_boardinfo[] = {
-	{
-		I2C_BOARD_INFO("bq27200", 0x55),
-	},
-};
-
-static int __init omap3_beagle_i2c_init(void)
-{
-	/* Standard BeagleBoard bus */
-	omap_register_i2c_bus(1, 2600, beagle_i2c_boardinfo,
-			ARRAY_SIZE(beagle_i2c_boardinfo));
-
-	/* TouchBook keyboard bus */
-	omap_register_i2c_bus(3, 100, touchBook_i2c_boardinfo,
-			ARRAY_SIZE(touchBook_i2c_boardinfo));
-
-	return 0;
-}
-
-static void __init omap3_ads7846_init(void)
-{
-	if (gpio_request(OMAP3_TS_GPIO, "ads7846_pen_down")) {
-		printk(KERN_ERR "Failed to request GPIO %d for "
-				"ads7846 pen down IRQ\n", OMAP3_TS_GPIO);
-		return;
-	}
-
-	gpio_direction_input(OMAP3_TS_GPIO);
-	omap_set_gpio_debounce(OMAP3_TS_GPIO, 1);
-	omap_set_gpio_debounce_time(OMAP3_TS_GPIO, 0xa);
-}
-
-static struct ads7846_platform_data ads7846_config = {
-	.x_min			= 100,
-	.y_min			= 265,
-	.x_max			= 3950,
-	.y_max			= 3750,
-	.x_plate_ohms		= 40,
-	.pressure_max		= 255,
-	.debounce_max		= 10,
-	.debounce_tol		= 5,
-	.debounce_rep		= 1,
-	.gpio_pendown		= OMAP3_TS_GPIO,
-	.keep_vref_on		= 1,
-};
-
-static struct omap2_mcspi_device_config ads7846_mcspi_config = {
-	.turbo_mode	= 0,
-	.single_channel	= 1,	/* 0: slave, 1: master */
-};
-
-static struct spi_board_info omap3_ads7846_spi_board_info[] __initdata = {
-	{
-		.modalias		= "ads7846",
-		.bus_num		= 4,
-		.chip_select		= 0,
-		.max_speed_hz		= 1500000,
-		.controller_data	= &ads7846_mcspi_config, //(void *) 161,
-		.irq			= OMAP_GPIO_IRQ(OMAP3_TS_GPIO),
-		.platform_data		= &ads7846_config,
-	}
-};
-
-static void __init omap3_beagle_init_irq(void)
-{
-	omap2_init_common_hw(mt46h32m32lf6_sdrc_params, omap3_mpu_rate_table,
-	            omap3_dsp_rate_table, omap3_l3_rate_table);
-	omap_init_irq();
-	omap_gpio_init();
-}
-
-static struct gpio_led gpio_leds[] = {
-	{
-		.name			= "beagleboard::usr0",
-		.default_trigger	= "heartbeat",
-		.gpio			= 150,
-	},
-	{
-		.name			= "beagleboard::usr1",
-		.default_trigger	= "mmc0",
-		.gpio			= 149,
-	},
-	{
-		.name			= "beagleboard::pmu_stat",
-		.gpio			= -EINVAL,	/* gets replaced */
-		.active_low		= true,
-	},
-};
-
-static struct gpio_led_platform_data gpio_led_info = {
-	.leds		= gpio_leds,
-	.num_leds	= ARRAY_SIZE(gpio_leds),
-};
-
-static struct platform_device leds_gpio = {
-	.name	= "leds-gpio",
-	.id	= -1,
-	.dev	= {
-		.platform_data	= &gpio_led_info,
-	},
-};
-
-static struct gpio_keys_button gpio_buttons[] = {
-	{
-		.code			= BTN_EXTRA,
-		.gpio			= 7,
-		.desc			= "user",
-		.wakeup			= 1,
-	},
-	{
-		.code			= KEY_POWER,
-		.gpio			= 183,
-		.desc			= "power",
-		.wakeup			= 1,
-	},
-};
-
-static struct gpio_keys_platform_data gpio_key_info = {
-	.buttons	= gpio_buttons,
-	.nbuttons	= ARRAY_SIZE(gpio_buttons),
-};
-
-static struct platform_device keys_gpio = {
-	.name	= "gpio-keys",
-	.id	= -1,
-	.dev	= {
-		.platform_data	= &gpio_key_info,
-	},
-};
-
-/* DSS */
-
-static int beagle_enable_dvi(struct omap_display *display)
-{
-	if (display->hw_config.panel_reset_gpio != -1)
-		gpio_set_value(display->hw_config.panel_reset_gpio, 1);
-
-	return 0;
-}
-
-static void beagle_disable_dvi(struct omap_display *display)
-{
-	if (display->hw_config.panel_reset_gpio != -1)
-		gpio_set_value(display->hw_config.panel_reset_gpio, 0);
-}
-
-static struct omap_dss_display_config beagle_display_data_dvi = {
-	.type = OMAP_DISPLAY_TYPE_DPI,
-	.name = "dvi",
-	.panel_name = "panel-generic",
-	.u.dpi.data_lines = 24,
-	.panel_reset_gpio = 176,
-	.panel_enable = beagle_enable_dvi,
-	.panel_disable = beagle_disable_dvi,
-};
-
-
-st