commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=2e3a0548dff756df563d428853d3e2de63d9f429 branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
These defines don't accomplish much as GPIO_# is the same thing as #. Each CPU already provides helpful symbolic defines like GPIO_<PIN> which everyone uses, so just punt these # ones. Signed-off-by: Mike Frysinger <[email protected]> --- arch/blackfin/include/asm/gpio.h | 49 -------------------------- arch/blackfin/mach-bf537/boards/cm_bf537e.c | 6 ++-- arch/blackfin/mach-bf537/boards/cm_bf537u.c | 12 +++--- arch/blackfin/mach-bf537/boards/tcm_bf537.c | 6 ++-- arch/blackfin/mach-bf561/include/mach/gpio.h | 6 ++-- 5 files changed, 15 insertions(+), 64 deletions(-) diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index 1ef8417..9b8d186 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h @@ -16,55 +16,6 @@ #include <mach/gpio.h> -#define GPIO_0 0 -#define GPIO_1 1 -#define GPIO_2 2 -#define GPIO_3 3 -#define GPIO_4 4 -#define GPIO_5 5 -#define GPIO_6 6 -#define GPIO_7 7 -#define GPIO_8 8 -#define GPIO_9 9 -#define GPIO_10 10 -#define GPIO_11 11 -#define GPIO_12 12 -#define GPIO_13 13 -#define GPIO_14 14 -#define GPIO_15 15 -#define GPIO_16 16 -#define GPIO_17 17 -#define GPIO_18 18 -#define GPIO_19 19 -#define GPIO_20 20 -#define GPIO_21 21 -#define GPIO_22 22 -#define GPIO_23 23 -#define GPIO_24 24 -#define GPIO_25 25 -#define GPIO_26 26 -#define GPIO_27 27 -#define GPIO_28 28 -#define GPIO_29 29 -#define GPIO_30 30 -#define GPIO_31 31 -#define GPIO_32 32 -#define GPIO_33 33 -#define GPIO_34 34 -#define GPIO_35 35 -#define GPIO_36 36 -#define GPIO_37 37 -#define GPIO_38 38 -#define GPIO_39 39 -#define GPIO_40 40 -#define GPIO_41 41 -#define GPIO_42 42 -#define GPIO_43 43 -#define GPIO_44 44 -#define GPIO_45 45 -#define GPIO_46 46 -#define GPIO_47 47 - #define PERIPHERAL_USAGE 1 #define GPIO_USAGE 0 diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537e.c b/arch/blackfin/mach-bf537/boards/cm_bf537e.c index a6a1c9e..2568d8f 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537e.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537e.c @@ -750,14 +750,14 @@ static int __init net2272_init(void) #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) int ret; - ret = gpio_request(GPIO_30, "net2272"); + ret = gpio_request(GPIO_PG14, "net2272"); if (ret) return ret; /* Reset USB Chip, PG14 */ - gpio_direction_output(GPIO_30, 0); + gpio_direction_output(GPIO_PG14, 0); mdelay(2); - gpio_set_value(GPIO_30, 1); + gpio_set_value(GPIO_PG14, 1); #endif return 0; diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537u.c b/arch/blackfin/mach-bf537/boards/cm_bf537u.c index 8897ff1..acf3db3 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537u.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537u.c @@ -715,26 +715,26 @@ static int __init net2272_init(void) #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) int ret; - ret = gpio_request(GPIO_47, driver_name); + ret = gpio_request(GPIO_PH15, driver_name); if (ret) return ret; - ret = gpio_request(GPIO_45, "net2272"); + ret = gpio_request(GPIO_PH13, "net2272"); if (ret) { - gpio_free(GPIO_47); + gpio_free(GPIO_PH15); return ret; } /* Set PH15 Low make /AMS2 work properly */ - gpio_direction_output(GPIO_47, 0); + gpio_direction_output(GPIO_PH15, 0); /* enable CLKBUF output */ bfin_write_VR_CTL(bfin_read_VR_CTL() | CLKBUFOE); /* Reset the USB chip */ - gpio_direction_output(GPIO_45, 0); + gpio_direction_output(GPIO_PH13, 0); mdelay(2); - gpio_set_value(GPIO_45, 1); + gpio_set_value(GPIO_PH13, 1); #endif return 0; diff --git a/arch/blackfin/mach-bf537/boards/tcm_bf537.c b/arch/blackfin/mach-bf537/boards/tcm_bf537.c index 2541685..2a1b059 100644 --- a/arch/blackfin/mach-bf537/boards/tcm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/tcm_bf537.c @@ -717,14 +717,14 @@ static int __init net2272_init(void) #if defined(CONFIG_USB_NET2272) || defined(CONFIG_USB_NET2272_MODULE) int ret; - ret = gpio_request(GPIO_30, "net2272"); + ret = gpio_request(GPIO_PG14, "net2272"); if (ret) return ret; /* Reset USB Chip, PG14 */ - gpio_direction_output(GPIO_30, 0); + gpio_direction_output(GPIO_PG14, 0); mdelay(2); - gpio_set_value(GPIO_30, 1); + gpio_set_value(GPIO_PG14, 1); #endif return 0; diff --git a/arch/blackfin/mach-bf561/include/mach/gpio.h b/arch/blackfin/mach-bf561/include/mach/gpio.h index 57d5eab..f9f8b2a 100644 --- a/arch/blackfin/mach-bf561/include/mach/gpio.h +++ b/arch/blackfin/mach-bf561/include/mach/gpio.h @@ -58,9 +58,9 @@ #define GPIO_PF46 46 #define GPIO_PF47 47 -#define PORT_FIO0 GPIO_0 -#define PORT_FIO1 GPIO_16 -#define PORT_FIO2 GPIO_32 +#define PORT_FIO0 GPIO_PF0 +#define PORT_FIO1 GPIO_PF16 +#define PORT_FIO2 GPIO_PF32 #include <mach-common/ports-f.h>
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
