From: Olof Johansson <olof@lixom.net>
Date: Fri, 21 Sep 2012 04:27:41 +0000 (-0700)
Subject: Merge branch 'next/soc' into next/multiplatform
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b612a85792192b70e6497619521772c38ace758e;p=linux-beck.git

Merge branch 'next/soc' into next/multiplatform

* next/soc: (50 commits)
  ARM: OMAP: AM33xx hwmod: fixup SPI after platform_data move
  MAINTAINERS: add an entry for the BCM2835 ARM sub-architecture
  ARM: bcm2835: instantiate console UART
  ARM: bcm2835: add stub clock driver
  ARM: bcm2835: add system timer
  ARM: bcm2835: add interrupt controller driver
  ARM: add infra-structure for BCM2835 and Raspberry Pi
  ARM: tegra20: add CPU hotplug support
  ARM: tegra30: add CPU hotplug support
  ARM: tegra: clean up the common assembly macros into sleep.h
  ARM: tegra: replace the CPU CAR access code by tegra_cpu_car_ops
  ARM: tegra: introduce tegra_cpu_car_ops structures
  ARM: Tegra: Add smp_twd clock for Tegra20
  ARM: AM33XX: clock: Add dcan clock aliases for device-tree
  ARM: OMAP2+: dpll: Add missing soc_is_am33xx() check for common functions
  ARM: OMAP: omap_device: idle devices with no driver bound
  ARM: OMAP: omap_device: don't attempt late suspend if no driver bound
  ARM: OMAP: omap_device: keep track of driver bound status
  ARM: OMAP3+: hwmod: Add AM33XX HWMOD data
  ARM: OMAP2+: hwmod: Hook-up am33xx support in omap_hwmod framework
  ...

Change/remove conflict in arch/arm/mach-ux500/clock.c resolved.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b612a85792192b70e6497619521772c38ace758e
diff --cc arch/arm/Kconfig
index 896824bb860a,171f184b089d..4235503a8686
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -672,8 -700,10 +689,9 @@@ config ARCH_TEGR
  	select HAVE_CLK
  	select HAVE_SMP
  	select MIGHT_HAVE_CACHE_L2X0
 -	select NEED_MACH_IO_H if PCI
  	select ARCH_HAS_CPUFREQ
  	select USE_OF
+ 	select COMMON_CLK
  	help
  	  This enables support for NVIDIA Tegra based systems (Tegra APX,
  	  Tegra 6xx and Tegra 2 series).
diff --cc arch/arm/mach-imx/clk-imx35.c
index 65fb8bcd86cb,cebc71d5a5af..177259b523cd
--- a/arch/arm/mach-imx/clk-imx35.c
+++ b/arch/arm/mach-imx/clk-imx35.c
@@@ -228,10 -231,13 +231,11 @@@ int __init mx35_clocks_init(
  	clk_register_clkdev(clk[i2c3_gate], NULL, "imx-i2c.2");
  	clk_register_clkdev(clk[ipu_gate], NULL, "ipu-core");
  	clk_register_clkdev(clk[ipu_gate], NULL, "mx3_sdc_fb");
+ 	clk_register_clkdev(clk[kpp_gate], NULL, "imx-keypad");
  	clk_register_clkdev(clk[owire_gate], NULL, "mxc_w1");
  	clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
 -	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.0");
 -	clk_register_clkdev(clk[ssi1_div_post], "per", "imx-ssi.0");
 -	clk_register_clkdev(clk[ipg], "ipg", "imx-ssi.1");
 -	clk_register_clkdev(clk[ssi2_div_post], "per", "imx-ssi.1");
 +	clk_register_clkdev(clk[ssi1_gate], NULL, "imx-ssi.0");
 +	clk_register_clkdev(clk[ssi2_gate], NULL, "imx-ssi.1");
  	/* i.mx35 has the i.mx21 type uart */
  	clk_register_clkdev(clk[uart1_gate], "per", "imx21-uart.0");
  	clk_register_clkdev(clk[ipg], "ipg", "imx21-uart.0");