← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/mach-msm/board-msm7x27.c

  • 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/board-msm7x27.c
130
130
}
131
131
 
132
132
MACHINE_START(MSM7X27_SURF, "QCT MSM7x27 SURF")
133
 
#ifdef CONFIG_MSM_DEBUG_UART
134
 
#endif
135
133
        .boot_params    = PLAT_PHYS_OFFSET + 0x100,
136
134
        .map_io         = msm7x2x_map_io,
137
135
        .init_irq       = msm7x2x_init_irq,
140
138
MACHINE_END
141
139
 
142
140
MACHINE_START(MSM7X27_FFA, "QCT MSM7x27 FFA")
143
 
#ifdef CONFIG_MSM_DEBUG_UART
144
 
#endif
145
141
        .boot_params    = PLAT_PHYS_OFFSET + 0x100,
146
142
        .map_io         = msm7x2x_map_io,
147
143
        .init_irq       = msm7x2x_init_irq,
150
146
MACHINE_END
151
147
 
152
148
MACHINE_START(MSM7X25_SURF, "QCT MSM7x25 SURF")
153
 
#ifdef CONFIG_MSM_DEBUG_UART
154
 
#endif
155
149
        .boot_params    = PLAT_PHYS_OFFSET + 0x100,
156
150
        .map_io         = msm7x2x_map_io,
157
151
        .init_irq       = msm7x2x_init_irq,
160
154
MACHINE_END
161
155
 
162
156
MACHINE_START(MSM7X25_FFA, "QCT MSM7x25 FFA")
163
 
#ifdef CONFIG_MSM_DEBUG_UART
164
 
#endif
165
157
        .boot_params    = PLAT_PHYS_OFFSET + 0x100,
166
158
        .map_io         = msm7x2x_map_io,
167
159
        .init_irq       = msm7x2x_init_irq,