mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 13:29:33 +00:00
95 lines
3.2 KiB
Diff
95 lines
3.2 KiB
Diff
From 24e9f61c1411858587d2af254ce2c1eb7c9c9e28 Mon Sep 17 00:00:00 2001
|
|
From: Corentin Labbe <clabbe@baylibre.com>
|
|
Date: Thu, 14 Nov 2019 15:47:32 +0000
|
|
Subject: [PATCH] arm64: dts: allwinner: sun50i-h6-pine-h64: state that the DT
|
|
supports 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>
|
|
---
|
|
.../devicetree/bindings/arm/sunxi.yaml | 2 +-
|
|
.../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 17 ++++++++++++++---
|
|
2 files changed, 15 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
|
|
index dd2ac556ef106..2325cfafd23f5 100644
|
|
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
|
|
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
|
|
@@ -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
|
|
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
index 74899ede00fba..4fcda71f1688f 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts
|
|
@@ -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 {
|
|
@@ -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 {
|
|
@@ -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";
|
|
@@ -68,7 +79,7 @@
|
|
pinctrl-0 = <&ext_rgmii_pins>;
|
|
phy-mode = "rgmii";
|
|
phy-handle = <&ext_rgmii_phy>;
|
|
- phy-supply = <®_aldo2>;
|
|
+ phy-supply = <®_gmac_3v3>;
|
|
allwinner,rx-delay-ps = <200>;
|
|
allwinner,tx-delay-ps = <200>;
|
|
status = "okay";
|