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

Commit 4a81220a authored by Olof Johansson's avatar Olof Johansson
Browse files

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

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: arch/arm/mach-omap2/smartreflex.c: add missing iounmap
  ARM: OMAP2+: arch/arm/mach-omap2/devices.c: introduce missing kfree
  ARM: OMAP: fix MMC2 loopback clock handling
  ARM: OMAP: fix erroneous mmc2 clock change on mmc3 setup
  ARM: OMAP2+: GPMC: fix device size setup
  ARM: OMAP2+: timer: Fix crash due to wrong arg to __omap_dm_timer_read_counter
  ARM: OMAP3: hwmod data: register dss hwmods after dss_core
  ARM: OMAP2/3: PRM: fix missing plat/irqs.h build breakage
  ARM: OMAP2+: io: fix compilation breakage on 2420-only configs
  ARM: OMAP4: hwmod data: Add names for DMIC memory address space
  ARM: OMAP3: hwmod data: add SYSC_HAS_ENAWAKEUP for dispc
  ARM: OMAP2+: hwmod data: split omap2/3 dispc hwmod class
  ARM: OMAP2: fix regulator warnings
  ARM: OMAP2: fix omap3 touchbook kconfig warning
  i2c: OMAP: Fix OMAP1 build error
parents 50b47c49 cd3a2ba0

arch/arm/mach-omap2/Kconfig

+5 −6
Original line number Diff line number Diff line
@@ -213,13 +213,12 @@ config MACH_OMAP3_PANDORA 
	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select REGULATOR_FIXED_VOLTAGE

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP3_TOUCHBOOK

	bool "OMAP3 Touch Book"

	depends on ARCH_OMAP3

	default y

	select BACKLIGHT_CLASS_DEVICE



config MACH_OMAP_3430SDP

	bool "OMAP 3430 SDP board"
@@ -265,7 +264,7 @@ config MACH_OMAP_ZOOM2 
	select SERIAL_8250

	select SERIAL_CORE_CONSOLE

	select SERIAL_8250_CONSOLE

	select REGULATOR_FIXED_VOLTAGE

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP_ZOOM3

	bool "OMAP3630 Zoom3 board"
@@ -275,7 +274,7 @@ config MACH_OMAP_ZOOM3 
	select SERIAL_8250

	select SERIAL_CORE_CONSOLE

	select SERIAL_8250_CONSOLE

	select REGULATOR_FIXED_VOLTAGE

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_CM_T35

	bool "CompuLab CM-T35/CM-T3730 modules"
@@ -334,7 +333,7 @@ config MACH_OMAP_4430SDP 
	depends on ARCH_OMAP4

	select OMAP_PACKAGE_CBL

	select OMAP_PACKAGE_CBS

	select REGULATOR_FIXED_VOLTAGE

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config MACH_OMAP4_PANDA

	bool "OMAP4 Panda Board"
@@ -342,7 +341,7 @@ config MACH_OMAP4_PANDA 
	depends on ARCH_OMAP4

	select OMAP_PACKAGE_CBL

	select OMAP_PACKAGE_CBS

	select REGULATOR_FIXED_VOLTAGE

	select REGULATOR_FIXED_VOLTAGE if REGULATOR



config OMAP3_EMU

	bool "OMAP3 debugging peripherals"

arch/arm/mach-omap2/devices.c

+1 −0
Original line number Diff line number Diff line
@@ -405,6 +405,7 @@ static int omap_mcspi_init(struct omap_hwmod *oh, void *unused) 
			break;

	default:

			pr_err("Invalid McSPI Revision value\n");

			kfree(pdata);

			return -EINVAL;

	}

arch/arm/mach-omap2/gpmc.c

+6 −0
Original line number Diff line number Diff line
@@ -528,7 +528,13 @@ int gpmc_cs_configure(int cs, int cmd, int wval) 


	case GPMC_CONFIG_DEV_SIZE:

		regval  = gpmc_cs_read_reg(cs, GPMC_CS_CONFIG1);



		/* clear 2 target bits */

		regval &= ~GPMC_CONFIG1_DEVICESIZE(3);



		/* set the proper value */

		regval |= GPMC_CONFIG1_DEVICESIZE(wval);



		gpmc_cs_write_reg(cs, GPMC_CS_CONFIG1, regval);

		break;

arch/arm/mach-omap2/hsmmc.c

+8 −8
Original line number Diff line number Diff line
@@ -175,14 +175,15 @@ static void hsmmc2_select_input_clk_src(struct omap_mmc_platform_data *mmc) 
{

	u32 reg;



	if (mmc->slots[0].internal_clock) {

	reg = omap_ctrl_readl(control_devconf1_offset);

	if (mmc->slots[0].internal_clock)

		reg |= OMAP2_MMCSDIO2ADPCLKISEL;

	else

		reg &= ~OMAP2_MMCSDIO2ADPCLKISEL;

	omap_ctrl_writel(reg, control_devconf1_offset);

}

}



static void hsmmc23_before_set_reg(struct device *dev, int slot,

static void hsmmc2_before_set_reg(struct device *dev, int slot,

				   int power_on, int vdd)

{

	struct omap_mmc_platform_data *mmc = dev->platform_data;
@@ -407,14 +408,13 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, 
			c->caps &= ~MMC_CAP_8_BIT_DATA;

			c->caps |= MMC_CAP_4_BIT_DATA;

		}

		/* FALLTHROUGH */

	case 3:

		if (mmc->slots[0].features & HSMMC_HAS_PBIAS) {

			/* off-chip level shifting, or none */

			mmc->slots[0].before_set_reg = hsmmc23_before_set_reg;

			mmc->slots[0].before_set_reg = hsmmc2_before_set_reg;

			mmc->slots[0].after_set_reg = NULL;

		}

		break;

	case 3:

	case 4:

	case 5:

		mmc->slots[0].before_set_reg = NULL;

arch/arm/mach-omap2/io.c

+3 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static void __init omap_hwmod_init_postsetup(void) 
	omap_pm_if_early_init();

}



#ifdef CONFIG_ARCH_OMAP2

#ifdef CONFIG_SOC_OMAP2420

void __init omap2420_init_early(void)

{

	omap2_set_globals_242x();
@@ -400,7 +400,9 @@ void __init omap2420_init_early(void) 
	omap_hwmod_init_postsetup();

	omap2420_clk_init();

}

#endif



#ifdef CONFIG_SOC_OMAP2430

void __init omap2430_init_early(void)

{

	omap2_set_globals_243x();