mvebu SoC changes for v3.18

- orion5x
     - remove pr_warning(), use pr_warn()
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
 iQIcBAABAgAGBQJUFVO9AAoJEP45WPkGe8ZnLZ4P/R8OxongpdQIdl4z4fc/gAqU
 /kWky2RXUEsN+5quS1DXH3NvSfuJzXGhknJ22+M1E7ijlv3Pvb3/CTYD/KClOGj+
 qZWluyDkOTq7Zv+EvTVHNqHUWn7wp73PxYezMRKNaAArkYHUKvAzA/wsRtR19dX6
 oFQ2GNOYUqU88nWnvnXSQgO7vg0HGWz7Rj6P6u5Hm1iQXqCGbRGEfOlMdMwedY//
 sAzg6GSTmmbsNItM3kXCzVTzR4WJUWM0wF30LlBkMwMqoaQOafmMIdwPSIwrmYQk
 y/5ECfRy8xup0phdEHD0JN9ONSX6zErYqhE4rBPZQvCGxqcl7bWIOgmMk1Ym23j0
 2rCRvI5yGbxWEND/AlOZ215aqABgqU0whm720v5WJMS4DAKm4KYEjvVldaV3BIuS
 XTWvxo+w4Bk0kg1u+dZeggq0nF2LBTqylgtqoldfMHhZ7ro4d4fzZ3ffFwOIC9eK
 hDEm9xlNvy2qeqVqy9o+31Hl3lT7lE1ZlTEIlvW3TrPjnwh/2bvt7l/h0erpfGly
 6pLDoSZw2KJi0OdI5cx1z3ek7NkMQeAe9yBkTLFtcjjhxzusgRzyQvy+L0l1RvZk
 5xfHrBxWnOJrbA+52Hn/QQDiyoaY0dEYMEytI+n8+0FWKMMVkrL0/XCojeB1R85I
 8Xf6rsAdiTjSzfhfOi2H
 =uwJg
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu into next/cleanup

Merge "ARM: mvebu: SoC changes for v3.18" from Jason Cooper:

mvebu SoC changes for v3.18

 - orion5x
    - remove pr_warning(), use pr_warn()

* tag 'mvebu-soc-3.18' of git://git.infradead.org/linux-mvebu:
  ARM: orion5x: Convert pr_warning to pr_warn

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-09-24 10:37:27 -07:00
commit c82eb46487
5 changed files with 9 additions and 9 deletions

View File

@ -550,7 +550,7 @@ static int __init dns323_identify_rev(void)
break;
}
if (i >= 1000) {
pr_warning("DNS-323: Timeout accessing PHY, assuming rev B1\n");
pr_warn("DNS-323: Timeout accessing PHY, assuming rev B1\n");
return DNS323_REV_B1;
}
writel((3 << 21) /* phy ID reg */ |
@ -562,7 +562,7 @@ static int __init dns323_identify_rev(void)
break;
}
if (i >= 1000) {
pr_warning("DNS-323: Timeout reading PHY, assuming rev B1\n");
pr_warn("DNS-323: Timeout reading PHY, assuming rev B1\n");
return DNS323_REV_B1;
}
pr_debug("DNS-323: Ethernet PHY ID 0x%x\n", reg & 0xffff);
@ -577,8 +577,8 @@ static int __init dns323_identify_rev(void)
case 0x0e10: /* MV88E1118 */
return DNS323_REV_C1;
default:
pr_warning("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n",
reg & 0xffff);
pr_warn("DNS-323: Unknown PHY ID 0x%04x, assuming rev B1\n",
reg & 0xffff);
}
return DNS323_REV_B1;
}

View File

@ -349,7 +349,7 @@ static void __init tsp2_init(void)
gpio_free(TSP2_RTC_GPIO);
}
if (tsp2_i2c_rtc.irq == 0)
pr_warning("tsp2_init: failed to get RTC IRQ\n");
pr_warn("tsp2_init: failed to get RTC IRQ\n");
i2c_register_board_info(0, &tsp2_i2c_rtc, 1);
/* register Terastation Pro II specific power-off method */

View File

@ -314,7 +314,7 @@ static void __init qnap_ts209_init(void)
gpio_free(TS209_RTC_GPIO);
}
if (qnap_ts209_i2c_rtc.irq == 0)
pr_warning("qnap_ts209_init: failed to get RTC IRQ\n");
pr_warn("qnap_ts209_init: failed to get RTC IRQ\n");
i2c_register_board_info(0, &qnap_ts209_i2c_rtc, 1);
/* register tsx09 specific power-off method */

View File

@ -302,7 +302,7 @@ static void __init qnap_ts409_init(void)
gpio_free(TS409_RTC_GPIO);
}
if (qnap_ts409_i2c_rtc.irq == 0)
pr_warning("qnap_ts409_init: failed to get RTC IRQ\n");
pr_warn("qnap_ts409_init: failed to get RTC IRQ\n");
i2c_register_board_info(0, &qnap_ts409_i2c_rtc, 1);
platform_device_register(&ts409_leds);

View File

@ -403,8 +403,8 @@ static void ts78xx_fpga_supports(void)
/* enable devices if magic matches */
switch ((ts78xx_fpga.id >> 8) & 0xffffff) {
case TS7800_FPGA_MAGIC:
pr_warning("unrecognised FPGA revision 0x%.2x\n",
ts78xx_fpga.id & 0xff);
pr_warn("unrecognised FPGA revision 0x%.2x\n",
ts78xx_fpga.id & 0xff);
ts78xx_fpga.supports.ts_rtc.present = 1;
ts78xx_fpga.supports.ts_nand.present = 1;
ts78xx_fpga.supports.ts_rng.present = 1;