From: Colin Cross <ccross@android.com>
Date: Tue, 9 Nov 2010 23:50:14 +0000 (-0800)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~354
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=82d09352796fa1909c358673c51fdc83fd4dcdb5;p=firefly-linux-kernel-4.4.55.git

Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36

Conflicts:
	drivers/mmc/host/sdhci-tegra.c

Change-Id: Id44ce43b0c17f1f3e917b8c7ebfd213790e8e0e1
---

82d09352796fa1909c358673c51fdc83fd4dcdb5
diff --cc arch/arm/mach-tegra/Kconfig
index 1197a84e4191,ef028cd62734..3fd7f6b615a6
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@@ -86,13 -73,17 +86,22 @@@ config TEGRA_FIQ_DEBUGGE
  	help
  	  Enables the FIQ serial debugger on Tegra"
  
 +config WIFI_CONTROL_FUNC
 +	bool "Enable WiFi control function abstraction"
 +	help
 +	  Enables Power/Reset/Carddetect function abstraction
 +
  endif
  
+ config TEGRA_CPU_DVFS
+ 	bool "Enable voltage scaling on Tegra CPU"
+ 	default y
+ 
+ config TEGRA_CORE_DVFS
+ 	bool "Enable voltage scaling on Tegra core"
+ 	depends on TEGRA_CPU_DVFS
+ 	default y
+ 
  config TEGRA_IOVMM_GART
  	bool "Enable I/O virtual memory manager for GART"
  	depends on ARCH_TEGRA_2x_SOC
diff --cc drivers/mmc/host/sdhci-tegra.c
index 65a671d20e0d,19f522d3a59f..635dced2e82b
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -33,7 -35,7 +35,8 @@@
  struct tegra_sdhci_host {
  	struct sdhci_host *sdhci;
  	struct clk *clk;
 +	struct tegra_sdhci_platform_data *plat;
+ 	int clk_enabled;
  };
  
  static irqreturn_t carddetect_irq(int irq, void *data)