← Back to branch summary

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

« back to all changes in this revision

Viewing changes to arch/arm/plat-omap/include/plat/serial.h

  • 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/plat-omap/include/plat/serial.h
51
51
#define OMAP4_UART3_BASE        0x48020000
52
52
#define OMAP4_UART4_BASE        0x4806e000
53
53
 
 
54
/* TI816X serial ports */
 
55
#define TI816X_UART1_BASE       0x48020000
 
56
#define TI816X_UART2_BASE       0x48022000
 
57
#define TI816X_UART3_BASE       0x48024000
 
58
 
54
59
/* External port on Zoom2/3 */
55
60
#define ZOOM_UART_BASE          0x10000000
56
61
#define ZOOM_UART_VIRT          0xfa400000
81
86
#define OMAP4UART2              OMAP2UART2
82
87
#define OMAP4UART3              43
83
88
#define OMAP4UART4              44
 
89
#define TI816XUART1             81
 
90
#define TI816XUART2             82
 
91
#define TI816XUART3             83
84
92
#define ZOOM_UART               95              /* Only on zoom2/3 */
85
93
 
86
94
/* This is only used by 8250.c for omap1510 */
96
104
 
97
105
struct omap_board_data;
98
106
 
99
 
extern void __init omap_serial_early_init(void);
100
107
extern void omap_serial_init(void);
101
108
extern void omap_serial_init_port(struct omap_board_data *bdata);
102
109
extern int omap_uart_can_sleep(void);