Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-20 02:51:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

berlin core changes for v4.18

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEE2MW6uuYZ+0zBfpF41kg+k28NbwgFAlsGarcTHGpzemhhbmcz
 QGdtYWlsLmNvbQAKCRDWSD6Tbw1vCOu1EACKtzVELOHfM9PJ5GkOcF1CKBymJchK
 rTEbZJ0miEUxs3d8h6OfRkbG8idnfKSEcBR+l8eRI5GREHD2sWCXfc7ulyORoLs/
 9lXAZy7DKihww6TVaUxZ74Z/KAPN0E2Ksej63tgDnZmo8xTEZjvaZwdfZ58RvHdQ
 lI9mQdxIPWfIBkr1DvLUe/BngzX5vjpxA/dpKAlxTqqNR1Aa5DqNvuyZ+a3eR40N
 a1pFJH8c15ZZvooLvVu+U++5taveFhd5m6TxrMhAJEzzYDDSWWrJIcq9ZQnrHPZs
 brGeRkTZHfL3VQikcgWR+Muqk7bBtHoI8RBEOzEz/bhRLnokVZW+NjQSNiXeHAaK
 Y25qGBA2SVheMIEIPdHHToxQttshRKXYZKoqrXFcC7PxZ4h03JMisOKtEtwcgglx
 aF+B9jO4Pub8v3C/1DHKlv9MsbEguuABR1QRMYKzNmLvlc+LZkboWWhdU35xVY3B
 SwXYwiwhp8nG2YKR5fp+EM1hAkrOO6FCA/pUrQY8CF4qDWkCT1KsXst2awKo/w8e
 DGpbhNADS8q3hWP0vE3Q//rCcZ6Vz4g9qY9Grqfpe2N5sd6fIKuZnURPiBNJSxoD
 F7X2sLaRbtmAMcOF7mdnaHf7B7gn9pw2Mj1Dipj4+4/jyDqn2FeVHDbs7ARrDMX1
 plLL5m8IbS6gfQ==
 =FTZu
 -----END PGP SIGNATURE-----

Merge tag 'berlin-core-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin into next/soc

berlin core changes for v4.18

* tag 'berlin-core-for-v4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/jszhang/linux-berlin:
  ARM: berlin: switch to SPDX license identifier
  arm: berlin: remove non-necessary flush_cache_all()
  ARM: berlin: extend BG2CD Kconfig entry

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-25 14:50:27 -07:00
commit 320b857947
4 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/mach-berlin/Kconfig
View File

@ -23,8 +23,12 @@ config MACH_BERLIN_BG2
config MACH_BERLIN_BG2CD
bool "Marvell Armada 1500-mini (BG2CD)"
select ARM_ERRATA_754322
select ARM_ERRATA_775420
select ARM_GLOBAL_TIMER
select CACHE_L2X0
select HAVE_ARM_TWD if SMP
select HAVE_ARM_SCU
select HAVE_ARM_TWD
select PINCTRL_BERLIN_BG2CD
config MACH_BERLIN_BG2Q

5
arch/arm/mach-berlin/berlin.c
View File

@ -1,3 +1,4 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree support for Marvell Berlin SoCs.
*
@ -5,10 +6,6 @@
*
* based on GPL'ed 2.6 kernel sources
* (c) Marvell International Ltd.
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <linux/init.h>

5
arch/arm/mach-berlin/headsmp.S
View File

@ -1,11 +1,8 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
* Copyright (C) 2014 Marvell Technology Group Ltd.
*
* Antoine Ténart <antoine.tenart@free-electrons.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/linkage.h>

6
arch/arm/mach-berlin/platsmp.c
View File

@ -1,11 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2014 Marvell Technology Group Ltd.
*
* Antoine Ténart <antoine.tenart@free-electrons.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
#include <linux/io.h>
@ -81,7 +78,6 @@ static void __init berlin_smp_prepare_cpus(unsigned int max_cpus)
goto unmap_scu;
scu_enable(scu_base);
flush_cache_all();
/*
* Write the first instruction the CPU will execute after being reset