Commit ac21e9af authored by Olof Johansson's avatar Olof Johansson
Browse files

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: default avatarOlof Johansson <olof@lixom.net>
parents 3773b5c9 12e0888d

arch/arm/include/debug/brcmstb.S

+13 −11
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-bcm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/arm/mach-bcm/board_bcm2835.c

+1 −10
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright (C) 2010 Broadcom

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by

 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/init.h>

arch/arm/mach-bcm/platsmp.c

+1 −9
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (C) 2014-2015 Broadcom Corporation

 * Copyright 2014 Linaro Limited

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 * This program is distributed "as is" WITHOUT ANY WARRANTY of any

 * kind, whether express or implied; without even the implied warranty

 * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include <linux/cpumask.h>

arch/arm/mach-bcm/platsmp.h

+1 −5
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Copyright (C) 2017 Stefan Wahren <stefan.wahren@i2se.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License as

 * published by the Free Software Foundation version 2.

 *

 */



extern const struct smp_operations bcm2836_smp_ops;

CRA Git | Maintained and supported by SUSTech CRA and CCSE