tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

ARM: brcmstb: Add entry for 7260

BCM7260 has the same UART base address as 7268, order the entries by
ascending chip number and alias the 7268 definition to the 7260
definition.

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

Florian Fainelli d47b51ad 59f181aa

+10 -8
+10 -8
arch/arm/include/debug/brcmstb.S
··· 22 22 23 23 #define UARTA_3390 REG_PHYS_ADDR(0x40a900) 24 24 #define UARTA_7250 REG_PHYS_ADDR(0x40b400) 25 - #define UARTA_7268 REG_PHYS_ADDR(0x40c000) 25 + #define UARTA_7260 REG_PHYS_ADDR(0x40c000) 26 + #define UARTA_7268 UARTA_7260 26 27 #define UARTA_7271 UARTA_7268 27 28 #define UARTA_7364 REG_PHYS_ADDR(0x40b000) 28 29 #define UARTA_7366 UARTA_7364 ··· 63 62 /* Chip specific detection starts here */ 64 63 20: checkuart(\rp, \rv, 0x33900000, 3390) 65 64 21: checkuart(\rp, \rv, 0x72500000, 7250) 66 - 22: checkuart(\rp, \rv, 0x72680000, 7268) 67 - 23: checkuart(\rp, \rv, 0x72710000, 7271) 68 - 24: checkuart(\rp, \rv, 0x73640000, 7364) 69 - 25: checkuart(\rp, \rv, 0x73660000, 7366) 70 - 26: checkuart(\rp, \rv, 0x07437100, 74371) 71 - 27: checkuart(\rp, \rv, 0x74390000, 7439) 72 - 28: checkuart(\rp, \rv, 0x74450000, 7445) 65 + 22: checkuart(\rp, \rv, 0x72600000, 7260) 66 + 23: checkuart(\rp, \rv, 0x72680000, 7268) 67 + 24: checkuart(\rp, \rv, 0x72710000, 7271) 68 + 25: checkuart(\rp, \rv, 0x73640000, 7364) 69 + 26: checkuart(\rp, \rv, 0x73660000, 7366) 70 + 27: checkuart(\rp, \rv, 0x07437100, 74371) 71 + 28: checkuart(\rp, \rv, 0x74390000, 7439) 72 + 29: checkuart(\rp, \rv, 0x74450000, 7445) 73 73 74 74 /* No valid UART found */ 75 75 90: mov \rp, #0