linux-raspberrypi: default to v6.1

Changelog-entry: default to Linux kernel v6.1
Signed-off-by: Alex Gonzalez <[email protected]>

layers/meta-balena-raspberrypi/conf/layer.conf

@@ -137,7 +137,7 @@ RPI_KERNEL_DEVICETREE:append:revpi-connect-s = " broadcom/bcm2711-rpi-cm4s.dtb"
 RPI_KERNEL_DEVICETREE:remove:revpi-connect = "bcm2711-rpi-cm4s.dtb"
 RPI_KERNEL_DEVICETREE:remove:revpi-core-3 = "bcm2711-rpi-cm4s.dtb"
 
-PREFERRED_VERSION:linux-raspberrypi = "5.10.%"
+PREFERRED_VERSION_linux-raspberrypi = "6.1%"
 
 FIRMWARE_COMPRESSION:raspberrypi4-64 ?= "1"
 FIRMWARE_COMPRESSION:raspberrypi0-2w-64 ?= "1"

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0001-Add-tpm-slb9670-tis-spi-DT-overlay.patch

@@ -1,4 +1,3 @@
-From d211b4e01d2621ce03854f722f8db5acfe457ae0 Mon Sep 17 00:00:00 2001
 From: Michal Toman <[email protected]>
 Date: Mon, 1 Feb 2021 16:05:38 +0100
 Subject: [PATCH] Add tpm-slb9670-tis-spi DT overlay
@@ -11,17 +10,17 @@ Signed-off-by: Michal Toman <[email protected]>
  create mode 100644 arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index d8a3677b583e..696b5789e64c 100644
+index 9203448db803..f6d410d31f8c 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -194,6 +194,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+@@ -276,6 +276,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  	tc358743-audio.dtbo \
  	tinylcd35.dtbo \
  	tpm-slb9670.dtbo \
 +	tpm-slb9670-tis-spi.dtbo \
+ 	tpm-slb9673.dtbo \
  	uart0.dtbo \
- 	uart1.dtbo \
- 	uart2.dtbo \
+ 	uart0-pi5.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts b/arch/arm/boot/dts/overlays/tpm-slb9670-tis-spi-overlay.dts
 new file mode 100644
 index 000000000000..e43f8cd248ec
@@ -49,6 +48,3 @@ index 000000000000..e43f8cd248ec
 +		};
 +	};
 +};
--- 
-2.26.2
-

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi/0006-overlays-Add-Hyperpixel4-overlays.patch

@@ -1,4 +1,3 @@
-From ee5c0bab10e280cf54d3d2c06c6a4cc6b6ed627b Mon Sep 17 00:00:00 2001
 From: Florin Sarbu <[email protected]>
 Date: Thu, 17 Oct 2019 11:16:39 +0200
 Subject: [PATCH] overlays: Add Hyperpixel4 overlays
@@ -13,22 +12,22 @@ They each are taken from:
 Upstream-status: Inappropriate [not author]
 Signed-off-by: Florin Sarbu <[email protected]>
 ---
- arch/arm/boot/dts/overlays/Makefile                |   4 +
- .../boot/dts/overlays/hyperpixel4-pi3-overlay.dts  |  98 ++++++++++++++++++++
- .../boot/dts/overlays/hyperpixel4-pi4-overlay.dts  |  98 ++++++++++++++++++++
- .../overlays/hyperpixel4-square-pi3-overlay.dts    | 103 +++++++++++++++++++++
- .../overlays/hyperpixel4-square-pi4-overlay.dts    | 103 +++++++++++++++++++++
+ arch/arm/boot/dts/overlays/Makefile           |   4 +
+ .../dts/overlays/hyperpixel4-pi3-overlay.dts  |  98 +++++++++++++++++
+ .../dts/overlays/hyperpixel4-pi4-overlay.dts  |  98 +++++++++++++++++
+ .../hyperpixel4-square-pi3-overlay.dts        | 103 ++++++++++++++++++
+ .../hyperpixel4-square-pi4-overlay.dts        | 103 ++++++++++++++++++
  5 files changed, 406 insertions(+)
  create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
  create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
  create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
  create mode 100644 arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts
 
 diff --git a/arch/arm/boot/dts/overlays/Makefile b/arch/arm/boot/dts/overlays/Makefile
-index 87082d6..554756c 100644
+index dd34b091565d..9203448db803 100644
 --- a/arch/arm/boot/dts/overlays/Makefile
 +++ b/arch/arm/boot/dts/overlays/Makefile
-@@ -59,6 +59,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
+@@ -99,6 +99,10 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  	hy28a.dtbo \
  	hy28b.dtbo \
  	hy28b-2017.dtbo \
@@ -38,10 +37,10 @@ index 87082d6..554756c 100644
 +	hyperpixel4-square-pi4.dtbo \
  	i-sabre-q2m.dtbo \
  	i2c-bcm2708.dtbo \
- 	i2c-gpio.dtbo \
+ 	i2c-fan.dtbo \
 diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
 new file mode 100644
-index 0000000..78bf59e
+index 000000000000..78bf59ebcf19
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hyperpixel4-pi3-overlay.dts
 @@ -0,0 +1,98 @@
@@ -145,7 +144,7 @@ index 0000000..78bf59e
 +};
 diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
 new file mode 100644
-index 0000000..3757a99
+index 000000000000..3757a996aabd
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hyperpixel4-pi4-overlay.dts
 @@ -0,0 +1,98 @@
@@ -249,7 +248,7 @@ index 0000000..3757a99
 +};
 diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
 new file mode 100644
-index 0000000..f544a6c
+index 000000000000..f544a6c7592f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi3-overlay.dts
 @@ -0,0 +1,103 @@
@@ -358,7 +357,7 @@ index 0000000..f544a6c
 +
 diff --git a/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts
 new file mode 100644
-index 0000000..f544a6c
+index 000000000000..f544a6c7592f
 --- /dev/null
 +++ b/arch/arm/boot/dts/overlays/hyperpixel4-square-pi4-overlay.dts
 @@ -0,0 +1,103 @@
@@ -465,6 +464,3 @@ index 0000000..f544a6c
 +	};
 +};
 +
--- 
-2.7.4
-

layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi_5.15.bbappend → layers/meta-balena-raspberrypi/recipes-kernel/linux/linux-raspberrypi_6.1%.bbappend

@@ -1,12 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:${THISDIR}/${MACHINE}:"
 
-SRC_URI:append:fincm3 = " \
-	file://0001-overlays-fin-add-internal-pull-ups-to-i2c_soft.patch \
-	file://0004-mmc-pwrseq-Repurpose-for-Marvell-SD8777.patch \
-	file://0005-balena-fin-wifi-sta-uap-mode.patch \
-	file://0007-overlays-Add-spyfly.dts.patch \
-"
-
 SRC_URI:append:raspberrypi4-superhub = " \
 	file://0001-Add-gpio-wdt-DT-overlay-for-Phoenix-Board.patch \
 	file://0002-Add-infineon-tpm-DT-overlay-for-Phoenix-Board.patch \