From: Olof Johansson <olof@lixom.net>
Date: Sun, 26 Feb 2012 22:43:43 +0000 (-0800)
Subject: Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f830e5c902106e7fe51460fd1e3263bea72bf41;p=linux-beck.git

Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp

Conflicts:
	arch/arm/mach-tegra/Makefile
---

0f830e5c902106e7fe51460fd1e3263bea72bf41
diff --cc arch/arm/mach-tegra/Makefile
index fc4ebe35f484,e0b7a4d32599..e5373fb94b9a
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -7,18 -7,16 +7,19 @@@ obj-
  obj-y                                   += timer.o
  obj-y                                   += pinmux.o
  obj-y					+= fuse.o
+ obj-y					+= pmc.o
 +obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
 +obj-$(CONFIG_CPU_IDLE)			+= sleep.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= powergate.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_clocks.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= tegra2_emc.o
  obj-$(CONFIG_ARCH_TEGRA_2x_SOC)		+= pinmux-tegra20-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= pinmux-tegra30-tables.o
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= board-dt-tegra30.o
 +obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks.o
  obj-$(CONFIG_SMP)                       += platsmp.o localtimer.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
- obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o
+ obj-$(CONFIG_TEGRA_SYSTEM_DMA)		+= dma.o apbio.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o
  obj-$(CONFIG_TEGRA_PCI)			+= pcie.o
  obj-$(CONFIG_USB_SUPPORT)		+= usb_phy.o
diff --cc arch/arm/mach-tegra/common.c
index 029558114236,43da4284d862..1cdcda13a0f7
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@@ -105,7 -124,7 +124,8 @@@ void __init tegra20_init_early(void
  #ifdef CONFIG_ARCH_TEGRA_3x_SOC
  void __init tegra30_init_early(void)
  {
 +	tegra30_init_clocks();
  	tegra_init_cache(0x441, 0x551);
+ 	tegra_pmc_init();
  }
  #endif