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

arch/arm/mach-omap2/board-omap3beagle.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -178,7 +178,9 @@ static int __init omap3_beagle_i2c_init(void)
		#ifdef CONFIG_I2C2_OMAP_BEAGLE
		omap_register_i2c_bus(2, 400, NULL, 0);
		#endif
		omap_register_i2c_bus(3, 400, NULL, 0);
		/* Bus 3 is attached to the DVI port where devices like the pico DLP
		* projector don't work reliably with 400kHz */
		omap_register_i2c_bus(3, 100, NULL, 0);
		return 0;
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,8 @@ obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
		obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
		obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
		obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o
		obj-$(CONFIG_I2C_OMAP) += i2c.o
		i2c-omap-$(CONFIG_I2C_OMAP) := i2c.o
		obj-y += $(i2c-omap-m) $(i2c-omap-y)

		# OMAP mailbox framework
		obj-$(CONFIG_OMAP_MBOX_FWK) += mailbox.o

+5 −9

Original line number	Diff line number	Diff line
		@@ -199,21 +199,17 @@ static struct clocksource clocksource_32k = {
		.flags = CLOCK_SOURCE_IS_CONTINUOUS,
		};

		/*
		* Rounds down to nearest nsec.
		*/
		unsigned long long omap_32k_ticks_to_nsecs(unsigned long ticks_32k)
		{
		return cyc2ns(&clocksource_32k, ticks_32k);
		}

		/*
		* Returns current time from boot in nsecs. It's OK for this to wrap
		* around for now, as it's just a relative time stamp.
		*/
		unsigned long long sched_clock(void)
		{
		return omap_32k_ticks_to_nsecs(omap_32k_read());
		unsigned long long ret;

		ret = (unsigned long long)omap_32k_read();
		ret = (ret * clocksource_32k.mult_orig) >> clocksource_32k.shift;
		return ret;
		}

		static int __init omap_init_clocksource_32k(void)

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ extern void omap_map_common_io(void);
		extern struct sys_timer omap_timer;
		extern void omap_serial_init(void);
		extern void omap_serial_enable_clocks(int enable);
		#ifdef CONFIG_I2C_OMAP
		#if defined(CONFIG_I2C_OMAP) \|\| defined(CONFIG_I2C_OMAP_MODULE)
		extern int omap_register_i2c_bus(int bus_id, u32 clkrate,
		struct i2c_board_info const *info,
		unsigned len);

+1 −1

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@
		!defined(CONFIG_ARCH_OMAP15XX) && \
		!defined(CONFIG_ARCH_OMAP16XX) && \
		!defined(CONFIG_ARCH_OMAP24XX)
		#error "Power management for this processor not implemented yet"
		#warning "Power management for this processor not implemented yet"
		#endif

		#ifndef __ASSEMBLER__