diff options
| author | Linus Torvalds | 2006-10-04 19:43:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2006-10-04 19:43:31 +0200 |
| commit | 5170065d8af2c102ca940303416579606bc7ff51 (patch) | |
| tree | cdf113cb04be06d0d3afc8df06acc628208dbcdd /include | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb (diff) | |
| parent | [MIPS] Remove remaining reference to ite_gpio.h from Kbuild (diff) | |
| download | kernel-qcow2-linux-5170065d8af2c102ca940303416579606bc7ff51.tar.gz kernel-qcow2-linux-5170065d8af2c102ca940303416579606bc7ff51.tar.xz kernel-qcow2-linux-5170065d8af2c102ca940303416579606bc7ff51.zip | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Remove remaining reference to ite_gpio.h from Kbuild
[MIPS] PNX8550 fixups
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-mips/mach-pnx8550/uart.h | 14 | ||||
| -rw-r--r-- | include/linux/Kbuild | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/include/asm-mips/mach-pnx8550/uart.h b/include/asm-mips/mach-pnx8550/uart.h index e32b9a23d70e..814a7a15ab49 100644 --- a/include/asm-mips/mach-pnx8550/uart.h +++ b/include/asm-mips/mach-pnx8550/uart.h @@ -13,4 +13,18 @@ #define PNX8550_UART_INT(x) (PNX8550_INT_GIC_MIN+19+x) #define IRQ_TO_UART(x) (x-PNX8550_INT_GIC_MIN-19) +/* early macros needed for prom/kgdb */ + +#define ip3106_lcr(base,port) *(volatile u32 *)(base+(port*0x1000) + 0x000) +#define ip3106_mcr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x004) +#define ip3106_baud(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x008) +#define ip3106_cfg(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x00C) +#define ip3106_fifo(base, port) *(volatile u32 *)(base+(port*0x1000) + 0x028) +#define ip3106_istat(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE0) +#define ip3106_ien(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE4) +#define ip3106_iclr(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFE8) +#define ip3106_iset(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFEC) +#define ip3106_pd(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFF4) +#define ip3106_mid(base, port) *(volatile u32 *)(base+(port*0x1000) + 0xFFC) + #endif diff --git a/include/linux/Kbuild b/include/linux/Kbuild index ea005c0a79fd..5114ff18101d 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -100,7 +100,6 @@ header-y += ipx.h header-y += irda.h header-y += isdn_divertif.h header-y += iso_fs.h -header-y += ite_gpio.h header-y += ixjuser.h header-y += jffs2.h header-y += keyctl.h |