Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01ec7b1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'omap-fixes-for-linus' of... 

Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6:
  OMAP: hwmod: Fix the missing braces
  OMAP4: clock: Fix multi-omap boot with reset un-used clocks
  OMAP3: PM: fix IO daisy chain enable to use PM_WKEN reg
  omap: GPIO: fix auto-disable of debounce clock
  omap: DMTIMER: Ack pending interrupt always when stopping a timer
  omap: Stalker board: switch over to gpio_set_debounce
  omap: fix build failure due to missing include dma-mapping.h
  omap iommu: Fix Memory leak
parents 5e9772b9 41bd03ba

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

+1 −3
Original line number Diff line number Diff line
@@ -538,9 +538,7 @@ static void ads7846_dev_init(void) 
		printk(KERN_ERR "can't get ads7846 pen down GPIO\n");



	gpio_direction_input(OMAP3_STALKER_TS_GPIO);



	omap_set_gpio_debounce(OMAP3_STALKER_TS_GPIO, 1);

	omap_set_gpio_debounce_time(OMAP3_STALKER_TS_GPIO, 0xa);

	gpio_set_debounce(OMAP3_STALKER_TS_GPIO, 310);

}



static int ads7846_get_pendown_state(void)

arch/arm/mach-omap2/clock44xx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -1369,6 +1369,7 @@ static struct clk emif1_ick = { 
	.ops		= &clkops_omap2_dflt,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_1_CLKCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.flags		= ENABLE_ON_INIT,

	.clkdm_name	= "l3_emif_clkdm",

	.parent		= &ddrphy_ck,

	.recalc		= &followparent_recalc,
@@ -1379,6 +1380,7 @@ static struct clk emif2_ick = { 
	.ops		= &clkops_omap2_dflt,

	.enable_reg	= OMAP4430_CM_MEMIF_EMIF_2_CLKCTRL,

	.enable_bit	= OMAP4430_MODULEMODE_HWCTRL,

	.flags		= ENABLE_ON_INIT,

	.clkdm_name	= "l3_emif_clkdm",

	.parent		= &ddrphy_ck,

	.recalc		= &followparent_recalc,

arch/arm/mach-omap2/omap_hwmod.c

+6 −3
Original line number Diff line number Diff line
@@ -409,10 +409,11 @@ static int _init_main_clk(struct omap_hwmod *oh) 
		return 0;



	oh->_clk = omap_clk_get_by_name(oh->main_clk);

	if (!oh->_clk)

	if (!oh->_clk) {

		pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",

			   oh->name, oh->main_clk);

		return -EINVAL;

	}



	if (!oh->_clk->clkdm)

		pr_warning("omap_hwmod: %s: missing clockdomain for %s.\n",
@@ -444,10 +445,11 @@ static int _init_interface_clks(struct omap_hwmod *oh) 
			continue;



		c = omap_clk_get_by_name(os->clk);

		if (!c)

		if (!c) {

			pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",

				   oh->name, os->clk);

			ret = -EINVAL;

		}

		os->_clk = c;

	}
@@ -470,10 +472,11 @@ static int _init_opt_clks(struct omap_hwmod *oh) 


	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {

		c = omap_clk_get_by_name(oc->clk);

		if (!c)

		if (!c) {

			pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",

				   oh->name, oc->clk);

			ret = -EINVAL;

		}

		oc->_clk = c;

	}

arch/arm/mach-omap2/pm34xx.c

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ static void omap3_enable_io_chain(void) 
		/* Do a readback to assure write has been done */

		prm_read_mod_reg(WKUP_MOD, PM_WKEN);



		while (!(prm_read_mod_reg(WKUP_MOD, PM_WKST) &

		while (!(prm_read_mod_reg(WKUP_MOD, PM_WKEN) &

			 OMAP3430_ST_IO_CHAIN_MASK)) {

			timeout++;

			if (timeout > 1000) {
@@ -108,7 +108,7 @@ static void omap3_enable_io_chain(void) 
				return;

			}

			prm_set_mod_reg_bits(OMAP3430_ST_IO_CHAIN_MASK,

					     WKUP_MOD, PM_WKST);

					     WKUP_MOD, PM_WKEN);

		}

	}

}

arch/arm/mach-omap2/usb-ehci.c

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>



#include <asm/io.h>

#include <plat/mux.h>