Skip to contentSkip to conversation

mxs_spi: fix compile error

PATCH In review Eric Bénard 2 participants 3 messages Sep 9, 2013 – Sep 10, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 mxs_spi: fix compile error

this fix :
drivers/spi/mxs_spi.c:29:22: fatal error: mach/mxs.h: No such file or directory and
drivers/spi/mxs_spi.c: In function 'mxs_spi_setup':
drivers/spi/mxs_spi.c:102:2: error: too few arguments to function 'stmp_reset_block' include/stmp-device.h:21:12: note: declared here

only compile tested ATM

---
 drivers/spi/mxs_spi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/mxs_spi.c +1 -2
index 4e539bf..a803652 100644
@@ -26,7 +26,6 @@
 #include <asm/mmu.h>
 #include <mach/generic.h>
 #include <mach/imx-regs.h>
-#include <mach/mxs.h>
 #include <mach/clock.h>
 #include <mach/ssp.h>
 
@@ -100,7 +99,7 @@ static int mxs_spi_setup(struct spi_device *spi)
 		return -EINVAL;
 	}
 
-	stmp_reset_block(mxs->regs + HW_SSP_CTRL0);
+	stmp_reset_block(mxs->regs + HW_SSP_CTRL0, 0);
 
 	val |= SSP_CTRL0_SSP_ASSERT_OUT(spi->chip_select);
 	val |= SSP_CTRL0_BUS_WIDTH(0);
Signature · 7 lines
1.8.3.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#1 lore raw

PATCH 2/2 serial_auart: fix compile error

this fix :
drivers/serial/serial_auart.c:49:22: fatal error: mach/mxs.h: No such file or directory
and
drivers/serial/serial_auart.c: In function 'auart_serial_init_port':
drivers/serial/serial_auart.c:174:2: warning: implicit declaration of function 'stmp_reset_block' [-Wimplicit-function-declaration]

only compile tested ATM

---
 drivers/serial/serial_auart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/serial/serial_auart.c +1 -1
index 6518dbb..0e1ab83 100644
@@ -42,11 +42,11 @@
 #include <io.h>
 #include <malloc.h>
 #include <notifier.h>
+#include <stmp-device.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 
 #include <mach/clock.h>
-#include <mach/mxs.h>
 #include <mach/imx-regs.h>
 
 #define HW_UARTAPP_CTRL0		(0x00000000)
Signature · 7 lines
1.8.3.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
maintainer
#2 lore raw
In reply to Eric Bénard

Hi Eric,

Quoted 10 lines · Eric Bénard

this fix :
drivers/spi/mxs_spi.c:29:22: fatal error: mach/mxs.h: No such file or directory and
drivers/spi/mxs_spi.c: In function 'mxs_spi_setup':
drivers/spi/mxs_spi.c:102:2: error: too few arguments to function 'stmp_reset_block' include/stmp-device.h:21:12: note: declared here

only compile tested ATM

Applied both. Also I applied a patch which enables both drivers in the imx28evk_defconfig. This should make sure this doesn't happen again since I compile test all defconfigs.

Sascha

Quoted 33 lines
---
 drivers/spi/mxs_spi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/spi/mxs_spi.c +1 -2
index 4e539bf..a803652 100644
@@ -26,7 +26,6 @@
 #include <asm/mmu.h>
 #include <mach/generic.h>
 #include <mach/imx-regs.h>
-#include <mach/mxs.h>
 #include <mach/clock.h>
 #include <mach/ssp.h>
 
@@ -100,7 +99,7 @@ static int mxs_spi_setup(struct spi_device *spi)
 		return -EINVAL;
 	}
 
-	stmp_reset_block(mxs->regs + HW_SSP_CTRL0);
+	stmp_reset_block(mxs->regs + HW_SSP_CTRL0, 0);
 
 	val |= SSP_CTRL0_SSP_ASSERT_OUT(spi->chip_select);
 	val |= SSP_CTRL0_BUS_WIDTH(0);
Signature · 7 lines
1.8.3.1


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox