Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: SoC specific updates" from Arnd Bergmann:
 "These changes are all specific to an soc family or the code for one
  soc.  Lots of work for Tegra3 this time, but also a lot of other
  platforms.  There will be another (smaller) set of soc patches later
  in the merge window for stuff that has dependencies on external trees
  or that was sent just before the merge window opened.

  The asoc tree added a few devices to the i.mx platform, which conflict
  with other devices added in the same place here.

  The tegra Makefile conflicts between a number of branches, mostly
  because of changes regarding localtimer.c, which was removed in the
  end.

  Signed-off-by: Arnd Bergmann <arnd@arndb.de>"
Fix up some trivial conflicts, including the mentioned Tegra Makefile.

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (51 commits)
  ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
  ARM: EXYNOS: add support JPEG
  ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
  ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
  ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
  ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
  ARM: S5PV210: Add usb otg phy control
  ARM: S3C64XX: Add usb otg phy control
  ARM: EXYNOS: Enable l2 configuration through device tree
  ARM: EXYNOS: remove useless code to save/restore L2
  ARM: EXYNOS: save L2 settings during bootup
  ARM: S5P: add L2 early resume code
  ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
  ARM: mx35: Setup the AIPS registers
  ARM: mx5: Use common function for configuring AIPS
  ARM: mx3: Setup AIPS registers
  ARM: mx3: Let mx31 and mx35 enter in LPM mode in WFI
  ARM: defconfig: imx_v6_v7: build in REGULATOR_FIXED_VOLTAGE
  ARM: imx: update imx_v6_v7_defconfig
  ARM: tegra: Demote EMC clock inconsistency BUG to WARN
  ...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-exynos/common.c
Simple merge

diff --cc arch/arm/mach-exynos/mct.c
Simple merge

diff --cc arch/arm/mach-highbank/highbank.c
index bb1684f9b68bfabf36ce7d0e08c03374f5004c46,a96183e73fad800481b8cacc7133dab155b05cb6..808b055289b2b0443cf5f197e47f3eac11aa6679
--- 1/arch/arm/mach-highbank/highbank.c
--- 2/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@@ -110,10 -109,8 +110,10 @@@ static void __init highbank_timer_init(
  
        highbank_clocks_init();
  
-       sp804_clocksource_init(timer_base + 0x20, "timer1");
+       sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1");
        sp804_clockevents_init(timer_base, irq, "timer0");
 +
 +      twd_local_timer_of_register();
  }
  
  static struct sys_timer highbank_timer = {

diff --cc arch/arm/mach-imx/Makefile
Simple merge

diff --cc arch/arm/mach-imx/crmregs-imx3.h
Simple merge

diff --cc arch/arm/mach-imx/mm-imx3.c
index 07699196b461b467a872f255b1964f439081303d,2215814c8c2cfd6646c2b65de77507f473b6e1f4..f8ca96c354f2280aa1ba10af200b3e443fce51fb
--- 1/arch/arm/mach-imx/mm-imx3.c
--- 2/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@@ -177,8 -175,9 +179,12 @@@ void __init imx31_soc_init(void
        }
  
        imx_add_imx_sdma("imx31-sdma", MX31_SDMA_BASE_ADDR, MX31_INT_SDMA, &imx31_sdma_pdata);
+ 
+       imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS1_BASE_ADDR));
+       imx_set_aips(MX31_IO_ADDRESS(MX31_AIPS2_BASE_ADDR));
++
 +      platform_device_register_simple("imx31-audmux", 0, imx31_audmux_res,
 +                                      ARRAY_SIZE(imx31_audmux_res));
  }
  #endif /* ifdef CONFIG_SOC_IMX31 */
  
@@@ -267,8 -262,9 +273,13 @@@ void __init imx35_soc_init(void
        }
  
        imx_add_imx_sdma("imx35-sdma", MX35_SDMA_BASE_ADDR, MX35_INT_SDMA, &imx35_sdma_pdata);
+ 
+       /* Setup AIPS registers */
+       imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS1_BASE_ADDR));
+       imx_set_aips(MX35_IO_ADDRESS(MX35_AIPS2_BASE_ADDR));
++
 +      /* i.mx35 has the i.mx31 type audmux */
 +      platform_device_register_simple("imx31-audmux", 0, imx35_audmux_res,
 +                                      ARRAY_SIZE(imx35_audmux_res));
  }
  #endif /* ifdef CONFIG_SOC_IMX35 */

diff --cc arch/arm/mach-imx/mm-imx5.c
index dc7c4ed815312a3a9cfda690b87ad646d587da84,92efecec12608af2095d6c0c8e75a62df6f987d0..51af9fa56944cf6daf19dc295e7d7ec7f1efd9d4
--- 1/arch/arm/mach-imx/mm-imx5.c
--- 2/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@@ -201,9 -185,10 +201,14 @@@ void __init imx51_soc_init(void
  
        /* i.mx51 has the i.mx35 type sdma */
        imx_add_imx_sdma("imx35-sdma", MX51_SDMA_BASE_ADDR, MX51_INT_SDMA, &imx51_sdma_pdata);
+ 
+       /* Setup AIPS registers */
+       imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS1_BASE_ADDR));
+       imx_set_aips(MX51_IO_ADDRESS(MX51_AIPS2_BASE_ADDR));
++
 +      /* i.mx51 has the i.mx31 type audmux */
 +      platform_device_register_simple("imx31-audmux", 0, imx51_audmux_res,
 +                                      ARRAY_SIZE(imx51_audmux_res));
  }
  
  void __init imx53_soc_init(void)
@@@ -219,7 -204,8 +224,12 @@@
  
        /* i.mx53 has the i.mx35 type sdma */
        imx_add_imx_sdma("imx35-sdma", MX53_SDMA_BASE_ADDR, MX53_INT_SDMA, &imx53_sdma_pdata);
+ 
+       /* Setup AIPS registers */
+       imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS1_BASE_ADDR));
+       imx_set_aips(MX53_IO_ADDRESS(MX53_AIPS2_BASE_ADDR));
++
 +      /* i.mx53 has the i.mx31 type audmux */
 +      platform_device_register_simple("imx31-audmux", 0, imx53_audmux_res,
 +                                      ARRAY_SIZE(imx53_audmux_res));
  }

diff --cc arch/arm/mach-omap2/id.c
Simple merge

diff --cc arch/arm/mach-omap2/io.c
Simple merge

diff --cc arch/arm/mach-tegra/Makefile
index bcbb4e8d553068e0528e847799d6fd9aad8a8297,fc4ebe35f48404f396643e3434f94596202d0605..76a79b8a1721058fcb4938de96ca8ca5405e7911
--- 1/arch/arm/mach-tegra/Makefile
--- 2/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -13,7 -15,8 +15,8 @@@ obj-$(CONFIG_ARCH_TEGRA_2x_SOC)               += teg
  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_SMP)                       += platsmp.o localtimer.o headsmp.o
+ obj-$(CONFIG_ARCH_TEGRA_3x_SOC)               += tegra30_clocks.o
 +obj-$(CONFIG_SMP)                     += platsmp.o headsmp.o
  obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
  obj-$(CONFIG_TEGRA_SYSTEM_DMA)                += dma.o
  obj-$(CONFIG_CPU_FREQ)                  += cpu-tegra.o

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

diff --cc arch/arm/plat-omap/include/plat/cpu.h
Simple merge