diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:01:09 +0100 |
| commit | bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98 (patch) | |
| tree | 3cf8336e5c2c6341120a2b68f8bb7a5df385fb64 /arch/arm/boards/freescale-mx6-sabrelite | |
| parent | 38c75d0f112d4e8bc3762cd8d0b6dbae3cf7e441 (diff) | |
| parent | 4f2ac27e2503e15bffdebca4757e02638686fe94 (diff) | |
| download | barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.gz barebox-bf38ac7b89dee71d14d4d65e9ad0d0cb727cbb98.tar.xz | |
Merge branch 'for-next/imx'
Conflicts:
arch/arm/boards/guf-neso/lowlevel.c
arch/arm/boards/pcm038/lowlevel.c
commands/Makefile
Diffstat (limited to 'arch/arm/boards/freescale-mx6-sabrelite')
| -rw-r--r-- | arch/arm/boards/freescale-mx6-sabrelite/board.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index 25402d7c9c..da37e17b8f 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -17,7 +17,7 @@ #include <common.h> #include <init.h> #include <environment.h> -#include <mach/imx-regs.h> +#include <mach/imx6-regs.h> #include <fec.h> #include <mach/gpio.h> #include <asm/armlinux.h> @@ -200,7 +200,7 @@ static inline int imx6_iim_register_fec_ethaddr(void) return 0; } -static int sabrelite_spi_cs[] = {GPIO_PORTC + 19}; +static int sabrelite_spi_cs[] = {IMX_GPIO_NR(3, 19)}; static struct spi_imx_master sabrelite_spi_0_data = { .chipselect = sabrelite_spi_cs, |