projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull thermal into release branch
[linux-drm-fsl-dcu.git]
/
arch
/
arm
/
mach-iop13xx
/
setup.c
diff --git
a/arch/arm/mach-iop13xx/setup.c
b/arch/arm/mach-iop13xx/setup.c
index 9a46bcd5f18e3992eaac306c62ba128fdf15d509..bc4871553f6ac489accea0b0146a1bd08b6609ba 100644
(file)
--- a/
arch/arm/mach-iop13xx/setup.c
+++ b/
arch/arm/mach-iop13xx/setup.c
@@
-258,15
+258,11
@@
void __init iop13xx_platform_init(void)
if (init_uart == IOP13XX_INIT_UART_DEFAULT) {
switch (iop13xx_dev_id()) {
if (init_uart == IOP13XX_INIT_UART_DEFAULT) {
switch (iop13xx_dev_id()) {
- /* enable both uarts on iop341
and iop342
*/
+ /* enable both uarts on iop341 */
case 0x3380:
case 0x3384:
case 0x3388:
case 0x338c:
case 0x3380:
case 0x3384:
case 0x3388:
case 0x338c:
- case 0x3382:
- case 0x3386:
- case 0x338a:
- case 0x338e:
init_uart |= IOP13XX_INIT_UART_0;
init_uart |= IOP13XX_INIT_UART_1;
break;
init_uart |= IOP13XX_INIT_UART_0;
init_uart |= IOP13XX_INIT_UART_1;
break;