APPLIED: [SRU][G/raspi][PATCH 0/2] Invalid compatible on CM4 arm64 (LP: #1919349)

[Tim Gardner]

Applied to groovy/linux-raspi-master-next. Thanks.

-rtg

On 3/18/21 8:28 AM, Juerg Haefliger wrote:
> [Impact]
> 
> The CM4 device tree returns an incorrect compatible for arm64.
> 
> arm64:
> 
> $ cat /proc/device-tree/model
> Raspberry Pi Compute Module 4 Rev 1.0
> $ cat /proc/device-tree/compatible
> raspberrypi,4-model-b
> brcm,bcm2711
> 
> armhf:
> 
> $ cat /proc/device-tree/model
> Raspberry Pi Compute Module 4 Rev 1.0
> $ cat /proc/device-tree/compatible
> raspberrypi,4-compute-module
> brcm,bcm2711
> 
> [Test Case]
> 
> See above.
> 
> [Where Problems Could Occur]
> 
> The brcmfmac driver uses that string to decide which wifi firmware to load. That will fail, if the correct firmware is not installed which means wifi will not work. There could be other drivers, that make use of this string.
> 
> Dave Stevenson (1):
>    dts: Add CM4 to arm64 dt files
> 
> Phil Elwell (1):
>    dts: Tidy the Raspberry Pi Makefile entries
> 
>   arch/arm/boot/dts/Makefile                       | 2 +-
>   arch/arm64/boot/dts/broadcom/Makefile            | 6 ++----
>   arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts | 1 +
>   3 files changed, 4 insertions(+), 5 deletions(-)
>   create mode 100644 arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
> 

-- 
-----------
Tim Gardner
Canonical, Inc