-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ARM: Merge for-2635-4/s5pv210-boards
Merge branch 'for-2635-4/s5pv210-boards' into for-2635-4/partial1 Conflicts: arch/arm/mach-s5pv210/include/mach/map.h
- Loading branch information
Showing
22 changed files
with
773 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,149 @@ | ||
| /* linux/arch/arm/mach-s5pv210/mach-aquila.c | ||
| * | ||
| * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| * http://www.samsung.com/ | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License version 2 as | ||
| * published by the Free Software Foundation. | ||
| */ | ||
|
|
||
| #include <linux/kernel.h> | ||
| #include <linux/types.h> | ||
| #include <linux/init.h> | ||
| #include <linux/serial_core.h> | ||
| #include <linux/fb.h> | ||
|
|
||
| #include <asm/mach/arch.h> | ||
| #include <asm/mach/map.h> | ||
| #include <asm/setup.h> | ||
| #include <asm/mach-types.h> | ||
|
|
||
| #include <mach/map.h> | ||
| #include <mach/regs-clock.h> | ||
| #include <mach/regs-fb.h> | ||
|
|
||
| #include <plat/regs-serial.h> | ||
| #include <plat/s5pv210.h> | ||
| #include <plat/devs.h> | ||
| #include <plat/cpu.h> | ||
| #include <plat/fb.h> | ||
|
|
||
| /* Following are default values for UCON, ULCON and UFCON UART registers */ | ||
| #define S5PV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ | ||
| S3C2410_UCON_RXILEVEL | \ | ||
| S3C2410_UCON_TXIRQMODE | \ | ||
| S3C2410_UCON_RXIRQMODE | \ | ||
| S3C2410_UCON_RXFIFO_TOI | \ | ||
| S3C2443_UCON_RXERR_IRQEN) | ||
|
|
||
| #define S5PV210_ULCON_DEFAULT S3C2410_LCON_CS8 | ||
|
|
||
| #define S5PV210_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE | \ | ||
| S5PV210_UFCON_TXTRIG4 | \ | ||
| S5PV210_UFCON_RXTRIG4) | ||
|
|
||
| static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = { | ||
| [0] = { | ||
| .hwport = 0, | ||
| .flags = 0, | ||
| .ucon = S5PV210_UCON_DEFAULT, | ||
| .ulcon = S5PV210_ULCON_DEFAULT, | ||
| .ufcon = S5PV210_UFCON_DEFAULT, | ||
| }, | ||
| [1] = { | ||
| .hwport = 1, | ||
| .flags = 0, | ||
| .ucon = S5PV210_UCON_DEFAULT, | ||
| .ulcon = S5PV210_ULCON_DEFAULT, | ||
| .ufcon = S5PV210_UFCON_DEFAULT, | ||
| }, | ||
| [2] = { | ||
| .hwport = 2, | ||
| .flags = 0, | ||
| .ucon = S5PV210_UCON_DEFAULT, | ||
| .ulcon = S5PV210_ULCON_DEFAULT, | ||
| .ufcon = S5PV210_UFCON_DEFAULT, | ||
| }, | ||
| [3] = { | ||
| .hwport = 3, | ||
| .flags = 0, | ||
| .ucon = S5PV210_UCON_DEFAULT, | ||
| .ulcon = S5PV210_ULCON_DEFAULT, | ||
| .ufcon = S5PV210_UFCON_DEFAULT, | ||
| }, | ||
| }; | ||
|
|
||
| /* Frame Buffer */ | ||
| static struct s3c_fb_pd_win aquila_fb_win0 = { | ||
| .win_mode = { | ||
| .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60), | ||
| .left_margin = 16, | ||
| .right_margin = 16, | ||
| .upper_margin = 3, | ||
| .lower_margin = 28, | ||
| .hsync_len = 2, | ||
| .vsync_len = 2, | ||
| .xres = 480, | ||
| .yres = 800, | ||
| }, | ||
| .max_bpp = 32, | ||
| .default_bpp = 16, | ||
| }; | ||
|
|
||
| static struct s3c_fb_pd_win aquila_fb_win1 = { | ||
| .win_mode = { | ||
| .pixclock = 1000000000000ULL / ((16+16+2+480)*(28+3+2+800)*60), | ||
| .left_margin = 16, | ||
| .right_margin = 16, | ||
| .upper_margin = 3, | ||
| .lower_margin = 28, | ||
| .hsync_len = 2, | ||
| .vsync_len = 2, | ||
| .xres = 480, | ||
| .yres = 800, | ||
| }, | ||
| .max_bpp = 32, | ||
| .default_bpp = 16, | ||
| }; | ||
|
|
||
| static struct s3c_fb_platdata aquila_lcd_pdata __initdata = { | ||
| .win[0] = &aquila_fb_win0, | ||
| .win[1] = &aquila_fb_win1, | ||
| .vidcon0 = VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB, | ||
| .vidcon1 = VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC | | ||
| VIDCON1_INV_VCLK | VIDCON1_INV_VDEN, | ||
| .setup_gpio = s5pv210_fb_gpio_setup_24bpp, | ||
| }; | ||
|
|
||
| static struct platform_device *aquila_devices[] __initdata = { | ||
| &s3c_device_fb, | ||
| }; | ||
|
|
||
| static void __init aquila_map_io(void) | ||
| { | ||
| s5p_init_io(NULL, 0, S5P_VA_CHIPID); | ||
| s3c24xx_init_clocks(24000000); | ||
| s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs)); | ||
| } | ||
|
|
||
| static void __init aquila_machine_init(void) | ||
| { | ||
| /* FB */ | ||
| s3c_fb_set_platdata(&aquila_lcd_pdata); | ||
|
|
||
| platform_add_devices(aquila_devices, ARRAY_SIZE(aquila_devices)); | ||
| } | ||
|
|
||
| MACHINE_START(AQUILA, "Aquila") | ||
| /* Maintainers: | ||
| Marek Szyprowski <m.szyprowski@samsung.com> | ||
| Kyungmin Park <kyungmin.park@samsung.com> */ | ||
| .phys_io = S3C_PA_UART & 0xfff00000, | ||
| .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc, | ||
| .boot_params = S5P_PA_SDRAM + 0x100, | ||
| .init_irq = s5pv210_init_irq, | ||
| .map_io = aquila_map_io, | ||
| .init_machine = aquila_machine_init, | ||
| .timer = &s3c24xx_timer, | ||
| MACHINE_END |
Oops, something went wrong.