From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 May 2012 16:39:05 +0000 (-0700)
Subject: Merge branch 'cleanup-soc' into cleanup
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=640ec79d6d8c10ceb254c269a1f7fd9cb47ea655;p=deliverable%2Flinux.git

Merge branch 'cleanup-soc' into cleanup

Conflicts:
	arch/arm/mach-omap2/Makefile
---

640ec79d6d8c10ceb254c269a1f7fd9cb47ea655
diff --cc arch/arm/mach-omap2/Makefile
index d8604a3e490e,669e2b18e026..7cdb9401ffa1
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -105,50 -102,48 +102,50 @@@ obj-$(CONFIG_ARCH_OMAP4)		+= voltagedom
  
  # OMAP powerdomain framework
  powerdomain-common			+= powerdomain.o powerdomain-common.o
- obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common) \
- 					   powerdomain2xxx_3xxx.o \
- 					   powerdomains2xxx_data.o \
- 					   powerdomains2xxx_3xxx_data.o
- obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common) \
- 					   powerdomain2xxx_3xxx.o \
- 					   powerdomains3xxx_data.o \
- 					   powerdomains2xxx_3xxx_data.o
- obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common) \
- 					   powerdomain44xx.o \
- 					   powerdomains44xx_data.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common)
+ obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= powerdomain2xxx_3xxx.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= powerdomains2xxx_3xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common)
+ obj-$(CONFIG_ARCH_OMAP3)		+= powerdomain2xxx_3xxx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains3xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= powerdomains2xxx_3xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common)
+ obj-$(CONFIG_ARCH_OMAP4)		+= powerdomain44xx.o
+ obj-$(CONFIG_ARCH_OMAP4)		+= powerdomains44xx_data.o
  
  # PRCM clockdomain control
- clockdomain-common			+= clockdomain.o \
- 					   clockdomains_common_data.o
- obj-$(CONFIG_ARCH_OMAP2)		+= $(clockdomain-common) \
- 					   clockdomain2xxx_3xxx.o \
- 					   clockdomains2xxx_3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o
++clockdomain-common			+= clockdomain.o
++clockdomain-common			+= clockdomains_common_data.o
++obj-$(CONFIG_ARCH_OMAP2)		+= $(clockdomain-common)
+ obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain2xxx_3xxx.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clockdomains2xxx_3xxx_data.o
  obj-$(CONFIG_SOC_OMAP2420)		+= clockdomains2420_data.o
  obj-$(CONFIG_SOC_OMAP2430)		+= clockdomains2430_data.o
- obj-$(CONFIG_ARCH_OMAP3)		+= $(clockdomain-common) \
- 					   clockdomain2xxx_3xxx.o \
- 					   clockdomains2xxx_3xxx_data.o \
- 					   clockdomains3xxx_data.o
- obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common) \
- 					   clockdomain44xx.o \
- 					   clockdomains44xx_data.o
 -obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o
++obj-$(CONFIG_ARCH_OMAP3)		+= $(clockdomain-common)
+ obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain2xxx_3xxx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains2xxx_3xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clockdomains3xxx_data.o
 -obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o
++obj-$(CONFIG_ARCH_OMAP4)		+= $(clockdomain-common)
+ obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain44xx.o
+ obj-$(CONFIG_ARCH_OMAP4)		+= clockdomains44xx_data.o
  
  # Clock framework
- obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o \
- 					   clkt2xxx_sys.o \
- 					   clkt2xxx_dpllcore.o \
- 					   clkt2xxx_virt_prcm_set.o \
- 					   clkt2xxx_apll.o clkt2xxx_osc.o \
- 					   clkt2xxx_dpll.o clkt_iclk.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_sys.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpllcore.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_virt_prcm_set.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_apll.o clkt2xxx_osc.o
+ obj-$(CONFIG_ARCH_OMAP2)		+= clkt2xxx_dpll.o clkt_iclk.o
  obj-$(CONFIG_SOC_OMAP2420)		+= clock2420_data.o
  obj-$(CONFIG_SOC_OMAP2430)		+= clock2430.o clock2430_data.o
- obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o \
- 					   clock34xx.o clkt34xx_dpll3m2.o \
- 					   clock3517.o clock36xx.o \
- 					   dpll3xxx.o clock3xxx_data.o \
- 					   clkt_iclk.o
- obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o \
- 					   dpll3xxx.o dpll44xx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= $(clock-common) clock3xxx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clock34xx.o clkt34xx_dpll3m2.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clock3517.o clock36xx.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= dpll3xxx.o clock3xxx_data.o
+ obj-$(CONFIG_ARCH_OMAP3)		+= clkt_iclk.o
+ obj-$(CONFIG_ARCH_OMAP4)		+= $(clock-common) clock44xx_data.o
+ obj-$(CONFIG_ARCH_OMAP4)		+= dpll3xxx.o dpll44xx.o
  
  # OMAP2 clock rate set data (old "OPP" data)
  obj-$(CONFIG_SOC_OMAP2420)		+= opp2420_data.o