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

ARM: versatile: switch to devicetree support 

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Antony Pavlov 2014-06-20 01:28:39 +04:00 committed by Sascha Hauer
parent daa3e125ab
commit 72621fddfc
4 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/boards/versatile/versatilepb.c
View File

@ -32,7 +32,6 @@
static int vpb_console_init(void)
{
barebox_set_model("ARM Versatile/PB (ARM926EJ-S)");
barebox_set_hostname("versatilepb");
versatile_register_uart(0);
@ -40,14 +39,6 @@ static int vpb_console_init(void)
}
console_initcall(vpb_console_init);
static int vpb_mem_init(void)
{
versatile_add_sdram(64 * 1024 *1024);
return 0;
}
mem_initcall(vpb_mem_init);
static struct smc91c111_pdata net_pdata = {
.qemu_fixup = 1,
};
@ -55,7 +46,6 @@ static struct smc91c111_pdata net_pdata = {
static int vpb_devices_init(void)
{
add_cfi_flash_device(DEVICE_ID_DYNAMIC, VERSATILE_FLASH_BASE, VERSATILE_FLASH_SIZE, 0);
versatile_register_i2c();
devfs_add_partition("nor0", 0x00000, 0x40000, DEVFS_PARTITION_FIXED, "self");
devfs_add_partition("nor0", 0x40000, 0x20000, DEVFS_PARTITION_FIXED, "env0");

10
arch/arm/dts/versatile-pb.dts Normal file
View File

@ -0,0 +1,10 @@
#include <arm/versatile-ab.dts>
/ {
model = "ARM Versatile PB";
compatible = "arm,versatile-pb";
memory {
reg = <0x0 0x04000000>;
};
};

11
arch/arm/mach-versatile/core.c
View File

@ -40,11 +40,6 @@
#include <mach/platform.h>
#include <mach/init.h>
void versatile_add_sdram(u32 size)
{
arm_add_mem_device("ram0", 0x00000000, size);
}
struct clk {
unsigned long rate;
};
@ -183,12 +178,6 @@ void versatile_register_uart(unsigned id)
amba_apb_device_add(NULL, "uart-pl011", id, start, 4096, NULL, 0);
}
void versatile_register_i2c(void)
{
add_generic_device("versatile-i2c", DEVICE_ID_DYNAMIC, NULL,
VERSATILE_I2C_BASE, SZ_4K, IORESOURCE_MEM, NULL);
}
void __noreturn reset_cpu (unsigned long ignored)
{
u32 val;

2
arch/arm/mach-versatile/include/mach/init.h
View File

@ -2,8 +2,6 @@
#ifndef __VERSATILE_INIT_H__
#define __VERSATILE_INIT_H__
void versatile_add_sdram(u32 size);
void versatile_register_uart(unsigned id);
void versatile_register_i2c(void);
#endif