From 6f778acc2a3d90f3b7d9a058f2902f4c02d70001 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Mon, 25 Jun 2012 03:41:45 -0700 Subject: [PATCH] --- yaml --- r: 319311 b: refs/heads/master c: a01366b4b5cc669633d1cf6ee327c85a5406ef5f h: refs/heads/master i: 319309: 9dd6e1d5bcdb722eb8353dfb14b6c3fbea892f6f 319307: 1b492b67cad72479397356f9474d5f6edce7d61e 319303: ccec288e78a6df69564a76ad7e7d541fce124ac1 319295: dc675b7c59c0877ff383fe5bf72aea4c39effcd0 v: v3 --- [refs] | 2 +- .../arm/mach-shmobile/board-armadillo800eva.c | 18 ++---------------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/[refs] b/[refs] index 78cd71a88e70..aad644122b07 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7e566fa26b7d34514d5ba7b8b4464934be8ff2c +refs/heads/master: a01366b4b5cc669633d1cf6ee327c85a5406ef5f diff --git a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c index 3066fa7e5374..5f8f571665a0 100644 --- a/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/trunk/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -121,20 +121,6 @@ * # amixer set "Headphone" 50 */ -/* - * FIXME !! - * - * gpio_no_direction - * - * current gpio frame work doesn't have - * the method to control only pull up/down/free. - * this function should be replaced by correct gpio function - */ -static void __init gpio_no_direction(u32 addr) -{ - __raw_writeb(0x00, addr); -} - /* * USB function * @@ -1087,8 +1073,8 @@ static void __init eva_init(void) gpio_request(GPIO_PORT7, NULL); gpio_request(GPIO_PORT8, NULL); - gpio_no_direction(GPIO_PORT7CR); /* FSIAOBT needs no direction */ - gpio_no_direction(GPIO_PORT8CR); /* FSIAOLR needs no direction */ + gpio_direction_none(GPIO_PORT7CR); /* FSIAOBT needs no direction */ + gpio_direction_none(GPIO_PORT8CR); /* FSIAOLR needs no direction */ /* FSI-HDMI */ gpio_request(GPIO_FN_FSIBCK, NULL);