From: Colin Cross <ccross@android.com>
Date: Tue, 26 Oct 2010 01:51:19 +0000 (-0700)
Subject: Merge branch 'android-tegra-2.6.36' into android-tegra-moto-2.6.36
X-Git-Tag: firefly_0821_release~9834^2~409
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=99efdba2169fbec390c4d475b8527ab83c8c565a;p=firefly-linux-kernel-4.4.55.git

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

Conflicts:
	arch/arm/mach-tegra/tegra2_clocks.c

Change-Id: I175cf5b73d60abd4ac0a9a3f8216a2b7b2ebae84
---

99efdba2169fbec390c4d475b8527ab83c8c565a
diff --cc arch/arm/mach-tegra/Makefile
index 4159860c0e88,869dd4cafdc3..069b4bce7541
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@@ -1,8 -1,8 +1,9 @@@
  obj-y                                   += common.o
  obj-y                                   += io.o
  obj-y                                   += irq.o legacy_irq.o
 +obj-y					+= syncpt.o
  obj-y                                   += clock.o
+ obj-y                                   += dvfs.o
  obj-y                                   += timer.o
  obj-y                                   += gpio.o
  obj-y                                   += pinmux.o
diff --cc arch/arm/mach-tegra/tegra2_clocks.c
index 1af224597751,4a9e3e0b7f2e..2d9055a64357
--- a/arch/arm/mach-tegra/tegra2_clocks.c
+++ b/arch/arm/mach-tegra/tegra2_clocks.c
@@@ -1876,6 -1975,7 +1975,8 @@@ struct clk_duplicate tegra_clk_duplicat
  	CLK_DUPLICATE("3d", "tegra_grhost", "gr3d"),
  	CLK_DUPLICATE("epp", "tegra_grhost", "epp"),
  	CLK_DUPLICATE("mpe", "tegra_grhost", "mpe"),
+ 	CLK_DUPLICATE("cop", "tegra-avp", "cop"),
++	CLK_DUPLICATE("usbd", "cpcap-otg", NULL),
  };
  
  #define CLK(dev, con, ck)	\