← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-u8500/trusty

« back to all changes in this revision

Viewing changes to arch/arm/mach-msm/Makefile

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-msm/Makefile
1
1
obj-y += io.o idle.o timer.o
2
 
ifndef CONFIG_ARCH_MSM8X60
3
 
obj-y += acpuclock-arm11.o
4
 
obj-y += dma.o
5
 
endif
6
 
 
7
 
ifdef CONFIG_MSM_VIC
8
 
obj-y += irq-vic.o
9
 
else
10
 
ifndef CONFIG_ARCH_MSM8X60
11
 
obj-y += irq.o
12
 
endif
13
 
endif
14
 
 
15
 
obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o
 
2
obj-y += clock.o
 
3
obj-$(CONFIG_DEBUG_FS) += clock-debug.o
 
4
 
 
5
obj-$(CONFIG_MSM_VIC) += irq-vic.o
 
6
obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o
 
7
 
 
8
obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o
 
9
obj-$(CONFIG_ARCH_MSM7X30) += dma.o
 
10
obj-$(CONFIG_ARCH_QSD8X50) += dma.o sirc.o
 
11
 
16
12
obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
17
 
obj-$(CONFIG_MSM_PROC_COMM) += clock.o
18
 
obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
 
13
 
19
14
obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
20
15
obj-$(CONFIG_MSM_SMD) += last_radio_log.o
21
16
obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
29
24
obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o
30
25
obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o
31
26
obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o
 
27
obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o
32
28
 
33
 
obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o
 
29
obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o
34
30
obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o
35
31
obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o
36
32
ifdef CONFIG_MSM_V2_TLMM
 
33
ifndef CONFIG_ARCH_MSM8960
 
34
# TODO: TLMM Mapping issues need to be resolved
37
35
obj-y   += gpio-v2.o
 
36
endif
38
37
else
39
38
obj-y   += gpio.o
40
39
endif