From 2a1374c43ec13d6d465cc01c72912414fe29bef9 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 10 Jul 2023 10:51:37 +0000 Subject: [PATCH] linux (NXP iMX6): rebase patches for 6.5-rc1 --- .../linux-001-imx6qdl-wandboard-revc1-dtsi-bluetooth.patch | 4 ++-- .../linux/linux-011-imx6qdl-sr-som-brcm-dtsi-bluetooth.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/projects/NXP/devices/iMX6/patches/linux/linux-001-imx6qdl-wandboard-revc1-dtsi-bluetooth.patch b/projects/NXP/devices/iMX6/patches/linux/linux-001-imx6qdl-wandboard-revc1-dtsi-bluetooth.patch index d881166f30..22f51b2117 100644 --- a/projects/NXP/devices/iMX6/patches/linux/linux-001-imx6qdl-wandboard-revc1-dtsi-bluetooth.patch +++ b/projects/NXP/devices/iMX6/patches/linux/linux-001-imx6qdl-wandboard-revc1-dtsi-bluetooth.patch @@ -1,8 +1,8 @@ Add MMC power sequence for usdhc2. Add bluetooth node to uart3. ---- a/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi +--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revc1.dtsi ++++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revc1.dtsi @@ -6,6 +6,15 @@ #include "imx6qdl-wandboard.dtsi" diff --git a/projects/NXP/devices/iMX6/patches/linux/linux-011-imx6qdl-sr-som-brcm-dtsi-bluetooth.patch b/projects/NXP/devices/iMX6/patches/linux/linux-011-imx6qdl-sr-som-brcm-dtsi-bluetooth.patch index 91f62bc157..f8509727d2 100644 --- a/projects/NXP/devices/iMX6/patches/linux/linux-011-imx6qdl-sr-som-brcm-dtsi-bluetooth.patch +++ b/projects/NXP/devices/iMX6/patches/linux/linux-011-imx6qdl-sr-som-brcm-dtsi-bluetooth.patch @@ -1,7 +1,7 @@ Add bluetooth node to uart4. ---- a/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi -+++ b/arch/arm/boot/dts/imx6qdl-sr-som-brcm.dtsi +--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-brcm.dtsi ++++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-brcm.dtsi @@ -128,6 +127,10 @@ pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>; uart-has-rtscts;