Skip to content

Commit

Permalink
arm64: dts: allwinner: sun50i-h6-pine-h64: state that the DT supports…
Browse files Browse the repository at this point in the history
… the modelA

The current sun50i-h6-pine-h64 DT does not specify which model (A or B)
it supports.
When this file was created, only modelA was existing, but now both model
exists and with the time, this DT drifted to support the model B since it is
the most common one.
Furtheremore, some part of the model A does not work with it like ethernet and
HDMI connector (as confirmed by Jernej on IRC).

So it is time to settle the issue, and the easiest way was to state that
this DT is for model B.
Easiest since only a small name changes is required.
Doing the opposite (stating this file is for model A) will add changes (for
ethernet and HDMI) and so, will break too many setup.

But as asked by the maintainer this patch state this file is for model A.
In the process this patch adds the missing compoments to made it work on
model A.

Signed-off-by: Corentin Labbe <clabbe@baylibre.com>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  • Loading branch information
Corentin Labbe authored and Maxime Ripard committed Dec 10, 2019
1 parent 3d73498 commit 24e9f61
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/sunxi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ properties:
- const: pine64,pine64-plus
- const: allwinner,sun50i-a64

- description: Pine64 PineH64
- description: Pine64 PineH64 model A
items:
- const: pine64,pine-h64
- const: allwinner,sun50i-h6
Expand Down
17 changes: 14 additions & 3 deletions arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <dt-bindings/gpio/gpio.h>

/ {
model = "Pine H64";
model = "Pine H64 model A";
compatible = "pine64,pine-h64", "allwinner,sun50i-h6";

aliases {
Expand All @@ -22,9 +22,10 @@
stdout-path = "serial0:115200n8";
};

connector {
hdmi_connector: connector {
compatible = "hdmi-connector";
type = "a";
ddc-en-gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; /* PH2 */

port {
hdmi_con_in: endpoint {
Expand Down Expand Up @@ -52,6 +53,16 @@
};
};

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>;
gpio = <&pio 2 16 GPIO_ACTIVE_HIGH>;
enable-active-high;
};

reg_usb_vbus: vbus {
compatible = "regulator-fixed";
regulator-name = "usb-vbus";
Expand All @@ -68,7 +79,7 @@
pinctrl-0 = <&ext_rgmii_pins>;
phy-mode = "rgmii";
phy-handle = <&ext_rgmii_phy>;
phy-supply = <&reg_aldo2>;
phy-supply = <&reg_gmac_3v3>;
allwinner,rx-delay-ps = <200>;
allwinner,tx-delay-ps = <200>;
status = "okay";
Expand Down

0 comments on commit 24e9f61

Please sign in to comment.