Skip to content

Commit

Permalink
board/raspberrypi: fix autoprobing of bluetooth driver
Browse files Browse the repository at this point in the history
The commit 689b9ac (package/rpi-firmware: rework boot/config file
handling) has split in two the property:

	dtoverlay=miniuart-bt,krnbt=on

Into:

	dtoverlay=miniuart-bt
	dtoverlay=krnbt=on

The initial property contained the dtbo file miniuart-bt[1] and its
parameter krnbt=on[2][3].

The first syntax is correct while the second is not. The krnbt=on is not
a dtoverlay[4] but a dtparam[5]. Therefore the property dtparam must be
used instead.

This fixes:

	# cat /sys/firmware/devicetree/base/chosen/user-warnings
	Failed to load overlay 'krnbt=on'

[1]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts
[2]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts#L91
[3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215
[4]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtoverlay
[5]: https://www.raspberrypi.com/documentation/computers/config_txt.html#dtparam

Signed-off-by: Gaël PORTAY <[email protected]>
Signed-off-by: Yann E. MORIN <[email protected]>
(cherry picked from commit 5be42d8)
Signed-off-by: Peter Korsgaard <[email protected]>
  • Loading branch information
gportay authored and jacmet committed Nov 30, 2023
1 parent d8bc17f commit ec866af
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion board/raspberrypi/config_0w.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
2 changes: 1 addition & 1 deletion board/raspberrypi/config_3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
2 changes: 1 addition & 1 deletion board/raspberrypi/config_3_64bit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on

# enable 64bits support
arm_64bit=1
2 changes: 1 addition & 1 deletion board/raspberrypi/config_4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on
2 changes: 1 addition & 1 deletion board/raspberrypi/config_4_64bit.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on

dtoverlay=vc4-kms-v3d-pi4
dtoverlay=imx219
Expand Down
2 changes: 1 addition & 1 deletion board/raspberrypi/config_zero2w.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ gpu_mem_1024=100
dtoverlay=miniuart-bt

# enable autoprobing of Bluetooth driver without need of hciattach/btattach
dtoverlay=krnbt=on
dtparam=krnbt=on

0 comments on commit ec866af

Please sign in to comment.