mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] mxs_spi: fix compile error
@ 2013-09-09 20:00 Eric Bénard
  2013-09-09 20:00 ` [PATCH 2/2] serial_auart: " Eric Bénard
  2013-09-10  6:22 ` [PATCH 1/2] mxs_spi: " Sascha Hauer
  0 siblings, 2 replies; 3+ messages in thread
From: Eric Bénard @ 2013-09-09 20:00 UTC (permalink / raw)
  To: barebox

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

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 drivers/spi/mxs_spi.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
index 4e539bf..a803652 100644
--- a/drivers/spi/mxs_spi.c
+++ b/drivers/spi/mxs_spi.c
@@ -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);
-- 
1.8.3.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [PATCH 2/2] serial_auart: fix compile error
  2013-09-09 20:00 [PATCH 1/2] mxs_spi: fix compile error Eric Bénard
@ 2013-09-09 20:00 ` Eric Bénard
  2013-09-10  6:22 ` [PATCH 1/2] mxs_spi: " Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Eric Bénard @ 2013-09-09 20:00 UTC (permalink / raw)
  To: barebox

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

Signed-off-by: Eric Bénard <eric@eukrea.com>
---
 drivers/serial/serial_auart.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/serial/serial_auart.c b/drivers/serial/serial_auart.c
index 6518dbb..0e1ab83 100644
--- a/drivers/serial/serial_auart.c
+++ b/drivers/serial/serial_auart.c
@@ -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)
-- 
1.8.3.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/2] mxs_spi: fix compile error
  2013-09-09 20:00 [PATCH 1/2] mxs_spi: fix compile error Eric Bénard
  2013-09-09 20:00 ` [PATCH 2/2] serial_auart: " Eric Bénard
@ 2013-09-10  6:22 ` Sascha Hauer
  1 sibling, 0 replies; 3+ messages in thread
From: Sascha Hauer @ 2013-09-10  6:22 UTC (permalink / raw)
  To: Eric Bénard; +Cc: barebox

Hi Eric,

On Mon, Sep 09, 2013 at 10:00:25PM +0200, Eric Bénard wrote:
> 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
> 
> Signed-off-by: Eric Bénard <eric@eukrea.com>

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

> ---
>  drivers/spi/mxs_spi.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/mxs_spi.c b/drivers/spi/mxs_spi.c
> index 4e539bf..a803652 100644
> --- a/drivers/spi/mxs_spi.c
> +++ b/drivers/spi/mxs_spi.c
> @@ -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);
> -- 
> 1.8.3.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox

-- 
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
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-09-10  6:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-09-09 20:00 [PATCH 1/2] mxs_spi: fix compile error Eric Bénard
2013-09-09 20:00 ` [PATCH 2/2] serial_auart: " Eric Bénard
2013-09-10  6:22 ` [PATCH 1/2] mxs_spi: " Sascha Hauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox