Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next...

Pull "ARM: hisi fixes for 4.14" from Wei Xu:

- Fix the comment typo of the machine code "0xe51ff004"
  to avoid confusion.

* tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi:
  ARM: hisi: Fix typo in comment

diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c
index 91bb02dec20f15a63f438f3ab65fe5dc62a40af7..da5689ababf7b933516f46d70436ad2be44a33b9 100644 (file)
--- a/arch/arm/mach-hisi/platsmp.c
+++ b/arch/arm/mach-hisi/platsmp.c
@@ -109,7 +109,7 @@ static void hix5hd2_set_scu_boot_addr(phys_addr_t start_addr, phys_addr_t jump_a
 
        virt = ioremap(start_addr, PAGE_SIZE);
 
-       writel_relaxed(0xe51ff004, virt);       /* ldr pc, [rc, #-4] */
+       writel_relaxed(0xe51ff004, virt);       /* ldr pc, [pc, #-4] */
        writel_relaxed(jump_addr, virt + 4);    /* pc jump phy address */
        iounmap(virt);
 }