← 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-omap2/include/mach/debug-macro.S

  • 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-omap2/include/mach/debug-macro.S
72
72
                beq     34f                     @ configure OMAP3UART4
73
73
                cmp     \rp, #OMAP4UART4        @ only on 44xx
74
74
                beq     44f                     @ configure OMAP4UART4
 
75
                cmp     \rp, #TI816XUART1       @ ti816x UART offsets different
 
76
                beq     81f                     @ configure UART1
 
77
                cmp     \rp, #TI816XUART2       @ ti816x UART offsets different
 
78
                beq     82f                     @ configure UART2
 
79
                cmp     \rp, #TI816XUART3       @ ti816x UART offsets different
 
80
                beq     83f                     @ configure UART3
75
81
                cmp     \rp, #ZOOM_UART         @ only on zoom2/3
76
82
                beq     95f                     @ configure ZOOM_UART
77
83
 
94
100
                b       98f
95
101
44:             mov     \rp, #UART_OFFSET(OMAP4_UART4_BASE)
96
102
                b       98f
 
103
81:             mov     \rp, #UART_OFFSET(TI816X_UART1_BASE)
 
104
                b       98f
 
105
82:             mov     \rp, #UART_OFFSET(TI816X_UART2_BASE)
 
106
                b       98f
 
107
83:             mov     \rp, #UART_OFFSET(TI816X_UART3_BASE)
 
108
                b       98f
97
109
95:             ldr     \rp, =ZOOM_UART_BASE
98
110
                mrc     p15, 0, \rv, c1, c0
99
111
                tst     \rv, #1                 @ MMU enabled?