From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 23:08:40 +0000 (-0700)
Subject: Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5e512d0785e67d9ff41ee4af39bb71fc6161d5c9;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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

Pull arm soc-specific updates from Arnd Bergmann:
 "This is stuff that does not fit well into another category and in
  particular is not related to a particular board.  The largest part in
  here is extending the am33xx support in the omap platform."

Fix up trivial conflicts in arch/arm/mach-{imx/mach-mx35_3ds.c, tegra/Makefile}

* tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (74 commits)
  ARM: LPC32xx: Add PWM support
  ARM: LPC32xx: Add PWM clock
  ARM: LPC32xx: Set system serial based on cpu unique id
  ARM: vexpress: Config option for early printk console
  ARM: vexpress: Add Device Tree for V2P-CA15_CA7 core tile
  ARM: vexpress: Convert V2P-CA15 Device Tree to 64 bit addresses
  ARM: vexpress: Add fixed regulator for SMSC
  ARM: vexpress: Add missing SP804 interrupt in motherboard's DTS files
  ARM: vexpress: Initial common clock support
  ARM: SAMSUNG: Introduce Kconfig variable for Samsung custom clk API
  ARM: EXYNOS: Add missing static storage class specifier in pmu.c file
  ARM: EXYNOS: Make combiner_init function static
  ARM: EXYNOS: Update HSOTG PHY clock setting for EXYNOS4X12
  ARM: versatile: Make plat-versatile clock optional
  ARM: vexpress: Check master site in daughterboard's sysctl operations
  ARM: vexpress: remove automatic errata workaround selection
  ARM: LPC32xx: Adjust to pl08x DMA interface changes
  ARM: EXYNOS: Clear SYS_WDTRESET bit to use watchdog reset
  ARM: imx: fix mx51 ehci setup errors
  ARM: imx: make ehci power/oc polarities configurable
  ...
---

5e512d0785e67d9ff41ee4af39bb71fc6161d5c9
diff --cc arch/arm/mach-imx/devices-imx35.h
index 27245ce9cab2,e55d1cbd293f..4815be1ee675
--- a/arch/arm/mach-imx/devices-imx35.h
+++ b/arch/arm/mach-imx/devices-imx35.h
@@@ -68,8 -68,12 +68,12 @@@ extern const struct imx_mxc_nand_data i
  #define imx35_add_mxc_nand(pdata)	\
  	imx_add_mxc_nand(&imx35_mxc_nand_data, pdata)
  
+ extern const struct imx_mxc_rtc_data imx35_mxc_rtc_data;
+ #define imx35_add_mxc_rtc()	\
+ 	imx_add_mxc_rtc(&imx35_mxc_rtc_data)
+ 
  extern const struct imx_mxc_w1_data imx35_mxc_w1_data;
 -#define imx35_add_mxc_w1(pdata)	\
 +#define imx35_add_mxc_w1()	\
  	imx_add_mxc_w1(&imx35_mxc_w1_data)
  
  extern const struct imx_sdhci_esdhc_imx_data imx35_sdhci_esdhc_imx_data[];
diff --cc arch/arm/mach-imx/mach-mx35_3ds.c
index 6bff87907317,85568ba43640..69018e5c52de
--- a/arch/arm/mach-imx/mach-mx35_3ds.c
+++ b/arch/arm/mach-imx/mach-mx35_3ds.c
@@@ -571,7 -571,8 +571,8 @@@ static void __init mx35_3ds_init(void
  	mxc_iomux_v3_setup_multiple_pads(mx35pdk_pads, ARRAY_SIZE(mx35pdk_pads));
  
  	imx35_add_fec(NULL);
 -	imx35_add_imx2_wdt(NULL);
 +	imx35_add_imx2_wdt();
+ 	imx35_add_mxc_rtc();
  	platform_add_devices(devices, ARRAY_SIZE(devices));
  
  	imx35_add_imx_uart0(&uart_pdata);
diff --cc arch/arm/mach-tegra/Makefile
index 35253fdd1ba7,e9f48ec00ca7..90aae34245cd
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -8,9 -8,10 +8,10 @@@ obj-
  obj-y					+= fuse.o
  obj-y					+= pmc.o
  obj-y					+= flowctrl.o
 +obj-y					+= powergate.o
+ obj-y					+= apbio.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_3x_SOC)		+= board-dt-tegra30.o