diff options
| author | Olof Johansson <olof@lixom.net> | 2018-09-23 05:30:28 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-09-23 05:30:28 -0700 |
| commit | e6f0e1c7569508f5b0e23cbac6e5d9da3f9bb284 (patch) | |
| tree | c64f76dfa8e0cf7f4378efb17148098e377987f0 /arch | |
| parent | a4986b08287e0868fad6dd1b6e8ed840b2f1003f (diff) | |
| parent | 13b91ed77a65cf3bf23353880245d0cbd9138294 (diff) | |
| download | linux-e6f0e1c7569508f5b0e23cbac6e5d9da3f9bb284.tar.gz linux-e6f0e1c7569508f5b0e23cbac6e5d9da3f9bb284.tar.bz2 linux-e6f0e1c7569508f5b0e23cbac6e5d9da3f9bb284.zip | |
Merge tag 'sunxi-fixes-for-4.19-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes - round 2
One additional fix regarding HDMI on the R40 SoC.
Based on preliminary tests and code dumps for the R40, it was thought
that the whole HDMI block was the same on the R40 and A64.
Recent tests regarding the A64 showed that this was not the case. The
HDMI PHY on the A64 only has one clock parent. How this occurs at the
hardware level is unclear, as Allwinner has not given any feedback on
this matter. Nevertheless it is clear that the hardware acts differently
between the A64 and R40 in such a way that the R40's HDMI PHY is not
backward compatible with the A64's. As such we need to drop the fallback
compatible string in the R40's device tree. This was added in v4.19-rc1.
* tag 'sunxi-fixes-for-4.19-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun8i: drop A64 HDMI PHY fallback compatible from R40 DT
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-r40.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi index ffd9f00f74a4..5f547c161baf 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi @@ -800,8 +800,7 @@ }; hdmi_phy: hdmi-phy@1ef0000 { - compatible = "allwinner,sun8i-r40-hdmi-phy", - "allwinner,sun50i-a64-hdmi-phy"; + compatible = "allwinner,sun8i-r40-hdmi-phy"; reg = <0x01ef0000 0x10000>; clocks = <&ccu CLK_BUS_HDMI1>, <&ccu CLK_HDMI_SLOW>, <&ccu 7>, <&ccu 16>; |