Skip to contentSkip to conversation

ARM64: dts: allwinner: Add devicetree for pineH64 modelB

PATCH Superseded Corentin Labbe 2 participants 7 messages Nov 9, 2019 – Nov 12, 2019

Subsystems (2)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v4 cover ARM64: dts: allwinner: Add devicetree for pineH64 modelB

Hello

Pineh64 have two existing model (A and B) with some hardware difference and so need two different DT file.
But the current situation has only one file for both.
This serie fix this situation by being more clear on which DT file is needed for both model.

Regards

Change since v3:
- state the current file is model A and add a new modelB file.

Change since v2:
- Added the HDMI connector node to model A

Changes since v1:
- Added the first patch for stating which model support the sun50i-h6-pine-h64.dts

Corentin Labbe (2):
ARM64: dts: sun50i-h6-pine-h64: state that the DT supports the modelA
ARM64: dts: allwinner: add pineh64 model B

 .../devicetree/bindings/arm/sunxi.yaml        |  9 ++++++--
 arch/arm64/boot/dts/allwinner/Makefile        |  1 +
 .../allwinner/sun50i-h6-pine-h64-modelB.dts   | 21 +++++++++++++++++++
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 +++++++++++++----
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts
Signature · 1 line
2.23.0
#1 lore raw

PATCH v4 1/2 ARM64: dts: 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.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  4 ++--
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/arm/sunxi.yaml +2 -2
index 8a1e38a1d7ab..b8ec616c2538 100644
@@ -599,9 +599,9 @@ properties:
           - const: pine64,pine64-plus
           - const: allwinner,sun50i-a64
 
-      - description: Pine64 PineH64
+      - description: Pine64 PineH64 model A
         items:
