[kernel] update arm configs for 3.1 update omap devicetree patch for updated field names

[Dennis Gilmore]

commit 0e5a4d72181b28f876e06f199c5874de2726c544
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Tue Aug 16 12:56:09 2011 -0500

    update arm configs for 3.1
    update omap devicetree patch for updated field names

 arm-omap-dt-compat.patch |    4 ++--
 config-arm-omap-generic  |    1 +
 config-arm-tegra         |    3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/arm-omap-dt-compat.patch b/arm-omap-dt-compat.patch
index ab7cd0a..4046e93 100644
--- a/arm-omap-dt-compat.patch
+++ b/arm-omap-dt-compat.patch
@@ -16,7 +16,7 @@ diff -up linux-2.6.39.armv7l/arch/arm/mach-omap2/board-omap3beagle.c.fdt linux-2
 @@ -600,4 +605,5 @@ MACHINE_START(OMAP3_BEAGLE, "OMAP3 Beagl
  	.init_irq	= omap3_beagle_init_irq,
  	.init_machine	= omap3_beagle_init,
- 	.timer		= &omap_timer,
+ 	.timer		= &omap3_secure_timer,
 +	.dt_compat      = omap3_beagle_dt_match,
  MACHINE_END
 diff -up linux-2.6.39.armv7l/arch/arm/mach-omap2/board-omap4panda.c.fdt linux-2.6.39.armv7l/arch/arm/mach-omap2/board-omap4panda.c
@@ -37,6 +37,6 @@ diff -up linux-2.6.39.armv7l/arch/arm/mach-omap2/board-omap4panda.c.fdt linux-2.
 @@ -717,4 +722,5 @@ MACHINE_START(OMAP4_PANDA, "OMAP4 Panda 
  	.init_irq	= gic_init_irq,
  	.init_machine	= omap4_panda_init,
- 	.timer		= &omap_timer,
+ 	.timer		= &omap4_timer,
 +	.dt_compat      = omap4_panda_match,
  MACHINE_END
diff --git a/config-arm-omap-generic b/config-arm-omap-generic
index 12a6e30..29f6ade 100644
--- a/config-arm-omap-generic
+++ b/config-arm-omap-generic
@@ -928,6 +928,7 @@ CONFIG_MMC_SPI=m
 # CONFIG_MEMSTICK is not set
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_GPIO_PLATFORM=y
+CONFIG_LEDS_GPIO_OF=y
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_LP5523 is not set
diff --git a/config-arm-tegra b/config-arm-tegra
index c79efcf..91c176b 100644
--- a/config-arm-tegra
+++ b/config-arm-tegra
@@ -4,6 +4,7 @@ CONFIG_MACH_KAEN=y
 CONFIG_MACH_PAZ00=y
 CONFIG_MACH_TRIMSLICE=y
 CONFIG_MACH_WARIO=y
+CONFIG_MACH_TEGRA_DT=y
 CONFIG_TEGRA_DEBUG_UARTD=y
 CONFIG_ARM_ERRATA_742230=y
 CONFIG_NO_HZ=y
@@ -46,6 +47,8 @@ CONFIG_LOCAL_TIMERS=y
 CONFIG_HW_PERF_EVENTS=y
 # CONFIG_NEON is not set
 # CONFIG_RFKILL_GPIO is not set
+CONFIG_GPIO_GENERIC_PLATFORM=y
+# CONFIG_GPIO_MCP23S08 is not set
 CONFIG_KEYBOARD_TEGRA=y
 # CONFIG_MPCORE_WATCHDOG is not set
 CONFIG_USB_EHCI_TEGRA=y