[PATCH 0/2] arm64: dts: allwinner: h6: orangepi-one-plus: ethernet and HDMI

[Jernej Skrabec]

This short series enables ethernet on OrangePi One Plus and HDMI output on
OrangePi One Plus and OrangePi Lite 2 (shared DTSI).

Note that patch 2 (HDMI) is based on top of:
http://lists.infradead.org/pipermail/linux-arm-kernel/2020-March/716661.html

Marcus Cooper (2):
arm64: dts: allwinner: h6: orangepi-one-plus: Enable ethernet
arm64: dts: allwinner: h6: orangepi: Enable HDMI

.../allwinner/sun50i-h6-orangepi-one-plus.dts | 33 +++++++++++++++++++
.../dts/allwinner/sun50i-h6-orangepi.dtsi | 26 +++++++++++++++
2 files changed, 59 insertions(+)

--
2.25.1

[Jernej Skrabec]

From: Marcus Cooper <codek...@gmail.com>

OrangePi One Plus has gigabit ethernet. Add nodes for it.

Signed-off-by: Marcus Cooper <codek...@gmail.com>
[patch split and commit message]
Signed-off-by: Jernej Skrabec <jernej....@siol.net>
---
.../allwinner/sun50i-h6-orangepi-one-plus.dts | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
index 83aab7368889..fceb298bfd53 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-one-plus.dts
@@ -7,4 +7,37 @@
/ {
model = "OrangePi One Plus";
compatible = "xunlong,orangepi-one-plus", "allwinner,sun50i-h6";
+
+ aliases {
+ ethernet0 = &emac;
+ };
+
+ reg_gmac_3v3: gmac-3v3 {
+ compatible = "regulator-fixed";
+ regulator-name = "vcc-gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>; /* PD6 */
+ vin-supply = <&reg_aldo2>;
+ };
+};
+
+&emac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&ext_rgmii_pins>;
+ phy-mode = "rgmii";
+ phy-handle = <&ext_rgmii_phy>;
+ phy-supply = <&reg_gmac_3v3>;
+ allwinner,rx-delay-ps = <200>;
+ allwinner,tx-delay-ps = <200>;
+ status = "okay";
+};
+
+&mdio {
+ ext_rgmii_phy: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <1>;
+ };
};
--
2.25.1

[Jernej Skrabec]

From: Marcus Cooper <codek...@gmail.com>

Both, OrangePi One Plus and OrangePi Lite 2 have HDMI output. Enable it
in common DTSI.

Signed-off-by: Marcus Cooper <codek...@gmail.com>
[patch split and commit message]
Signed-off-by: Jernej Skrabec <jernej....@siol.net>
---

.../dts/allwinner/sun50i-h6-orangepi.dtsi | 26 +++++++++++++++++++
1 file changed, 26 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
index 37fc3f3697f7..9287976c4a50 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
@@ -20,6 +20,18 @@ chosen {
stdout-path = "serial0:115200n8";
};

+ connector {
+ compatible = "hdmi-connector";
+ type = "a";
+ ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */
+
+ port {
+ hdmi_con_in: endpoint {
+ remote-endpoint = <&hdmi_out_con>;
+ };
+ };
+ };
+
ext_osc32k: ext_osc32k_clk {
#clock-cells = <0>;
compatible = "fixed-clock";
@@ -52,6 +64,10 @@ reg_vcc5v: vcc5v {
};
};

+&de {

+ status = "okay";
+};
+

&ehci0 {
status = "okay";
};
@@ -65,6 +81,16 @@ &gpu {
status = "okay";
};

+&hdmi {

+ status = "okay";
+};
+

+&hdmi_out {
+ hdmi_out_con: endpoint {
+ remote-endpoint = <&hdmi_con_in>;
+ };
+};
+
&mmc0 {
vmmc-supply = <&reg_cldo1>;
cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
--
2.25.1

[Christopher Obbard]

Hi Jernej,

> From: Marcus Cooper <codek...@gmail.com>
>
> OrangePi One Plus has gigabit ethernet. Add nodes for it.
>
> Signed-off-by: Marcus Cooper <codek...@gmail.com>
> [patch split and commit message]
> Signed-off-by: Jernej Skrabec <jernej....@siol.net>
> ---
> .../allwinner/sun50i-h6-orangepi-one-plus.dts | 33 +++++++++++++++++++
> 1 file changed, 33 insertions(+)

Reviewed-by: Christopher Obbard <ch...@64studio.com>
Tested-by: Christopher Obbard <ch...@64studio.com>

[Christopher Obbard]

Hi Jernej,

> From: Marcus Cooper <codek...@gmail.com>
>
> Both, OrangePi One Plus and OrangePi Lite 2 have HDMI output. Enable it
> in common DTSI.
>
> Signed-off-by: Marcus Cooper <codek...@gmail.com>
> [patch split and commit message]
> Signed-off-by: Jernej Skrabec <jernej....@siol.net>
> ---
> .../dts/allwinner/sun50i-h6-orangepi.dtsi | 26 +++++++++++++++++++
> 1 file changed, 26 insertions(+)