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

Merge tag 'arm-soc/for-4.21/soc' of https://github.com/Broadcom/stblinux into next/soc

This pull request contains Broadcom ARM-based SoCs machine files updates
for 4.21, please pull the following:

- Stefan switches relevant BCM283x files under arch/arm/mach-bcm to the
SPDX license identifiers

- Justin adds an entry in the Broadcom STB debug LL stub for 7255

- Florian enables reset controller support for BCM63xx SoCs

* tag 'arm-soc/for-4.21/soc' of https://github.com/Broadcom/stblinux:
ARM: mach-bcm: Switch bcm2835 and platsmp to SPDX identifier
ARM: BCM63XX: Enable reset controller support
ARM: brcmstb: Add entry for 7255

Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson ac21e9af 3773b5c9

+17 -35
+13 -11
arch/arm/include/debug/brcmstb.S
··· 26 26 27 27 #define UARTA_3390 REG_PHYS_ADDR(0x40a900) 28 28 #define UARTA_7250 REG_PHYS_ADDR(0x40b400) 29 - #define UARTA_7260 REG_PHYS_ADDR(0x40c000) 30 - #define UARTA_7268 UARTA_7260 29 + #define UARTA_7255 REG_PHYS_ADDR(0x40c000) 30 + #define UARTA_7260 UARTA_7255 31 + #define UARTA_7268 UARTA_7255 31 32 #define UARTA_7271 UARTA_7268 32 33 #define UARTA_7278 REG_PHYS_ADDR_V7(0x40c000) 33 34 #define UARTA_7364 REG_PHYS_ADDR(0x40b000) ··· 83 82 /* Chip specific detection starts here */ 84 83 20: checkuart(\rp, \rv, 0x33900000, 3390) 85 84 21: checkuart(\rp, \rv, 0x72500000, 7250) 86 - 22: checkuart(\rp, \rv, 0x72600000, 7260) 87 - 23: checkuart(\rp, \rv, 0x72680000, 7268) 88 - 24: checkuart(\rp, \rv, 0x72710000, 7271) 89 - 25: checkuart(\rp, \rv, 0x73640000, 7364) 90 - 26: checkuart(\rp, \rv, 0x73660000, 7366) 91 - 27: checkuart(\rp, \rv, 0x07437100, 74371) 92 - 28: checkuart(\rp, \rv, 0x74390000, 7439) 93 - 29: checkuart(\rp, \rv, 0x74450000, 7445) 94 - 30: checkuart(\rp, \rv, 0x72780000, 7278) 85 + 22: checkuart(\rp, \rv, 0x72550000, 7255) 86 + 23: checkuart(\rp, \rv, 0x72600000, 7260) 87 + 24: checkuart(\rp, \rv, 0x72680000, 7268) 88 + 25: checkuart(\rp, \rv, 0x72710000, 7271) 89 + 26: checkuart(\rp, \rv, 0x72780000, 7278) 90 + 27: checkuart(\rp, \rv, 0x73640000, 7364) 91 + 28: checkuart(\rp, \rv, 0x73660000, 7366) 92 + 29: checkuart(\rp, \rv, 0x07437100, 74371) 93 + 30: checkuart(\rp, \rv, 0x74390000, 7439) 94 + 31: checkuart(\rp, \rv, 0x74450000, 7445) 95 95 96 96 /* No valid UART found */ 97 97 90: mov \rp, #0
+1
arch/arm/mach-bcm/Kconfig
··· 189 189 bool "Broadcom BCM63xx DSL SoC" 190 190 depends on ARCH_MULTI_V7 191 191 depends on MMU 192 + select ARCH_HAS_RESET_CONTROLLER 192 193 select ARM_ERRATA_754322 193 194 select ARM_ERRATA_764369 if SMP 194 195 select ARM_GIC
+1 -10
arch/arm/mach-bcm/board_bcm2835.c
··· 1 + // SPDX-License-Identifier: GPL-2.0+ 1 2 /* 2 3 * Copyright (C) 2010 Broadcom 3 - * 4 - * This program is free software; you can redistribute it and/or modify 5 - * it under the terms of the GNU General Public License as published by 6 - * the Free Software Foundation; either version 2 of the License, or 7 - * (at your option) any later version. 8 - * 9 - * This program is distributed in the hope that it will be useful, 10 - * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 - * GNU General Public License for more details. 13 4 */ 14 5 15 6 #include <linux/init.h>
+1 -9
arch/arm/mach-bcm/platsmp.c
··· 1 + // SPDX-License-Identifier: GPL-2.0 1 2 /* 2 3 * Copyright (C) 2014-2015 Broadcom Corporation 3 4 * Copyright 2014 Linaro Limited 4 - * 5 - * This program is free software; you can redistribute it and/or 6 - * modify it under the terms of the GNU General Public License as 7 - * published by the Free Software Foundation version 2. 8 - * 9 - * This program is distributed "as is" WITHOUT ANY WARRANTY of any 10 - * kind, whether express or implied; without even the implied warranty 11 - * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 12 - * GNU General Public License for more details. 13 5 */ 14 6 15 7 #include <linux/cpumask.h>
+1 -5
arch/arm/mach-bcm/platsmp.h
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 /* 2 3 * Copyright (C) 2017 Stefan Wahren <stefan.wahren@i2se.com> 3 - * 4 - * This program is free software; you can redistribute it and/or 5 - * modify it under the terms of the GNU General Public License as 6 - * published by the Free Software Foundation version 2. 7 - * 8 4 */ 9 5 10 6 extern const struct smp_operations bcm2836_smp_ops;