diff options
Diffstat (limited to 'kernel/arch/mips/bmips')
| -rw-r--r-- | kernel/arch/mips/bmips/Kconfig | 4 | ||||
| -rw-r--r-- | kernel/arch/mips/bmips/irq.c | 2 | ||||
| -rw-r--r-- | kernel/arch/mips/bmips/setup.c | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/kernel/arch/mips/bmips/Kconfig b/kernel/arch/mips/bmips/Kconfig index f35c84c01..e2c4fd682 100644 --- a/kernel/arch/mips/bmips/Kconfig +++ b/kernel/arch/mips/bmips/Kconfig @@ -57,6 +57,10 @@ config DT_BCM97425SVMB bool "BCM97425SVMB" select BUILTIN_DTB +config DT_BCM97435SVMB + bool "BCM97435SVMB" + select BUILTIN_DTB + endchoice endif diff --git a/kernel/arch/mips/bmips/irq.c b/kernel/arch/mips/bmips/irq.c index 14552e58f..e7fc6f934 100644 --- a/kernel/arch/mips/bmips/irq.c +++ b/kernel/arch/mips/bmips/irq.c @@ -34,5 +34,5 @@ void __init arch_init_irq(void) irqchip_init(); } -OF_DECLARE_2(irqchip, mips_cpu_intc, "mti,cpu-interrupt-controller", +IRQCHIP_DECLARE(mips_cpu_intc, "mti,cpu-interrupt-controller", mips_cpu_irq_of_init); diff --git a/kernel/arch/mips/bmips/setup.c b/kernel/arch/mips/bmips/setup.c index fae800e8b..5b16d2955 100644 --- a/kernel/arch/mips/bmips/setup.c +++ b/kernel/arch/mips/bmips/setup.c @@ -149,13 +149,14 @@ void __init plat_mem_setup(void) /* intended to somewhat resemble ARM; see Documentation/arm/Booting */ if (fw_arg0 == 0 && fw_arg1 == 0xffffffff) dtb = phys_to_virt(fw_arg2); + else if (fw_arg0 == -2) /* UHI interface */ + dtb = (void *)fw_arg1; else if (__dtb_start != __dtb_end) dtb = (void *)__dtb_start; else panic("no dtb found"); __dt_setup_arch(dtb); - strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); for (q = bmips_quirk_list; q->quirk_fn; q++) { if (of_flat_dt_is_compatible(of_get_flat_dt_root(), |