From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 23 Jul 2012 23:04:15 +0000 (-0700)
Subject: Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=451ce7f9cf2d17e34d5d64b76cac047a2a1a3b89;p=openwrt%2Fstaging%2Fblogic.git

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

Pull general arm-soc cleanups from Arnd Bergmann:
 "These are all boring changes, moving stuff around or renaming things
  mostly, and also getting rid of stuff that is duplicate or should not
  be there to start with.  Platform-wise this is all over the place,
  mainly omap, samsung, at91, imx and tegra."

Resolve trivial conflict in arch/arm/mach-omap2/clockdomains3xxx_data.c

* tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (67 commits)
  ARM: clps711x: Remove the setting of the time
  ARM: clps711x: Removed superfluous transform virt_to_bus and related functions
  ARM: clps711x/p720t: Replace __initcall by .init_early call
  ARM: S3C24XX: Remove unused GPIO definitions for Openmoko GTA02 board
  ARM: S3C24XX: Remove unused GPIO definitions for port J
  ARM: S3C24XX: Remove unused GPA, GPE, GPH bank GPIO aliases
  ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API
  ARM: S3C24XX: Convert the PM code to gpiolib API
  ARM: S3C24XX: Convert QT2410 board file to the gpiolib API
  ARM: S3C24XX: Convert SMDK board file to the gpiolib API
  ARM: S3C24XX: Free the backlight gpio requested in Mini2440 board code
  ARM: imx: remove unused pdata from device macros
  ARM: imx: Kconfig: Remove IMX_HAVE_PLATFORM_IMX_SSI from MACH_MX25_3DS
  ARM: at91: fix new build errors
  ARM: at91: add AIC5 support
  ARM: at91: remove mach/irqs.h
  ARM: at91: sparse irq support
  ARM: at91: at91 based machines specify their own irq handler at run time
  ARM: at91: remove static irq priorities for sam9x5
  ARM: at91: add of irq priorities support
  ...
---

451ce7f9cf2d17e34d5d64b76cac047a2a1a3b89
diff --cc Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
index 000000000000,f77c3031607f..c6d7b11db9eb
mode 000000,100644..100644
--- a/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
+++ b/Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.txt
@@@ -1,0 -1,27 +1,25 @@@
+ * NVIDIA Tegra Secure Digital Host Controller
+ 
+ This controller on Tegra family SoCs provides an interface for MMC, SD,
+ and SDIO types of memory cards.
+ 
++This file documents differences between the core properties described
++by mmc.txt and the properties used by the sdhci-tegra driver.
++
+ Required properties:
+ - compatible : Should be "nvidia,<chip>-sdhci"
 -- reg : Should contain SD/MMC registers location and length
 -- interrupts : Should contain SD/MMC interrupt
 -- bus-width : Number of data lines, can be <1>, <4>, or <8>
+ 
+ Optional properties:
 -- cd-gpios : Specify GPIOs for card detection
 -- wp-gpios : Specify GPIOs for write protection
+ - power-gpios : Specify GPIOs for power control
+ 
+ Example:
+ 
+ sdhci@c8000200 {
+ 	compatible = "nvidia,tegra20-sdhci";
+ 	reg = <0xc8000200 0x200>;
+ 	interrupts = <47>;
+ 	cd-gpios = <&gpio 69 0>; /* gpio PI5 */
+ 	wp-gpios = <&gpio 57 0>; /* gpio PH1 */
+ 	power-gpios = <&gpio 155 0>; /* gpio PT3 */
+ 	bus-width = <8>;
+ };
diff --cc arch/arm/mach-omap2/clockdomains3xxx_data.c
index 8e35080026d3,2cdc17c9d2fa..56089c49142a
--- a/arch/arm/mach-omap2/clockdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/clockdomains3xxx_data.c
@@@ -452,15 -345,20 +452,13 @@@ static struct clkdm_autodep clkdm_am35x
   *
   */
  
 -static struct clockdomain *clockdomains_omap3430_common[] __initdata = {
 +static struct clockdomain *clockdomains_common[] __initdata = {
  	&wkup_common_clkdm,
- 	&cm_common_clkdm,
- 	&prm_common_clkdm,
 -	&mpu_3xxx_clkdm,
  	&neon_clkdm,
 -	&iva2_clkdm,
 -	&d2d_clkdm,
  	&core_l3_3xxx_clkdm,
  	&core_l4_3xxx_clkdm,
 -	&dss_3xxx_clkdm,
 -	&cam_clkdm,
 -	&per_clkdm,
  	&emu_clkdm,
  	&dpll1_clkdm,
 -	&dpll2_clkdm,
  	&dpll3_clkdm,
  	&dpll4_clkdm,
  	NULL