Omap1 updates for 2.6.29 merge window

Hi,

Here are few omap1 specific updates for review.

Regards,

Tony

---

David Brownell (2):
ARM: OMAP1: osk5912: LED trigger update for CF
ARM: OMAP1: osk5912: Mistral eeprom support

 arch/arm/mach-omap1/board-osk.c |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 deletions(-)

Signature

From: David Brownell <[email protected]>

List the 4 Kbit I2C EEPROM included on the Mistral board.

Also add a comment about the hardware workaround needed to properly support the WAKE button. More info at

http://elinux.org/OSK_Mistral_wakeup_button_mod

Still no support for the (optional) camera sensor.

---
 arch/arm/mach-omap1/board-osk.c |   29 +++++++++++++++++++++++++++--
 1 files changed, 27 insertions(+), 2 deletions(-)

index 2f88095..4b7c1bc 100644
@@ -260,7 +260,6 @@ static struct i2c_board_info __initdata osk_i2c_board_info[] = {
 	},
 	/* TODO when driver support is ready:
 	 *  - aic23 audio chip at 0x1a
-	 *  - on Mistral, 24c04 eeprom at 0x50
 	 *  - optionally on Mistral, ov9640 camera sensor at 0x30
 	 */
 };

@@ -337,11 +336,28 @@ static struct omap_board_config_kernel osk_config[] __initdata = {
 #ifdef	CONFIG_OMAP_OSK_MISTRAL
 
 #include <linux/input.h>
+#include <linux/i2c/at24.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
 #include <mach/keypad.h>
 
+static struct at24_platform_data at24c04 = {
+	.byte_len	= SZ_4K / 8,
+	.page_size	= 16,
+};
+
+static struct i2c_board_info __initdata mistral_i2c_board_info[] = {
+	{
+		/* NOTE:  powered from LCD supply */
+		I2C_BOARD_INFO("24c04", 0x50),
+		.platform_data	= &at24c04,
+	},
+	/* TODO when driver support is ready:
+	 *  - optionally ov9640 camera sensor at 0x30
+	 */
+};
+
 static const int osk_keymap[] = {
 	/* KEY(col, row, code) */
 	KEY(0, 0, KEY_F1),		/* SW4 */

@@ -488,7 +504,13 @@ static void __init osk_mistral_init(void)
 	spi_register_board_info(mistral_boardinfo,
 			ARRAY_SIZE(mistral_boardinfo));
 
-	/* the sideways button (SW1) is for use as a "wakeup" button */
+	/* the sideways button (SW1) is for use as a "wakeup" button
+	 *
+	 * NOTE:  The Mistral board has the wakeup button (SW1) wired
+	 * to the LCD 3.3V rail, which is powered down during suspend.
+	 * To allow this button to wake up the omap, work around this
+	 * HW bug by rewiring SW1 to use the main 3.3V rail.
+	 */
 	omap_cfg_reg(N15_1610_MPUIO2);
 	if (gpio_request(OMAP_MPUIO(2), "wakeup") == 0) {
 		int ret = 0;

@@ -521,6 +543,9 @@ static void __init osk_mistral_init(void)
 	if (gpio_request(2, "lcd_pwr") == 0)
 		gpio_direction_output(2, 1);
 
+	i2c_register_board_info(1, mistral_i2c_board_info,
+			ARRAY_SIZE(mistral_i2c_board_info));
+
 	platform_add_devices(mistral_devices, ARRAY_SIZE(mistral_devices));
 }
 #else

From: David Brownell <[email protected]>

Help OSK work better with root-on-CF, by having one of the LEDs use the "ide-disk" trigger (to kick in during CF I/O).

---
 arch/arm/mach-omap1/board-osk.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

index 4b7c1bc..ff9e67b 100644
@@ -188,7 +188,8 @@ static struct gpio_led tps_leds[] = {
 	/* NOTE:  D9 and D2 have hardware blink support.
 	 * Also, D9 requires non-battery power.
 	 */
-	{ .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9", },
+	{ .gpio = OSK_TPS_GPIO_LED_D9, .name = "d9",
+			.default_trigger = "ide-disk", },
 	{ .gpio = OSK_TPS_GPIO_LED_D2, .name = "d2", },
 	{ .gpio = OSK_TPS_GPIO_LED_D3, .name = "d3", .active_low = 1,
 			.default_trigger = "heartbeat", },

Ok.

Are these, and the other OMAP2,3 series going to be submitted sometime?

Here's the pull request for you for all of the above. Let me know if you want a separate pull request for each series.

This does not include the MMC init patches or Hiroshi's patches.

Regards,

Tony

The following changes since commit 8b1fae4e4200388b64dd88065639413cb3f1051c:
Linus Torvalds (1):

        Linux 2.6.28-rc8

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git omap3-upstream

Arun KS (1):
ARM: OMAP3: Pin multiplexing updates for 24xx and 34xx

David Brownell (9):
ARM: OMAP: gpios implement new to_irq()
ARM: OMAP: switch to standard gpio get/set calls
ARM: OMAP: switch to gpio_direction_input
ARM: OMAP: switch to gpio_direction_output
ARM: OMAP: use gpio_to_irq
ARM: OMAP: minor gpio bugfixes
ARM: OMAP1: osk5912: Mistral eeprom support
ARM: OMAP1: osk5912: LED trigger update for CF
ARM: OMAP2: bard-h4: list those eeproms

Grazvydas Ignotas (1):
ARM: OMAP3: Add basic support for Pandora handheld console

Jarkko Nikula (5):
ARM: OMAP: Extend gpio label column width in omap_gpio debugfs file
ARM: OMAP: make legacy gpio request/free calls superfluous
ARM: OMAP: Switch to gpio_request/free calls
ARM: OMAP: Switch ohci-omap to gpio_request/free calls
ARM: OMAP3: Add OMAP34xx pin multiplexing into I2C bus registration helper

Jouni Hogander (1):
ARM: OMAP: Enable GPIO debounce clock only when debounce is enabled v3

Lauri Leukkunen (1):
ARM: OMAP2: Use omap_rev() instead of system_rev

Paul Walmsley (2):
ARM: OMAP2: drop redundant pending write check for gptimer
ARM: OMAP2: skip unnecessary TLDR write during non-autoreload for gptimer

Santosh Shilimkar (1):
ARM: OMAP3: DMA: Fix for sDMA Errata 1.113

Stanley.Miao (1):
ARM: OMAP3: LDP: Add Ethernet device support to make ldp boot succeess

Tony Lindgren (3):
ARM: OMAP2: Prepare cpu detection for further improvements
ARM: OMAP2: Fix cpu detection
ARM: OMAP3: Warn about spurious interrupts

 arch/arm/configs/omap3_pandora_defconfig        | 1409 +++++++++++++++++++++++
 arch/arm/configs/omap_ldp_defconfig             |  148 +++-
 arch/arm/mach-omap1/board-fsample.c             |    7 +-
 arch/arm/mach-omap1/board-h2.c                  |   24 +-
 arch/arm/mach-omap1/board-h3.c                  |    9 +-
 arch/arm/mach-omap1/board-innovator.c           |    2 +-
 arch/arm/mach-omap1/board-nokia770.c            |   12 +-
 arch/arm/mach-omap1/board-osk.c                 |   43 +-
 arch/arm/mach-omap1/board-palmte.c              |   14 +-
 arch/arm/mach-omap1/board-palmtt.c              |    2 +-
 arch/arm/mach-omap1/board-palmz71.c             |   23 +-
 arch/arm/mach-omap1/board-perseus2.c            |    7 +-
 arch/arm/mach-omap1/board-sx1.c                 |   11 +-
 arch/arm/mach-omap1/board-voiceblue.c           |   49 +-
 arch/arm/mach-omap1/fpga.c                      |    6 +-
 arch/arm/mach-omap1/id.c                        |   53 +-
 arch/arm/mach-omap1/leds-h2p2-debug.c           |   10 +-
 arch/arm/mach-omap1/leds-osk.c                  |    4 +-
 arch/arm/mach-omap1/leds.c                      |    8 +-
 arch/arm/mach-omap1/pm.c                        |    6 +-
 arch/arm/mach-omap1/serial.c                    |   10 +-
 arch/arm/mach-omap2/Kconfig                     |    4 +
 arch/arm/mach-omap2/Makefile                    |    1 +
 arch/arm/mach-omap2/board-2430sdp.c             |    4 +-
 arch/arm/mach-omap2/board-apollon.c             |   15 +-
 arch/arm/mach-omap2/board-h4.c                  |   14 +
 arch/arm/mach-omap2/board-ldp.c                 |   57 +
 arch/arm/mach-omap2/board-omap3pandora.c        |  180 +++
 arch/arm/mach-omap2/clock34xx.c                 |    2 +-
 arch/arm/mach-omap2/clock34xx.h                 |   36 +-
 arch/arm/mach-omap2/id.c                        |  305 +++---
 arch/arm/mach-omap2/irq.c                       |   39 +
 arch/arm/mach-omap2/mux.c                       |   44 +-
 arch/arm/mach-omap2/usb-tusb6010.c              |    6 +-
 arch/arm/plat-omap/debug-devices.c              |    8 +-
 arch/arm/plat-omap/debug-leds.c                 |   10 +-
 arch/arm/plat-omap/dma.c                        |   15 +-
 arch/arm/plat-omap/dmtimer.c                    |   11 +-
 arch/arm/plat-omap/gpio.c                       |  127 +--
 arch/arm/plat-omap/i2c.c                        |   55 +-
 arch/arm/plat-omap/include/mach/board-apollon.h |    4 +-
 arch/arm/plat-omap/include/mach/board-ldp.h     |    5 +-
 arch/arm/plat-omap/include/mach/cpu.h           |   82 +-
 arch/arm/plat-omap/include/mach/gpio.h          |   31 +-
 arch/arm/plat-omap/include/mach/mux.h           |   41 +
 arch/arm/plat-omap/sram.c                       |    3 +-
 drivers/input/keyboard/omap-keypad.c            |    8 +-
 drivers/mtd/onenand/omap2.c                     |   10 +-
 drivers/usb/host/ohci-omap.c                    |    8 +-
 49 files changed, 2448 insertions(+), 534 deletions(-)
 create mode 100644 arch/arm/configs/omap3_pandora_defconfig
 create mode 100644 arch/arm/mach-omap2/board-omap3pandora.c