diff options
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-anubis.c | 25 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-osiris.c | 20 |
2 files changed, 23 insertions, 22 deletions
diff --git a/arch/arm/mach-s3c2410/mach-anubis.c b/arch/arm/mach-s3c2410/mach-anubis.c index 4a92d6f92d6b..0a5a7e4a24ad 100644 --- a/arch/arm/mach-s3c2410/mach-anubis.c +++ b/arch/arm/mach-s3c2410/mach-anubis.c | |||
| @@ -60,11 +60,12 @@ static struct map_desc anubis_iodesc[] __initdata = { | |||
| 60 | .virtual = (u32)S3C24XX_VA_ISA_BYTE, | 60 | .virtual = (u32)S3C24XX_VA_ISA_BYTE, |
| 61 | .pfn = __phys_to_pfn(0x0), | 61 | .pfn = __phys_to_pfn(0x0), |
| 62 | .length = SZ_4M, | 62 | .length = SZ_4M, |
| 63 | .type = MT_DEVICE | 63 | .type = MT_DEVICE, |
| 64 | }, { | 64 | }, { |
| 65 | .virtual = (u32)S3C24XX_VA_ISA_WORD, | 65 | .virtual = (u32)S3C24XX_VA_ISA_WORD, |
| 66 | .pfn = __phys_to_pfn(0x0), | 66 | .pfn = __phys_to_pfn(0x0), |
| 67 | .length = SZ_4M, MT_DEVICE | 67 | .length = SZ_4M, |
| 68 | .type = MT_DEVICE, | ||
| 68 | }, | 69 | }, |
| 69 | 70 | ||
| 70 | /* we could possibly compress the next set down into a set of smaller tables | 71 | /* we could possibly compress the next set down into a set of smaller tables |
| @@ -78,12 +79,12 @@ static struct map_desc anubis_iodesc[] __initdata = { | |||
| 78 | .virtual = (u32)ANUBIS_VA_CTRL1, | 79 | .virtual = (u32)ANUBIS_VA_CTRL1, |
| 79 | .pfn = __phys_to_pfn(ANUBIS_PA_CTRL1), | 80 | .pfn = __phys_to_pfn(ANUBIS_PA_CTRL1), |
| 80 | .length = SZ_4K, | 81 | .length = SZ_4K, |
| 81 | .type = MT_DEVICE | 82 | .type = MT_DEVICE, |
| 82 | }, { | 83 | }, { |
| 83 | .virtual = (u32)ANUBIS_VA_CTRL2, | 84 | .virtual = (u32)ANUBIS_VA_CTRL2, |
| 84 | .pfn = __phys_to_pfn(ANUBIS_PA_CTRL2), | 85 | .pfn = __phys_to_pfn(ANUBIS_PA_CTRL2), |
| 85 | .length = SZ_4K, | 86 | .length = SZ_4K, |
| 86 | .type =MT_DEVICE | 87 | .type = MT_DEVICE, |
| 87 | }, | 88 | }, |
| 88 | 89 | ||
| 89 | /* IDE drives */ | 90 | /* IDE drives */ |
| @@ -126,7 +127,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = { | |||
| 126 | .name = "pclk", | 127 | .name = "pclk", |
| 127 | .divisor = 1, | 128 | .divisor = 1, |
| 128 | .min_baud = 0, | 129 | .min_baud = 0, |
| 129 | .max_baud = 0. | 130 | .max_baud = 0, |
| 130 | } | 131 | } |
| 131 | }; | 132 | }; |
| 132 | 133 | ||
| @@ -139,7 +140,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { | |||
| 139 | .ulcon = ULCON, | 140 | .ulcon = ULCON, |
| 140 | .ufcon = UFCON, | 141 | .ufcon = UFCON, |
| 141 | .clocks = anubis_serial_clocks, | 142 | .clocks = anubis_serial_clocks, |
| 142 | .clocks_size = ARRAY_SIZE(anubis_serial_clocks) | 143 | .clocks_size = ARRAY_SIZE(anubis_serial_clocks), |
| 143 | }, | 144 | }, |
| 144 | [1] = { | 145 | [1] = { |
| 145 | .hwport = 2, | 146 | .hwport = 2, |
| @@ -148,7 +149,7 @@ static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = { | |||
| 148 | .ulcon = ULCON, | 149 | .ulcon = ULCON, |
| 149 | .ufcon = UFCON, | 150 | .ufcon = UFCON, |
| 150 | .clocks = anubis_serial_clocks, | 151 | .clocks = anubis_serial_clocks, |
| 151 | .clocks_size = ARRAY_SIZE(anubis_serial_clocks) | 152 | .clocks_size = ARRAY_SIZE(anubis_serial_clocks), |
| 152 | }, | 153 | }, |
| 153 | }; | 154 | }; |
| 154 | 155 | ||
| @@ -162,7 +163,7 @@ static struct mtd_partition anubis_default_nand_part[] = { | |||
| 162 | [0] = { | 163 | [0] = { |
| 163 | .name = "Boot Agent", | 164 | .name = "Boot Agent", |
| 164 | .size = SZ_16K, | 165 | .size = SZ_16K, |
| 165 | .offset = 0 | 166 | .offset = 0, |
| 166 | }, | 167 | }, |
| 167 | [1] = { | 168 | [1] = { |
| 168 | .name = "/boot", | 169 | .name = "/boot", |
| @@ -194,21 +195,21 @@ static struct s3c2410_nand_set anubis_nand_sets[] = { | |||
| 194 | .nr_chips = 1, | 195 | .nr_chips = 1, |
| 195 | .nr_map = external_map, | 196 | .nr_map = external_map, |
| 196 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), | 197 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), |
| 197 | .partitions = anubis_default_nand_part | 198 | .partitions = anubis_default_nand_part, |
| 198 | }, | 199 | }, |
| 199 | [0] = { | 200 | [0] = { |
| 200 | .name = "chip0", | 201 | .name = "chip0", |
| 201 | .nr_chips = 1, | 202 | .nr_chips = 1, |
| 202 | .nr_map = chip0_map, | 203 | .nr_map = chip0_map, |
| 203 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), | 204 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), |
| 204 | .partitions = anubis_default_nand_part | 205 | .partitions = anubis_default_nand_part, |
| 205 | }, | 206 | }, |
| 206 | [2] = { | 207 | [2] = { |
| 207 | .name = "chip1", | 208 | .name = "chip1", |
| 208 | .nr_chips = 1, | 209 | .nr_chips = 1, |
| 209 | .nr_map = chip1_map, | 210 | .nr_map = chip1_map, |
| 210 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), | 211 | .nr_partitions = ARRAY_SIZE(anubis_default_nand_part), |
| 211 | .partitions = anubis_default_nand_part | 212 | .partitions = anubis_default_nand_part, |
| 212 | }, | 213 | }, |
| 213 | }; | 214 | }; |
| 214 | 215 | ||
| @@ -313,7 +314,7 @@ static struct s3c24xx_board anubis_board __initdata = { | |||
| 313 | .devices = anubis_devices, | 314 | .devices = anubis_devices, |
| 314 | .devices_count = ARRAY_SIZE(anubis_devices), | 315 | .devices_count = ARRAY_SIZE(anubis_devices), |
| 315 | .clocks = anubis_clocks, | 316 | .clocks = anubis_clocks, |
| 316 | .clocks_count = ARRAY_SIZE(anubis_clocks) | 317 | .clocks_count = ARRAY_SIZE(anubis_clocks), |
| 317 | }; | 318 | }; |
| 318 | 319 | ||
| 319 | static void __init anubis_map_io(void) | 320 | static void __init anubis_map_io(void) |
diff --git a/arch/arm/mach-s3c2410/mach-osiris.c b/arch/arm/mach-s3c2410/mach-osiris.c index 858fd03c6bc5..e193ba69e652 100644 --- a/arch/arm/mach-s3c2410/mach-osiris.c +++ b/arch/arm/mach-s3c2410/mach-osiris.c | |||
| @@ -67,12 +67,12 @@ static struct map_desc osiris_iodesc[] __initdata = { | |||
| 67 | .virtual = (u32)OSIRIS_VA_CTRL1, | 67 | .virtual = (u32)OSIRIS_VA_CTRL1, |
| 68 | .pfn = __phys_to_pfn(OSIRIS_PA_CTRL1), | 68 | .pfn = __phys_to_pfn(OSIRIS_PA_CTRL1), |
| 69 | .length = SZ_16K, | 69 | .length = SZ_16K, |
| 70 | .type = MT_DEVICE | 70 | .type = MT_DEVICE, |
| 71 | }, { | 71 | }, { |
| 72 | .virtual = (u32)OSIRIS_VA_CTRL2, | 72 | .virtual = (u32)OSIRIS_VA_CTRL2, |
| 73 | .pfn = __phys_to_pfn(OSIRIS_PA_CTRL2), | 73 | .pfn = __phys_to_pfn(OSIRIS_PA_CTRL2), |
| 74 | .length = SZ_16K, | 74 | .length = SZ_16K, |
| 75 | .type = MT_DEVICE | 75 | .type = MT_DEVICE, |
| 76 | }, | 76 | }, |
| 77 | }; | 77 | }; |
| 78 | 78 | ||
| @@ -91,7 +91,7 @@ static struct s3c24xx_uart_clksrc osiris_serial_clocks[] = { | |||
| 91 | .name = "pclk", | 91 | .name = "pclk", |
| 92 | .divisor = 1, | 92 | .divisor = 1, |
| 93 | .min_baud = 0, | 93 | .min_baud = 0, |
| 94 | .max_baud = 0. | 94 | .max_baud = 0, |
| 95 | } | 95 | } |
| 96 | }; | 96 | }; |
| 97 | 97 | ||
| @@ -103,7 +103,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { | |||
| 103 | .ulcon = ULCON, | 103 | .ulcon = ULCON, |
| 104 | .ufcon = UFCON, | 104 | .ufcon = UFCON, |
| 105 | .clocks = osiris_serial_clocks, | 105 | .clocks = osiris_serial_clocks, |
| 106 | .clocks_size = ARRAY_SIZE(osiris_serial_clocks) | 106 | .clocks_size = ARRAY_SIZE(osiris_serial_clocks), |
| 107 | }, | 107 | }, |
| 108 | [1] = { | 108 | [1] = { |
| 109 | .hwport = 1, | 109 | .hwport = 1, |
| @@ -112,7 +112,7 @@ static struct s3c2410_uartcfg osiris_uartcfgs[] __initdata = { | |||
| 112 | .ulcon = ULCON, | 112 | .ulcon = ULCON, |
| 113 | .ufcon = UFCON, | 113 | .ufcon = UFCON, |
| 114 | .clocks = osiris_serial_clocks, | 114 | .clocks = osiris_serial_clocks, |
| 115 | .clocks_size = ARRAY_SIZE(osiris_serial_clocks) | 115 | .clocks_size = ARRAY_SIZE(osiris_serial_clocks), |
| 116 | }, | 116 | }, |
| 117 | }; | 117 | }; |
| 118 | 118 | ||
| @@ -126,7 +126,7 @@ static struct mtd_partition osiris_default_nand_part[] = { | |||
| 126 | [0] = { | 126 | [0] = { |
| 127 | .name = "Boot Agent", | 127 | .name = "Boot Agent", |
| 128 | .size = SZ_16K, | 128 | .size = SZ_16K, |
| 129 | .offset = 0 | 129 | .offset = 0, |
| 130 | }, | 130 | }, |
| 131 | [1] = { | 131 | [1] = { |
| 132 | .name = "/boot", | 132 | .name = "/boot", |
| @@ -158,21 +158,21 @@ static struct s3c2410_nand_set osiris_nand_sets[] = { | |||
| 158 | .nr_chips = 1, | 158 | .nr_chips = 1, |
| 159 | .nr_map = external_map, | 159 | .nr_map = external_map, |
| 160 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), | 160 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), |
| 161 | .partitions = osiris_default_nand_part | 161 | .partitions = osiris_default_nand_part, |
| 162 | }, | 162 | }, |
| 163 | [0] = { | 163 | [0] = { |
| 164 | .name = "chip0", | 164 | .name = "chip0", |
| 165 | .nr_chips = 1, | 165 | .nr_chips = 1, |
| 166 | .nr_map = chip0_map, | 166 | .nr_map = chip0_map, |
| 167 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), | 167 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), |
| 168 | .partitions = osiris_default_nand_part | 168 | .partitions = osiris_default_nand_part, |
| 169 | }, | 169 | }, |
| 170 | [2] = { | 170 | [2] = { |
| 171 | .name = "chip1", | 171 | .name = "chip1", |
| 172 | .nr_chips = 1, | 172 | .nr_chips = 1, |
| 173 | .nr_map = chip1_map, | 173 | .nr_map = chip1_map, |
| 174 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), | 174 | .nr_partitions = ARRAY_SIZE(osiris_default_nand_part), |
| 175 | .partitions = osiris_default_nand_part | 175 | .partitions = osiris_default_nand_part, |
| 176 | }, | 176 | }, |
| 177 | }; | 177 | }; |
| 178 | 178 | ||
| @@ -245,7 +245,7 @@ static struct s3c24xx_board osiris_board __initdata = { | |||
| 245 | .devices = osiris_devices, | 245 | .devices = osiris_devices, |
| 246 | .devices_count = ARRAY_SIZE(osiris_devices), | 246 | .devices_count = ARRAY_SIZE(osiris_devices), |
| 247 | .clocks = osiris_clocks, | 247 | .clocks = osiris_clocks, |
| 248 | .clocks_count = ARRAY_SIZE(osiris_clocks) | 248 | .clocks_count = ARRAY_SIZE(osiris_clocks), |
| 249 | }; | 249 | }; |
| 250 | 250 | ||
| 251 | static void __init osiris_map_io(void) | 251 | static void __init osiris_map_io(void) |
