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

Conflicts:
	arch/arm/mach-tegra/Makefile

diff --cc arch/arm/boot/dts/tegra-paz00.dts
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
index fc4ebe35f48404f396643e3434f94596202d0605,e0b7a4d3259996dfec3e67d226e08cfa6d62696c..e5373fb94b9a3a9f3f54789dac1183f0f5c2995c
--- 1/arch/arm/mach-tegra/Makefile
--- 2/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 029558114236f9ddddb6052d5c5491120839b14c,43da4284d862c2392fb6094f77dc38a3816dc167..1cdcda13a0f782349834085566d3793bcb401841
--- 1/arch/arm/mach-tegra/common.c
--- 2/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

diff --cc arch/arm/mach-tegra/tegra2_clocks.c
Simple merge