bring some stuff from 2.6.32 over to 3.0

changes-from-2.6.32.diff

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 0c22aad..7f86af3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -541,9 +541,16 @@ static struct omap_hwmod omap3xxx_l4_per_hwmod = {
 	.flags		= HWMOD_NO_IDLEST,
 };
 
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__gpio1;
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__timer1;
+static struct omap_hwmod_ocp_if omap3xxx_l4_wkup__wd_timer2;
+
 /* Slave interfaces on the L4_WKUP interconnect */
 static struct omap_hwmod_ocp_if *omap3xxx_l4_wkup_slaves[] = {
 	&omap3xxx_l4_core__l4_wkup,
+	&omap3xxx_l4_wkup__gpio1,
+	&omap3xxx_l4_wkup__timer1,
+	&omap3xxx_l4_wkup__wd_timer2,
 };
 
 /* L4 WKUP */
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c
index 5c33271..0981116 100644
--- a/drivers/gpio/gpio-omap.c
+++ b/drivers/gpio/gpio-omap.c
@@ -1943,6 +1943,7 @@ static int __init omap3_gpio_pads_init(void)
 	gpio_pads = NULL;
 	gpio_amt = 0;
 
+#ifndef CONFIG_MACH_ENCORE
 	if (cpu_is_omap3630()) {
 		gpio_pads_config = zoom3_gpio_pads_config;
 		n_gpio_configs = ARRAY_SIZE(zoom3_gpio_pads_config);
@@ -1950,6 +1951,10 @@ static int __init omap3_gpio_pads_init(void)
 		gpio_pads_config = zoom2_gpio_pads_config;
 		n_gpio_configs = ARRAY_SIZE(zoom2_gpio_pads_config);
 	}
+#else
+	gpio_pads_config = zoom2_gpio_pads_config;
+	n_gpio_configs = ARRAY_SIZE(zoom2_gpio_pads_config);
+#endif
 
 	memset(gpio_pad_map, 0x00, sizeof(gpio_pad_map));