From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 00:34:48 +0000 (-0700)
Subject: Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: firefly_0821_release~3680^2~2394
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f1d2c07d331f717da79a42952be7dc1c0d35f846;p=firefly-linux-kernel-4.4.55.git

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

Pull arm-soc board specific updates from Arnd Bergmann:
 "These changes are all for individual board files.  In the long run,
  those files will largely go away, and the amount of changes appears to
  be continuously decreasing, which is a good sign.  This time around,
  changes are focused on tegra, omap and samsung."

Fix conflicts in arch/arm/mach-{omap2/common-board-devices.c,tegra/Makefile.boot}
as per the 'for-linus' branch.

* tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
  ARM: EXYNOS: Add leds status1 and status2 on Origen board
  ARM: S3C64XX: Mark most Cragganmore initdata devinitdata
  ARM: EXYNOS: Add missing .reserve field to SMDKC210
  ARM: EXYNOS: Add DRM device to SMDK4X12 board
  ARM: S3C64XX: Clean up after SPI driver platform data updates
  ARM: SAMSUNG: no need to set the value for clk_xusbxti when it is 24Mhz
  ARM: EXYNOS: Add framebuffer support for SMDK4X12
  ARM: EXYNOS: Add HSOTG support to SMDK4X12
  ARM: S5PV210: Add audio platform device in Goni board
  ARM: S5PV210: Add audio platform device in Aquila board
  ARM: EXYNOS: Add audio platform device in SMDKV310 board
  ARM: S3C64XX: Don't specify an irq_base for WM1192-EV1 board
  ARM: OMAP3: Fix omap3evm randconfig error introduced by VBUS support
  ARM: OMAP: board-omap4panda: MUX configuration for sys_nirq2
  ARM: OMAP: board-4430sdp: MUX configuration for sys_nirq2
  ARM: OMAP3530evm: set pendown_state and debounce time for ads7846
  ARM: omap3evm: enable VBUS switch for EHCI tranceiver
  ARM: OMAP3EVM: Adding USB internal LDOs board file
  ARM: OMAP3EVM: Add NAND flash definition
  ARM: OMAP3: cm-t35: add tvp5150 decoder support
  ...
---

f1d2c07d331f717da79a42952be7dc1c0d35f846
diff --cc arch/arm/mach-tegra/Makefile
index 90aae34245cd,1f6f237586e4..c3d7303b9ac8
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -8,13 -8,11 +8,12 @@@ 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
  obj-$(CONFIG_ARCH_TEGRA_3x_SOC)		+= tegra30_clocks.o
  obj-$(CONFIG_SMP)			+= platsmp.o headsmp.o
  obj-$(CONFIG_SMP)                       += reset.o
diff --cc arch/arm/mach-tegra/Makefile.boot
index 435f00ca3c58,a369f96bd05e..7a1bb62ddcf0
--- a/arch/arm/mach-tegra/Makefile.boot
+++ b/arch/arm/mach-tegra/Makefile.boot
@@@ -2,10 -2,9 +2,10 @@@ zreladdr-$(CONFIG_ARCH_TEGRA_2x_SOC)	+
  params_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00000100
  initrd_phys-$(CONFIG_ARCH_TEGRA_2x_SOC)	:= 0x00800000
  
- dtb-$(CONFIG_MACH_HARMONY) += tegra20-harmony.dtb
- dtb-$(CONFIG_MACH_PAZ00) += tegra20-paz00.dtb
- dtb-$(CONFIG_MACH_SEABOARD) += tegra20-seaboard.dtb
- dtb-$(CONFIG_MACH_TRIMSLICE) += tegra20-trimslice.dtb
- dtb-$(CONFIG_MACH_VENTANA) += tegra20-ventana.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-harmony.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-paz00.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-seaboard.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-trimslice.dtb
+ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-ventana.dtb
 +dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += tegra20-whistler.dtb
  dtb-$(CONFIG_ARCH_TEGRA_3x_SOC) += tegra30-cardhu.dtb