diff options
| author | Olof Johansson <olof@lixom.net> | 2018-01-11 19:59:50 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-11 19:59:50 -0500 |
| commit | bd730bfd100844acf4637b575e94cbafc0de426c (patch) | |
| tree | 23605317a95dd50733661670e691de23a3bde257 | |
| parent | 9ddd0c131a1aaa9a0047ecdfac8e935aed0f7206 (diff) | |
| parent | bdae44705c0d5b751fbd79bc4a169905b25ed335 (diff) | |
Merge tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into fixes
Allwinner fixes for 4.15, round 2
One fix that fixes the display pipeline description in the device tree
for the A10 and A20 SoCs. This description was introduced in 4.15-rc1
with a mismatch in the graph remote endpoints, which would likely
result in the driver misinterpreting how the individual components fit
together.
* tag 'sunxi-fixes-for-4.15-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
ARM: dts: sun[47]i: Fix display backend 1 output to TCON0 remote endpoint
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/sun4i-a10.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sun7i-a20.dtsi | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 5840f5c75c3b..4f2f2eea0755 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi | |||
| @@ -1104,7 +1104,7 @@ | |||
| 1104 | 1104 | ||
| 1105 | be1_out_tcon0: endpoint@0 { | 1105 | be1_out_tcon0: endpoint@0 { |
| 1106 | reg = <0>; | 1106 | reg = <0>; |
| 1107 | remote-endpoint = <&tcon1_in_be0>; | 1107 | remote-endpoint = <&tcon0_in_be1>; |
| 1108 | }; | 1108 | }; |
| 1109 | 1109 | ||
| 1110 | be1_out_tcon1: endpoint@1 { | 1110 | be1_out_tcon1: endpoint@1 { |
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 59655e42e4b0..bd0cd3204273 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi | |||
| @@ -1354,7 +1354,7 @@ | |||
| 1354 | 1354 | ||
| 1355 | be1_out_tcon0: endpoint@0 { | 1355 | be1_out_tcon0: endpoint@0 { |
| 1356 | reg = <0>; | 1356 | reg = <0>; |
| 1357 | remote-endpoint = <&tcon1_in_be0>; | 1357 | remote-endpoint = <&tcon0_in_be1>; |
| 1358 | }; | 1358 | }; |
| 1359 | 1359 | ||
| 1360 | be1_out_tcon1: endpoint@1 { | 1360 | be1_out_tcon1: endpoint@1 { |