Merge branch 'omap-upstream' into for-next (c81592ba) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+63 −14

Original line number	Diff line number	Diff line
		@@ -4127,6 +4127,69 @@ S: Maintained
		F: drivers/video/riva/
		F: drivers/video/nvidia/

		OMAP SUPPORT
		P: Tony Lindgren <tony@atomide.com>
		M: tony@atomide.com
		L: linux-omap@vger.kernel.org
		W: http://www.muru.com/linux/omap/
		W: http://linux.omap.com/
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git
		S: Maintained
		F: arch/arm/omap

		OMAP CLOCK FRAMEWORK SUPPORT
		P: Paul Walmsley
		M: paul@pwsan.com
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: arch/arm/omap/clock

		OMAP POWER MANAGEMENT SUPPORT
		P: Kevin Hilman
		M: khilman@deeprootsystems.com
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: arch/arm/omap/pm

		OMAP AUDIO SUPPORT
		P: Jarkko Nikula
		M: jhnikula@gmail.com
		L: alsa-devel@alsa-project.org (subscribers-only)
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: sound/soc/omap/

		OMAP FRAMEBUFFER SUPPORT
		P: Imre Deak
		M: imre.deak@nokia.com
		L: linux-fbdev-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: drivers/video/omap/

		OMAP MMC SUPPORT
		P: Jarkko Lavinen
		M: jarkko.lavinen@nokia.com
		L: linux-kernel@vger.kernel.org
		L: linux-omap@vger.kernel.org
		S: Maintained
		F: drivers/mmc/host/omap

		OMAP RANDOM NUMBER GENERATOR SUPPORT
		P: Deepak Saxena
		M: dsaxena@plexity.net
		S: Maintained
		F: drivers/char/hw_random/omap-rng.c

		OMAP USB SUPPORT
		P: Felipe Balbi
		M: felipe.balbi@nokia.com
		P: David Brownell
		M: dbrownell@users.sourceforge.net
		L: linux-usb@vger.kernel.org
		L: linux-omap@vger.kernel.org
		S: Maintained

		OMFS FILESYSTEM
		P: Bob Copeland
		M: me@bobcopeland.com
		@@ -5515,20 +5578,6 @@ F: drivers/misc/tifm*
		F: drivers/mmc/host/tifm_sd.c
		F: include/linux/tifm.h

		TI OMAP MMC INTERFACE DRIVER
		P: Carlos Aguiar, Anderson Briglia and Syed Khasim
		M: linux-omap@vger.kernel.org
		W: http://linux.omap.com
		W: http://www.muru.com/linux/omap/
		S: Maintained
		F: drivers/mmc/host/omap.c

		TI OMAP RANDOM NUMBER GENERATOR SUPPORT
		P: Deepak Saxena
		M: dsaxena@plexity.net
		S: Maintained
		F: drivers/char/hw_random/omap-rng.c

		TIPC NETWORK LAYER
		P: Per Liden
		M: per.liden@ericsson.com

arch/arm/configs/rx51_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ CONFIG_ALIGNMENT_TRAP=y
		#
		CONFIG_ZBOOT_ROM_TEXT=0x0
		CONFIG_ZBOOT_ROM_BSS=0x0
		CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs rw console=ttyMTD5"
		CONFIG_CMDLINE="init=/sbin/preinit ubi.mtd=rootfs root=ubi0:rootfs rootfstype=ubifs rootflags=bulk_read,no_chk_data_crc rw console=ttyMTD,log console=tty0"
		# CONFIG_XIP_KERNEL is not set
		# CONFIG_KEXEC is not set

arch/arm/mach-omap1/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,6 @@ config MACH_OMAP_H2
		config MACH_OMAP_H3
		bool "TI H3 Support"
		depends on ARCH_OMAP1 && ARCH_OMAP16XX
		# select GPIOEXPANDER_OMAP
		help
		TI OMAP 1710 H3 board support. Say Y here if you have such
		a board.

arch/arm/mach-omap1/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,10 @@ obj-$(CONFIG_OMAP_32K_TIMER) += timer32k.o
		# Power Management
		obj-$(CONFIG_PM) += pm.o sleep.o

		# DSP
		obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox_mach.o
		mailbox_mach-objs := mailbox.o

		led-y := leds.o

		# Specific board support

arch/arm/mach-omap1/board-nokia770.c

+13 −0

Original line number	Diff line number	Diff line
		@@ -33,8 +33,11 @@
		#include <mach/common.h>
		#include <mach/dsp_common.h>
		#include <mach/omapfb.h>
		#include <mach/hwa742.h>
		#include <mach/lcd_mipid.h>
		#include <mach/mmc.h>
		#include <mach/usb.h>
		#include <mach/clock.h>

		#define ADS7846_PENDOWN_GPIO 15

		@@ -162,6 +165,15 @@ static struct spi_board_info nokia770_spi_board_info[] __initdata = {
		},
		};

		static struct hwa742_platform_data nokia770_hwa742_platform_data = {
		.te_connected = 1,
		};

		static void hwa742_dev_init(void)
		{
		clk_add_alias("hwa_sys_ck", NULL, "bclk", NULL);
		omapfb_set_ctrl_platform_data(&nokia770_hwa742_platform_data);
		}

		/* assume no Mini-AB port */

		@@ -370,6 +382,7 @@ static void __init omap_nokia770_init(void)
		omap_serial_init();
		omap_register_i2c_bus(1, 100, NULL, 0);
		omap_dsp_init();
		hwa742_dev_init();
		ads7846_dev_init();
		mipid_dev_init();
		omap_usb_init(&nokia770_usb_config);