[PATCH] arm: cfa10036: Add proper resource length

[PATCH] arm: cfa10036: Add proper resource length

[Maxime Ripard]

The cfa10036 board file were missing the length parameter when adding
devices. This made barebox crash early in the boot, in the mxs-mci
driver.

Provide the resources lengths in a consistent format.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/boards/crystalfontz-cfa10036/cfa10036.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
index e454afd..fcb7057 100644
--- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
+++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
@@ -23,6 +23,7 @@
 #include <init.h>
 #include <mci.h>
 #include <io.h>
+#include <sizes.h>
 
 #include <mach/clock.h>
 #include <mach/imx-regs.h>
@@ -89,7 +90,7 @@ static int cfa10036_devices_init(void)
 	armlinux_set_bootparams((void *)IMX_MEMORY_BASE + 0x100);
 	armlinux_set_architecture(MACH_TYPE_CFA10036);
 
-	add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, 0,
+	add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, SZ_8K,
 			   IORESOURCE_MEM, &mci_pdata);
 
 	return 0;
@@ -98,7 +99,7 @@ device_initcall(cfa10036_devices_init);
 
 static int cfa10036_console_init(void)
 {
-	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
+	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, SZ_8K,
 			   IORESOURCE_MEM, NULL);
 
 	return 0;
-- 
1.7.9.5


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

Re: [PATCH] arm: cfa10036: Add proper resource length

[Sascha Hauer]

On Fri, Sep 28, 2012 at 03:58:12PM +0200, Maxime Ripard wrote:
> The cfa10036 board file were missing the length parameter when adding
> devices. This made barebox crash early in the boot, in the mxs-mci
> driver.
> 
> Provide the resources lengths in a consistent format.

Applied, thanks

Sascha

> 
> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> ---
>  arch/arm/boards/crystalfontz-cfa10036/cfa10036.c |    5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
> index e454afd..fcb7057 100644
> --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
> +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c
> @@ -23,6 +23,7 @@
>  #include <init.h>
>  #include <mci.h>
>  #include <io.h>
> +#include <sizes.h>
>  
>  #include <mach/clock.h>
>  #include <mach/imx-regs.h>
> @@ -89,7 +90,7 @@ static int cfa10036_devices_init(void)
>  	armlinux_set_bootparams((void *)IMX_MEMORY_BASE + 0x100);
>  	armlinux_set_architecture(MACH_TYPE_CFA10036);
>  
> -	add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, 0,
> +	add_generic_device("mxs_mci", 0, NULL, IMX_SSP0_BASE, SZ_8K,
>  			   IORESOURCE_MEM, &mci_pdata);
>  
>  	return 0;
> @@ -98,7 +99,7 @@ device_initcall(cfa10036_devices_init);
>  
>  static int cfa10036_console_init(void)
>  {
> -	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, 8192,
> +	add_generic_device("stm_serial", 0, NULL, IMX_DBGUART_BASE, SZ_8K,
>  			   IORESOURCE_MEM, NULL);
>  
>  	return 0;
> -- 
> 1.7.9.5
> 
> 
> _______________________________________________
> 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

Re: [PATCH] arm: cfa10036: Add proper resource length

[Maxime Ripard]

Hi Sascha,

Le 28/09/2012 16:32, Sascha Hauer a écrit :
> On Fri, Sep 28, 2012 at 03:58:12PM +0200, Maxime Ripard wrote:
>> The cfa10036 board file were missing the length parameter when adding
>> devices. This made barebox crash early in the boot, in the mxs-mci
>> driver.
>>
>> Provide the resources lengths in a consistent format.
> 
> Applied, thanks

Will this be applied to the next stable release (2012.10)? Since 2012.09
was already broken (my bad), it would be nice if 2012.10 wasn't.

-- 
Maxime Ripard, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

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

Re: [PATCH] arm: cfa10036: Add proper resource length

[Sascha Hauer]

On Fri, Sep 28, 2012 at 04:39:02PM +0200, Maxime Ripard wrote:
> Hi Sascha,
> 
> Le 28/09/2012 16:32, Sascha Hauer a écrit :
> > On Fri, Sep 28, 2012 at 03:58:12PM +0200, Maxime Ripard wrote:
> >> The cfa10036 board file were missing the length parameter when adding
> >> devices. This made barebox crash early in the boot, in the mxs-mci
> >> driver.
> >>
> >> Provide the resources lengths in a consistent format.
> > 
> > Applied, thanks
> 
> Will this be applied to the next stable release (2012.10)? Since 2012.09
> was already broken (my bad), it would be nice if 2012.10 wasn't.

Yes, I applied this to master.

Sascha


-- 
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