diff options
author | Mike Frysinger <vapier@gentoo.org> | 2010-07-05 04:40:41 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2010-08-06 12:55:51 -0400 |
commit | 812ae98f0849fbceb32c6d21bcdda42b40264c82 (patch) | |
tree | ce8ae222c26275010faa61afeae6575f441d2fab /arch | |
parent | eb9649095f4e81a6535c10377da3d5f48b9ad822 (diff) |
Blackfin: gpio/portmux: clean up whitespace corruption
Random tabs instead of spaces, mixes of the two, and unicode spaces
instead of ascii spaces.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/blackfin/include/asm/gpio.h | 106 | ||||
-rw-r--r-- | arch/blackfin/include/asm/portmux.h | 10 | ||||
-rw-r--r-- | arch/blackfin/kernel/bfin_gpio.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf518/include/mach/gpio.h | 82 | ||||
-rw-r--r-- | arch/blackfin/mach-bf518/include/mach/portmux.h | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/gpio.h | 96 | ||||
-rw-r--r-- | arch/blackfin/mach-bf527/include/mach/portmux.h | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/include/mach/gpio.h | 32 | ||||
-rw-r--r-- | arch/blackfin/mach-bf533/include/mach/portmux.h | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/gpio.h | 96 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/include/mach/portmux.h | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf538/include/mach/gpio.h | 108 | ||||
-rw-r--r-- | arch/blackfin/mach-bf548/include/mach/portmux.h | 2 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/gpio.h | 96 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/include/mach/portmux.h | 2 |
15 files changed, 323 insertions, 323 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 01b19d0cf509..0300c6a09d5b 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -7,63 +7,63 @@ | |||
7 | #ifndef __ARCH_BLACKFIN_GPIO_H__ | 7 | #ifndef __ARCH_BLACKFIN_GPIO_H__ |
8 | #define __ARCH_BLACKFIN_GPIO_H__ | 8 | #define __ARCH_BLACKFIN_GPIO_H__ |
9 | 9 | ||
10 | #define gpio_bank(x) ((x) >> 4) | 10 | #define gpio_bank(x) ((x) >> 4) |
11 | #define gpio_bit(x) (1<<((x) & 0xF)) | 11 | #define gpio_bit(x) (1<<((x) & 0xF)) |
12 | #define gpio_sub_n(x) ((x) & 0xF) | 12 | #define gpio_sub_n(x) ((x) & 0xF) |
13 | 13 | ||
14 | #define GPIO_BANKSIZE 16 | 14 | #define GPIO_BANKSIZE 16 |
15 | #define GPIO_BANK_NUM DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, GPIO_BANKSIZE) | 15 | #define GPIO_BANK_NUM DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, GPIO_BANKSIZE) |
16 | 16 | ||
17 | #include <mach/gpio.h> | 17 | #include <mach/gpio.h> |
18 | 18 | ||
19 | #define GPIO_0 0 | 19 | #define GPIO_0 0 |
20 | #define GPIO_1 1 | 20 | #define GPIO_1 1 |
21 | #define GPIO_2 2 | 21 | #define GPIO_2 2 |
22 | #define GPIO_3 3 | 22 | #define GPIO_3 3 |
23 | #define GPIO_4 4 | 23 | #define GPIO_4 4 |
24 | #define GPIO_5 5 | 24 | #define GPIO_5 5 |
25 | #define GPIO_6 6 | 25 | #define GPIO_6 6 |
26 | #define GPIO_7 7 | 26 | #define GPIO_7 7 |
27 | #define GPIO_8 8 | 27 | #define GPIO_8 8 |
28 | #define GPIO_9 9 | 28 | #define GPIO_9 9 |
29 | #define GPIO_10 10 | 29 | #define GPIO_10 10 |
30 | #define GPIO_11 11 | 30 | #define GPIO_11 11 |
31 | #define GPIO_12 12 | 31 | #define GPIO_12 12 |
32 | #define GPIO_13 13 | 32 | #define GPIO_13 13 |
33 | #define GPIO_14 14 | 33 | #define GPIO_14 14 |
34 | #define GPIO_15 15 | 34 | #define GPIO_15 15 |
35 | #define GPIO_16 16 | 35 | #define GPIO_16 16 |
36 | #define GPIO_17 17 | 36 | #define GPIO_17 17 |
37 | #define GPIO_18 18 | 37 | #define GPIO_18 18 |
38 | #define GPIO_19 19 | 38 | #define GPIO_19 19 |
39 | #define GPIO_20 20 | 39 | #define GPIO_20 20 |
40 | #define GPIO_21 21 | 40 | #define GPIO_21 21 |
41 | #define GPIO_22 22 | 41 | #define GPIO_22 22 |
42 | #define GPIO_23 23 | 42 | #define GPIO_23 23 |
43 | #define GPIO_24 24 | 43 | #define GPIO_24 24 |
44 | #define GPIO_25 25 | 44 | #define GPIO_25 25 |
45 | #define GPIO_26 26 | 45 | #define GPIO_26 26 |
46 | #define GPIO_27 27 | 46 | #define GPIO_27 27 |
47 | #define GPIO_28 28 | 47 | #define GPIO_28 28 |
48 | #define GPIO_29 29 | 48 | #define GPIO_29 29 |
49 | #define GPIO_30 30 | 49 | #define GPIO_30 30 |
50 | #define GPIO_31 31 | 50 | #define GPIO_31 31 |
51 | #define GPIO_32 32 | 51 | #define GPIO_32 32 |
52 | #define GPIO_33 33 | 52 | #define GPIO_33 33 |
53 | #define GPIO_34 34 | 53 | #define GPIO_34 34 |
54 | #define GPIO_35 35 | 54 | #define GPIO_35 35 |
55 | #define GPIO_36 36 | 55 | #define GPIO_36 36 |
56 | #define GPIO_37 37 | 56 | #define GPIO_37 37 |
57 | #define GPIO_38 38 | 57 | #define GPIO_38 38 |
58 | #define GPIO_39 39 | 58 | #define GPIO_39 39 |
59 | #define GPIO_40 40 | 59 | #define GPIO_40 40 |
60 | #define GPIO_41 41 | 60 | #define GPIO_41 41 |
61 | #define GPIO_42 42 | 61 | #define GPIO_42 42 |
62 | #define GPIO_43 43 | 62 | #define GPIO_43 43 |
63 | #define GPIO_44 44 | 63 | #define GPIO_44 44 |
64 | #define GPIO_45 45 | 64 | #define GPIO_45 45 |
65 | #define GPIO_46 46 | 65 | #define GPIO_46 46 |
66 | #define GPIO_47 47 | 66 | #define GPIO_47 47 |
67 | 67 | ||
68 | #define PERIPHERAL_USAGE 1 | 68 | #define PERIPHERAL_USAGE 1 |
69 | #define GPIO_USAGE 0 | 69 | #define GPIO_USAGE 0 |
diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h index edd8ef3a3788..9b1e2c37b324 100644 --- a/arch/blackfin/include/asm/portmux.h +++ b/arch/blackfin/include/asm/portmux.h | |||
@@ -1,9 +1,9 @@ | |||
1 | /* | 1 | /* |
2 | * Common header file for Blackfin family of processors | 2 | * Common header file for Blackfin family of processors |
3 | * | 3 | * |
4 | * Copyright 2007-2008 Analog Devices Inc. | 4 | * Copyright 2007-2008 Analog Devices Inc. |
5 | * | 5 | * |
6 | * Licensed under the GPL-2 or later. | 6 | * Licensed under the GPL-2 or later. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #ifndef _PORTMUX_H_ | 9 | #ifndef _PORTMUX_H_ |
@@ -1042,8 +1042,8 @@ void peripheral_free_list(const unsigned short per[]); | |||
1042 | #define P_NOR_CLK P_UNDEF | 1042 | #define P_NOR_CLK P_UNDEF |
1043 | #endif | 1043 | #endif |
1044 | 1044 | ||
1045 | #ifndef P_TMRCLK | 1045 | #ifndef P_TMRCLK |
1046 | #define P_TMRCLK P_UNDEF | 1046 | #define P_TMRCLK P_UNDEF |
1047 | #endif | 1047 | #endif |
1048 | 1048 | ||
1049 | #ifndef P_AMC_ARDY_NOR_WAIT | 1049 | #ifndef P_AMC_ARDY_NOR_WAIT |
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c index 052241e5b297..c5650559a4e1 100644 --- a/arch/blackfin/kernel/bfin_gpio.c +++ b/arch/blackfin/kernel/bfin_gpio.c | |||
@@ -108,7 +108,7 @@ static unsigned short * const port_fer[] = { | |||
108 | }; | 108 | }; |
109 | #endif | 109 | #endif |
110 | 110 | ||
111 | #define RESOURCE_LABEL_SIZE 16 | 111 | #define RESOURCE_LABEL_SIZE 16 |
112 | 112 | ||
113 | static struct str_ident { | 113 | static struct str_ident { |
114 | char name[RESOURCE_LABEL_SIZE]; | 114 | char name[RESOURCE_LABEL_SIZE]; |
@@ -659,7 +659,7 @@ EXPORT_SYMBOL(get_gpio_dir); | |||
659 | 659 | ||
660 | /*********************************************************** | 660 | /*********************************************************** |
661 | * | 661 | * |
662 | * FUNCTIONS: Blackfin Peripheral Resource Allocation | 662 | * FUNCTIONS: Blackfin Peripheral Resource Allocation |
663 | * and PortMux Setup | 663 | * and PortMux Setup |
664 | * | 664 | * |
665 | * INPUTS/OUTPUTS: | 665 | * INPUTS/OUTPUTS: |
diff --git a/arch/blackfin/mach-bf518/include/mach/gpio.h b/arch/blackfin/mach-bf518/include/mach/gpio.h index 3532a744c389..9af6ce0f6321 100644 --- a/arch/blackfin/mach-bf518/include/mach/gpio.h +++ b/arch/blackfin/mach-bf518/include/mach/gpio.h | |||
@@ -9,47 +9,47 @@ | |||
9 | 9 | ||
10 | #define MAX_BLACKFIN_GPIOS 41 | 10 | #define MAX_BLACKFIN_GPIOS 41 |
11 | 11 | ||
12 | #define GPIO_PF0 0 | 12 | #define GPIO_PF0 0 |
13 | #define GPIO_PF1 1 | 13 | #define GPIO_PF1 1 |
14 | #define GPIO_PF2 2 | 14 | #define GPIO_PF2 2 |
15 | #define GPIO_PF3 3 | 15 | #define GPIO_PF3 3 |
16 | #define GPIO_PF4 4 | 16 | #define GPIO_PF4 4 |
17 | #define GPIO_PF5 5 | 17 | #define GPIO_PF5 5 |
18 | #define GPIO_PF6 6 | 18 | #define GPIO_PF6 6 |
19 | #define GPIO_PF7 7 | 19 | #define GPIO_PF7 7 |
20 | #define GPIO_PF8 8 | 20 | #define GPIO_PF8 8 |
21 | #define GPIO_PF9 9 | 21 | #define GPIO_PF9 9 |
22 | #define GPIO_PF10 10 | 22 | #define GPIO_PF10 10 |
23 | #define GPIO_PF11 11 | 23 | #define GPIO_PF11 11 |
24 | #define GPIO_PF12 12 | 24 | #define GPIO_PF12 12 |
25 | #define GPIO_PF13 13 | 25 | #define GPIO_PF13 13 |
26 | #define GPIO_PF14 14 | 26 | #define GPIO_PF14 14 |
27 | #define GPIO_PF15 15 | 27 | #define GPIO_PF15 15 |
28 | #define GPIO_PG0 16 | 28 | #define GPIO_PG0 16 |
29 | #define GPIO_PG1 17 | 29 | #define GPIO_PG1 17 |
30 | #define GPIO_PG2 18 | 30 | #define GPIO_PG2 18 |
31 | #define GPIO_PG3 19 | 31 | #define GPIO_PG3 19 |
32 | #define GPIO_PG4 20 | 32 | #define GPIO_PG4 20 |
33 | #define GPIO_PG5 21 | 33 | #define GPIO_PG5 21 |
34 | #define GPIO_PG6 22 | 34 | #define GPIO_PG6 22 |
35 | #define GPIO_PG7 23 | 35 | #define GPIO_PG7 23 |
36 | #define GPIO_PG8 24 | 36 | #define GPIO_PG8 24 |
37 | #define GPIO_PG9 25 | 37 | #define GPIO_PG9 25 |
38 | #define GPIO_PG10 26 | 38 | #define GPIO_PG10 26 |
39 | #define GPIO_PG11 27 | 39 | #define GPIO_PG11 27 |
40 | #define GPIO_PG12 28 | 40 | #define GPIO_PG12 28 |
41 | #define GPIO_PG13 29 | 41 | #define GPIO_PG13 29 |
42 | #define GPIO_PG14 30 | 42 | #define GPIO_PG14 30 |
43 | #define GPIO_PG15 31 | 43 | #define GPIO_PG15 31 |
44 | #define GPIO_PH0 32 | 44 | #define GPIO_PH0 32 |
45 | #define GPIO_PH1 33 | 45 | #define GPIO_PH1 33 |
46 | #define GPIO_PH2 34 | 46 | #define GPIO_PH2 34 |
47 | #define GPIO_PH3 35 | 47 | #define GPIO_PH3 35 |
48 | #define GPIO_PH4 36 | 48 | #define GPIO_PH4 36 |
49 | #define GPIO_PH5 37 | 49 | #define GPIO_PH5 37 |
50 | #define GPIO_PH6 38 | 50 | #define GPIO_PH6 38 |
51 | #define GPIO_PH7 39 | 51 | #define GPIO_PH7 39 |
52 | #define GPIO_PH8 40 | 52 | #define GPIO_PH8 40 |
53 | 53 | ||
54 | #define PORT_F GPIO_PF0 | 54 | #define PORT_F GPIO_PF0 |
55 | #define PORT_G GPIO_PG0 | 55 | #define PORT_G GPIO_PG0 |
diff --git a/arch/blackfin/mach-bf518/include/mach/portmux.h b/arch/blackfin/mach-bf518/include/mach/portmux.h index 5d62430a621a..cd84a569b04e 100644 --- a/arch/blackfin/mach-bf518/include/mach/portmux.h +++ b/arch/blackfin/mach-bf518/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
11 | 11 | ||
12 | /* EMAC MII/RMII Port Mux */ | 12 | /* EMAC MII/RMII Port Mux */ |
13 | #define P_MII0_ETxD2 (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) | 13 | #define P_MII0_ETxD2 (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf527/include/mach/gpio.h b/arch/blackfin/mach-bf527/include/mach/gpio.h index 104bff85290d..f80c2995efdb 100644 --- a/arch/blackfin/mach-bf527/include/mach/gpio.h +++ b/arch/blackfin/mach-bf527/include/mach/gpio.h | |||
@@ -9,54 +9,54 @@ | |||
9 | 9 | ||
10 | #define MAX_BLACKFIN_GPIOS 48 | 10 | #define MAX_BLACKFIN_GPIOS 48 |
11 | 11 | ||
12 | #define GPIO_PF0 0 | 12 | #define GPIO_PF0 0 |
13 | #define GPIO_PF1 1 | 13 | #define GPIO_PF1 1 |
14 | #define GPIO_PF2 2 | 14 | #define GPIO_PF2 2 |
15 | #define GPIO_PF3 3 | 15 | #define GPIO_PF3 3 |
16 | #define GPIO_PF4 4 | 16 | #define GPIO_PF4 4 |
17 | #define GPIO_PF5 5 | 17 | #define GPIO_PF5 5 |
18 | #define GPIO_PF6 6 | 18 | #define GPIO_PF6 6 |
19 | #define GPIO_PF7 7 | 19 | #define GPIO_PF7 7 |
20 | #define GPIO_PF8 8 | 20 | #define GPIO_PF8 8 |
21 | #define GPIO_PF9 9 | 21 | #define GPIO_PF9 9 |
22 | #define GPIO_PF10 10 | 22 | #define GPIO_PF10 10 |
23 | #define GPIO_PF11 11 | 23 | #define GPIO_PF11 11 |
24 | #define GPIO_PF12 12 | 24 | #define GPIO_PF12 12 |
25 | #define GPIO_PF13 13 | 25 | #define GPIO_PF13 13 |
26 | #define GPIO_PF14 14 | 26 | #define GPIO_PF14 14 |
27 | #define GPIO_PF15 15 | 27 | #define GPIO_PF15 15 |
28 | #define GPIO_PG0 16 | 28 | #define GPIO_PG0 16 |
29 | #define GPIO_PG1 17 | 29 | #define GPIO_PG1 17 |
30 | #define GPIO_PG2 18 | 30 | #define GPIO_PG2 18 |
31 | #define GPIO_PG3 19 | 31 | #define GPIO_PG3 19 |
32 | #define GPIO_PG4 20 | 32 | #define GPIO_PG4 20 |
33 | #define GPIO_PG5 21 | 33 | #define GPIO_PG5 21 |
34 | #define GPIO_PG6 22 | 34 | #define GPIO_PG6 22 |
35 | #define GPIO_PG7 23 | 35 | #define GPIO_PG7 23 |
36 | #define GPIO_PG8 24 | 36 | #define GPIO_PG8 24 |
37 | #define GPIO_PG9 25 | 37 | #define GPIO_PG9 25 |
38 | #define GPIO_PG10 26 | 38 | #define GPIO_PG10 26 |
39 | #define GPIO_PG11 27 | 39 | #define GPIO_PG11 27 |
40 | #define GPIO_PG12 28 | 40 | #define GPIO_PG12 28 |
41 | #define GPIO_PG13 29 | 41 | #define GPIO_PG13 29 |
42 | #define GPIO_PG14 30 | 42 | #define GPIO_PG14 30 |
43 | #define GPIO_PG15 31 | 43 | #define GPIO_PG15 31 |
44 | #define GPIO_PH0 32 | 44 | #define GPIO_PH0 32 |
45 | #define GPIO_PH1 33 | 45 | #define GPIO_PH1 33 |
46 | #define GPIO_PH2 34 | 46 | #define GPIO_PH2 34 |
47 | #define GPIO_PH3 35 | 47 | #define GPIO_PH3 35 |
48 | #define GPIO_PH4 36 | 48 | #define GPIO_PH4 36 |
49 | #define GPIO_PH5 37 | 49 | #define GPIO_PH5 37 |
50 | #define GPIO_PH6 38 | 50 | #define GPIO_PH6 38 |
51 | #define GPIO_PH7 39 | 51 | #define GPIO_PH7 39 |
52 | #define GPIO_PH8 40 | 52 | #define GPIO_PH8 40 |
53 | #define GPIO_PH9 41 | 53 | #define GPIO_PH9 41 |
54 | #define GPIO_PH10 42 | 54 | #define GPIO_PH10 42 |
55 | #define GPIO_PH11 43 | 55 | #define GPIO_PH11 43 |
56 | #define GPIO_PH12 44 | 56 | #define GPIO_PH12 44 |
57 | #define GPIO_PH13 45 | 57 | #define GPIO_PH13 45 |
58 | #define GPIO_PH14 46 | 58 | #define GPIO_PH14 46 |
59 | #define GPIO_PH15 47 | 59 | #define GPIO_PH15 47 |
60 | 60 | ||
61 | #define PORT_F GPIO_PF0 | 61 | #define PORT_F GPIO_PF0 |
62 | #define PORT_G GPIO_PG0 | 62 | #define PORT_G GPIO_PG0 |
diff --git a/arch/blackfin/mach-bf527/include/mach/portmux.h b/arch/blackfin/mach-bf527/include/mach/portmux.h index 8e821db8e489..08bae421f5c9 100644 --- a/arch/blackfin/mach-bf527/include/mach/portmux.h +++ b/arch/blackfin/mach-bf527/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
11 | 11 | ||
12 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) | 12 | #define P_PPI0_D0 (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) |
13 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PF1) | P_FUNCT(0)) | 13 | #define P_PPI0_D1 (P_DEFINED | P_IDENT(GPIO_PF1) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf533/include/mach/gpio.h b/arch/blackfin/mach-bf533/include/mach/gpio.h index 2af19d69a7a7..e02416db4b00 100644 --- a/arch/blackfin/mach-bf533/include/mach/gpio.h +++ b/arch/blackfin/mach-bf533/include/mach/gpio.h | |||
@@ -9,22 +9,22 @@ | |||
9 | 9 | ||
10 | #define MAX_BLACKFIN_GPIOS 16 | 10 | #define MAX_BLACKFIN_GPIOS 16 |
11 | 11 | ||
12 | #define GPIO_PF0 0 | 12 | #define GPIO_PF0 0 |
13 | #define GPIO_PF1 1 | 13 | #define GPIO_PF1 1 |
14 | #define GPIO_PF2 2 | 14 | #define GPIO_PF2 2 |
15 | #define GPIO_PF3 3 | 15 | #define GPIO_PF3 3 |
16 | #define GPIO_PF4 4 | 16 | #define GPIO_PF4 4 |
17 | #define GPIO_PF5 5 | 17 | #define GPIO_PF5 5 |
18 | #define GPIO_PF6 6 | 18 | #define GPIO_PF6 6 |
19 | #define GPIO_PF7 7 | 19 | #define GPIO_PF7 7 |
20 | #define GPIO_PF8 8 | 20 | #define GPIO_PF8 8 |
21 | #define GPIO_PF9 9 | 21 | #define GPIO_PF9 9 |
22 | #define GPIO_PF10 10 | 22 | #define GPIO_PF10 10 |
23 | #define GPIO_PF11 11 | 23 | #define GPIO_PF11 11 |
24 | #define GPIO_PF12 12 | 24 | #define GPIO_PF12 12 |
25 | #define GPIO_PF13 13 | 25 | #define GPIO_PF13 13 |
26 | #define GPIO_PF14 14 | 26 | #define GPIO_PF14 14 |
27 | #define GPIO_PF15 15 | 27 | #define GPIO_PF15 15 |
28 | 28 | ||
29 | #define PORT_F GPIO_PF0 | 29 | #define PORT_F GPIO_PF0 |
30 | 30 | ||
diff --git a/arch/blackfin/mach-bf533/include/mach/portmux.h b/arch/blackfin/mach-bf533/include/mach/portmux.h index 4af9195469bf..96f5d9129f20 100644 --- a/arch/blackfin/mach-bf533/include/mach/portmux.h +++ b/arch/blackfin/mach-bf533/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
11 | 11 | ||
12 | #define P_PPI0_CLK (P_DONTCARE) | 12 | #define P_PPI0_CLK (P_DONTCARE) |
13 | #define P_PPI0_FS1 (P_DONTCARE) | 13 | #define P_PPI0_FS1 (P_DONTCARE) |
diff --git a/arch/blackfin/mach-bf537/include/mach/gpio.h b/arch/blackfin/mach-bf537/include/mach/gpio.h index 104bff85290d..f80c2995efdb 100644 --- a/arch/blackfin/mach-bf537/include/mach/gpio.h +++ b/arch/blackfin/mach-bf537/include/mach/gpio.h | |||
@@ -9,54 +9,54 @@ | |||
9 | 9 | ||
10 | #define MAX_BLACKFIN_GPIOS 48 | 10 | #define MAX_BLACKFIN_GPIOS 48 |
11 | 11 | ||
12 | #define GPIO_PF0 0 | 12 | #define GPIO_PF0 0 |
13 | #define GPIO_PF1 1 | 13 | #define GPIO_PF1 1 |
14 | #define GPIO_PF2 2 | 14 | #define GPIO_PF2 2 |
15 | #define GPIO_PF3 3 | 15 | #define GPIO_PF3 3 |
16 | #define GPIO_PF4 4 | 16 | #define GPIO_PF4 4 |
17 | #define GPIO_PF5 5 | 17 | #define GPIO_PF5 5 |
18 | #define GPIO_PF6 6 | 18 | #define GPIO_PF6 6 |
19 | #define GPIO_PF7 7 | 19 | #define GPIO_PF7 7 |
20 | #define GPIO_PF8 8 | 20 | #define GPIO_PF8 8 |
21 | #define GPIO_PF9 9 | 21 | #define GPIO_PF9 9 |
22 | #define GPIO_PF10 10 | 22 | #define GPIO_PF10 10 |
23 | #define GPIO_PF11 11 | 23 | #define GPIO_PF11 11 |
24 | #define GPIO_PF12 12 | 24 | #define GPIO_PF12 12 |
25 | #define GPIO_PF13 13 | 25 | #define GPIO_PF13 13 |
26 | #define GPIO_PF14 14 | 26 | #define GPIO_PF14 14 |
27 | #define GPIO_PF15 15 | 27 | #define GPIO_PF15 15 |
28 | #define GPIO_PG0 16 | 28 | #define GPIO_PG0 16 |
29 | #define GPIO_PG1 17 | 29 | #define GPIO_PG1 17 |
30 | #define GPIO_PG2 18 | 30 | #define GPIO_PG2 18 |
31 | #define GPIO_PG3 19 | 31 | #define GPIO_PG3 19 |
32 | #define GPIO_PG4 20 | 32 | #define GPIO_PG4 20 |
33 | #define GPIO_PG5 21 | 33 | #define GPIO_PG5 21 |
34 | #define GPIO_PG6 22 | 34 | #define GPIO_PG6 22 |
35 | #define GPIO_PG7 23 | 35 | #define GPIO_PG7 23 |
36 | #define GPIO_PG8 24 | 36 | #define GPIO_PG8 24 |
37 | #define GPIO_PG9 25 | 37 | #define GPIO_PG9 25 |
38 | #define GPIO_PG10 26 | 38 | #define GPIO_PG10 26 |
39 | #define GPIO_PG11 27 | 39 | #define GPIO_PG11 27 |
40 | #define GPIO_PG12 28 | 40 | #define GPIO_PG12 28 |
41 | #define GPIO_PG13 29 | 41 | #define GPIO_PG13 29 |
42 | #define GPIO_PG14 30 | 42 | #define GPIO_PG14 30 |
43 | #define GPIO_PG15 31 | 43 | #define GPIO_PG15 31 |
44 | #define GPIO_PH0 32 | 44 | #define GPIO_PH0 32 |
45 | #define GPIO_PH1 33 | 45 | #define GPIO_PH1 33 |
46 | #define GPIO_PH2 34 | 46 | #define GPIO_PH2 34 |
47 | #define GPIO_PH3 35 | 47 | #define GPIO_PH3 35 |
48 | #define GPIO_PH4 36 | 48 | #define GPIO_PH4 36 |
49 | #define GPIO_PH5 37 | 49 | #define GPIO_PH5 37 |
50 | #define GPIO_PH6 38 | 50 | #define GPIO_PH6 38 |
51 | #define GPIO_PH7 39 | 51 | #define GPIO_PH7 39 |
52 | #define GPIO_PH8 40 | 52 | #define GPIO_PH8 40 |
53 | #define GPIO_PH9 41 | 53 | #define GPIO_PH9 41 |
54 | #define GPIO_PH10 42 | 54 | #define GPIO_PH10 42 |
55 | #define GPIO_PH11 43 | 55 | #define GPIO_PH11 43 |
56 | #define GPIO_PH12 44 | 56 | #define GPIO_PH12 44 |
57 | #define GPIO_PH13 45 | 57 | #define GPIO_PH13 45 |
58 | #define GPIO_PH14 46 | 58 | #define GPIO_PH14 46 |
59 | #define GPIO_PH15 47 | 59 | #define GPIO_PH15 47 |
60 | 60 | ||
61 | #define PORT_F GPIO_PF0 | 61 | #define PORT_F GPIO_PF0 |
62 | #define PORT_G GPIO_PG0 | 62 | #define PORT_G GPIO_PG0 |
diff --git a/arch/blackfin/mach-bf537/include/mach/portmux.h b/arch/blackfin/mach-bf537/include/mach/portmux.h index 355e127bb8fa..71d9eaeb579e 100644 --- a/arch/blackfin/mach-bf537/include/mach/portmux.h +++ b/arch/blackfin/mach-bf537/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES (MAX_BLACKFIN_GPIOS + GPIO_BANKSIZE) /* We additionally handle PORTJ */ | 10 | #define MAX_RESOURCES (MAX_BLACKFIN_GPIOS + GPIO_BANKSIZE) /* We additionally handle PORTJ */ |
11 | 11 | ||
12 | #define P_UART0_TX (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) | 12 | #define P_UART0_TX (P_DEFINED | P_IDENT(GPIO_PF0) | P_FUNCT(0)) |
13 | #define P_UART0_RX (P_DEFINED | P_IDENT(GPIO_PF1) | P_FUNCT(0)) | 13 | #define P_UART0_RX (P_DEFINED | P_IDENT(GPIO_PF1) | P_FUNCT(0)) |
@@ -136,7 +136,6 @@ | |||
136 | P_MDC, \ | 136 | P_MDC, \ |
137 | P_MDIO, 0} | 137 | P_MDIO, 0} |
138 | 138 | ||
139 | |||
140 | #define P_RMII0 {\ | 139 | #define P_RMII0 {\ |
141 | P_MII0_ETxD0, \ | 140 | P_MII0_ETxD0, \ |
142 | P_MII0_ETxD1, \ | 141 | P_MII0_ETxD1, \ |
@@ -149,4 +148,5 @@ | |||
149 | P_RMII0_CRS_DV, \ | 148 | P_RMII0_CRS_DV, \ |
150 | P_MDC, \ | 149 | P_MDC, \ |
151 | P_MDIO, 0} | 150 | P_MDIO, 0} |
152 | #endif /* _MACH_PORTMUX_H_ */ | 151 | |
152 | #endif /* _MACH_PORTMUX_H_ */ | ||
diff --git a/arch/blackfin/mach-bf538/include/mach/gpio.h b/arch/blackfin/mach-bf538/include/mach/gpio.h index 0c346fba9619..bd9adb7183da 100644 --- a/arch/blackfin/mach-bf538/include/mach/gpio.h +++ b/arch/blackfin/mach-bf538/include/mach/gpio.h | |||
@@ -10,60 +10,60 @@ | |||
10 | #define MAX_BLACKFIN_GPIOS 16 | 10 | #define MAX_BLACKFIN_GPIOS 16 |
11 | #define BFIN_SPECIAL_GPIO_BANKS 3 | 11 | #define BFIN_SPECIAL_GPIO_BANKS 3 |
12 | 12 | ||
13 | #define GPIO_PF0 0 /* PF */ | 13 | #define GPIO_PF0 0 /* PF */ |
14 | #define GPIO_PF1 1 | 14 | #define GPIO_PF1 1 |
15 | #define GPIO_PF2 2 | 15 | #define GPIO_PF2 2 |
16 | #define GPIO_PF3 3 | 16 | #define GPIO_PF3 3 |
17 | #define GPIO_PF4 4 | 17 | #define GPIO_PF4 4 |
18 | #define GPIO_PF5 5 | 18 | #define GPIO_PF5 5 |
19 | #define GPIO_PF6 6 | 19 | #define GPIO_PF6 6 |
20 | #define GPIO_PF7 7 | 20 | #define GPIO_PF7 7 |
21 | #define GPIO_PF8 8 | 21 | #define GPIO_PF8 8 |
22 | #define GPIO_PF9 9 | 22 | #define GPIO_PF9 9 |
23 | #define GPIO_PF10 10 | 23 | #define GPIO_PF10 10 |
24 | #define GPIO_PF11 11 | 24 | #define GPIO_PF11 11 |
25 | #define GPIO_PF12 12 | 25 | #define GPIO_PF12 12 |
26 | #define GPIO_PF13 13 | 26 | #define GPIO_PF13 13 |
27 | #define GPIO_PF14 14 | 27 | #define GPIO_PF14 14 |
28 | #define GPIO_PF15 15 | 28 | #define GPIO_PF15 15 |
29 | #define GPIO_PC0 16 /* PC */ | 29 | #define GPIO_PC0 16 /* PC */ |
30 | #define GPIO_PC1 17 | 30 | #define GPIO_PC1 17 |
31 | #define GPIO_PC4 20 | 31 | #define GPIO_PC4 20 |
32 | #define GPIO_PC5 21 | 32 | #define GPIO_PC5 21 |
33 | #define GPIO_PC6 22 | 33 | #define GPIO_PC6 22 |
34 | #define GPIO_PC7 23 | 34 | #define GPIO_PC7 23 |
35 | #define GPIO_PC8 24 | 35 | #define GPIO_PC8 24 |
36 | #define GPIO_PC9 25 | 36 | #define GPIO_PC9 25 |
37 | #define GPIO_PD0 32 /* PD */ | 37 | #define GPIO_PD0 32 /* PD */ |
38 | #define GPIO_PD1 33 | 38 | #define GPIO_PD1 33 |
39 | #define GPIO_PD2 34 | 39 | #define GPIO_PD2 34 |
40 | #define GPIO_PD3 35 | 40 | #define GPIO_PD3 35 |
41 | #define GPIO_PD4 36 | 41 | #define GPIO_PD4 36 |
42 | #define GPIO_PD5 37 | 42 | #define GPIO_PD5 37 |
43 | #define GPIO_PD6 38 | 43 | #define GPIO_PD6 38 |
44 | #define GPIO_PD7 39 | 44 | #define GPIO_PD7 39 |
45 | #define GPIO_PD8 40 | 45 | #define GPIO_PD8 40 |
46 | #define GPIO_PD9 41 | 46 | #define GPIO_PD9 41 |
47 | #define GPIO_PD10 42 | 47 | #define GPIO_PD10 42 |
48 | #define GPIO_PD11 43 | 48 | #define GPIO_PD11 43 |
49 | #define GPIO_PD12 44 | 49 | #define GPIO_PD12 44 |
50 | #define GPIO_PD13 45 | 50 | #define GPIO_PD13 45 |
51 | #define GPIO_PE0 48 /* PE */ | 51 | #define GPIO_PE0 48 /* PE */ |
52 | #define GPIO_PE1 49 | 52 | #define GPIO_PE1 49 |
53 | #define GPIO_PE2 50 | 53 | #define GPIO_PE2 50 |
54 | #define GPIO_PE3 51 | 54 | #define GPIO_PE3 51 |
55 | #define GPIO_PE4 52 | 55 | #define GPIO_PE4 52 |
56 | #define GPIO_PE5 53 | 56 | #define GPIO_PE5 53 |
57 | #define GPIO_PE6 54 | 57 | #define GPIO_PE6 54 |
58 | #define GPIO_PE7 55 | 58 | #define GPIO_PE7 55 |
59 | #define GPIO_PE8 56 | 59 | #define GPIO_PE8 56 |
60 | #define GPIO_PE9 57 | 60 | #define GPIO_PE9 57 |
61 | #define GPIO_PE10 58 | 61 | #define GPIO_PE10 58 |
62 | #define GPIO_PE11 59 | 62 | #define GPIO_PE11 59 |
63 | #define GPIO_PE12 60 | 63 | #define GPIO_PE12 60 |
64 | #define GPIO_PE13 61 | 64 | #define GPIO_PE13 61 |
65 | #define GPIO_PE14 62 | 65 | #define GPIO_PE14 62 |
66 | #define GPIO_PE15 63 | 66 | #define GPIO_PE15 63 |
67 | 67 | ||
68 | #define PORT_F GPIO_PF0 | 68 | #define PORT_F GPIO_PF0 |
69 | #define PORT_C GPIO_PC0 | 69 | #define PORT_C GPIO_PC0 |
diff --git a/arch/blackfin/mach-bf548/include/mach/portmux.h b/arch/blackfin/mach-bf548/include/mach/portmux.h index 89f282d52690..e22246202730 100644 --- a/arch/blackfin/mach-bf548/include/mach/portmux.h +++ b/arch/blackfin/mach-bf548/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
11 | 11 | ||
12 | #define P_SPORT2_TFS (P_DEFINED | P_IDENT(GPIO_PA0) | P_FUNCT(0)) | 12 | #define P_SPORT2_TFS (P_DEFINED | P_IDENT(GPIO_PA0) | P_FUNCT(0)) |
13 | #define P_SPORT2_DTSEC (P_DEFINED | P_IDENT(GPIO_PA1) | P_FUNCT(0)) | 13 | #define P_SPORT2_DTSEC (P_DEFINED | P_IDENT(GPIO_PA1) | P_FUNCT(0)) |
diff --git a/arch/blackfin/mach-bf561/include/mach/gpio.h b/arch/blackfin/mach-bf561/include/mach/gpio.h index a651a8cf805f..4f8aa5d08802 100644 --- a/arch/blackfin/mach-bf561/include/mach/gpio.h +++ b/arch/blackfin/mach-bf561/include/mach/gpio.h | |||
@@ -9,54 +9,54 @@ | |||
9 | 9 | ||
10 | #define MAX_BLACKFIN_GPIOS 48 | 10 | #define MAX_BLACKFIN_GPIOS 48 |
11 | 11 | ||
12 | #define GPIO_PF0 0 | 12 | #define GPIO_PF0 0 |
13 | #define GPIO_PF1 1 | 13 | #define GPIO_PF1 1 |
14 | #define GPIO_PF2 2 | 14 | #define GPIO_PF2 2 |
15 | #define GPIO_PF3 3 | 15 | #define GPIO_PF3 3 |
16 | #define GPIO_PF4 4 | 16 | #define GPIO_PF4 4 |
17 | #define GPIO_PF5 5 | 17 | #define GPIO_PF5 5 |
18 | #define GPIO_PF6 6 | 18 | #define GPIO_PF6 6 |
19 | #define GPIO_PF7 7 | 19 | #define GPIO_PF7 7 |
20 | #define GPIO_PF8 8 | 20 | #define GPIO_PF8 8 |
21 | #define GPIO_PF9 9 | 21 | #define GPIO_PF9 9 |
22 | #define GPIO_PF10 10 | 22 | #define GPIO_PF10 10 |
23 | #define GPIO_PF11 11 | 23 | #define GPIO_PF11 11 |
24 | #define GPIO_PF12 12 | 24 | #define GPIO_PF12 12 |
25 | #define GPIO_PF13 13 | 25 | #define GPIO_PF13 13 |
26 | #define GPIO_PF14 14 | 26 | #define GPIO_PF14 14 |
27 | #define GPIO_PF15 15 | 27 | #define GPIO_PF15 15 |
28 | #define GPIO_PF16 16 | 28 | #define GPIO_PF16 16 |
29 | #define GPIO_PF17 17 | 29 | #define GPIO_PF17 17 |
30 | #define GPIO_PF18 18 | 30 | #define GPIO_PF18 18 |
31 | #define GPIO_PF19 19 | 31 | #define GPIO_PF19 19 |
32 | #define GPIO_PF20 20 | 32 | #define GPIO_PF20 20 |
33 | #define GPIO_PF21 21 | 33 | #define GPIO_PF21 21 |
34 | #define GPIO_PF22 22 | 34 | #define GPIO_PF22 22 |
35 | #define GPIO_PF23 23 | 35 | #define GPIO_PF23 23 |
36 | #define GPIO_PF24 24 | 36 | #define GPIO_PF24 24 |
37 | #define GPIO_PF25 25 | 37 | #define GPIO_PF25 25 |
38 | #define GPIO_PF26 26 | 38 | #define GPIO_PF26 26 |
39 | #define GPIO_PF27 27 | 39 | #define GPIO_PF27 27 |
40 | #define GPIO_PF28 28 | 40 | #define GPIO_PF28 28 |
41 | #define GPIO_PF29 29 | 41 | #define GPIO_PF29 29 |
42 | #define GPIO_PF30 30 | 42 | #define GPIO_PF30 30 |
43 | #define GPIO_PF31 31 | 43 | #define GPIO_PF31 31 |
44 | #define GPIO_PF32 32 | 44 | #define GPIO_PF32 32 |
45 | #define GPIO_PF33 33 | 45 | #define GPIO_PF33 33 |
46 | #define GPIO_PF34 34 | 46 | #define GPIO_PF34 34 |
47 | #define GPIO_PF35 35 | 47 | #define GPIO_PF35 35 |
48 | #define GPIO_PF36 36 | 48 | #define GPIO_PF36 36 |
49 | #define GPIO_PF37 37 | 49 | #define GPIO_PF37 37 |
50 | #define GPIO_PF38 38 | 50 | #define GPIO_PF38 38 |
51 | #define GPIO_PF39 39 | 51 | #define GPIO_PF39 39 |
52 | #define GPIO_PF40 40 | 52 | #define GPIO_PF40 40 |
53 | #define GPIO_PF41 41 | 53 | #define GPIO_PF41 41 |
54 | #define GPIO_PF42 42 | 54 | #define GPIO_PF42 42 |
55 | #define GPIO_PF43 43 | 55 | #define GPIO_PF43 43 |
56 | #define GPIO_PF44 44 | 56 | #define GPIO_PF44 44 |
57 | #define GPIO_PF45 45 | 57 | #define GPIO_PF45 45 |
58 | #define GPIO_PF46 46 | 58 | #define GPIO_PF46 46 |
59 | #define GPIO_PF47 47 | 59 | #define GPIO_PF47 47 |
60 | 60 | ||
61 | #define PORT_FIO0 GPIO_0 | 61 | #define PORT_FIO0 GPIO_0 |
62 | #define PORT_FIO1 GPIO_16 | 62 | #define PORT_FIO1 GPIO_16 |
diff --git a/arch/blackfin/mach-bf561/include/mach/portmux.h b/arch/blackfin/mach-bf561/include/mach/portmux.h index 56be4e8d1966..2339ffd0dde8 100644 --- a/arch/blackfin/mach-bf561/include/mach/portmux.h +++ b/arch/blackfin/mach-bf561/include/mach/portmux.h | |||
@@ -7,7 +7,7 @@ | |||
7 | #ifndef _MACH_PORTMUX_H_ | 7 | #ifndef _MACH_PORTMUX_H_ |
8 | #define _MACH_PORTMUX_H_ | 8 | #define _MACH_PORTMUX_H_ |
9 | 9 | ||
10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS | 10 | #define MAX_RESOURCES MAX_BLACKFIN_GPIOS |
11 | 11 | ||
12 | #define P_PPI0_CLK (P_DONTCARE) | 12 | #define P_PPI0_CLK (P_DONTCARE) |
13 | #define P_PPI0_FS1 (P_DONTCARE) | 13 | #define P_PPI0_FS1 (P_DONTCARE) |