From f5ba67264c402f9e8b8f0f61edb4067083c9927a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= Date: Sat, 1 Feb 2025 19:35:53 +0100 Subject: [PATCH] board/raspberrypi*: remove dtparam krnbt=on MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The config.txt of the Rasperry Pi's supporting Wi-Fi and Bluetooth (i.e. zero W, zero 2 W, 3, and 4) switch the Bluetooth function to use the mini-UART (ttyS0) and restore UART0 (ttyAMA0) over the GPIOs 14 and 15 (as per miniuart-bt-overlay.dts[1]). All of them turn "on" the parameter krnbt to autoprobe the bluetooth driver. According to the README.md, the dtparam krnbt is now defaulting to "on" since linux-raspberrypi 6.1.y[2]; it was defaulting to "off" before[3]. This removes the dtparam=krnbt=on from these config.txt files since the value set is actually the default value. [1]: https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/miniuart-bt-overlay.dts [2]: https://github.com/raspberrypi/linux/blob/rpi-6.1.y/arch/arm/boot/dts/overlays/README#L294-L296 [3]: https://github.com/raspberrypi/linux/blob/rpi-5.10.y/arch/arm/boot/dts/overlays/README#L213-L215 Signed-off-by: Gaël PORTAY Signed-off-by: Arnout Vandecappelle --- board/raspberrypi/config_0w.txt | 3 --- board/raspberrypi/config_3.txt | 3 --- board/raspberrypi/config_3_64bit.txt | 3 --- board/raspberrypi/config_4.txt | 3 --- board/raspberrypi/config_4_64bit.txt | 3 --- board/raspberrypi/config_zero2w.txt | 3 --- 6 files changed, 18 deletions(-) diff --git a/board/raspberrypi/config_0w.txt b/board/raspberrypi/config_0w.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_0w.txt +++ b/board/raspberrypi/config_0w.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_3.txt b/board/raspberrypi/config_3.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_3.txt +++ b/board/raspberrypi/config_3.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_3_64bit.txt b/board/raspberrypi/config_3_64bit.txt index 88206e9b14..bbd8b69363 100644 --- a/board/raspberrypi/config_3_64bit.txt +++ b/board/raspberrypi/config_3_64bit.txt @@ -25,8 +25,5 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on - # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_4.txt b/board/raspberrypi/config_4.txt index 9b77d23d74..13a7238f6e 100644 --- a/board/raspberrypi/config_4.txt +++ b/board/raspberrypi/config_4.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on diff --git a/board/raspberrypi/config_4_64bit.txt b/board/raspberrypi/config_4_64bit.txt index fcb1c5c30a..2eef6dd1a2 100644 --- a/board/raspberrypi/config_4_64bit.txt +++ b/board/raspberrypi/config_4_64bit.txt @@ -25,8 +25,5 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on - # enable 64bits support arm_64bit=1 diff --git a/board/raspberrypi/config_zero2w.txt b/board/raspberrypi/config_zero2w.txt index 123e09cf56..0267210e2d 100644 --- a/board/raspberrypi/config_zero2w.txt +++ b/board/raspberrypi/config_zero2w.txt @@ -24,6 +24,3 @@ gpu_mem_1024=100 # Enable UART0 for serial console on ttyAMA0 dtoverlay=miniuart-bt - -# enable autoprobing of Bluetooth driver without need of hciattach/btattach -dtparam=krnbt=on