linux (NXP iMX6): rebase patches for 6.5-rc1

This commit is contained in:
Rudi Heitbaum 2023-07-10 10:51:37 +00:00
parent e9712777a2
commit 2a1374c43e
2 changed files with 4 additions and 4 deletions

View File

@ -1,8 +1,8 @@
Add MMC power sequence for usdhc2. Add MMC power sequence for usdhc2.
Add bluetooth node to uart3. Add bluetooth node to uart3.
--- a/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revc1.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard-revc1.dtsi
@@ -6,6 +6,15 @@ @@ -6,6 +6,15 @@
#include "imx6qdl-wandboard.dtsi" #include "imx6qdl-wandboard.dtsi"

View File

@ -1,7 +1,7 @@
Add bluetooth node to uart4. Add bluetooth node to uart4.
--- a/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/imx6qdl-sr-som-brcm.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-sr-som-brcm.dtsi
@@ -128,6 +127,10 @@ @@ -128,6 +127,10 @@
pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>; pinctrl-0 = <&pinctrl_microsom_brcm_bt &pinctrl_microsom_uart4>;
uart-has-rtscts; uart-has-rtscts;