diff options
Diffstat (limited to 'drivers/spi/spi-gpio.c')
-rw-r--r-- | drivers/spi/spi-gpio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 3fb09f981980..7beeb29472ac 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c | |||
@@ -115,17 +115,17 @@ spi_to_pdata(const struct spi_device *spi) | |||
115 | 115 | ||
116 | static inline void setsck(const struct spi_device *spi, int is_on) | 116 | static inline void setsck(const struct spi_device *spi, int is_on) |
117 | { | 117 | { |
118 | gpio_set_value(SPI_SCK_GPIO, is_on); | 118 | gpio_set_value_cansleep(SPI_SCK_GPIO, is_on); |
119 | } | 119 | } |
120 | 120 | ||
121 | static inline void setmosi(const struct spi_device *spi, int is_on) | 121 | static inline void setmosi(const struct spi_device *spi, int is_on) |
122 | { | 122 | { |
123 | gpio_set_value(SPI_MOSI_GPIO, is_on); | 123 | gpio_set_value_cansleep(SPI_MOSI_GPIO, is_on); |
124 | } | 124 | } |
125 | 125 | ||
126 | static inline int getmiso(const struct spi_device *spi) | 126 | static inline int getmiso(const struct spi_device *spi) |
127 | { | 127 | { |
128 | return !!gpio_get_value(SPI_MISO_GPIO); | 128 | return !!gpio_get_value_cansleep(SPI_MISO_GPIO); |
129 | } | 129 | } |
130 | 130 | ||
131 | #undef pdata | 131 | #undef pdata |
@@ -229,7 +229,7 @@ static void spi_gpio_chipselect(struct spi_device *spi, int is_active) | |||
229 | 229 | ||
230 | if (cs != SPI_GPIO_NO_CHIPSELECT) { | 230 | if (cs != SPI_GPIO_NO_CHIPSELECT) { |
231 | /* SPI is normally active-low */ | 231 | /* SPI is normally active-low */ |
232 | gpio_set_value(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active); | 232 | gpio_set_value_cansleep(cs, (spi->mode & SPI_CS_HIGH) ? is_active : !is_active); |
233 | } | 233 | } |
234 | } | 234 | } |
235 | 235 | ||