diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 22:17:12 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-08-16 22:17:12 +0200 |
| commit | f7c1897785c674ee0c6d76b9bff69d982131c0eb (patch) | |
| tree | 4294dd44d886ce70ddab26a986405d6168e4b8e9 /arch/arm | |
| parent | aae4e7a8bc44722fe70d58920a36916b1043195e (diff) | |
| parent | d2057bbb79aad0e0f20112edd7b6599f06101e64 (diff) | |
| download | linux-f7c1897785c674ee0c6d76b9bff69d982131c0eb.tar.bz2 | |
Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next/cleanup
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
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-hisi/platsmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-hisi/platsmp.c b/arch/arm/mach-hisi/platsmp.c index 91bb02dec20f..da5689ababf7 100644 --- 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); } |