ARM: 8138/1: drop ISAR0 workaround for B15
authorBrian Norris <computersforpeace@gmail.com>
Fri, 5 Sep 2014 22:00:33 +0000 (23:00 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Sep 2014 16:39:52 +0000 (17:39 +0100)
The Brahma-B15's ISAR0 correcty advertises UDIV/SDIV support in both ARM
and Thumb2 modes (CPUID_EXT_ISAR0=02101110), so we don't need to
manually apply this hwcap.

The code in question actually predates the following commit, which made
our hwcaps unnecessary:

    commit 8164f7af88d9ad3a757bd14f634b23997ee77f6b
    Author: Stephen Boyd <sboyd@codeaurora.org>
    Date:   Mon Mar 18 19:44:15 2013 +0100

        ARM: 7680/1: Detect support for SDIV/UDIV from ISAR0 register

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/proc-v7.S

index b5d67db2089779c9a1ba1580ec078ee9bce07dad..b3a947863ac7bb7e38d47b7a640d698b55a34bbc 100644 (file)
@@ -570,7 +570,7 @@ __v7_ca15mp_proc_info:
 __v7_b15mp_proc_info:
        .long   0x420f00f0
        .long   0xff0ffff0
-       __v7_proc __v7_b15mp_setup, hwcaps = HWCAP_IDIV
+       __v7_proc __v7_b15mp_setup
        .size   __v7_b15mp_proc_info, . - __v7_b15mp_proc_info
 
        /*