Skip to contentSkip to conversation

Resolve -rt OMAP conflicts

PATCH New Kevin Hilman 1 participant 1 message May 22, 2007

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Resolve -rt OMAP conflicts

This patch removes all the OMAP clocksource/clockevent stuff from the -rt patch since it is now all in the OMAP tree.

It also removes the few raw_spinlock additions to OMAP specific files which will be revisited/resumitted if necessary. I currently believe that all of these raw spinlocks are no longer necessary.

arch/arm/Kconfig +0 -1
@@ -363,7 +363,6 @@
 config ARCH_OMAP
 	bool "TI OMAP"
 	select GENERIC_GPIO
-	select GENERIC_TIME
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 

reverted:

arch/arm/mach-omap1/pm.c +1 -1
@@ -120,7 +120,7 @@
 
 	local_irq_disable();
 	local_fiq_disable();
+	if (need_resched()) {
-	if (need_resched() || need_resched_delayed()) {
 		local_fiq_enable();
 		local_irq_enable();
 		return;

reverted:

arch/arm/mach-omap1/time.c +73 -133

281 lines not on this page · raw message

reverted:

arch/arm/mach-omap2/pm.c +1 -1
@@ -53,7 +53,7 @@
 {
 	local_irq_disable();
 	local_fiq_disable();
+	if (need_resched()) {
-	if (need_resched() || need_resched_delayed()) {
 		local_fiq_enable();
 		local_irq_enable();
 		return;

reverted:

arch/arm/plat-omap/Kconfig +0 -1
@@ -11,7 +11,6 @@
 
 config ARCH_OMAP1
 	bool "TI OMAP1"
-	select GENERIC_CLOCKEVENTS
 
 config ARCH_OMAP2
 	bool "TI OMAP2"

reverted:

arch/arm/plat-omap/clock.c +1 -1
@@ -29,7 +29,7 @@
 
 static LIST_HEAD(clocks);
 static DEFINE_MUTEX(clocks_mutex);
+static DEFINE_SPINLOCK(clockfw_lock);
-static DEFINE_RAW_SPINLOCK(clockfw_lock);
 
 static struct clk_functions *arch_clock;
 

reverted:

arch/arm/plat-omap/common.c +0 -50

53 lines not on this page · raw message

reverted:

arch/arm/plat-omap/dma.c +1 -1
@@ -982,7 +982,7 @@
 /*----------------------------------------------------------------------------*/
 
 static struct lcd_dma_info {
+	spinlock_t lock;
-	raw_spinlock_t lock;
 	int reserved;
 	void (* callback)(u16 status, void *data);
 	void *cb_data;

reverted:

arch/arm/plat-omap/gpio.c +1 -1
@@ -120,7 +120,7 @@
 	u32 reserved_map;
 	u32 suspend_wakeup;
 	u32 saved_wakeup;
+	spinlock_t lock;
-	raw_spinlock_t lock;
 };
 
 #define METHOD_MPUIO		0

reverted:

arch/arm/plat-omap/mux.c +1 -1
@@ -56,7 +56,7 @@
  */
 int __init_or_module omap_cfg_reg(const unsigned long index)
 {
+	static DEFINE_SPINLOCK(mux_spin_lock);
-	static DEFINE_RAW_SPINLOCK(mux_spin_lock);
 
 	unsigned long flags;
 	struct pin_config *cfg;

reverted:

arch/arm/plat-omap/timer32k.c +100 -39

199 lines not on this page · raw message

--