Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 296667
b: refs/heads/master
c: 426f1af
h: refs/heads/master
i:
  296665: e5c5440
  296663: 6a05fa1
v: v3
  • Loading branch information
Arnd Bergmann committed Mar 24, 2012
1 parent 3edab95 commit e6c1981
Show file tree
Hide file tree
Showing 54 changed files with 437 additions and 469 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e9dd7ed2a365b021cdbb35b5cad62f6ab6aeb5d2
refs/heads/master: 426f1af947c61dee48a9267f84bff227e503a547
39 changes: 3 additions & 36 deletions trunk/arch/arm/mach-shmobile/board-ag5evm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/hardware/gic.h>
#include <asm/hardware/cache-l2x0.h>
#include <asm/traps.h>
Expand Down Expand Up @@ -487,27 +485,6 @@ static struct platform_device *ag5evm_devices[] __initdata = {
&sdhi1_device,
};

static struct map_desc ag5evm_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
* used by CPGA, INTC and PFC.
*/
{
.virtual = 0xe6000000,
.pfn = __phys_to_pfn(0xe6000000),
.length = 256 << 20,
.type = MT_DEVICE_NONSHARED
},
};

static void __init ag5evm_map_io(void)
{
iotable_init(ag5evm_io_desc, ARRAY_SIZE(ag5evm_io_desc));

/* setup early devices and console here as well */
sh73a0_add_early_devices();
shmobile_setup_console();
}

static void __init ag5evm_init(void)
{
sh73a0_pinmux_init();
Expand Down Expand Up @@ -623,22 +600,12 @@ static void __init ag5evm_init(void)
platform_add_devices(ag5evm_devices, ARRAY_SIZE(ag5evm_devices));
}

static void __init ag5evm_timer_init(void)
{
sh73a0_clock_init();
shmobile_timer.init();
return;
}

struct sys_timer ag5evm_timer = {
.init = ag5evm_timer_init,
};

MACHINE_START(AG5EVM, "ag5evm")
.map_io = ag5evm_map_io,
.map_io = sh73a0_map_io,
.init_early = sh73a0_add_early_devices,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = sh73a0_init_irq,
.handle_irq = gic_handle_irq,
.init_machine = ag5evm_init,
.timer = &ag5evm_timer,
.timer = &shmobile_timer,
MACHINE_END
49 changes: 6 additions & 43 deletions trunk/arch/arm/mach-shmobile/board-ap4evb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>
#include <asm/setup.h>

/*
Expand Down Expand Up @@ -1190,32 +1188,6 @@ static struct i2c_board_info i2c1_devices[] = {
},
};

static struct map_desc ap4evb_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
* used by CPGA, INTC and PFC.
*/
{
.virtual = 0xe6000000,
.pfn = __phys_to_pfn(0xe6000000),
.length = 256 << 20,
.type = MT_DEVICE_NONSHARED
},
};

static void __init ap4evb_map_io(void)
{
iotable_init(ap4evb_io_desc, ARRAY_SIZE(ap4evb_io_desc));

/*
* DMA memory at 0xff200000 - 0xffdfffff. The default 2MB size isn't
* enough to allocate the frame buffer memory.
*/
init_consistent_dma_size(12 << 20);

/* setup early devices and console here as well */
sh7372_add_early_devices();
shmobile_setup_console();
}

#define GPIO_PORT9CR 0xE6051009
#define GPIO_PORT10CR 0xE605100A
Expand All @@ -1225,6 +1197,9 @@ static void __init ap4evb_init(void)
u32 srcr4;
struct clk *clk;

/* External clock source */
clk_set_rate(&sh7372_dv_clki_clk, 27000000);

sh7372_pinmux_init();

/* enable SCIFA0 */
Expand Down Expand Up @@ -1461,23 +1436,11 @@ static void __init ap4evb_init(void)
pm_clk_add(&lcdc1_device.dev, "hdmi");
}

static void __init ap4evb_timer_init(void)
{
sh7372_clock_init();
shmobile_timer.init();

/* External clock source */
clk_set_rate(&sh7372_dv_clki_clk, 27000000);
}

static struct sys_timer ap4evb_timer = {
.init = ap4evb_timer_init,
};

