Commit 86a7b7ef54650b99f7f638d6a6990fe7c0dfaaab
Exists in
master
and in
4 other branches
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: MIPS: RB532: Fix devices.c compilation. MIPS: Fix MIPS I build.
Showing 2 changed files Side-by-side Diff
arch/mips/kernel/syscall.c
| ... | ... | @@ -306,6 +306,7 @@ |
| 306 | 306 | |
| 307 | 307 | if (cpu_has_llsc && R10000_LLSC_WAR) { |
| 308 | 308 | __asm__ __volatile__ ( |
| 309 | + " .set mips3 \n" | |
| 309 | 310 | " li %[err], 0 \n" |
| 310 | 311 | "1: ll %[old], (%[addr]) \n" |
| 311 | 312 | " move %[tmp], %[new] \n" |
| ... | ... | @@ -320,6 +321,7 @@ |
| 320 | 321 | " "STR(PTR)" 1b, 4b \n" |
| 321 | 322 | " "STR(PTR)" 2b, 4b \n" |
| 322 | 323 | " .previous \n" |
| 324 | + " .set mips0 \n" | |
| 323 | 325 | : [old] "=&r" (old), |
| 324 | 326 | [err] "=&r" (err), |
| 325 | 327 | [tmp] "=&r" (tmp) |
| ... | ... | @@ -329,6 +331,7 @@ |
| 329 | 331 | : "memory"); |
| 330 | 332 | } else if (cpu_has_llsc) { |
| 331 | 333 | __asm__ __volatile__ ( |
| 334 | + " .set mips3 \n" | |
| 332 | 335 | " li %[err], 0 \n" |
| 333 | 336 | "1: ll %[old], (%[addr]) \n" |
| 334 | 337 | " move %[tmp], %[new] \n" |
| ... | ... | @@ -347,6 +350,7 @@ |
| 347 | 350 | " "STR(PTR)" 1b, 5b \n" |
| 348 | 351 | " "STR(PTR)" 2b, 5b \n" |
| 349 | 352 | " .previous \n" |
| 353 | + " .set mips0 \n" | |
| 350 | 354 | : [old] "=&r" (old), |
| 351 | 355 | [err] "=&r" (err), |
| 352 | 356 | [tmp] "=&r" (tmp) |
arch/mips/rb532/devices.c
| ... | ... | @@ -110,7 +110,6 @@ |
| 110 | 110 | static struct platform_device korina_dev0 = { |
| 111 | 111 | .id = -1, |
| 112 | 112 | .name = "korina", |
| 113 | - .dev.driver_data = &korina_dev0_data, | |
| 114 | 113 | .resource = korina_dev0_res, |
| 115 | 114 | .num_resources = ARRAY_SIZE(korina_dev0_res), |
| 116 | 115 | }; |
| ... | ... | @@ -331,6 +330,8 @@ |
| 331 | 330 | |
| 332 | 331 | /* set the uart clock to the current cpu frequency */ |
| 333 | 332 | rb532_uart_res[0].uartclk = idt_cpu_freq; |
| 333 | + | |
| 334 | + dev_set_drvdata(&korina_dev0.dev, &korina_dev0_data); | |
| 334 | 335 | |
| 335 | 336 | return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs)); |
| 336 | 337 | } |