Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / m68k / hp300 / config.c

diff --git a/arch/m68k/hp300/config.c b/arch/m68k/hp300/config.c
index b7609f791522a45f12170799cdae4f89bc8ab80f..a9befe65adc42b16e49ee318812eecb8d9b3a3f3 100644 (file)
--- a/arch/m68k/hp300/config.c
+++ b/arch/m68k/hp300/config.c
@@ -14,6 +14,8 @@
 #include <linux/console.h>
 
 #include <asm/bootinfo.h>
+#include <asm/bootinfo-hp300.h>
+#include <asm/byteorder.h>
 #include <asm/machdep.h>
 #include <asm/blinken.h>
 #include <asm/io.h>                               /* readb() and writeb() */
@@ -70,22 +72,22 @@ extern int hp300_setup_serial_console(void) __init;
 int __init hp300_parse_bootinfo(const struct bi_record *record)
 {
        int unknown = 0;
-       const unsigned long *data = record->data;
+       const void *data = record->data;
 
-       switch (record->tag) {
+       switch (be16_to_cpu(record->tag)) {
        case BI_HP300_MODEL:
-               hp300_model = *data;
+               hp300_model = be32_to_cpup(data);
                break;
 
        case BI_HP300_UART_SCODE:
-               hp300_uart_scode = *data;
+               hp300_uart_scode = be32_to_cpup(data);
                break;
 
        case BI_HP300_UART_ADDR:
                /* serial port address: ignored here */
                break;
 
-        default:
+       default:
                unknown = 1;
        }
 
@@ -260,11 +262,12 @@ void __init config_hp300(void)
 #endif
        mach_max_dma_address = 0xffffffff;
 
-       if (hp300_model >= HP_330 && hp300_model <= HP_433S && hp300_model != HP_350) {
-               printk(KERN_INFO "Detected HP9000 model %s\n", hp300_models[hp300_model-HP_320]);
+       if (hp300_model >= HP_330 && hp300_model <= HP_433S &&
+           hp300_model != HP_350) {
+               pr_info("Detected HP9000 model %s\n",
+                       hp300_models[hp300_model-HP_320]);
                strcat(hp300_model_name, hp300_models[hp300_model-HP_320]);
-       }
-       else {
+       } else {
                panic("Unknown HP9000 Model");
        }
 #ifdef CONFIG_SERIAL_8250_CONSOLE