diff options
author | Michael Hennerich <michael.hennerich@analog.com> | 2008-01-22 05:36:20 -0500 |
---|---|---|
committer | Bryan Wu <bryan.wu@analog.com> | 2008-01-22 05:36:20 -0500 |
commit | acbcd2631975cf6f0be5cd294cbfd12226cd9958 (patch) | |
tree | fc603be9957970892395b145547af3e17add7084 /arch/blackfin/mach-bf537 | |
parent | b97b8a998397e8c64699559099fa9febffae2b4d (diff) |
[Blackfin] arch: Fix BUG gpio_direction_output API is not compatitable with GENERIC_GPIO API interface
signef-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <bryan.wu@analog.com>
Diffstat (limited to 'arch/blackfin/mach-bf537')
-rw-r--r-- | arch/blackfin/mach-bf537/boards/generic_board.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/pnav10.c | 6 | ||||
-rw-r--r-- | arch/blackfin/mach-bf537/boards/stamp.c | 7 |
3 files changed, 3 insertions, 16 deletions
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 1c97219a2ab5..3225b1588398 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c | |||
@@ -205,12 +205,8 @@ static struct resource sl811_hcd_resources[] = { | |||
205 | void sl811_port_power(struct device *dev, int is_on) | 205 | void sl811_port_power(struct device *dev, int is_on) |
206 | { | 206 | { |
207 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | 207 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
208 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 208 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); |
209 | 209 | ||
210 | if (is_on) | ||
211 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); | ||
212 | else | ||
213 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); | ||
214 | } | 210 | } |
215 | #endif | 211 | #endif |
216 | 212 | ||
diff --git a/arch/blackfin/mach-bf537/boards/pnav10.c b/arch/blackfin/mach-bf537/boards/pnav10.c index 23e10c7dab5b..4c4870590bd8 100644 --- a/arch/blackfin/mach-bf537/boards/pnav10.c +++ b/arch/blackfin/mach-bf537/boards/pnav10.c | |||
@@ -134,12 +134,8 @@ static struct resource sl811_hcd_resources[] = { | |||
134 | void sl811_port_power(struct device *dev, int is_on) | 134 | void sl811_port_power(struct device *dev, int is_on) |
135 | { | 135 | { |
136 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | 136 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
137 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 137 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); |
138 | 138 | ||
139 | if (is_on) | ||
140 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); | ||
141 | else | ||
142 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); | ||
143 | } | 139 | } |
144 | #endif | 140 | #endif |
145 | 141 | ||
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 3e0ad04d8d75..37759ac7df2a 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c | |||
@@ -250,12 +250,7 @@ static struct resource sl811_hcd_resources[] = { | |||
250 | void sl811_port_power(struct device *dev, int is_on) | 250 | void sl811_port_power(struct device *dev, int is_on) |
251 | { | 251 | { |
252 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); | 252 | gpio_request(CONFIG_USB_SL811_BFIN_GPIO_VBUS, "usb:SL811_VBUS"); |
253 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS); | 253 | gpio_direction_output(CONFIG_USB_SL811_BFIN_GPIO_VBUS, is_on); |
254 | |||
255 | if (is_on) | ||
256 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 1); | ||
257 | else | ||
258 | gpio_set_value(CONFIG_USB_SL811_BFIN_GPIO_VBUS, 0); | ||
259 | } | 254 | } |
260 | #endif | 255 | #endif |
261 | 256 | ||