diff options
Diffstat (limited to 'arch/arm/mach-s5pc100')
-rw-r--r-- | arch/arm/mach-s5pc100/cpu.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/dma.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/map.h | 26 | ||||
-rw-r--r-- | arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 7 |
4 files changed, 22 insertions, 15 deletions
diff --git a/arch/arm/mach-s5pc100/cpu.c b/arch/arm/mach-s5pc100/cpu.c index 816c4d4afef0..7b5bdbc9a5df 100644 --- a/arch/arm/mach-s5pc100/cpu.c +++ b/arch/arm/mach-s5pc100/cpu.c | |||
@@ -54,7 +54,7 @@ static struct map_desc s5pc100_iodesc[] __initdata = { | |||
54 | .type = MT_DEVICE, | 54 | .type = MT_DEVICE, |
55 | }, { | 55 | }, { |
56 | .virtual = (unsigned long)VA_VIC2, | 56 | .virtual = (unsigned long)VA_VIC2, |
57 | .pfn = __phys_to_pfn(S5PC100_PA_VIC2), | 57 | .pfn = __phys_to_pfn(S5P_PA_VIC2), |
58 | .length = SZ_16K, | 58 | .length = SZ_16K, |
59 | .type = MT_DEVICE, | 59 | .type = MT_DEVICE, |
60 | }, { | 60 | }, { |
diff --git a/arch/arm/mach-s5pc100/dma.c b/arch/arm/mach-s5pc100/dma.c index 8e7af46bba09..0f5517571e2c 100644 --- a/arch/arm/mach-s5pc100/dma.c +++ b/arch/arm/mach-s5pc100/dma.c | |||
@@ -21,9 +21,9 @@ | |||
21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
22 | 22 | ||
23 | #include <plat/devs.h> | 23 | #include <plat/devs.h> |
24 | #include <plat/irqs.h> | ||
25 | 24 | ||
26 | #include <mach/map.h> | 25 | #include <mach/map.h> |
26 | #include <mach/irqs.h> | ||
27 | 27 | ||
28 | #include <plat/s3c-pl330-pdata.h> | 28 | #include <plat/s3c-pl330-pdata.h> |
29 | 29 | ||
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h index a0b2fee332a1..cadae4305688 100644 --- a/arch/arm/mach-s5pc100/include/mach/map.h +++ b/arch/arm/mach-s5pc100/include/mach/map.h | |||
@@ -44,9 +44,7 @@ | |||
44 | #define S5PC100_PA_OTHERS (0xE0200000) | 44 | #define S5PC100_PA_OTHERS (0xE0200000) |
45 | #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000) | 45 | #define S5PC100_VA_OTHERS (S3C_VA_SYS + 0x10000) |
46 | 46 | ||
47 | #define S5PC100_PA_GPIO (0xE0300000) | 47 | #define S5P_PA_GPIO (0xE0300000) |
48 | |||
49 | #define S5PC1XX_PA_GPIO S5PC100_PA_GPIO | ||
50 | #define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000) | 48 | #define S5PC1XX_VA_GPIO S3C_ADDR(0x00500000) |
51 | 49 | ||
52 | /* Interrupt */ | 50 | /* Interrupt */ |
@@ -56,6 +54,10 @@ | |||
56 | #define S5PC100_VA_VIC_OFFSET 0x10000 | 54 | #define S5PC100_VA_VIC_OFFSET 0x10000 |
57 | #define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET)) | 55 | #define S5PC1XX_PA_VIC(x) (S5PC100_PA_VIC + ((x) * S5PC100_PA_VIC_OFFSET)) |
58 | #define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET)) | 56 | #define S5PC1XX_VA_VIC(x) (S5PC100_VA_VIC + ((x) * S5PC100_VA_VIC_OFFSET)) |
57 | #define S5P_PA_VIC0 S5PC1XX_PA_VIC(0) | ||
58 | #define S5P_PA_VIC1 S5PC1XX_PA_VIC(1) | ||
59 | #define S5P_PA_VIC2 S5PC1XX_PA_VIC(2) | ||
60 | |||
59 | 61 | ||
60 | #define S5PC100_PA_ONENAND (0xE7100000) | 62 | #define S5PC100_PA_ONENAND (0xE7100000) |
61 | 63 | ||
@@ -92,6 +94,10 @@ | |||
92 | 94 | ||
93 | #define S5PC100_PA_FB (0xEE000000) | 95 | #define S5PC100_PA_FB (0xEE000000) |
94 | 96 | ||
97 | #define S5PC100_PA_I2S0 (0xF2000000) | ||
98 | #define S5PC100_PA_I2S1 (0xF2100000) | ||
99 | #define S5PC100_PA_I2S2 (0xF2200000) | ||
100 | |||
95 | #define S5PC100_PA_AC97 0xF2300000 | 101 | #define S5PC100_PA_AC97 0xF2300000 |
96 | 102 | ||
97 | /* PCM */ | 103 | /* PCM */ |
@@ -115,16 +121,14 @@ | |||
115 | #define S3C_PA_G3D S5PC100_PA_G3D | 121 | #define S3C_PA_G3D S5PC100_PA_G3D |
116 | #define S3C_PA_JPEG S5PC100_PA_JPEG | 122 | #define S3C_PA_JPEG S5PC100_PA_JPEG |
117 | #define S3C_PA_ROTATOR S5PC100_PA_ROTATOR | 123 | #define S3C_PA_ROTATOR S5PC100_PA_ROTATOR |
118 | #define S3C_VA_VIC0 (S3C_VA_IRQ + 0x0) | 124 | #define S5P_VA_VIC0 S5PC1XX_VA_VIC(0) |
119 | #define S3C_VA_VIC1 (S3C_VA_IRQ + 0x10000) | 125 | #define S5P_VA_VIC1 S5PC1XX_VA_VIC(1) |
120 | #define S3C_VA_VIC2 (S3C_VA_IRQ + 0x20000) | 126 | #define S5P_VA_VIC2 S5PC1XX_VA_VIC(2) |
121 | #define S3C_PA_IIC S5PC100_PA_I2C | ||
122 | #define S3C_PA_IIC1 S5PC100_PA_I2C1 | ||
123 | #define S3C_PA_USB_HSOTG S5PC100_PA_USB_HSOTG | 127 | #define S3C_PA_USB_HSOTG S5PC100_PA_USB_HSOTG |
124 | #define S3C_PA_USB_HSPHY S5PC100_PA_USB_HSPHY | 128 | #define S3C_PA_USB_HSPHY S5PC100_PA_USB_HSPHY |
125 | #define S3C_PA_HSMMC0 S5PC100_PA_HSMMC0 | 129 | #define S3C_PA_HSMMC0 S5PC100_PA_HSMMC(0) |
126 | #define S3C_PA_HSMMC1 S5PC100_PA_HSMMC1 | 130 | #define S3C_PA_HSMMC1 S5PC100_PA_HSMMC(1) |
127 | #define S3C_PA_HSMMC2 S5PC100_PA_HSMMC2 | 131 | #define S3C_PA_HSMMC2 S5PC100_PA_HSMMC(2) |
128 | #define S3C_PA_KEYPAD S5PC100_PA_KEYPAD | 132 | #define S3C_PA_KEYPAD S5PC100_PA_KEYPAD |
129 | #define S3C_PA_TSADC S5PC100_PA_TSADC | 133 | #define S3C_PA_TSADC S5PC100_PA_TSADC |
130 | #define S3C_PA_ONENAND S5PC100_PA_ONENAND | 134 | #define S3C_PA_ONENAND S5PC100_PA_ONENAND |
diff --git a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h index dd6295e1251d..763edebdd577 100644 --- a/arch/arm/mach-s5pc100/include/mach/regs-gpio.h +++ b/arch/arm/mach-s5pc100/include/mach/regs-gpio.h | |||
@@ -60,9 +60,12 @@ | |||
60 | #define S5PC100EINT30PEND (S5P_VA_GPIO + 0xF40) | 60 | #define S5PC100EINT30PEND (S5P_VA_GPIO + 0xF40) |
61 | #define S5P_EINT_PEND(x) (S5PC100EINT30PEND + ((x) * 0x4)) | 61 | #define S5P_EINT_PEND(x) (S5PC100EINT30PEND + ((x) * 0x4)) |
62 | 62 | ||
63 | #define EINT_REG_NR(x) (EINT_OFFSET(x) >> 3) | 63 | #define eint_offset(irq) ((irq) < IRQ_EINT16_31 ? ((irq) - IRQ_EINT(0)) : \ |
64 | (((irq) - S5P_EINT_BASE2))) | ||
64 | 65 | ||
65 | #define eint_irq_to_bit(irq) (1 << (EINT_OFFSET(irq) & 0x7)) | 66 | #define EINT_REG_NR(x) (eint_offset(x) >> 3) |
67 | |||
68 | #define eint_irq_to_bit(irq) (1 << (eint_offset(irq) & 0x7)) | ||
66 | 69 | ||
67 | /* values for S5P_EXTINT0 */ | 70 | /* values for S5P_EXTINT0 */ |
68 | #define S5P_EXTINT_LOWLEV (0x00) | 71 | #define S5P_EXTINT_LOWLEV (0x00) |