sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

ARM/Samsung: unify device registration for the S3C24XX SoCs 

Barebox crashes since it has trouble with a resource size of 0. Most of the
S3C24XX based platforms crashes at runtime and can't use devices with resource
sizes of 0 anymore. This patch fix it by unifying the device registration for
all current Barebox's S3C24XX based platforms.

- A9M2410 and A9M2440 compile time tested only.
- Mini2440 also runtime tested.

Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
This commit is contained in:
Juergen Beisert 2012-07-13 20:46:19 +02:00
parent c0cf41f958
commit 0d22e37ff8
4 changed files with 67 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/boards/a9m2410/a9m2410.c
View File

@ -32,6 +32,7 @@
#include <partition.h>
#include <nand.h>
#include <io.h>
#include <mach/devices-s3c24xx.h>
#include <mach/s3c-iomap.h>
#include <mach/s3c24xx-nand.h>
#include <mach/s3c-generic.h>
@ -109,8 +110,7 @@ static int a9m2410_devices_init(void)
writel(reg, S3C_MISCCR);
/* ----------- the devices the boot loader should work with -------- */
add_generic_device("s3c24x0_nand", DEVICE_ID_DYNAMIC, NULL, S3C24X0_NAND_BASE,
0, IORESOURCE_MEM, &nand_info);
s3c24xx_add_nand(&nand_info);
/*
* SMSC 91C111 network controller on the baseboard
* connected to CS line 1 and interrupt line
@ -145,8 +145,7 @@ void __bare_init nand_boot(void)
static int a9m2410_console_init(void)
{
add_generic_device("s3c_serial", DEVICE_ID_DYNAMIC, NULL, S3C_UART1_BASE,
S3C_UART1_SIZE, IORESOURCE_MEM, NULL);
s3c24xx_add_uart1();
return 0;
}

7
arch/arm/boards/a9m2440/a9m2440.c
View File

@ -32,6 +32,7 @@
#include <partition.h>
#include <nand.h>
#include <io.h>
#include <mach/devices-s3c24xx.h>
#include <mach/s3c-iomap.h>
#include <mach/s3c24xx-nand.h>
#include <mach/s3c-generic.h>
@ -129,8 +130,7 @@ static int a9m2440_devices_init(void)
writel(reg, S3C_MISCCR);
/* ----------- the devices the boot loader should work with -------- */
add_generic_device("s3c24x0_nand", DEVICE_ID_DYNAMIC, NULL, S3C24X0_NAND_BASE, 0,
IORESOURCE_MEM, &nand_info);
s3c24xx_add_nand(&nand_info);
/*
* cs8900 network controller onboard
* Connected to CS line 5 + A24 and interrupt line EINT9,
@ -164,8 +164,7 @@ void __bare_init nand_boot(void)
static int a9m2440_console_init(void)
{
add_generic_device("s3c_serial", DEVICE_ID_DYNAMIC, NULL, S3C_UART1_BASE,
S3C_UART1_SIZE, IORESOURCE_MEM, NULL);
s3c24xx_add_uart1();
return 0;
}

16
arch/arm/boards/mini2440/mini2440.c
View File

@ -39,6 +39,7 @@
#include <io.h>
#include <mach/gpio.h>
#include <mach/s3c-iomap.h>
#include <mach/devices-s3c24xx.h>
#include <mach/s3c24xx-nand.h>
#include <mach/s3c-generic.h>
#include <mach/s3c-mci.h>
@ -297,8 +298,7 @@ static int mini2440_devices_init(void)
reg |= 0x10000;
writel(reg, S3C_MISCCR);
add_generic_device("s3c24x0_nand", DEVICE_ID_DYNAMIC, NULL, S3C24X0_NAND_BASE,
0, IORESOURCE_MEM, &nand_info);
s3c24xx_add_nand(&nand_info);
add_dm9000_device(0, S3C_CS4_BASE + 0x300, S3C_CS4_BASE + 0x304,
IORESOURCE_MEM_16BIT, &dm9000_data);
@ -312,12 +312,9 @@ static int mini2440_devices_init(void)
devfs_add_partition("nand0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env_raw");
dev_add_bb_dev("env_raw", "env0");
#endif
add_generic_device("s3c_mci", 0, NULL, S3C2410_SDI_BASE, 0,
IORESOURCE_MEM, &mci_data);
add_generic_device("s3c_fb", 0, NULL, S3C2410_LCD_BASE, 0,
IORESOURCE_MEM, &s3c24x0_fb_data);
add_generic_device("ohci", 0, NULL, S3C2410_USB_HOST_BASE, 0x100,
IORESOURCE_MEM, NULL);
s3c24xx_add_mci(&mci_data);
s3c24xx_add_fb(&s3c24x0_fb_data);
s3c24xx_add_ohci();
armlinux_set_bootparams((void*)S3C_SDRAM_BASE + 0x100);
armlinux_set_architecture(MACH_TYPE_MINI2440);
@ -344,8 +341,7 @@ static int mini2440_console_init(void)
s3c_gpio_mode(GPH2_TXD0);
s3c_gpio_mode(GPH3_RXD0);
add_generic_device("s3c_serial", DEVICE_ID_DYNAMIC, NULL, S3C_UART1_BASE,
S3C_UART1_SIZE, IORESOURCE_MEM, NULL);
s3c24xx_add_uart1();
return 0;
}

55
arch/arm/mach-samsung/include/mach/devices-s3c24xx.h Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright 2012 Juergen Beisert
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*/
#ifndef INCLUDE_MACH_DEVICES_S3C24XX_H
# define INCLUDE_MACH_DEVICES_S3C24XX_H
#include <driver.h>
#include <mach/s3c24xx-iomap.h>
#include <mach/s3c24xx-nand.h>
#include <mach/s3c-mci.h>
#include <mach/s3c24xx-fb.h>
static inline void s3c24xx_add_nand(struct s3c24x0_nand_platform_data *d)
{
add_generic_device("s3c24x0_nand", DEVICE_ID_DYNAMIC, NULL,
S3C24X0_NAND_BASE, 0x80, IORESOURCE_MEM, d);
}
static inline void s3c24xx_add_mci(struct s3c_mci_platform_data *d)
{
add_generic_device("s3c_mci", DEVICE_ID_DYNAMIC, NULL,
S3C2410_SDI_BASE, 0x80, IORESOURCE_MEM, d);
}
static inline void s3c24xx_add_fb(struct s3c_fb_platform_data *d)
{
add_generic_device("s3c_fb", DEVICE_ID_DYNAMIC, NULL,
S3C2410_LCD_BASE, 0x80, IORESOURCE_MEM, d);
}
static inline void s3c24xx_add_ohci(void)
{
add_generic_device("ohci", DEVICE_ID_DYNAMIC, NULL,
S3C2410_USB_HOST_BASE, 0x100, IORESOURCE_MEM, NULL);
}
static inline void s3c24xx_add_uart1(void)
{
add_generic_device("s3c_serial", DEVICE_ID_DYNAMIC, NULL, S3C_UART1_BASE,
S3C_UART1_SIZE, IORESOURCE_MEM, NULL);
}
#endif /* INCLUDE_MACH_DEVICES_S3C24XX_H */