ARM: brcmstb: Add support for the V7 memory map

The 7278 device is the first device that includes support for the V7
memory map developed for use in 64-bit architecture brcmstb devices.
This map relocates the register physical offset from 0xF0000000 to
0x0000000008000000.

Since the ARM PERIPHBASE value is also relocated in the V7 memory map
we can use its value to determine whether this device uses the new
V7 memory map and therefore where to look for the SUN_TOP_CTRL
register used to identify the chip family.

Signed-off-by: Doug Berger <opendmb@gmail.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/include/debug/brcmstb.S b/arch/arm/include/debug/brcmstb.S
index c826f15d2f80382e160633bbc82f4d3a02f9b8fb..0f580caa81e51abcf51216577ee96ece658d3b7e 100644 (file)
--- a/arch/arm/include/debug/brcmstb.S
+++ b/arch/arm/include/debug/brcmstb.S
@@ -11,20 +11,25 @@
  * GNU General Public License for more details.
  */
 #include <linux/serial_reg.h>
+#include <asm/cputype.h>
 
 /* Physical register offset and virtual register offset */
 #define REG_PHYS_BASE          0xf0000000
+#define REG_PHYS_BASE_V7       0x08000000
 #define REG_VIRT_BASE          0xfc000000
 #define REG_PHYS_ADDR(x)       ((x) + REG_PHYS_BASE)
+#define REG_PHYS_ADDR_V7(x)    ((x) + REG_PHYS_BASE_V7)
 
 /* Product id can be read from here */
 #define SUN_TOP_CTRL_BASE      REG_PHYS_ADDR(0x404000)
+#define SUN_TOP_CTRL_BASE_V7   REG_PHYS_ADDR_V7(0x404000)
 
 #define UARTA_3390             REG_PHYS_ADDR(0x40a900)
 #define UARTA_7250             REG_PHYS_ADDR(0x40b400)
 #define UARTA_7260             REG_PHYS_ADDR(0x40c000)
 #define UARTA_7268             UARTA_7260
 #define UARTA_7271             UARTA_7268
+#define UARTA_7278             REG_PHYS_ADDR_V7(0x40c000)
 #define UARTA_7364             REG_PHYS_ADDR(0x40b000)
 #define UARTA_7366             UARTA_7364
 #define UARTA_74371            REG_PHYS_ADDR(0x406b00)
@@ -55,8 +60,21 @@
                mov     \rv, #0                 @ yes; record init is done
                str     \rv, [\tmp]
 
+               /* Check for V7 memory map if B53 */
+               mrc     p15, 0, \rv, c0, c0, 0  @ get Main ID register
+               ldr     \rp, =ARM_CPU_PART_MASK
+               and     \rv, \rv, \rp
+               ldr     \rp, =ARM_CPU_PART_BRAHMA_B53   @ check for B53 CPU
+               cmp     \rv, \rp
+               bne     10f
+
+               /* if PERIPHBASE doesn't overlap REG_PHYS_BASE use V7 map */
+               mrc     p15, 1, \rv, c15, c3, 0 @ get PERIPHBASE from CBAR
+               ands    \rv, \rv, #REG_PHYS_BASE
+               ldreq   \rp, =SUN_TOP_CTRL_BASE_V7
+
                /* Check SUN_TOP_CTRL base */
-               ldr     \rp, =SUN_TOP_CTRL_BASE @ load SUN_TOP_CTRL PA
+10:            ldrne   \rp, =SUN_TOP_CTRL_BASE @ load SUN_TOP_CTRL PA
                ldr     \rv, [\rp, #0]          @ get register contents
 ARM_BE8(       rev     \rv, \rv )
                and     \rv, \rv, #0xffffff00   @ strip revision bits [7:0]
@@ -72,6 +90,7 @@ ARM_BE8(      rev     \rv, \rv )
 27:            checkuart(\rp, \rv, 0x07437100, 74371)
 28:            checkuart(\rp, \rv, 0x74390000, 7439)
 29:            checkuart(\rp, \rv, 0x74450000, 7445)
+30:            checkuart(\rp, \rv, 0x72780000, 7278)
 
                /* No valid UART found */
 90:            mov     \rp, #0