diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-01-28 20:12:14 -0500 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-02-23 20:52:15 -0500 |
| commit | 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f (patch) | |
| tree | 8b89db3128eb45123561cd7aad172f27000ed537 | |
| parent | a0af8b3c701d254b55fc291150d5320317c0a338 (diff) | |
ARM: S5P6442: Add Samsung S5P6442 CPU support
This patch adds support for Samsung S5P6442 CPU. This patch also adds
an entry for S5P6442 cpu in plat-s5p cpu table.
Signed-off-by: Adityapratap Sharma <aditya.ps@samsung.com>
Signed-off-by: Atul Dahiya <atul.dahiya@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
| -rw-r--r-- | arch/arm/mach-s5p6442/Kconfig | 24 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/Makefile | 18 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/Makefile.boot | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/cpu.c | 121 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/debug-macro.S | 36 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/gpio.h | 123 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/hardware.h | 18 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/map.h | 58 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/memory.h | 19 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/system.h | 26 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/include/mach/uncompress.h | 24 | ||||
| -rw-r--r-- | arch/arm/mach-s5p6442/init.c | 44 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/cpu.c | 10 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/map-s5p.h | 1 | ||||
| -rw-r--r-- | arch/arm/plat-s5p/include/plat/s5p6442.h | 33 | ||||
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/debug-macro.S | 12 |
17 files changed, 617 insertions, 0 deletions
diff --git a/arch/arm/mach-s5p6442/Kconfig b/arch/arm/mach-s5p6442/Kconfig new file mode 100644 index 000000000000..4f3f6de6a013 --- /dev/null +++ b/arch/arm/mach-s5p6442/Kconfig | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | # arch/arm/mach-s5p6442/Kconfig | ||
| 2 | # | ||
| 3 | # Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | # http://www.samsung.com/ | ||
| 5 | # | ||
| 6 | # Licensed under GPLv2 | ||
| 7 | |||
| 8 | # Configuration options for the S5P6442 | ||
| 9 | |||
| 10 | if ARCH_S5P6442 | ||
| 11 | |||
| 12 | config CPU_S5P6442 | ||
| 13 | bool | ||
| 14 | select PLAT_S5P | ||
| 15 | help | ||
| 16 | Enable S5P6442 CPU support | ||
| 17 | |||
| 18 | config MACH_SMDK6442 | ||
| 19 | bool "SMDK6442" | ||
| 20 | select CPU_S5P6442 | ||
| 21 | help | ||
| 22 | Machine support for Samsung SMDK6442 | ||
| 23 | |||
| 24 | endif | ||
diff --git a/arch/arm/mach-s5p6442/Makefile b/arch/arm/mach-s5p6442/Makefile new file mode 100644 index 000000000000..8a0f8ac65602 --- /dev/null +++ b/arch/arm/mach-s5p6442/Makefile | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | # arch/arm/mach-s5p6442/Makefile | ||
| 2 | # | ||
| 3 | # Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | # http://www.samsung.com/ | ||
| 5 | # | ||
| 6 | # Licensed under GPLv2 | ||
| 7 | |||
| 8 | obj-y := | ||
| 9 | obj-m := | ||
| 10 | obj-n := | ||
| 11 | obj- := | ||
| 12 | |||
| 13 | # Core support for S5P6442 system | ||
| 14 | |||
| 15 | obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o | ||
| 16 | |||
| 17 | # machine support | ||
| 18 | |||
diff --git a/arch/arm/mach-s5p6442/Makefile.boot b/arch/arm/mach-s5p6442/Makefile.boot new file mode 100644 index 000000000000..ff90aa13bd67 --- /dev/null +++ b/arch/arm/mach-s5p6442/Makefile.boot | |||
| @@ -0,0 +1,2 @@ | |||
| 1 | zreladdr-y := 0x20008000 | ||
| 2 | params_phys-y := 0x20000100 | ||
diff --git a/arch/arm/mach-s5p6442/cpu.c b/arch/arm/mach-s5p6442/cpu.c new file mode 100644 index 000000000000..bc2524df89b3 --- /dev/null +++ b/arch/arm/mach-s5p6442/cpu.c | |||
| @@ -0,0 +1,121 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/cpu.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/types.h> | ||
| 13 | #include <linux/interrupt.h> | ||
| 14 | #include <linux/list.h> | ||
| 15 | #include <linux/timer.h> | ||
| 16 | #include <linux/init.h> | ||
| 17 | #include <linux/clk.h> | ||
| 18 | #include <linux/io.h> | ||
| 19 | #include <linux/sysdev.h> | ||
| 20 | #include <linux/serial_core.h> | ||
| 21 | #include <linux/platform_device.h> | ||
| 22 | |||
| 23 | #include <asm/mach/arch.h> | ||
| 24 | #include <asm/mach/map.h> | ||
| 25 | #include <asm/mach/irq.h> | ||
| 26 | |||
| 27 | #include <asm/proc-fns.h> | ||
| 28 | |||
| 29 | #include <mach/hardware.h> | ||
| 30 | #include <mach/map.h> | ||
| 31 | #include <asm/irq.h> | ||
| 32 | |||
| 33 | #include <plat/regs-serial.h> | ||
| 34 | #include <mach/regs-clock.h> | ||
| 35 | |||
| 36 | #include <plat/cpu.h> | ||
| 37 | #include <plat/devs.h> | ||
| 38 | #include <plat/clock.h> | ||
| 39 | #include <plat/s5p6442.h> | ||
| 40 | |||
| 41 | /* Initial IO mappings */ | ||
| 42 | |||
| 43 | static struct map_desc s5p6442_iodesc[] __initdata = { | ||
| 44 | { | ||
| 45 | .virtual = (unsigned long)S5P_VA_SYSTIMER, | ||
| 46 | .pfn = __phys_to_pfn(S5P6442_PA_SYSTIMER), | ||
| 47 | .length = SZ_16K, | ||
| 48 | .type = MT_DEVICE, | ||
| 49 | }, { | ||
| 50 | .virtual = (unsigned long)VA_VIC2, | ||
| 51 | .pfn = __phys_to_pfn(S5P6442_PA_VIC2), | ||
| 52 | .length = SZ_16K, | ||
| 53 | .type = MT_DEVICE, | ||
| 54 | } | ||
| 55 | }; | ||
| 56 | |||
| 57 | static void s5p6442_idle(void) | ||
| 58 | { | ||
| 59 | if (!need_resched()) | ||
| 60 | cpu_do_idle(); | ||
| 61 | |||
| 62 | local_irq_enable(); | ||
| 63 | } | ||
| 64 | |||
| 65 | /* s5p6442_map_io | ||
| 66 | * | ||
| 67 | * register the standard cpu IO areas | ||
| 68 | */ | ||
| 69 | |||
| 70 | void __init s5p6442_map_io(void) | ||
| 71 | { | ||
| 72 | iotable_init(s5p6442_iodesc, ARRAY_SIZE(s5p6442_iodesc)); | ||
| 73 | } | ||
| 74 | |||
| 75 | void __init s5p6442_init_clocks(int xtal) | ||
| 76 | { | ||
| 77 | printk(KERN_DEBUG "%s: initializing clocks\n", __func__); | ||
| 78 | |||
| 79 | s3c24xx_register_baseclocks(xtal); | ||
| 80 | s5p_register_clocks(xtal); | ||
| 81 | s5p6442_register_clocks(); | ||
| 82 | s5p6442_setup_clocks(); | ||
| 83 | } | ||
| 84 | |||
| 85 | void __init s5p6442_init_irq(void) | ||
| 86 | { | ||
| 87 | /* S5P6442 supports 3 VIC */ | ||
| 88 | u32 vic[3]; | ||
| 89 | |||
| 90 | /* VIC0, VIC1, and VIC2: some interrupt reserved */ | ||
| 91 | vic[0] = 0x7fefffff; | ||
| 92 | vic[1] = 0X7f389c81; | ||
| 93 | vic[2] = 0X1bbbcfff; | ||
| 94 | |||
| 95 | s5p_init_irq(vic, ARRAY_SIZE(vic)); | ||
| 96 | } | ||
| 97 | |||
| 98 | static struct sysdev_class s5p6442_sysclass = { | ||
| 99 | .name = "s5p6442-core", | ||
| 100 | }; | ||
| 101 | |||
| 102 | static struct sys_device s5p6442_sysdev = { | ||
| 103 | .cls = &s5p6442_sysclass, | ||
| 104 | }; | ||
| 105 | |||
| 106 | static int __init s5p6442_core_init(void) | ||
| 107 | { | ||
| 108 | return sysdev_class_register(&s5p6442_sysclass); | ||
| 109 | } | ||
| 110 | |||
| 111 | core_initcall(s5p6442_core_init); | ||
| 112 | |||
| 113 | int __init s5p6442_init(void) | ||
| 114 | { | ||
| 115 | printk(KERN_INFO "S5P6442: Initializing architecture\n"); | ||
| 116 | |||
| 117 | /* set idle function */ | ||
| 118 | pm_idle = s5p6442_idle; | ||
| 119 | |||
| 120 | return sysdev_register(&s5p6442_sysdev); | ||
| 121 | } | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/debug-macro.S b/arch/arm/mach-s5p6442/include/mach/debug-macro.S new file mode 100644 index 000000000000..1aae691e58ef --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/debug-macro.S | |||
| @@ -0,0 +1,36 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/debug-macro.S | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | /* pull in the relevant register and map files. */ | ||
| 14 | |||
| 15 | #include <mach/map.h> | ||
| 16 | #include <plat/regs-serial.h> | ||
| 17 | |||
| 18 | .macro addruart, rx | ||
| 19 | mrc p15, 0, \rx, c1, c0 | ||
| 20 | tst \rx, #1 | ||
| 21 | ldreq \rx, = S3C_PA_UART | ||
| 22 | ldrne \rx, = S3C_VA_UART | ||
| 23 | #if CONFIG_DEBUG_S3C_UART != 0 | ||
| 24 | add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART) | ||
| 25 | #endif | ||
| 26 | .endm | ||
| 27 | |||
| 28 | #define fifo_full fifo_full_s5pv210 | ||
| 29 | #define fifo_level fifo_level_s5pv210 | ||
| 30 | |||
| 31 | /* include the reset of the code which will do the work, we're only | ||
| 32 | * compiling for a single cpu processor type so the default of s3c2440 | ||
| 33 | * will be fine with us. | ||
| 34 | */ | ||
| 35 | |||
| 36 | #include <plat/debug-macro.S> | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/entry-macro.S b/arch/arm/mach-s5p6442/include/mach/entry-macro.S new file mode 100644 index 000000000000..6d574edbf1ae --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/entry-macro.S | |||
| @@ -0,0 +1,48 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/entry-macro.S | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * Low-level IRQ helper macros for the Samsung S5P6442 | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #include <asm/hardware/vic.h> | ||
| 14 | #include <mach/map.h> | ||
| 15 | #include <plat/irqs.h> | ||
| 16 | |||
| 17 | .macro disable_fiq | ||
| 18 | .endm | ||
| 19 | |||
| 20 | .macro get_irqnr_preamble, base, tmp | ||
| 21 | ldr \base, =VA_VIC0 | ||
| 22 | .endm | ||
| 23 | |||
| 24 | .macro arch_ret_to_user, tmp1, tmp2 | ||
| 25 | .endm | ||
| 26 | |||
| 27 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
| 28 | |||
| 29 | @ check the vic0 | ||
| 30 | mov \irqnr, # S5P_IRQ_OFFSET + 31 | ||
| 31 | ldr \irqstat, [ \base, # VIC_IRQ_STATUS ] | ||
| 32 | teq \irqstat, #0 | ||
| 33 | |||
| 34 | @ otherwise try vic1 | ||
| 35 | addeq \tmp, \base, #(VA_VIC1 - VA_VIC0) | ||
| 36 | addeq \irqnr, \irqnr, #32 | ||
| 37 | ldreq \irqstat, [ \tmp, # VIC_IRQ_STATUS ] | ||
| 38 | teqeq \irqstat, #0 | ||
| 39 | |||
| 40 | @ otherwise try vic2 | ||
| 41 | addeq \tmp, \base, #(VA_VIC2 - VA_VIC0) | ||
| 42 | addeq \irqnr, \irqnr, #32 | ||
| 43 | ldreq \irqstat, [ \tmp, # VIC_IRQ_STATUS ] | ||
| 44 | teqeq \irqstat, #0 | ||
| 45 | |||
| 46 | clzne \irqstat, \irqstat | ||
| 47 | subne \irqnr, \irqnr, \irqstat | ||
| 48 | .endm | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/gpio.h b/arch/arm/mach-s5p6442/include/mach/gpio.h new file mode 100644 index 000000000000..b8715df2fdab --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/gpio.h | |||
| @@ -0,0 +1,123 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/gpio.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - GPIO lib support | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_GPIO_H | ||
| 14 | #define __ASM_ARCH_GPIO_H __FILE__ | ||
| 15 | |||
| 16 | #define gpio_get_value __gpio_get_value | ||
| 17 | #define gpio_set_value __gpio_set_value | ||
| 18 | #define gpio_cansleep __gpio_cansleep | ||
| 19 | #define gpio_to_irq __gpio_to_irq | ||
| 20 | |||
| 21 | /* GPIO bank sizes */ | ||
| 22 | #define S5P6442_GPIO_A0_NR (8) | ||
| 23 | #define S5P6442_GPIO_A1_NR (2) | ||
| 24 | #define S5P6442_GPIO_B_NR (4) | ||
| 25 | #define S5P6442_GPIO_C0_NR (5) | ||
| 26 | #define S5P6442_GPIO_C1_NR (5) | ||
| 27 | #define S5P6442_GPIO_D0_NR (2) | ||
| 28 | #define S5P6442_GPIO_D1_NR (6) | ||
| 29 | #define S5P6442_GPIO_E0_NR (8) | ||
| 30 | #define S5P6442_GPIO_E1_NR (5) | ||
| 31 | #define S5P6442_GPIO_F0_NR (8) | ||
| 32 | #define S5P6442_GPIO_F1_NR (8) | ||
| 33 | #define S5P6442_GPIO_F2_NR (8) | ||
| 34 | #define S5P6442_GPIO_F3_NR (6) | ||
| 35 | #define S5P6442_GPIO_G0_NR (7) | ||
| 36 | #define S5P6442_GPIO_G1_NR (7) | ||
| 37 | #define S5P6442_GPIO_G2_NR (7) | ||
| 38 | #define S5P6442_GPIO_H0_NR (8) | ||
| 39 | #define S5P6442_GPIO_H1_NR (8) | ||
| 40 | #define S5P6442_GPIO_H2_NR (8) | ||
| 41 | #define S5P6442_GPIO_H3_NR (8) | ||
| 42 | #define S5P6442_GPIO_J0_NR (8) | ||
| 43 | #define S5P6442_GPIO_J1_NR (6) | ||
| 44 | #define S5P6442_GPIO_J2_NR (8) | ||
| 45 | #define S5P6442_GPIO_J3_NR (8) | ||
| 46 | #define S5P6442_GPIO_J4_NR (5) | ||
| 47 | |||
| 48 | /* GPIO bank numbers */ | ||
| 49 | |||
| 50 | /* CONFIG_S3C_GPIO_SPACE allows the user to select extra | ||
| 51 | * space for debugging purposes so that any accidental | ||
| 52 | * change from one gpio bank to another can be caught. | ||
| 53 | */ | ||
| 54 | |||
| 55 | #define S5P6442_GPIO_NEXT(__gpio) \ | ||
| 56 | ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1) | ||
| 57 | |||
| 58 | enum s5p_gpio_number { | ||
| 59 | S5P6442_GPIO_A0_START = 0, | ||
| 60 | S5P6442_GPIO_A1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_A0), | ||
| 61 | S5P6442_GPIO_B_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_A1), | ||
| 62 | S5P6442_GPIO_C0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_B), | ||
| 63 | S5P6442_GPIO_C1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_C0), | ||
| 64 | S5P6442_GPIO_D0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_C1), | ||
| 65 | S5P6442_GPIO_D1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_D0), | ||
| 66 | S5P6442_GPIO_E0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_D1), | ||
| 67 | S5P6442_GPIO_E1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_E0), | ||
| 68 | S5P6442_GPIO_F0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_E1), | ||
| 69 | S5P6442_GPIO_F1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_F0), | ||
| 70 | S5P6442_GPIO_F2_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_F1), | ||
| 71 | S5P6442_GPIO_F3_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_F2), | ||
| 72 | S5P6442_GPIO_G0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_F3), | ||
| 73 | S5P6442_GPIO_G1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_G0), | ||
| 74 | S5P6442_GPIO_G2_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_G1), | ||
| 75 | S5P6442_GPIO_H0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_G2), | ||
| 76 | S5P6442_GPIO_H1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_H0), | ||
| 77 | S5P6442_GPIO_H2_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_H1), | ||
| 78 | S5P6442_GPIO_H3_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_H2), | ||
| 79 | S5P6442_GPIO_J0_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_H3), | ||
| 80 | S5P6442_GPIO_J1_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_J0), | ||
| 81 | S5P6442_GPIO_J2_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_J1), | ||
| 82 | S5P6442_GPIO_J3_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_J2), | ||
| 83 | S5P6442_GPIO_J4_START = S5P6442_GPIO_NEXT(S5P6442_GPIO_J3), | ||
| 84 | }; | ||
| 85 | |||
| 86 | /* S5P6442 GPIO number definitions. */ | ||
| 87 | #define S5P6442_GPA0(_nr) (S5P6442_GPIO_A0_START + (_nr)) | ||
| 88 | #define S5P6442_GPA1(_nr) (S5P6442_GPIO_A1_START + (_nr)) | ||
| 89 | #define S5P6442_GPB(_nr) (S5P6442_GPIO_B_START + (_nr)) | ||
| 90 | #define S5P6442_GPC0(_nr) (S5P6442_GPIO_C0_START + (_nr)) | ||
| 91 | #define S5P6442_GPC1(_nr) (S5P6442_GPIO_C1_START + (_nr)) | ||
| 92 | #define S5P6442_GPD0(_nr) (S5P6442_GPIO_D0_START + (_nr)) | ||
| 93 | #define S5P6442_GPD1(_nr) (S5P6442_GPIO_D1_START + (_nr)) | ||
| 94 | #define S5P6442_GPE0(_nr) (S5P6442_GPIO_E0_START + (_nr)) | ||
| 95 | #define S5P6442_GPE1(_nr) (S5P6442_GPIO_E1_START + (_nr)) | ||
| 96 | #define S5P6442_GPF0(_nr) (S5P6442_GPIO_F0_START + (_nr)) | ||
| 97 | #define S5P6442_GPF1(_nr) (S5P6442_GPIO_F1_START + (_nr)) | ||
| 98 | #define S5P6442_GPF2(_nr) (S5P6442_GPIO_F2_START + (_nr)) | ||
| 99 | #define S5P6442_GPF3(_nr) (S5P6442_GPIO_F3_START + (_nr)) | ||
| 100 | #define S5P6442_GPG0(_nr) (S5P6442_GPIO_G0_START + (_nr)) | ||
| 101 | #define S5P6442_GPG1(_nr) (S5P6442_GPIO_G1_START + (_nr)) | ||
| 102 | #define S5P6442_GPG2(_nr) (S5P6442_GPIO_G2_START + (_nr)) | ||
| 103 | #define S5P6442_GPH0(_nr) (S5P6442_GPIO_H0_START + (_nr)) | ||
| 104 | #define S5P6442_GPH1(_nr) (S5P6442_GPIO_H1_START + (_nr)) | ||
| 105 | #define S5P6442_GPH2(_nr) (S5P6442_GPIO_H2_START + (_nr)) | ||
| 106 | #define S5P6442_GPH3(_nr) (S5P6442_GPIO_H3_START + (_nr)) | ||
| 107 | #define S5P6442_GPJ0(_nr) (S5P6442_GPIO_J0_START + (_nr)) | ||
| 108 | #define S5P6442_GPJ1(_nr) (S5P6442_GPIO_J1_START + (_nr)) | ||
| 109 | #define S5P6442_GPJ2(_nr) (S5P6442_GPIO_J2_START + (_nr)) | ||
| 110 | #define S5P6442_GPJ3(_nr) (S5P6442_GPIO_J3_START + (_nr)) | ||
| 111 | #define S5P6442_GPJ4(_nr) (S5P6442_GPIO_J4_START + (_nr)) | ||
| 112 | |||
| 113 | /* the end of the S5P6442 specific gpios */ | ||
| 114 | #define S5P6442_GPIO_END (S5P6442_GPJ4(S5P6442_GPIO_J4_NR) + 1) | ||
| 115 | #define S3C_GPIO_END S5P6442_GPIO_END | ||
| 116 | |||
| 117 | /* define the number of gpios we need to the one after the GPJ4() range */ | ||
| 118 | #define ARCH_NR_GPIOS (S5P6442_GPJ4(S5P6442_GPIO_J4_NR) + \ | ||
| 119 | CONFIG_SAMSUNG_GPIO_EXTRA + 1) | ||
| 120 | |||
| 121 | #include <asm-generic/gpio.h> | ||
| 122 | |||
| 123 | #endif /* __ASM_ARCH_GPIO_H */ | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/hardware.h b/arch/arm/mach-s5p6442/include/mach/hardware.h new file mode 100644 index 000000000000..8cd7b67b49d4 --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/hardware.h | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/hardware.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - Hardware support | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_HARDWARE_H | ||
| 14 | #define __ASM_ARCH_HARDWARE_H __FILE__ | ||
| 15 | |||
| 16 | /* currently nothing here, placeholder */ | ||
| 17 | |||
| 18 | #endif /* __ASM_ARCH_HARDWARE_H */ | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/map.h b/arch/arm/mach-s5p6442/include/mach/map.h new file mode 100644 index 000000000000..685277d792fb --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/map.h | |||
| @@ -0,0 +1,58 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/map.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - Memory map definitions | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_MAP_H | ||
| 14 | #define __ASM_ARCH_MAP_H __FILE__ | ||
| 15 | |||
| 16 | #include <plat/map-base.h> | ||
| 17 | #include <plat/map-s5p.h> | ||
| 18 | |||
| 19 | #define S5P6442_PA_CHIPID (0xE0000000) | ||
| 20 | #define S5P_PA_CHIPID S5P6442_PA_CHIPID | ||
| 21 | |||
| 22 | #define S5P6442_PA_SYSCON (0xE0100000) | ||
| 23 | #define S5P_PA_SYSCON S5P6442_PA_SYSCON | ||
| 24 | |||
| 25 | #define S5P6442_PA_GPIO (0xE0200000) | ||
| 26 | #define S5P_PA_GPIO S5P6442_PA_GPIO | ||
| 27 | |||
| 28 | #define S5P6442_PA_VIC0 (0xE4000000) | ||
| 29 | #define S5P_PA_VIC0 S5P6442_PA_VIC0 | ||
| 30 | |||
| 31 | #define S5P6442_PA_VIC1 (0xE4100000) | ||
| 32 | #define S5P_PA_VIC1 S5P6442_PA_VIC1 | ||
| 33 | |||
| 34 | #define S5P6442_PA_VIC2 (0xE4200000) | ||
| 35 | #define S5P_PA_VIC2 S5P6442_PA_VIC2 | ||
| 36 | |||
| 37 | #define S5P6442_PA_TIMER (0xEA000000) | ||
| 38 | #define S5P_PA_TIMER S5P6442_PA_TIMER | ||
| 39 | |||
| 40 | #define S5P6442_PA_SYSTIMER (0xEA100000) | ||
| 41 | |||
| 42 | #define S5P6442_PA_UART (0xEC000000) | ||
| 43 | |||
| 44 | #define S5P_PA_UART0 (S5P6442_PA_UART + 0x0) | ||
| 45 | #define S5P_PA_UART1 (S5P6442_PA_UART + 0x400) | ||
| 46 | #define S5P_PA_UART2 (S5P6442_PA_UART + 0x800) | ||
| 47 | #define S5P_SZ_UART SZ_256 | ||
| 48 | |||
| 49 | #define S5P6442_PA_IIC0 (0xEC100000) | ||
| 50 | |||
| 51 | #define S5P6442_PA_SDRAM (0x20000000) | ||
| 52 | #define S5P_PA_SDRAM S5P6442_PA_SDRAM | ||
| 53 | |||
| 54 | /* compatibiltiy defines. */ | ||
| 55 | #define S3C_PA_UART S5P6442_PA_UART | ||
| 56 | #define S3C_PA_IIC S5P6442_PA_IIC0 | ||
| 57 | |||
| 58 | #endif /* __ASM_ARCH_MAP_H */ | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/memory.h b/arch/arm/mach-s5p6442/include/mach/memory.h new file mode 100644 index 000000000000..9ddd877ba2ea --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/memory.h | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/memory.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - Memory definitions | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 14 | #define __ASM_ARCH_MEMORY_H | ||
| 15 | |||
| 16 | #define PHYS_OFFSET UL(0x20000000) | ||
| 17 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
| 18 | |||
| 19 | #endif /* __ASM_ARCH_MEMORY_H */ | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/system.h b/arch/arm/mach-s5p6442/include/mach/system.h new file mode 100644 index 000000000000..8bcd8ed0c3c3 --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/system.h | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/system.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - system support header | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_SYSTEM_H | ||
| 14 | #define __ASM_ARCH_SYSTEM_H __FILE__ | ||
| 15 | |||
| 16 | static void arch_idle(void) | ||
| 17 | { | ||
| 18 | /* nothing here yet */ | ||
| 19 | } | ||
| 20 | |||
| 21 | static void arch_reset(char mode, const char *cmd) | ||
| 22 | { | ||
| 23 | /* nothing here yet */ | ||
| 24 | } | ||
| 25 | |||
| 26 | #endif /* __ASM_ARCH_SYSTEM_H */ | ||
diff --git a/arch/arm/mach-s5p6442/include/mach/uncompress.h b/arch/arm/mach-s5p6442/include/mach/uncompress.h new file mode 100644 index 000000000000..5ac7cbeeb987 --- /dev/null +++ b/arch/arm/mach-s5p6442/include/mach/uncompress.h | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/include/mach/uncompress.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * S5P6442 - uncompress code | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_UNCOMPRESS_H | ||
| 14 | #define __ASM_ARCH_UNCOMPRESS_H | ||
| 15 | |||
| 16 | #include <mach/map.h> | ||
| 17 | #include <plat/uncompress.h> | ||
| 18 | |||
| 19 | static void arch_detect_cpu(void) | ||
| 20 | { | ||
| 21 | /* we do not need to do any cpu detection here at the moment. */ | ||
| 22 | } | ||
| 23 | |||
| 24 | #endif /* __ASM_ARCH_UNCOMPRESS_H */ | ||
diff --git a/arch/arm/mach-s5p6442/init.c b/arch/arm/mach-s5p6442/init.c new file mode 100644 index 000000000000..1874bdb71e1d --- /dev/null +++ b/arch/arm/mach-s5p6442/init.c | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p6442/s5p6442-init.c | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #include <linux/kernel.h> | ||
| 12 | #include <linux/types.h> | ||
| 13 | #include <linux/init.h> | ||
| 14 | #include <linux/serial_core.h> | ||
| 15 | |||
| 16 | #include <plat/cpu.h> | ||
| 17 | #include <plat/devs.h> | ||
| 18 | #include <plat/s5p6442.h> | ||
| 19 | #include <plat/regs-serial.h> | ||
| 20 | |||
| 21 | static struct s3c24xx_uart_clksrc s5p6442_serial_clocks[] = { | ||
| 22 | [0] = { | ||
| 23 | .name = "pclk", | ||
| 24 | .divisor = 1, | ||
| 25 | .min_baud = 0, | ||
| 26 | .max_baud = 0, | ||
| 27 | }, | ||
| 28 | }; | ||
| 29 | |||
| 30 | /* uart registration process */ | ||
| 31 | void __init s5p6442_common_init_uarts(struct s3c2410_uartcfg *cfg, int no) | ||
| 32 | { | ||
| 33 | struct s3c2410_uartcfg *tcfg = cfg; | ||
| 34 | u32 ucnt; | ||
| 35 | |||
| 36 | for (ucnt = 0; ucnt < no; ucnt++, tcfg++) { | ||
| 37 | if (!tcfg->clocks) { | ||
| 38 | tcfg->clocks = s5p6442_serial_clocks; | ||
| 39 | tcfg->clocks_size = ARRAY_SIZE(s5p6442_serial_clocks); | ||
| 40 | } | ||
| 41 | } | ||
| 42 | |||
| 43 | s3c24xx_init_uartdevs("s5pv210-uart", s5p_uart_resources, cfg, no); | ||
| 44 | } | ||
diff --git a/arch/arm/plat-s5p/cpu.c b/arch/arm/plat-s5p/cpu.c index ee9c6b302ded..e69992488e2e 100644 --- a/arch/arm/plat-s5p/cpu.c +++ b/arch/arm/plat-s5p/cpu.c | |||
| @@ -18,10 +18,12 @@ | |||
| 18 | #include <mach/regs-clock.h> | 18 | #include <mach/regs-clock.h> |
| 19 | #include <plat/cpu.h> | 19 | #include <plat/cpu.h> |
| 20 | #include <plat/s5p6440.h> | 20 | #include <plat/s5p6440.h> |
| 21 | #include <plat/s5p6442.h> | ||
| 21 | 22 | ||
| 22 | /* table of supported CPUs */ | 23 | /* table of supported CPUs */ |
| 23 | 24 | ||
| 24 | static const char name_s5p6440[] = "S5P6440"; | 25 | static const char name_s5p6440[] = "S5P6440"; |
| 26 | static const char name_s5p6442[] = "S5P6442"; | ||
| 25 | 27 | ||
| 26 | static struct cpu_table cpu_ids[] __initdata = { | 28 | static struct cpu_table cpu_ids[] __initdata = { |
| 27 | { | 29 | { |
| @@ -32,6 +34,14 @@ static struct cpu_table cpu_ids[] __initdata = { | |||
| 32 | .init_uarts = s5p6440_init_uarts, | 34 | .init_uarts = s5p6440_init_uarts, |
| 33 | .init = s5p6440_init, | 35 | .init = s5p6440_init, |
| 34 | .name = name_s5p6440, | 36 | .name = name_s5p6440, |
| 37 | }, { | ||
| 38 | .idcode = 0x36442000, | ||
| 39 | .idmask = 0xffffff00, | ||
| 40 | .map_io = s5p6442_map_io, | ||
| 41 | .init_clocks = s5p6442_init_clocks, | ||
| 42 | .init_uarts = s5p6442_init_uarts, | ||
| 43 | .init = s5p6442_init, | ||
| 44 | .name = name_s5p6442, | ||
| 35 | }, | 45 | }, |
| 36 | }; | 46 | }; |
| 37 | 47 | ||
diff --git a/arch/arm/plat-s5p/include/plat/map-s5p.h b/arch/arm/plat-s5p/include/plat/map-s5p.h index 51d9cb5a3e2b..cc60604591dc 100644 --- a/arch/arm/plat-s5p/include/plat/map-s5p.h +++ b/arch/arm/plat-s5p/include/plat/map-s5p.h | |||
| @@ -28,5 +28,6 @@ | |||
| 28 | #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) | 28 | #define VA_VIC(x) (S3C_VA_IRQ + ((x) * 0x10000)) |
| 29 | #define VA_VIC0 VA_VIC(0) | 29 | #define VA_VIC0 VA_VIC(0) |
| 30 | #define VA_VIC1 VA_VIC(1) | 30 | #define VA_VIC1 VA_VIC(1) |
| 31 | #define VA_VIC2 VA_VIC(2) | ||
| 31 | 32 | ||
| 32 | #endif /* __ASM_PLAT_MAP_S5P_H */ | 33 | #endif /* __ASM_PLAT_MAP_S5P_H */ |
diff --git a/arch/arm/plat-s5p/include/plat/s5p6442.h b/arch/arm/plat-s5p/include/plat/s5p6442.h new file mode 100644 index 000000000000..7b8801349c94 --- /dev/null +++ b/arch/arm/plat-s5p/include/plat/s5p6442.h | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | /* arch/arm/plat-s5p/include/plat/s5p6442.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com/ | ||
| 5 | * | ||
| 6 | * Header file for s5p6442 cpu support | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | /* Common init code for S5P6442 related SoCs */ | ||
| 14 | |||
| 15 | extern void s5p6442_common_init_uarts(struct s3c2410_uartcfg *cfg, int no); | ||
| 16 | extern void s5p6442_register_clocks(void); | ||
| 17 | extern void s5p6442_setup_clocks(void); | ||
| 18 | |||
| 19 | #ifdef CONFIG_CPU_S5P6442 | ||
| 20 | |||
| 21 | extern int s5p6442_init(void); | ||
| 22 | extern void s5p6442_init_irq(void); | ||
| 23 | extern void s5p6442_map_io(void); | ||
| 24 | extern void s5p6442_init_clocks(int xtal); | ||
| 25 | |||
| 26 | #define s5p6442_init_uarts s5p6442_common_init_uarts | ||
| 27 | |||
| 28 | #else | ||
| 29 | #define s5p6442_init_clocks NULL | ||
| 30 | #define s5p6442_init_uarts NULL | ||
| 31 | #define s5p6442_map_io NULL | ||
| 32 | #define s5p6442_init NULL | ||
| 33 | #endif | ||
diff --git a/arch/arm/plat-samsung/include/plat/debug-macro.S b/arch/arm/plat-samsung/include/plat/debug-macro.S index 43ed0ec25f85..dc6efd90e8ff 100644 --- a/arch/arm/plat-samsung/include/plat/debug-macro.S +++ b/arch/arm/plat-samsung/include/plat/debug-macro.S | |||
| @@ -11,6 +11,18 @@ | |||
| 11 | 11 | ||
| 12 | #include <plat/regs-serial.h> | 12 | #include <plat/regs-serial.h> |
| 13 | 13 | ||
| 14 | /* The S5PV210/S5PC110 and S5P6442 implementations are as belows. */ | ||
| 15 | |||
| 16 | .macro fifo_level_s5pv210 rd, rx | ||
| 17 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | ||
| 18 | and \rd, \rd, #S5PV210_UFSTAT_TXMASK | ||
| 19 | .endm | ||
| 20 | |||
| 21 | .macro fifo_full_s5pv210 rd, rx | ||
| 22 | ldr \rd, [ \rx, # S3C2410_UFSTAT ] | ||
| 23 | tst \rd, #S5PV210_UFSTAT_TXFULL | ||
| 24 | .endm | ||
| 25 | |||
| 14 | /* The S3C2440 implementations are used by default as they are the | 26 | /* The S3C2440 implementations are used by default as they are the |
| 15 | * most widely re-used */ | 27 | * most widely re-used */ |
| 16 | 28 | ||
