aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/board-da850-evm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index c6e11c682e4c..f89b0b7cb6f2 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -266,7 +266,7 @@ static inline void da850_evm_setup_emac_rmii(int rmii_sel)
266 struct davinci_soc_info *soc_info = &davinci_soc_info; 266 struct davinci_soc_info *soc_info = &davinci_soc_info;
267 267
268 soc_info->emac_pdata->rmii_en = 1; 268 soc_info->emac_pdata->rmii_en = 1;
269 gpio_set_value(rmii_sel, 0); 269 gpio_set_value_cansleep(rmii_sel, 0);
270} 270}
271#else 271#else
272static inline void da850_evm_setup_emac_rmii(int rmii_sel) { } 272static inline void da850_evm_setup_emac_rmii(int rmii_sel) { }
@@ -325,9 +325,9 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client,
325 unsigned gpio, unsigned ngpio, void *c) 325 unsigned gpio, unsigned ngpio, void *c)
326{ 326{
327 /* deselect all functionalities */ 327 /* deselect all functionalities */
328 gpio_set_value(gpio + 5, 1); 328 gpio_set_value_cansleep(gpio + 5, 1);
329 gpio_set_value(gpio + 6, 1); 329 gpio_set_value_cansleep(gpio + 6, 1);
330 gpio_set_value(gpio + 7, 1); 330 gpio_set_value_cansleep(gpio + 7, 1);
331 331
332 gpio_free(gpio + 5); 332 gpio_free(gpio + 5);
333 gpio_free(gpio + 6); 333 gpio_free(gpio + 6);