Merge remote-tracking branches 'spi/topic/atmel', 'spi/topic/bcm2385'…

…, 'spi/topic/bcm2835', 'spi/topic/bcm53xx' and 'spi/topic/bitbang' into spi-next
chewitt · Apr 11, 2015 · f9de734 · f9de734
6 parents 19655dd + ea46732 + b716c4f + 704f32d + b3e7766 + 232a5ad
commit f9de734
Show file tree

Hide file tree

Showing 6 changed files with 283 additions and 145 deletions.
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
@@ -180,11 +180,17 @@
 	  | SPI_BF(name, value))
 
 /* Register access macros */
+#ifdef CONFIG_AVR32
 #define spi_readl(port, reg) \
 	__raw_readl((port)->regs + SPI_##reg)
 #define spi_writel(port, reg, value) \
 	__raw_writel((value), (port)->regs + SPI_##reg)
-
+#else
+#define spi_readl(port, reg) \
+	readl_relaxed((port)->regs + SPI_##reg)
+#define spi_writel(port, reg, value) \
+	writel_relaxed((value), (port)->regs + SPI_##reg)
+#endif
 /* use PIO for small transfers, avoiding DMA setup/teardown overhead and
  * cache operations; better heuristics consider wordsize and bitrate.
  */