diff options
author | Jagan Teki <jagan@amarulasolutions.com> | 2018-09-25 04:49:40 -0400 |
---|---|---|
committer | Chen-Yu Tsai <wens@csie.org> | 2018-09-25 05:38:12 -0400 |
commit | f4e4453aa9f474bb86f656a1cd56367444767f56 (patch) | |
tree | 29c8252bd0df4b7dbd21b6e681755e77d4d54029 | |
parent | e85f28e047d06d2b472e1160acf75dc4af2fdfaf (diff) |
arm64: dts: allwinner: a64: Enable HDMI output on A64 boards w/ HDMI
Enable all necessary device tree nodes and add connector node to device
trees for all supported A64 boards with HDMI.
Jagan, tested on BPI-M64, OPI-Win, A64-Olinuxino, NPI-A64
Vasily, tested on pine64-lts
Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
[Icenowy: squash all board patches altogether and change supply name]
Signed-off-by: Icenowy Zheng <icenowy@aosc.io>
Tested-by: Jagan Teki <jagan@amarulasolutions.com>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
6 files changed, 156 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts index 846c350decb4..ef1c90401bb2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | |||
@@ -60,6 +60,17 @@ | |||
60 | stdout-path = "serial0:115200n8"; | 60 | stdout-path = "serial0:115200n8"; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | hdmi-connector { | ||
64 | compatible = "hdmi-connector"; | ||
65 | type = "a"; | ||
66 | |||
67 | port { | ||
68 | hdmi_con_in: endpoint { | ||
69 | remote-endpoint = <&hdmi_out_con>; | ||
70 | }; | ||
71 | }; | ||
72 | }; | ||
73 | |||
63 | leds { | 74 | leds { |
64 | compatible = "gpio-leds"; | 75 | compatible = "gpio-leds"; |
65 | 76 | ||
@@ -86,6 +97,10 @@ | |||
86 | }; | 97 | }; |
87 | }; | 98 | }; |
88 | 99 | ||
100 | &de { | ||
101 | status = "okay"; | ||
102 | }; | ||
103 | |||
89 | &ehci0 { | 104 | &ehci0 { |
90 | status = "okay"; | 105 | status = "okay"; |
91 | }; | 106 | }; |
@@ -103,6 +118,17 @@ | |||
103 | status = "okay"; | 118 | status = "okay"; |
104 | }; | 119 | }; |
105 | 120 | ||
121 | &hdmi { | ||
122 | hvcc-supply = <®_dldo1>; | ||
123 | status = "okay"; | ||
124 | }; | ||
125 | |||
126 | &hdmi_out { | ||
127 | hdmi_out_con: endpoint { | ||
128 | remote-endpoint = <&hdmi_con_in>; | ||
129 | }; | ||
130 | }; | ||
131 | |||
106 | &i2c1 { | 132 | &i2c1 { |
107 | pinctrl-names = "default"; | 133 | pinctrl-names = "default"; |
108 | pinctrl-0 = <&i2c1_pins>; | 134 | pinctrl-0 = <&i2c1_pins>; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts index a0ac1390270e..31884dbc8838 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | |||
@@ -59,6 +59,17 @@ | |||
59 | stdout-path = "serial0:115200n8"; | 59 | stdout-path = "serial0:115200n8"; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | hdmi-connector { | ||
63 | compatible = "hdmi-connector"; | ||
64 | type = "a"; | ||
65 | |||
66 | port { | ||
67 | hdmi_con_in: endpoint { | ||
68 | remote-endpoint = <&hdmi_out_con>; | ||
69 | }; | ||
70 | }; | ||
71 | }; | ||
72 | |||
62 | leds { | 73 | leds { |
63 | compatible = "gpio-leds"; | 74 | compatible = "gpio-leds"; |
64 | 75 | ||
@@ -76,6 +87,10 @@ | |||
76 | }; | 87 | }; |
77 | }; | 88 | }; |
78 | 89 | ||
90 | &de { | ||
91 | status = "okay"; | ||
92 | }; | ||
93 | |||
79 | &ehci0 { | 94 | &ehci0 { |
80 | status = "okay"; | 95 | status = "okay"; |
81 | }; | 96 | }; |
@@ -93,6 +108,17 @@ | |||
93 | status = "okay"; | 108 | status = "okay"; |
94 | }; | 109 | }; |
95 | 110 | ||
111 | &hdmi { | ||
112 | hvcc-supply = <®_dldo1>; | ||
113 | status = "okay"; | ||
114 | }; | ||
115 | |||
116 | &hdmi_out { | ||
117 | hdmi_out_con: endpoint { | ||
118 | remote-endpoint = <&hdmi_con_in>; | ||
119 | }; | ||
120 | }; | ||
121 | |||
96 | /* i2c1 connected with gpio headers like pine64, bananapi */ | 122 | /* i2c1 connected with gpio headers like pine64, bananapi */ |
97 | &i2c1 { | 123 | &i2c1 { |
98 | pinctrl-names = "default"; | 124 | pinctrl-names = "default"; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts index 657f58def54c..6ef3dd4c2389 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts | |||
@@ -59,6 +59,17 @@ | |||
59 | stdout-path = "serial0:115200n8"; | 59 | stdout-path = "serial0:115200n8"; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | hdmi-connector { | ||
63 | compatible = "hdmi-connector"; | ||
64 | type = "a"; | ||
65 | |||
66 | port { | ||
67 | hdmi_con_in: endpoint { | ||
68 | remote-endpoint = <&hdmi_out_con>; | ||
69 | }; | ||
70 | }; | ||
71 | }; | ||
72 | |||
62 | reg_usb1_vbus: usb1-vbus { | 73 | reg_usb1_vbus: usb1-vbus { |
63 | compatible = "regulator-fixed"; | 74 | compatible = "regulator-fixed"; |
64 | regulator-name = "usb1-vbus"; | 75 | regulator-name = "usb1-vbus"; |
@@ -76,6 +87,10 @@ | |||
76 | }; | 87 | }; |
77 | }; | 88 | }; |
78 | 89 | ||
90 | &de { | ||
91 | status = "okay"; | ||
92 | }; | ||
93 | |||
79 | &ehci0 { | 94 | &ehci0 { |
80 | status = "okay"; | 95 | status = "okay"; |
81 | }; | 96 | }; |
@@ -93,6 +108,17 @@ | |||
93 | status = "okay"; | 108 | status = "okay"; |
94 | }; | 109 | }; |
95 | 110 | ||
111 | &hdmi { | ||
112 | hvcc-supply = <®_dldo1>; | ||
113 | status = "okay"; | ||
114 | }; | ||
115 | |||
116 | &hdmi_out { | ||
117 | hdmi_out_con: endpoint { | ||
118 | remote-endpoint = <&hdmi_con_in>; | ||
119 | }; | ||
120 | }; | ||
121 | |||
96 | &mdio { | 122 | &mdio { |
97 | ext_rgmii_phy: ethernet-phy@1 { | 123 | ext_rgmii_phy: ethernet-phy@1 { |
98 | compatible = "ethernet-phy-ieee802.3-c22"; | 124 | compatible = "ethernet-phy-ieee802.3-c22"; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index dc9a8d77f693..b0c64f75792c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | |||
@@ -64,6 +64,17 @@ | |||
64 | stdout-path = "serial0:115200n8"; | 64 | stdout-path = "serial0:115200n8"; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | hdmi-connector { | ||
68 | compatible = "hdmi-connector"; | ||
69 | type = "a"; | ||
70 | |||
71 | port { | ||
72 | hdmi_con_in: endpoint { | ||
73 | remote-endpoint = <&hdmi_out_con>; | ||
74 | }; | ||
75 | }; | ||
76 | }; | ||
77 | |||
67 | leds { | 78 | leds { |
68 | compatible = "gpio-leds"; | 79 | compatible = "gpio-leds"; |
69 | 80 | ||
@@ -101,6 +112,10 @@ | |||
101 | }; | 112 | }; |
102 | }; | 113 | }; |
103 | 114 | ||
115 | &de { | ||
116 | status = "okay"; | ||
117 | }; | ||
118 | |||
104 | &ehci0 { | 119 | &ehci0 { |
105 | status = "okay"; | 120 | status = "okay"; |
106 | }; | 121 | }; |
@@ -118,6 +133,17 @@ | |||
118 | status = "okay"; | 133 | status = "okay"; |
119 | }; | 134 | }; |
120 | 135 | ||
136 | &hdmi { | ||
137 | hvcc-supply = <®_dldo1>; | ||
138 | status = "okay"; | ||
139 | }; | ||
140 | |||
141 | &hdmi_out { | ||
142 | hdmi_out_con: endpoint { | ||
143 | remote-endpoint = <&hdmi_con_in>; | ||
144 | }; | ||
145 | }; | ||
146 | |||
121 | &mdio { | 147 | &mdio { |
122 | ext_rgmii_phy: ethernet-phy@1 { | 148 | ext_rgmii_phy: ethernet-phy@1 { |
123 | compatible = "ethernet-phy-ieee802.3-c22"; | 149 | compatible = "ethernet-phy-ieee802.3-c22"; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts index d3d5282b0ba8..c077b6c1f458 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | |||
@@ -62,6 +62,21 @@ | |||
62 | chosen { | 62 | chosen { |
63 | stdout-path = "serial0:115200n8"; | 63 | stdout-path = "serial0:115200n8"; |
64 | }; | 64 | }; |
65 | |||
66 | hdmi-connector { | ||
67 | compatible = "hdmi-connector"; | ||
68 | type = "a"; | ||
69 | |||
70 | port { | ||
71 | hdmi_con_in: endpoint { | ||
72 | remote-endpoint = <&hdmi_out_con>; | ||
73 | }; | ||
74 | }; | ||
75 | }; | ||
76 | }; | ||
77 | |||
78 | &de { | ||
79 | status = "okay"; | ||
65 | }; | 80 | }; |
66 | 81 | ||
67 | &ehci0 { | 82 | &ehci0 { |
@@ -82,6 +97,17 @@ | |||
82 | 97 | ||
83 | }; | 98 | }; |
84 | 99 | ||
100 | &hdmi { | ||
101 | hvcc-supply = <®_dldo1>; | ||
102 | status = "okay"; | ||
103 | }; | ||
104 | |||
105 | &hdmi_out { | ||
106 | hdmi_out_con: endpoint { | ||
107 | remote-endpoint = <&hdmi_con_in>; | ||
108 | }; | ||
109 | }; | ||
110 | |||
85 | &i2c1 { | 111 | &i2c1 { |
86 | pinctrl-names = "default"; | 112 | pinctrl-names = "default"; |
87 | pinctrl-0 = <&i2c1_pins>; | 113 | pinctrl-0 = <&i2c1_pins>; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts index beaa092976d7..53fcc9098df3 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts | |||
@@ -61,6 +61,17 @@ | |||
61 | stdout-path = "serial0:115200n8"; | 61 | stdout-path = "serial0:115200n8"; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | hdmi-connector { | ||
65 | compatible = "hdmi-connector"; | ||
66 | type = "a"; | ||
67 | |||
68 | port { | ||
69 | hdmi_con_in: endpoint { | ||
70 | remote-endpoint = <&hdmi_out_con>; | ||
71 | }; | ||
72 | }; | ||
73 | }; | ||
74 | |||
64 | reg_vcc1v8: vcc1v8 { | 75 | reg_vcc1v8: vcc1v8 { |
65 | compatible = "regulator-fixed"; | 76 | compatible = "regulator-fixed"; |
66 | regulator-name = "vcc1v8"; | 77 | regulator-name = "vcc1v8"; |
@@ -69,6 +80,10 @@ | |||
69 | }; | 80 | }; |
70 | }; | 81 | }; |
71 | 82 | ||
83 | &de { | ||
84 | status = "okay"; | ||
85 | }; | ||
86 | |||
72 | &ehci0 { | 87 | &ehci0 { |
73 | status = "okay"; | 88 | status = "okay"; |
74 | }; | 89 | }; |
@@ -86,6 +101,17 @@ | |||
86 | status = "okay"; | 101 | status = "okay"; |
87 | }; | 102 | }; |
88 | 103 | ||
104 | &hdmi { | ||
105 | hvcc-supply = <®_dldo1>; | ||
106 | status = "okay"; | ||
107 | }; | ||
108 | |||
109 | &hdmi_out { | ||
110 | hdmi_out_con: endpoint { | ||
111 | remote-endpoint = <&hdmi_con_in>; | ||
112 | }; | ||
113 | }; | ||
114 | |||
89 | &mdio { | 115 | &mdio { |
90 | ext_rgmii_phy: ethernet-phy@1 { | 116 | ext_rgmii_phy: ethernet-phy@1 { |
91 | compatible = "ethernet-phy-ieee802.3-c22"; | 117 | compatible = "ethernet-phy-ieee802.3-c22"; |