openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

This pull request contains Broadcom ARM-based SoCs machine fixes for 

5.5-rc1, please pull the following:
 
 - H. Nikolaus adds a missing sentinel entry to the BCM2711 machine
   descriptor compatible array which would make multiplatform kernels fail
   to boot
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAl32+2MACgkQh9CWnEQH
 BwQg2hAA0TTMHzR+md8KUN1b0ae5mVbksj8Irqz01yw83Ljikzj395HqtMm0qIiR
 8XBPp9Va79El9NVRXw3YGPySDagR+AFU1+1btWUs/4cjMPQCmbjjO4n0yyPuvO0k
 l2lNf5fu89NHyFOot/Mv56s0KMAz0mjQdEfjx/QzK1PmVitk02NT2EhluftGWcIa
 SB63+g2dzD2X9wOwL61lH4YZwGyxH7kblv2SsWb1F1RAi6lX2IQ4U3T7hwXXxNdZ
 Tmvg5b9fP641Bwi+MYiqpnhfOOgeN/d+YNFRULDJ10PxBH45A85OpxnJJTC0qcHr
 T0at6gBfDGHtXOjcZuw4yrvkWnvCe2DZ3S5K0vYsvxPTvxgGPp+UCKBLXcmaKGXJ
 1YDJDGOanjYHhKTQ02RvAaIk2lhfuhRdEMyPmHH39PWVQinrXQcBGIKinhR9+YOG
 6HhAVUtO02FxhWXOg3N8zQz9X+3S/NrWZl1jySGsNLhxlzIW9SGqYsEeyy/2o/w9
 W/indX6jNy7uMtWQMQ7cZMNT9symhPPcyC6vDcdkmt1jKCdG3M8hNd3glnc24dir
 gF/N8gMYPQINQndK3fa+eKgVQAzHsSRxvbRc8BtEpMNnGzJSWrques1Nqj9iwSUt
 fywU8i4oNuA02H6AagB+sV8A3Uo753/TdLnXQ5dAMf952uE23QU=
 =1quG
 -----END PGP SIGNATURE-----

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

This pull request contains Broadcom ARM-based SoCs machine fixes for
5.5-rc1, please pull the following:

- H. Nikolaus adds a missing sentinel entry to the BCM2711 machine
  descriptor compatible array which would make multiplatform kernels fail
  to boot

* tag 'arm-soc/for-5.5/soc-fixes' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Add missing sentinel to bcm2711_compat[]

Link: https://lore.kernel.org/r/20191216035701.15534-1-f.fainelli@gmail.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-12-16 11:33:29 -08:00
parent c3e5ac0c9e 59034b9d6a
commit e3992af125
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-bcm/bcm2711.c
View File

@ -13,6 +13,7 @@ static const char * const bcm2711_compat[] = {
#ifdef CONFIG_ARCH_MULTI_V7 #ifdef CONFIG_ARCH_MULTI_V7
"brcm,bcm2711", "brcm,bcm2711",
#endif #endif
NULL
}; };
DT_MACHINE_START(BCM2711, "BCM2711") DT_MACHINE_START(BCM2711, "BCM2711")