The patch below does not apply to the 4.14-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-4.14.y git checkout FETCH_HEAD git cherry-pick -x af1c89ddb74f170eccd5a57001d7317560b638ea # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '167810226715267@kroah.com' --subject-prefix 'PATCH 4.14.y' HEAD^..
Possible dependencies:
af1c89ddb74f ("ARM: dts: exynos: correct HDMI phy compatible in Exynos4") 73a901d09a21 ("ARM: dts: exynos: Add soc node to exynos4") 9097b4bd9fce ("ARM: dts: exynos: Use pmu label in exynos4412") e030be47ac48 ("ARM: dts: exynos: Use labels instead of full paths in exynos4210") e58864515240 ("ARM: dts: exynos: Use pinctrl labels in exynos4412-pinctrl") 88c166cec136 ("ARM: dts: exynos: Use pinctrl labels in exynos4210-pinctrl") 3be1ecf291df ("ARM: dts: exynos: Use lower case hex addresses in node unit addresses") 6351fe9375f4 ("ARM: dts: exynos: Add G3D power domain to Exynos5250") c0d40bb3ac71 ("ARM: dts: exynos: Add audio power domain to Exynos5250") 9fbb4c096323 ("ARM: dts: exynos: Fix power domain node names for Exynos5250") 528832d4c01a ("ARM: dts: exynos: Add audio power domain support to Exynos542x SoCs") cdd745c8c76b ("ARM: dts: exynos: Remove duplicate definitions of SSS nodes for Exynos5") 78a68acf3d33 ("ARM: dts: exynos: Switch to dedicated Odroid XU3 sound card binding") 061ae5326613 ("Merge tag 'samsung-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From af1c89ddb74f170eccd5a57001d7317560b638ea Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org Date: Wed, 25 Jan 2023 10:45:05 +0100 Subject: [PATCH] ARM: dts: exynos: correct HDMI phy compatible in Exynos4
The HDMI phy compatible was missing vendor prefix.
Fixes: ed80d4cab772 ("ARM: dts: add hdmi related nodes for exynos4 SoCs") Cc: stable@vger.kernel.org Link: https://lore.kernel.org/r/20230125094513.155063-1-krzysztof.kozlowski@linaro... Signed-off-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 55afe9972460..d1adaee2af58 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -605,7 +605,7 @@ i2c_8: i2c@138e0000 { status = "disabled";
hdmi_i2c_phy: hdmiphy@38 { - compatible = "exynos4210-hdmiphy"; + compatible = "samsung,exynos4210-hdmiphy"; reg = <0x38>; }; };