MACHINE_START(AP4EVB, "ap4evb")
.map_io = ap4evb_map_io,
.map_io = sh7372_map_io,
.init_early = sh7372_add_early_devices,
.init_irq = sh7372_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = ap4evb_init,
.timer = &ap4evb_timer,
.timer = &shmobile_timer,
MACHINE_END
44 changes: 12 additions & 32 deletions trunk/arch/arm/mach-shmobile/board-bonito.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -328,28 +328,6 @@ static struct platform_device *bonito_base_devices[] __initdata = {
* map I/O
*/
static struct map_desc bonito_io_desc[] __initdata = {
/*
* for CPGA/INTC/PFC
* 0xe6000000-0xefffffff -> 0xe6000000-0xefffffff
*/
{
.virtual = 0xe6000000,
.pfn = __phys_to_pfn(0xe6000000),
.length = 160 << 20,
.type = MT_DEVICE_NONSHARED
},
#ifdef CONFIG_CACHE_L2X0
/*
* for l2x0_init()
* 0xf0100000-0xf0101000 -> 0xf0002000-0xf0003000
*/
{
.virtual = 0xf0002000,
.pfn = __phys_to_pfn(0xf0100000),
.length = PAGE_SIZE,
.type = MT_DEVICE_NONSHARED
},
#endif
/*
* for FPGA (0x1800000-0x19ffffff)
* 0x18000000-0x18002000 -> 0xf0003000-0xf0005000
Expand All @@ -364,11 +342,8 @@ static struct map_desc bonito_io_desc[] __initdata = {

static void __init bonito_map_io(void)
{
r8a7740_map_io();
iotable_init(bonito_io_desc, ARRAY_SIZE(bonito_io_desc));

/* setup early devices and console here as well */
r8a7740_add_early_devices();
shmobile_setup_console();
}

/*
Expand Down Expand Up @@ -492,7 +467,7 @@ static void __init bonito_init(void)
}
}

static void __init bonito_timer_init(void)
static void __init bonito_earlytimer_init(void)
{
u16 val;
u8 md_ck = 0;
Expand All @@ -507,17 +482,22 @@ static void __init bonito_timer_init(void)
md_ck |= MD_CK0;

r8a7740_clock_init(md_ck);
shmobile_timer.init();
shmobile_earlytimer_init();
}

struct sys_timer bonito_timer = {
.init = bonito_timer_init,
};
void __init bonito_add_early_devices(void)
{
r8a7740_add_early_devices();

/* override timer setup with board-specific code */
shmobile_timer.init = bonito_earlytimer_init;
}

MACHINE_START(BONITO, "bonito")
.map_io = bonito_map_io,
.init_early = bonito_add_early_devices,
.init_irq = r8a7740_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = bonito_init,
.timer = &bonito_timer,
.timer = &shmobile_timer,
MACHINE_END
38 changes: 3 additions & 35 deletions trunk/arch/arm/mach-shmobile/board-g3evm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>

/*
* IrDA
Expand Down Expand Up @@ -246,27 +244,6 @@ static struct platform_device *g3evm_devices[] __initdata = {
&irda_device,
};

static struct map_desc g3evm_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
* used by CPGA, INTC and PFC.
*/
{
.virtual = 0xe6000000,
.pfn = __phys_to_pfn(0xe6000000),
.length = 256 << 20,
.type = MT_DEVICE_NONSHARED
},
};

static void __init g3evm_map_io(void)
{
iotable_init(g3evm_io_desc, ARRAY_SIZE(g3evm_io_desc));

/* setup early devices and console here as well */
sh7367_add_early_devices();
shmobile_setup_console();
}

static void __init g3evm_init(void)
{
sh7367_pinmux_init();
Expand Down Expand Up @@ -354,20 +331,11 @@ static void __init g3evm_init(void)
platform_add_devices(g3evm_devices, ARRAY_SIZE(g3evm_devices));
}

static void __init g3evm_timer_init(void)
{
sh7367_clock_init();
shmobile_timer.init();
}

static struct sys_timer g3evm_timer = {
.init = g3evm_timer_init,
};

MACHINE_START(G3EVM, "g3evm")
.map_io = g3evm_map_io,
.map_io = sh7367_map_io,
.init_early = sh7367_add_early_devices,
.init_irq = sh7367_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = g3evm_init,
.timer = &g3evm_timer,
.timer = &shmobile_timer,
MACHINE_END
38 changes: 3 additions & 35 deletions trunk/arch/arm/mach-shmobile/board-g4evm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@
#include <mach/common.h>
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
#include <asm/mach/time.h>

/*
* SDHI
Expand Down Expand Up @@ -260,27 +258,6 @@ static struct platform_device *g4evm_devices[] __initdata = {
&sdhi1_device,
};

static struct map_desc g4evm_io_desc[] __initdata = {
/* create a 1:1 entity map for 0xe6xxxxxx
* used by CPGA, INTC and PFC.
*/
{
.virtual = 0xe6000000,
.pfn = __phys_to_pfn(0xe6000000),
.length = 256 << 20,
.type = MT_DEVICE_NONSHARED
},
};

static void __init g4evm_map_io(void)
{
iotable_init(g4evm_io_desc, ARRAY_SIZE(g4evm_io_desc));

/* setup early devices and console here as well */
sh7377_add_early_devices();
shmobile_setup_console();
}

#define GPIO_SDHID0_D0 0xe60520fc
#define GPIO_SDHID0_D1 0xe60520fd
#define GPIO_SDHID0_D2 0xe60520fe
Expand Down Expand Up @@ -397,20 +374,11 @@ static void __init g4evm_init(void)
platform_add_devices(g4evm_devices, ARRAY_SIZE(g4evm_devices));
}

static void __init g4evm_timer_init(void)
{
sh7377_clock_init();
shmobile_timer.init();
}

static struct sys_timer g4evm_timer = {
.init = g4evm_timer_init,
};

MACHINE_START(G4EVM, "g4evm")
.map_io = g4evm_map_io,
.map_io = sh7377_map_io,
.init_early = sh7377_add_early_devices,
.init_irq = sh7377_init_irq,
.handle_irq = shmobile_handle_irq_intc,
.init_machine = g4evm_init,
.timer = &g4evm_timer,
.timer = &shmobile_timer,
MACHINE_END
Loading

0 comments on commit e6c1981

Please sign in to comment.