---

yaml --- r: 163149 b: refs/heads/master c: 5d11326 h: refs/heads/master i: 163147: ff1fab5 v: v3
git-mirror · Sep 3, 2009 · 96d36be · 96d36be
1 parent c7c02df
commit 96d36be
Show file tree

Hide file tree

Showing 16 changed files with 37 additions and 661 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5567fa1f543dde3c42f8e52bf4f7005135b24896
+refs/heads/master: 5d113262ee9e074e0d36362d878892819bfdeb47
diff --git a/trunk/arch/arm/mach-omap2/board-3430sdp.c b/trunk/arch/arm/mach-omap2/board-3430sdp.c
@@ -473,11 +473,6 @@ static inline void board_smc91x_init(void)
 
 #endif
 
-static void enable_board_wakeup_source(void)
-{
-	omap_cfg_reg(AF26_34XX_SYS_NIRQ); /* T2 interrupt line (keypad) */
-}
-
 static void __init omap_3430sdp_init(void)
 {
 	omap3430_i2c_init();
@@ -495,7 +490,6 @@ static void __init omap_3430sdp_init(void)
 	omap_serial_init();
 	usb_musb_init();
 	board_smc91x_init();
-	enable_board_wakeup_source();
 }
 
 static void __init omap_3430sdp_map_io(void)

diff --git a/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c b/trunk/arch/arm/mach-omap2/board-zoom-debugboard.c
@@ -96,7 +96,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device zoom2_debugboard_serial_device = {
 	.name			= "serial8250",
-	.id			= 3,
+	.id			= PLAT8250_DEV_PLATFORM1,
 	.dev			= {
 		.platform_data	= serial_platform_data,
 	},
@@ -129,7 +129,6 @@ static inline void __init zoom2_init_quaduart(void)
 static inline int omap_zoom2_debugboard_detect(void)
 {
 	int debug_board_detect = 0;
-	int ret = 1;
 
 	debug_board_detect = ZOOM2_SMSC911X_GPIO;
 
@@ -141,10 +140,10 @@ static inline int omap_zoom2_debugboard_detect(void)
 	gpio_direction_input(debug_board_detect);
 
 	if (!gpio_get_value(debug_board_detect)) {
-		ret = 0;
+		gpio_free(debug_board_detect);
+		return 0;
 	}
-	gpio_free(debug_board_detect);
-	return ret;
+	return 1;
 }
 
 static struct platform_device *zoom2_devices[] __initdata = {

diff --git a/trunk/arch/arm/mach-omap2/clock.c b/trunk/arch/arm/mach-omap2/clock.c
@@ -1043,7 +1043,5 @@ void omap2_clk_disable_unused(struct clk *clk)
 		omap2_clk_disable(clk);
 	} else
 		_omap2_clk_disable(clk);
-	if (clk->clkdm != NULL)
-		pwrdm_clkdm_state_switch(clk->clkdm);
 }
 #endif
diff --git a/trunk/arch/arm/mach-omap2/clockdomain.c b/trunk/arch/arm/mach-omap2/clockdomain.c
@@ -299,8 +299,7 @@ struct clockdomain *clkdm_lookup(const char *name)
  * anything else to indicate failure; or -EINVAL if the function pointer
  * is null.
  */
-int clkdm_for_each(int (*fn)(struct clockdomain *clkdm, void *user),
-			void *user)
+int clkdm_for_each(int (*fn)(struct clockdomain *clkdm))
 {
 	struct clockdomain *clkdm;
 	int ret = 0;
@@ -310,7 +309,7 @@ int clkdm_for_each(int (*fn)(struct clockdomain *clkdm, void *user),
 
 	mutex_lock(&clkdm_mutex);
 	list_for_each_entry(clkdm, &clkdm_list, node) {
-		ret = (*fn)(clkdm, user);
+		ret = (*fn)(clkdm);
 		if (ret)
 			break;
 	}
@@ -485,8 +484,6 @@ void omap2_clkdm_allow_idle(struct clockdomain *clkdm)
 			    v << __ffs(clkdm->clktrctrl_mask),
 			    clkdm->pwrdm.ptr->prcm_offs,
 			    CM_CLKSTCTRL);
-
-	pwrdm_clkdm_state_switch(clkdm);
 }
 
 /**
@@ -575,7 +572,6 @@ int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
 		omap2_clkdm_wakeup(clkdm);
 
 	pwrdm_wait_transition(clkdm->pwrdm.ptr);
-	pwrdm_clkdm_state_switch(clkdm);
 
 	return 0;
 }
@@ -628,8 +624,6 @@ int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
 	else
 		omap2_clkdm_sleep(clkdm);
 
-	pwrdm_clkdm_state_switch(clkdm);
-
 	return 0;
 }
 
diff --git a/trunk/arch/arm/mach-omap2/mux.c b/trunk/arch/arm/mach-omap2/mux.c
@@ -542,11 +542,6 @@ MUX_CFG_34XX("AF13_3430_MMC3_DAT2", 0x5e8,
 		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)
 MUX_CFG_34XX("AF13_3430_MMC3_DAT3", 0x5e2,
 		OMAP34XX_MUX_MODE2 | OMAP34XX_PIN_INPUT_PULLUP)
-
-/* SYS_NIRQ T2 INT1 */
-MUX_CFG_34XX("AF26_34XX_SYS_NIRQ", 0x1E0,
-		OMAP3_WAKEUP_EN | OMAP34XX_PIN_INPUT_PULLUP |
-		OMAP34XX_MUX_MODE0)
 };
 
 #define OMAP34XX_PINS_SZ	ARRAY_SIZE(omap34xx_pins)