arm-bsp/n1sdp: update to linux yocto kernel 6.6

Bumped kernel version to v6.6 and rebased N1SDP kernel PCIe quirk patches on top of this new version.

Signed-off-by: Anusmita Dutta Mazumder <anusmita.duttamazumder@arm.com>

meta-arm-bsp/conf/machine/n1sdp.conf

@@ -19,7 +19,7 @@ WKS_FILE_DEPENDS:append = " ${EXTRA_IMAGEDEPENDS}"
 
 # Use kernel provided by yocto
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.1%"
+PREFERRED_VERSION_linux-yocto ?= "6.6%"
 
 # RTL8168E Gigabit Ethernet Controller is attached to the PCIe interface
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "linux-firmware-rtl8168"

meta-arm-bsp/recipes-kernel/linux/linux-arm-platforms.inc

@@ -67,7 +67,7 @@ COMPATIBLE_MACHINE:musca-s1 = "(^$)"
 #
 # N1SDP KMACHINE
 #
-FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.1/n1sdp:"
+FILESEXTRAPATHS:prepend:n1sdp := "${THISDIR}/linux-yocto-6.6/n1sdp:"
 COMPATIBLE_MACHINE:n1sdp = "n1sdp"
 KBUILD_DEFCONFIG:n1sdp = "defconfig"
 KCONFIG_MODE:n1sdp = "--alldefconfig"

meta-arm-bsp/recipes-kernel/linux/linux-yocto-6.6/n1sdp/0006-arm64-defconfig-disable-config-options-that-does-not.patch

@@ -1,28 +1,41 @@
-From 330a620b5c73505e62a2e0accc155fbc78859cee Mon Sep 17 00:00:00 2001
+From afdd5ae3eeb44381f906b6227422373d4af2811d Mon Sep 17 00:00:00 2001
 From: Vishnu Banavath <vishnu.banavath@arm.com>
 Date: Wed, 21 Sep 2022 15:54:14 +0100
-Subject: [PATCH] arm64: defconfig: disable config options that does not apply
+Subject: [PATCH] arm64: defconfig: disable config options that does not apply 
  anymore
 
 Following config options should be not set to be more accurate and
 works with build system like yocto
+CONFIG_BT_HCIBTUSB
+CONFIG_BT_HCIBTUSB_MTK
 CONFIG_BT_HCIUART_MRVL
 CONFIG_BT_MRVL
 CONFIG_BT_MRVL_SDIO
 CONFIG_BT_QCOMSMD
+CONFIG_BT_NXPUART
 
 Upstream-Status: Pending [not submitted upstream yet]
 Signed-off-by: Adam Johnston <adam.johnston@arm.com>
 Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com>
+Signed-off-by: Xueliang Zhong <xueliang.zhong@arm.com>
+Signed-off-by: Anusmita Dutta Mazumder <anusmita.duttamazumder@arm.com>
 ---
- arch/arm64/configs/defconfig | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
+ arch/arm64/configs/defconfig | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
-index 973aa3b4d407..61f040394a2d 100644
+index d2b5208eb55d..b3028113de25 100644
 --- a/arch/arm64/configs/defconfig
 +++ b/arch/arm64/configs/defconfig
-@@ -198,10 +198,10 @@ CONFIG_BT_HCIUART=m
+@@ -186,17 +186,17 @@ CONFIG_BT_HIDP=m
+ # CONFIG_BT_LE is not set
+ CONFIG_BT_LEDS=y
+ # CONFIG_BT_DEBUGFS is not set
+-CONFIG_BT_HCIBTUSB=m
+-CONFIG_BT_HCIBTUSB_MTK=y
++# CONFIG_BT_HCIBTUSB is not set
++# CONFIG_BT_HCIBTUSB_MTK is not set
+ CONFIG_BT_HCIUART=m
  CONFIG_BT_HCIUART_LL=y
  CONFIG_BT_HCIUART_BCM=y
  CONFIG_BT_HCIUART_QCA=y
@@ -30,10 +43,15 @@ index 973aa3b4d407..61f040394a2d 100644
 -CONFIG_BT_MRVL=m
 -CONFIG_BT_MRVL_SDIO=m
 -CONFIG_BT_QCOMSMD=m
+-CONFIG_BT_NXPUART=m
 +# CONFIG_BT_HCIUART_MRVL is not set
 +# CONFIG_BT_MRVL is not set
 +# CONFIG_BT_MRVL_SDIO is not set
 +# CONFIG_BT_QCOMSMD is not set
++# CONFIG_BT_NXPUART is not set
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
  CONFIG_MAC80211_LEDS=y
+-- 
+2.38.1
+