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

Commit 90e17dcc authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.12/fixes-signed' of... 

Merge tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

From Tony Lindgren, fixes for 3.12-rc1:

OMAP fixes for build warnings and cpuidle, and a few trivial typo fixes.

* tag 'omap-for-v3.12/fixes-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: mux: fix trivial typo in name
  ARM: OMAP4 SMP: Corrected a typo fucntions to functions
  ARM: OMAP4: cpuidle: fix: call cpu_cluster_pm_exit conditionally
  mailbox: remove unnecessary platform_set_drvdata()
  ARM: mach-omap2: gpmc: Fix warning when CONFIG_ARM_LPAE=y
  ARM: OMAP: fix return value check in omap_device_build_from_dt()
  ARM: OMAP4: Fix clock_get error for GPMC during boot

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3244aae5 e942cc06

arch/arm/mach-omap2/cclock44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -1632,7 +1632,7 @@ static struct omap_clk omap44xx_clks[] = { 
	CLK(NULL,	"auxclk5_src_ck",		&auxclk5_src_ck),

	CLK(NULL,	"auxclk5_ck",			&auxclk5_ck),

	CLK(NULL,	"auxclkreq5_ck",		&auxclkreq5_ck),

	CLK("omap-gpmc",	"fck",			&dummy_ck),

	CLK("50000000.gpmc",	"fck",			&dummy_ck),

	CLK("omap_i2c.1",	"ick",			&dummy_ck),

	CLK("omap_i2c.2",	"ick",			&dummy_ck),

	CLK("omap_i2c.3",	"ick",			&dummy_ck),

arch/arm/mach-omap2/cpuidle44xx.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev, 
	 * Call idle CPU cluster PM exit notifier chain

	 * to restore GIC and wakeupgen context.

	 */

	if ((cx->mpu_state == PWRDM_POWER_RET) &&

	if (dev->cpu == 0 && (cx->mpu_state == PWRDM_POWER_RET) &&

		(cx->mpu_logic_state == PWRDM_POWER_OFF))

		cpu_cluster_pm_exit();

arch/arm/mach-omap2/gpmc.c

+2 −2
Original line number Diff line number Diff line
@@ -1491,8 +1491,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev, 
	 */

	ret = gpmc_cs_remap(cs, res.start);

	if (ret < 0) {

		dev_err(&pdev->dev, "cannot remap GPMC CS %d to 0x%x\n",

			cs, res.start);

		dev_err(&pdev->dev, "cannot remap GPMC CS %d to %pa\n",

			cs, &res.start);

		goto err;

	}

arch/arm/mach-omap2/mux34xx.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ static struct omap_mux __initdata omap3_muxmodes[] = { 
		"uart1_rts", "ssi1_flag_tx", NULL, NULL,

		"gpio_149", NULL, NULL, "safe_mode"),

	_OMAP3_MUXENTRY(UART1_RX, 151,

		"uart1_rx", "ss1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",

		"uart1_rx", "ssi1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",

		"gpio_151", NULL, NULL, "safe_mode"),

	_OMAP3_MUXENTRY(UART1_TX, 148,

		"uart1_tx", "ssi1_dat_tx", NULL, NULL,

arch/arm/mach-omap2/omap-smp.c

+1 −1
Original line number Diff line number Diff line 
/*

 * OMAP4 SMP source file. It contains platform specific fucntions

 * OMAP4 SMP source file. It contains platform specific functions

 * needed for the linux smp kernel.

 *

 * Copyright (C) 2009 Texas Instruments, Inc.