summaryrefslogtreecommitdiff
path: root/drivers/spi/altera_spi.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-10-28 16:56:43 -0400
committerTom Rini <trini@konsulko.com>2015-10-28 16:56:43 -0400
commit446d37c1acc76680770400fd90e6c502e49d72df (patch)
treef309e83e262b0ee6e41d0f1bf92af9fb0e3faa18 /drivers/spi/altera_spi.c
parentab0a6a5dba740afb490e6e7d417e345284e0dbec (diff)
parentbef87adf95e7ca923f866e27bbcccb2dad85df9f (diff)
downloadu-boot-imx-446d37c1acc76680770400fd90e6c502e49d72df.zip
u-boot-imx-446d37c1acc76680770400fd90e6c502e49d72df.tar.gz
u-boot-imx-446d37c1acc76680770400fd90e6c502e49d72df.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/altera_spi.c')
-rw-r--r--drivers/spi/altera_spi.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/spi/altera_spi.c b/drivers/spi/altera_spi.c
index ff3512a..e49949b 100644
--- a/drivers/spi/altera_spi.c
+++ b/drivers/spi/altera_spi.c
@@ -11,14 +11,17 @@
#include <dm.h>
#include <errno.h>
#include <malloc.h>
-#include <spi.h>
#include <fdtdec.h>
+#include <spi.h>
#include <asm/io.h>
DECLARE_GLOBAL_DATA_PTR;
+#define ALTERA_SPI_STATUS_RRDY_MSK BIT(7)
+#define ALTERA_SPI_CONTROL_SSO_MSK BIT(10)
+
#ifndef CONFIG_ALTERA_SPI_IDLE_VAL
-#define CONFIG_ALTERA_SPI_IDLE_VAL 0xff
+#define CONFIG_ALTERA_SPI_IDLE_VAL 0xff
#endif
struct altera_spi_regs {
@@ -38,9 +41,6 @@ struct altera_spi_priv {
struct altera_spi_regs *regs;
};
-#define ALTERA_SPI_STATUS_RRDY_MSK (1 << 7)
-#define ALTERA_SPI_CONTROL_SSO_MSK (1 << 10)
-
static void spi_cs_activate(struct udevice *dev, uint cs)
{
struct udevice *bus = dev->parent;