Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 (d555dd50) · Commits · e / devices / android_kernel_sony_msm8998

arch/arm/Kconfig

+5 −2

Original line number	Diff line number	Diff line
		@@ -721,7 +721,8 @@ config LEDS

		config LEDS_TIMER
		bool "Timer LED" if (!ARCH_CDB89712 && !ARCH_OMAP) \|\| \
		MACH_OMAP_H2 \|\| MACH_OMAP_PERSEUS2
		OMAP_OSK_MISTRAL \|\| MACH_OMAP_H2 \
		\|\| MACH_OMAP_PERSEUS2
		depends on LEDS
		depends on !GENERIC_CLOCKEVENTS
		default y if ARCH_EBSA110
		@@ -738,7 +739,9 @@ config LEDS_TIMER

		config LEDS_CPU
		bool "CPU usage LED" if (!ARCH_CDB89712 && !ARCH_EBSA110 && \
		!ARCH_OMAP) \|\| MACH_OMAP_H2 \|\| MACH_OMAP_PERSEUS2
		!ARCH_OMAP) \
		\|\| OMAP_OSK_MISTRAL \|\| MACH_OMAP_H2 \
		\|\| MACH_OMAP_PERSEUS2
		depends on LEDS
		help
		If you say Y here, the red LED will be used to give a good real

+7 −5

Original line number	Diff line number	Diff line
		@@ -294,9 +294,11 @@ static int h3_select_irda(struct device *dev, int state)
		return err;
		}

		static void set_trans_mode(void *data)
		static void set_trans_mode(struct work_struct *work)
		{
		int *mode = data;
		struct omap_irda_config *irda_config =
		container_of(work, struct omap_irda_config, gpio_expa.work);
		int mode = irda_config->mode;
		unsigned char expa;
		int err = 0;

		@@ -306,7 +308,7 @@ static void set_trans_mode(void *data)

		expa &= ~0x03;

		if (*mode & IR_SIRMODE) {
		if (mode & IR_SIRMODE) {
		expa \|= 0x01;
		} else { /* MIR/FIR */
		expa \|= 0x03;
		@@ -321,9 +323,9 @@ static int h3_transceiver_mode(struct device *dev, int mode)
		{
		struct omap_irda_config *irda_config = dev->platform_data;

		irda_config->mode = mode;
		cancel_delayed_work(&irda_config->gpio_expa);
		PREPARE_WORK(&irda_config->gpio_expa, set_trans_mode, &mode);
		#error this is not permitted - mode is an argument variable
		PREPARE_DELAYED_WORK(&irda_config->gpio_expa, set_trans_mode);
		schedule_delayed_work(&irda_config->gpio_expa, 0);

		return 0;

+3 −3

Original line number	Diff line number	Diff line
		@@ -133,13 +133,13 @@ void osk_leds_event(led_event_t evt)
		mistral_setled();
		break;

		case led_idle_start:
		hw_led_state \|= IDLE_LED;
		case led_idle_start: /* idle == off */
		hw_led_state &= ~IDLE_LED;
		mistral_setled();
		break;

		case led_idle_end:
		hw_led_state &= ~IDLE_LED;
		hw_led_state \|= IDLE_LED;
		mistral_setled();
		break;

+0 −11

Original line number	Diff line number	Diff line
		@@ -57,7 +57,6 @@
		#include <asm/arch/tc.h>
		#include <asm/arch/pm.h>
		#include <asm/arch/mux.h>
		#include <asm/arch/tps65010.h>
		#include <asm/arch/dma.h>
		#include <asm/arch/dsp_common.h>
		#include <asm/arch/dmtimer.h>
		@@ -250,11 +249,6 @@ void omap_pm_suspend(void)

		omap_serial_wake_trigger(1);

		if (machine_is_omap_osk()) {
		/* Stop LED1 (D9) blink */
		tps65010_set_led(LED1, OFF);
		}

		if (!cpu_is_omap15xx())
		omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);

		@@ -447,11 +441,6 @@ void omap_pm_suspend(void)
		omap_serial_wake_trigger(0);

		printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);

		if (machine_is_omap_osk()) {
		/* Let LED1 (D9) blink again */
		tps65010_set_led(LED1, BLINK);
		}
		}

		#if defined(DEBUG) && defined(CONFIG_PROC_FS)

+2 −11

Original line number	Diff line number	Diff line
		@@ -1160,8 +1160,8 @@ int __init omap2_clk_init(void)
		clk_enable(&sync_32k_ick);
		clk_enable(&omapctrl_ick);

		/* Force the APLLs active during bootup to avoid disabling and
		* enabling them unnecessarily. */
		/* Force the APLLs always active. The clocks are idled
		* automatically by hardware. */
		clk_enable(&apll96_ck);
		clk_enable(&apll54_ck);

		@@ -1174,12 +1174,3 @@ int __init omap2_clk_init(void)

		return 0;
		}

		static int __init omap2_disable_aplls(void)
		{
		clk_disable(&apll96_ck);
		clk_disable(&apll54_ck);

		return 0;
		}
		late_initcall(omap2_disable_aplls);