Merge branch 'omap-fixes-for-linus' of... (d22966d0) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+43 −44

Original line number	Diff line number	Diff line
		@@ -30,57 +30,56 @@
		/* Zoom2 has Qwerty keyboard*/
		static int board_keymap[] = {
		KEY(0, 0, KEY_E),
		KEY(1, 0, KEY_R),
		KEY(2, 0, KEY_T),
		KEY(3, 0, KEY_HOME),
		KEY(6, 0, KEY_I),
		KEY(7, 0, KEY_LEFTSHIFT),
		KEY(0, 1, KEY_D),
		KEY(0, 1, KEY_R),
		KEY(0, 2, KEY_T),
		KEY(0, 3, KEY_HOME),
		KEY(0, 6, KEY_I),
		KEY(0, 7, KEY_LEFTSHIFT),
		KEY(1, 0, KEY_D),
		KEY(1, 1, KEY_F),
		KEY(2, 1, KEY_G),
		KEY(3, 1, KEY_SEND),
		KEY(6, 1, KEY_K),
		KEY(7, 1, KEY_ENTER),
		KEY(0, 2, KEY_X),
		KEY(1, 2, KEY_C),
		KEY(1, 2, KEY_G),
		KEY(1, 3, KEY_SEND),
		KEY(1, 6, KEY_K),
		KEY(1, 7, KEY_ENTER),
		KEY(2, 0, KEY_X),
		KEY(2, 1, KEY_C),
		KEY(2, 2, KEY_V),
		KEY(3, 2, KEY_END),
		KEY(6, 2, KEY_DOT),
		KEY(7, 2, KEY_CAPSLOCK),
		KEY(0, 3, KEY_Z),
		KEY(1, 3, KEY_KPPLUS),
		KEY(2, 3, KEY_B),
		KEY(2, 3, KEY_END),
		KEY(2, 6, KEY_DOT),
		KEY(2, 7, KEY_CAPSLOCK),
		KEY(3, 0, KEY_Z),
		KEY(3, 1, KEY_KPPLUS),
		KEY(3, 2, KEY_B),
		KEY(3, 3, KEY_F1),
		KEY(6, 3, KEY_O),
		KEY(7, 3, KEY_SPACE),
		KEY(0, 4, KEY_W),
		KEY(1, 4, KEY_Y),
		KEY(2, 4, KEY_U),
		KEY(3, 4, KEY_F2),
		KEY(3, 6, KEY_O),
		KEY(3, 7, KEY_SPACE),
		KEY(4, 0, KEY_W),
		KEY(4, 1, KEY_Y),
		KEY(4, 2, KEY_U),
		KEY(4, 3, KEY_F2),
		KEY(4, 4, KEY_VOLUMEUP),
		KEY(6, 4, KEY_L),
		KEY(7, 4, KEY_LEFT),
		KEY(0, 5, KEY_S),
		KEY(1, 5, KEY_H),
		KEY(2, 5, KEY_J),
		KEY(3, 5, KEY_F3),
		KEY(4, 6, KEY_L),
		KEY(4, 7, KEY_LEFT),
		KEY(5, 0, KEY_S),
		KEY(5, 1, KEY_H),
		KEY(5, 2, KEY_J),
		KEY(5, 3, KEY_F3),
		KEY(5, 5, KEY_VOLUMEDOWN),
		KEY(6, 5, KEY_M),
		KEY(4, 5, KEY_ENTER),
		KEY(7, 5, KEY_RIGHT),
		KEY(0, 6, KEY_Q),
		KEY(1, 6, KEY_A),
		KEY(2, 6, KEY_N),
		KEY(3, 6, KEY_BACKSPACE),
		KEY(5, 6, KEY_M),
		KEY(5, 7, KEY_ENTER),
		KEY(6, 0, KEY_Q),
		KEY(6, 1, KEY_A),
		KEY(6, 2, KEY_N),
		KEY(6, 3, KEY_BACKSPACE),
		KEY(6, 6, KEY_P),
		KEY(7, 6, KEY_UP),
		KEY(6, 7, KEY_SELECT),
		KEY(7, 7, KEY_DOWN),
		KEY(0, 7, KEY_PROG1), /MACRO 1 <User defined> /
		KEY(1, 7, KEY_PROG2), /MACRO 2 <User defined> /
		KEY(2, 7, KEY_PROG3), /MACRO 3 <User defined> /
		KEY(3, 7, KEY_PROG4), /MACRO 4 <User defined> /
		0
		KEY(7, 0, KEY_PROG1), /MACRO 1 <User defined> /
		KEY(7, 1, KEY_PROG2), /MACRO 2 <User defined> /
		KEY(7, 2, KEY_PROG3), /MACRO 3 <User defined> /
		KEY(7, 3, KEY_PROG4), /MACRO 4 <User defined> /
		KEY(7, 5, KEY_RIGHT),
		KEY(7, 6, KEY_UP),
		KEY(7, 7, KEY_DOWN)
		};

		static struct matrix_keymap_data board_map_data = {

arch/arm/mach-omap2/clock34xx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -473,7 +473,7 @@ static u16 _omap3_dpll_compute_freqsel(struct clk *clk, u8 n)
		unsigned long fint;
		u16 f = 0;

		fint = clk->dpll_data->clk_ref->rate / (n + 1);
		fint = clk->dpll_data->clk_ref->rate / n;

		pr_debug("clock: fint is %lu\n", fint);

arch/arm/mach-omap2/clock34xx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -489,9 +489,9 @@ static struct clk core_ck = {
		static struct clk dpll3_m2x2_ck = {
		.name = "dpll3_m2x2_ck",
		.ops = &clkops_null,
		.parent = &dpll3_x2_ck,
		.parent = &dpll3_m2_ck,
		.clkdm_name = "dpll3_clkdm",
		.recalc = &followparent_recalc,
		.recalc = &omap3_clkoutx2_recalc,
		};

		/* The PWRDN bit is apparently only available on 3430ES2 and above */

arch/arm/mach-omap2/gpmc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -378,7 +378,7 @@ EXPORT_SYMBOL(gpmc_cs_request);
		void gpmc_cs_free(int cs)
		{
		spin_lock(&gpmc_mem_lock);
		if (cs >= GPMC_CS_NUM \|\| !gpmc_cs_reserved(cs)) {
		if (cs >= GPMC_CS_NUM \|\| cs < 0 \|\| !gpmc_cs_reserved(cs)) {
		printk(KERN_ERR "Trying to free non-reserved GPMC CS%d\n", cs);
		BUG();
		spin_unlock(&gpmc_mem_lock);

arch/arm/plat-omap/gpio.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -373,7 +373,7 @@ static inline int gpio_valid(int gpio)

		static int check_gpio(int gpio)
		{
		if (unlikely(gpio_valid(gpio)) < 0) {
		if (unlikely(gpio_valid(gpio) < 0)) {
		printk(KERN_ERR "omap-gpio: invalid GPIO %d\n", gpio);
		dump_stack();
		return -1;