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

Commit c6041d4a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-fixes-for-v3.6-rc1' of... 

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

Omap fixes for issues noted during the merge window, mostly
PM related.

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

:
  ARM: OMAP: dmtimers: Fix locking issue in omap_dm_timer_request*()
  ARM: OMAP4: Register the OPP table only for 4430 device
  cpufreq: OMAP: Handle missing frequency table on SMP systems
  ARM: OMAP4: sleep: Save the complete used register stack frame
  ARM: OMAP2+: cpu: Add am33xx device under cpu_class_is_omap2
  omap: Fix multi.h when only ARCH_OMAP3 and SOC_AM33XX are selected
  ARM: OMAP2+: Fix dmtimer set source clock failure
  Revert "ARM: OMAP3: PM: call pre/post transition per powerdomain"
  ARM: OMAP3: TWL4030: ensure sys_nirq1 is mux'd and wakeup enabled
  omap2: mux: remove comment for nonexistent member
  OMAP: remove unused parameter arch_id from uncompress.h
  arm/dts: Mark vcxio, v2v1 and v1v8 regulators as always on
  OMAP2+: Fix random config build break with !ARM_CPU_SUSPEND
  arm/dts: Fix am33xx wdt node
  ARM: OMAP3: igep0020: set GPIO mode for mux mcspi1_cs2 pin
  Revert "ARM: OMAP3530evm: set pendown_state and debounce time for ads7846"

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e18287d3 c5491d1a

arch/arm/boot/dts/am33xx.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -154,5 +154,10 @@ 
			#size-cells = <0>;

			ti,hwmods = "i2c3";

		};



		wdt2: wdt@44e35000 {

			compatible = "ti,omap3-wdt";

			ti,hwmods = "wd_timer2";

		};

	};

};

arch/arm/boot/dts/twl6030.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 


	vcxio: regulator@8 {

		compatible = "ti,twl6030-vcxio";

		regulator-always-on;

	};



	vusb: regulator@9 {
@@ -74,10 +75,12 @@ 


	v1v8: regulator@10 {

		compatible = "ti,twl6030-v1v8";

		regulator-always-on;

	};



	v2v1: regulator@11 {

		compatible = "ti,twl6030-v2v1";

		regulator-always-on;

	};



	clk32kg: regulator@12 {

arch/arm/mach-omap2/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ config SOC_OMAP5 
	select CPU_V7

	select ARM_GIC

	select HAVE_SMP

	select ARM_CPU_SUSPEND if PM



comment "OMAP Core Type"

	depends on ARCH_OMAP2

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

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,8 @@ static const struct usbhs_omap_board_data igep3_usbhs_bdata __initconst = { 


#ifdef CONFIG_OMAP_MUX

static struct omap_board_mux board_mux[] __initdata = {

	/* SMSC9221 LAN Controller ETH IRQ (GPIO_176) */

	OMAP3_MUX(MCSPI1_CS2, OMAP_MUX_MODE4 | OMAP_PIN_INPUT),

	{ .reg_offset = OMAP_MUX_TERMINATOR },

};

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
#include "hsmmc.h"

#include "common-board-devices.h"



#define OMAP3_EVM_TS_GPIO	175

#define OMAP3_EVM_EHCI_VBUS	22

#define OMAP3_EVM_EHCI_SELECT	61