diff options
author | Tony Lindgren <tony@atomide.com> | 2008-01-24 20:24:15 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-04-14 12:57:13 -0400 |
commit | 9330899e0f878ff3b7a23b856de8bbb52c9c04fd (patch) | |
tree | 7ea8c0362e6320dfbd7c6dd124e34a0b6ef7c6b1 /include/asm-arm | |
parent | f7337a199acffa9f12fa9d88253d33bfb56ef14a (diff) |
ARM: OMAP2: Clean-up mux code
Misc clean-up for the mux code and remove some unnecessary
ifdefs. Patch changes debug function so it can be used on
both 24xx and 34xx.
Changes are mostly for omap2, but patch also cleans up some
omap1 and common mux code.
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-omap/mux.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h index 68dd93685f69..ff9a5b5575fd 100644 --- a/include/asm-arm/arch-omap/mux.h +++ b/include/asm-arm/arch-omap/mux.h | |||
@@ -4,9 +4,10 @@ | |||
4 | * Table of the Omap register configurations for the FUNC_MUX and | 4 | * Table of the Omap register configurations for the FUNC_MUX and |
5 | * PULL_DWN combinations. | 5 | * PULL_DWN combinations. |
6 | * | 6 | * |
7 | * Copyright (C) 2003 - 2005 Nokia Corporation | 7 | * Copyright (C) 2004 - 2008 Texas Instruments Inc. |
8 | * Copyright (C) 2003 - 2008 Nokia Corporation | ||
8 | * | 9 | * |
9 | * Written by Tony Lindgren <tony.lindgren@nokia.com> | 10 | * Written by Tony Lindgren |
10 | * | 11 | * |
11 | * This program is free software; you can redistribute it and/or modify | 12 | * This program is free software; you can redistribute it and/or modify |
12 | * it under the terms of the GNU General Public License as published by | 13 | * it under the terms of the GNU General Public License as published by |
@@ -27,14 +28,6 @@ | |||
27 | * - W8 = ball | 28 | * - W8 = ball |
28 | * - 1610 = 1510 or 1610, none if common for both 1510 and 1610 | 29 | * - 1610 = 1510 or 1610, none if common for both 1510 and 1610 |
29 | * - MMC2_DAT0 = function | 30 | * - MMC2_DAT0 = function |
30 | * | ||
31 | * Change log: | ||
32 | * Added entry for the I2C interface. (02Feb 2004) | ||
33 | * Copyright (C) 2004 Texas Instruments | ||
34 | * | ||
35 | * Added entry for the keypad and uwire CS1. (09Mar 2004) | ||
36 | * Copyright (C) 2004 Texas Instruments | ||
37 | * | ||
38 | */ | 31 | */ |
39 | 32 | ||
40 | #ifndef __ASM_ARCH_MUX_H | 33 | #ifndef __ASM_ARCH_MUX_H |