Merge tag 'tags/bcm2835-soc-next-2018-11-27' into soc/next
authorFlorian Fainelli <f.fainelli@gmail.com>
Tue, 27 Nov 2018 21:24:50 +0000 (13:24 -0800)
committerFlorian Fainelli <f.fainelli@gmail.com>
Tue, 27 Nov 2018 21:24:50 +0000 (13:24 -0800)
This pull request adds SPDX identifiers to the bcm2835 platform files.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
arch/arm/include/debug/brcmstb.S
arch/arm/mach-bcm/Kconfig

index 0f580ca..bf8702e 100644 (file)
@@ -26,8 +26,9 @@
 
 #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_7255             REG_PHYS_ADDR(0x40c000)
+#define UARTA_7260             UARTA_7255
+#define UARTA_7268             UARTA_7255
 #define UARTA_7271             UARTA_7268
 #define UARTA_7278             REG_PHYS_ADDR_V7(0x40c000)
 #define UARTA_7364             REG_PHYS_ADDR(0x40b000)
@@ -82,15 +83,16 @@ ARM_BE8(    rev     \rv, \rv )
                /* Chip specific detection starts here */
 20:            checkuart(\rp, \rv, 0x33900000, 3390)
 21:            checkuart(\rp, \rv, 0x72500000, 7250)
-22:            checkuart(\rp, \rv, 0x72600000, 7260)
-23:            checkuart(\rp, \rv, 0x72680000, 7268)
-24:            checkuart(\rp, \rv, 0x72710000, 7271)
-25:            checkuart(\rp, \rv, 0x73640000, 7364)
-26:            checkuart(\rp, \rv, 0x73660000, 7366)
-27:            checkuart(\rp, \rv, 0x07437100, 74371)
-28:            checkuart(\rp, \rv, 0x74390000, 7439)
-29:            checkuart(\rp, \rv, 0x74450000, 7445)
-30:            checkuart(\rp, \rv, 0x72780000, 7278)
+22:            checkuart(\rp, \rv, 0x72550000, 7255)
+23:            checkuart(\rp, \rv, 0x72600000, 7260)
+24:            checkuart(\rp, \rv, 0x72680000, 7268)
+25:            checkuart(\rp, \rv, 0x72710000, 7271)
+26:            checkuart(\rp, \rv, 0x72780000, 7278)
+27:            checkuart(\rp, \rv, 0x73640000, 7364)
+28:            checkuart(\rp, \rv, 0x73660000, 7366)
+29:            checkuart(\rp, \rv, 0x07437100, 74371)
+30:            checkuart(\rp, \rv, 0x74390000, 7439)
+31:            checkuart(\rp, \rv, 0x74450000, 7445)
 
                /* No valid UART found */
 90:            mov     \rp, #0
index 25aac6e..005f4e9 100644 (file)
@@ -189,6 +189,7 @@ config ARCH_BCM_63XX
        bool "Broadcom BCM63xx DSL SoC"
        depends on ARCH_MULTI_V7
        depends on MMU
+       select ARCH_HAS_RESET_CONTROLLER
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369 if SMP
        select ARM_GIC