From: Greg Kroah-Hartman Date: Mon, 20 Dec 2021 11:41:48 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.4.296~28 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=355d2519e5b3bb6343722347fb5207dfe827c535;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: arm-dts-imx6ull-pinfunc-fix-csi_data07__esai_tx0-pad-name.patch --- diff --git a/queue-4.14/arm-dts-imx6ull-pinfunc-fix-csi_data07__esai_tx0-pad-name.patch b/queue-4.14/arm-dts-imx6ull-pinfunc-fix-csi_data07__esai_tx0-pad-name.patch new file mode 100644 index 00000000000..40c11929bb2 --- /dev/null +++ b/queue-4.14/arm-dts-imx6ull-pinfunc-fix-csi_data07__esai_tx0-pad-name.patch @@ -0,0 +1,37 @@ +From 737e65c7956795b3553781fb7bc82fce1c39503f Mon Sep 17 00:00:00 2001 +From: Fabio Estevam +Date: Wed, 24 Nov 2021 15:45:41 -0300 +Subject: ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad name + +From: Fabio Estevam + +commit 737e65c7956795b3553781fb7bc82fce1c39503f upstream. + +According to the i.MX6ULL Reference Manual, pad CSI_DATA07 may +have the ESAI_TX0 functionality, not ESAI_T0. + +Also, NXP's i.MX Config Tools 10.0 generates dtsi with the +MX6ULL_PAD_CSI_DATA07__ESAI_TX0 naming, so fix it accordingly. + +There are no devicetree users in mainline that use the old name, +so just remove the old entry. + +Fixes: c201369d4aa5 ("ARM: dts: imx6ull: add imx6ull support") +Reported-by: George Makarov +Signed-off-by: Fabio Estevam +Signed-off-by: Shawn Guo +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm/boot/dts/imx6ull-pinfunc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm/boot/dts/imx6ull-pinfunc.h ++++ b/arch/arm/boot/dts/imx6ull-pinfunc.h +@@ -51,6 +51,6 @@ + #define MX6ULL_PAD_CSI_DATA04__ESAI_TX_FS 0x01F4 0x0480 0x0000 0x9 0x0 + #define MX6ULL_PAD_CSI_DATA05__ESAI_TX_CLK 0x01F8 0x0484 0x0000 0x9 0x0 + #define MX6ULL_PAD_CSI_DATA06__ESAI_TX5_RX0 0x01FC 0x0488 0x0000 0x9 0x0 +-#define MX6ULL_PAD_CSI_DATA07__ESAI_T0 0x0200 0x048C 0x0000 0x9 0x0 ++#define MX6ULL_PAD_CSI_DATA07__ESAI_TX0 0x0200 0x048C 0x0000 0x9 0x0 + + #endif /* __DTS_IMX6ULL_PINFUNC_H */ diff --git a/queue-4.14/series b/queue-4.14/series index b920dc234a9..b9b20dc49c2 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -30,3 +30,4 @@ timekeeping-really-make-sure-wall_to_monotonic-isn-t-positive.patch libata-if-t_length-is-zero-dma-direction-should-be-dma_none.patch net-systemport-add-global-locking-for-descriptor-lifecycle.patch firmware-arm_scpi-fix-string-overflow-in-scpi-genpd-driver.patch +arm-dts-imx6ull-pinfunc-fix-csi_data07__esai_tx0-pad-name.patch