-          - const: pine64,pine-h64
+          - const: pine64,pine-h64-modelA
           - const: allwinner,sun50i-h6
 
       - description: Pine64 LTS
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +15 -4
index 74899ede00fb..1d9afde4d3d7 100644
@@ -10,8 +10,8 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Pine H64";
-	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
+	model = "Pine H64 model A";
+	compatible = "pine64,pine-h64-modelA", "allwinner,sun50i-h6";
 
 	aliases {
 		ethernet0 = &emac;
@@ -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 = <&reg_aldo2>;
+	phy-supply = <&reg_gmac_3v3>;
 	allwinner,rx-delay-ps = <200>;
 	allwinner,tx-delay-ps = <200>;
 	status = "okay";
Signature · 1 line
2.23.0
#2 lore raw

Re: [PATCH v4 1/2] ARM64: dts: sun50i-h6-pine-h64: state that the DT supports the modelA

Hi,

Quoted 29 lines · Corentin Labbe

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.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  4 ++--
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/arm/sunxi.yaml +0 -0
index 8a1e38a1d7ab..b8ec616c2538 100644

Documentation/devicetree/bindings/arm/sunxi.yaml properties: · line 604

Quoted 8 lines
Documentation/devicetree/bindings/arm/sunxi.yaml +2 -2
@@ -599,9 +599,9 @@ properties:
           - const: pine64,pine64-plus
           - const: allwinner,sun50i-a64
 
-      - description: Pine64 PineH64
+      - description: Pine64 PineH64 model A
         items:
-          - const: pine64,pine-h64
+          - const: pine64,pine-h64-modelA

You can change the description to make it more obvious if you want to, but changing the compatible is a no-go.

Quoted 8 lines
Documentation/devicetree/bindings/arm/sunxi.yaml +0 -0
           - const: allwinner,sun50i-h6
 
       - description: Pine64 LTS
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +0 -0
index 74899ede00fb..1d9afde4d3d7 100644

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts line 14

Quoted 7 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +2 -2
@@ -10,8 +10,8 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Pine H64";
-	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
+	model = "Pine H64 model A";
+	compatible = "pine64,pine-h64-modelA", "allwinner,sun50i-h6";

Same thing here, changing the model is fine, the compatible isn't

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts line 25

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +1 -1
 	aliases {
 		ethernet0 = &emac;
@@ -22,9 +22,10 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	connector {
+	hdmi_connector: connector {

Why do you need to add the label?

Thanks!
Maxime

#3 lore raw

Re: [PATCH v4 1/2] ARM64: dts: sun50i-h6-pine-h64: state that the DT supports the modelA

Quoted 54 lines · Maxime Ripard

Hi,

Quoted 29 lines · Corentin Labbe

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.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  4 ++--
 .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 19 +++++++++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)
Documentation/devicetree/bindings/arm/sunxi.yaml +0 -0
index 8a1e38a1d7ab..b8ec616c2538 100644

Documentation/devicetree/bindings/arm/sunxi.yaml properties: · line 604

Quoted 8 lines
Documentation/devicetree/bindings/arm/sunxi.yaml +2 -2
@@ -599,9 +599,9 @@ properties:
           - const: pine64,pine64-plus
           - const: allwinner,sun50i-a64
 
-      - description: Pine64 PineH64
+      - description: Pine64 PineH64 model A
         items:
-          - const: pine64,pine-h64
+          - const: pine64,pine-h64-modelA

You can change the description to make it more obvious if you want to, but changing the compatible is a no-go.

Quoted 10 lines
Documentation/devicetree/bindings/arm/sunxi.yaml +0 -0
           - const: allwinner,sun50i-h6
 
       - description: Pine64 LTS
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +0 -0
index 74899ede00fb..1d9afde4d3d7 100644
@@ -10,8 +10,8 @@
 #include <dt-bindings/gpio/gpio.h>
 
Quoted 8 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts line 14

Quoted 5 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +2 -2
 / {
-	model = "Pine H64";
-	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
+	model = "Pine H64 model A";
+	compatible = "pine64,pine-h64-modelA", "allwinner,sun50i-h6";

Same thing here, changing the model is fine, the compatible isn't

Hello

I will erase compatible changes in next version.

Quoted 11 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts line 25

Quoted 8 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64.dts +1 -1
 	aliases {
 		ethernet0 = &emac;
@@ -22,9 +22,10 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	connector {
+	hdmi_connector: connector {

Why do you need to add the label?

For dropping the ddc-en-gpios property in model B. If you want, I can split this line change in an extra patch.

Regards

#4 lore raw

PATCH v4 2/2 ARM64: dts: allwinner: add pineh64 model B

In reply to Corentin Labbe

This patch adds the model B of the PineH64.
The model B is smaller than the pine64 model A and has no PCIE slot.

The only devicetree difference with the pineH64 model A, is the PHY regulator and the HDMI connector node.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  5 +++++
 arch/arm64/boot/dts/allwinner/Makefile        |  1 +
 .../allwinner/sun50i-h6-pine-h64-modelB.dts   | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index b8ec616c2538..227217bf28df 100644
@@ -604,6 +604,11 @@ properties:
           - const: pine64,pine-h64-modelA
           - const: allwinner,sun50i-h6
 
+      - description: Pine64 PineH64 model B
+        items:
+          - const: pine64,pine-h64-modelB
+          - const: allwinner,sun50i-h6
+
       - description: Pine64 LTS
         items:
           - const: pine64,pine64-lts
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index d2418021768b..bda89b9ccb4a 100644
@@ -26,4 +26,5 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-modelB.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts new file +21 -0
new file mode 100644
index 000000000000..063a85223faa
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Corentin LABBE <[email protected]>
+ */
+
+#include "sun50i-h6-pine-h64.dts"
+
+/ {
+	model = "Pine H64 model B";
+	compatible = "pine64,pine-h64-modelB", "allwinner,sun50i-h6";
+
+	/delete-node/ reg_gmac_3v3;
+};
+
+&hdmi_connector {
+	/delete-property/ ddc-en-gpios;
+};
+
+&emac {
+	phy-supply = <&reg_aldo2>;
+};
Signature · 1 line
2.23.0
#5 lore raw

Re: [PATCH v4 2/2] ARM64: dts: allwinner: add pineh64 model B

Quoted 46 lines · Corentin Labbe

This patch adds the model B of the PineH64.
The model B is smaller than the pine64 model A and has no PCIE slot.

The only devicetree difference with the pineH64 model A, is the PHY regulator and the HDMI connector node.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  5 +++++
 arch/arm64/boot/dts/allwinner/Makefile        |  1 +
 .../allwinner/sun50i-h6-pine-h64-modelB.dts   | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index b8ec616c2538..227217bf28df 100644
@@ -604,6 +604,11 @@ properties:
           - const: pine64,pine-h64-modelA
           - const: allwinner,sun50i-h6
 
+      - description: Pine64 PineH64 model B
+        items:
+          - const: pine64,pine-h64-modelB
+          - const: allwinner,sun50i-h6
+
       - description: Pine64 LTS
         items:
           - const: pine64,pine64-lts
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index d2418021768b..bda89b9ccb4a 100644
@@ -26,4 +26,5 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-modelB.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts new file +0 -0
new file mode 100644
index 000000000000..063a85223faa

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts line 10

Quoted 10 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts new file +10 -0
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Corentin LABBE <[email protected]>
+ */
+
+#include "sun50i-h6-pine-h64.dts"
+
+/ {
+	model = "Pine H64 model B";
+	compatible = "pine64,pine-h64-modelB", "allwinner,sun50i-h6";

compatibles are usually lowercase, what about pine64,pine-h64-model-b?

Maxime

#6 lore raw

Re: [PATCH v4 2/2] ARM64: dts: allwinner: add pineh64 model B

Quoted 51 lines · Maxime Ripard
Quoted 50 lines · Corentin Labbe

This patch adds the model B of the PineH64.
The model B is smaller than the pine64 model A and has no PCIE slot.

The only devicetree difference with the pineH64 model A, is the PHY regulator and the HDMI connector node.

---
 .../devicetree/bindings/arm/sunxi.yaml        |  5 +++++
 arch/arm64/boot/dts/allwinner/Makefile        |  1 +
 .../allwinner/sun50i-h6-pine-h64-modelB.dts   | 21 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts
Documentation/devicetree/bindings/arm/sunxi.yaml +5 -0
index b8ec616c2538..227217bf28df 100644
@@ -604,6 +604,11 @@ properties:
           - const: pine64,pine-h64-modelA
           - const: allwinner,sun50i-h6
 
+      - description: Pine64 PineH64 model B
+        items:
+          - const: pine64,pine-h64-modelB
+          - const: allwinner,sun50i-h6
+
       - description: Pine64 LTS
         items:
           - const: pine64,pine64-lts
arch/arm64/boot/dts/allwinner/Makefile +1 -0
index d2418021768b..bda89b9ccb4a 100644
@@ -26,4 +26,5 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-3.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-lite2.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-orangepi-one-plus.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64.dtb
+dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-modelB.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts new file +4 -0
new file mode 100644
index 000000000000..063a85223faa
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2019 Corentin LABBE <[email protected]>
+ */
Quoted 9 lines

arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts line 10

Quoted 6 lines
arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelB.dts new file +6 -0
+
+#include "sun50i-h6-pine-h64.dts"
+
+/ {
+	model = "Pine H64 model B";
+	compatible = "pine64,pine-h64-modelB", "allwinner,sun50i-h6";

compatibles are usually lowercase, what about pine64,pine-h64-model-b?

Perfect, I will use it.

Regards