2019-10-29 20:04:33

by Corentin LABBE

Subject: [PATCH v2 2/2] ARM64: dts: allwinner: add pineh64 model A

This patch adds the model A of the PineH64.
The model A has the same size of the pine64 and has a PCIE slot.

The only devicetree difference with the pineH64 model B, is the PHY
regulator.
Signed-off-by: Corentin Labbe <[email protected]>
---
.../devicetree/bindings/arm/sunxi.yaml | 5 ++++
arch/arm64/boot/dts/allwinner/Makefile | 1 +
.../allwinner/sun50i-h6-pine-h64-modelA.dts | 26 +++++++++++++++++++
3 files changed, 32 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts

diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml
index 9a1e4992b9e9..0059925a3395 100644
--- a/Documentation/devicetree/bindings/arm/sunxi.yaml
+++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
@@ -594,6 +594,11 @@ properties:
- const: pine64,pine64-plus
- const: allwinner,sun50i-a64

+ - description: Pine64 PineH64 model A
+ items:
+ - const: pine64,pine-h64-modelA
+ - const: allwinner,sun50i-h6
+
- description: Pine64 PineH64 model B
items:
- const: pine64,pine-h64-modelB
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
index d2418021768b..6bda5d9961c8 100644
--- a/arch/arm64/boot/dts/allwinner/Makefile
+++ b/arch/arm64/boot/dts/allwinner/Makefile
@@ -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-modelA.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts
new file mode 100644
index 000000000000..fef47687c85e
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts
@@ -0,0 +1,26 @@
+// 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 A";
+ compatible = "pine64,pine-h64-modelA", "allwinner,sun50i-h6";
+
+ 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;
+ };
+
+};
+
+&emac {
+ phy-supply = <&reg_gmac_3v3>;
+};
--
2.21.0

2019-10-29 20:07:14

by Jernej Skrabec

Subject: Re: [PATCH v2 2/2] ARM64: dts: allwinner: add pineh64 model A

Dne torek, 29. oktober 2019 ob 20:17:43 CET je Corentin Labbe napisal(a):
> This patch adds the model A of the PineH64.
> The model A has the same size of the pine64 and has a PCIE slot.
>
> The only devicetree difference with the pineH64 model B, is the PHY
> regulator.
> Signed-off-by: Corentin Labbe <[email protected]>
> ---
> .../devicetree/bindings/arm/sunxi.yaml | 5 ++++
> arch/arm64/boot/dts/allwinner/Makefile | 1 +
> .../allwinner/sun50i-h6-pine-h64-modelA.dts | 26 +++++++++++++++++++
> 3 files changed, 32 insertions(+)
> create mode 100644
> arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts
>
> diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml
> b/Documentation/devicetree/bindings/arm/sunxi.yaml index
> 9a1e4992b9e9..0059925a3395 100644
> --- a/Documentation/devicetree/bindings/arm/sunxi.yaml
> +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml
> @@ -594,6 +594,11 @@ properties:
> - const: pine64,pine64-plus
> - const: allwinner,sun50i-a64
>
> + - description: Pine64 PineH64 model A
> + items:
> + - const: pine64,pine-h64-modelA
> + - const: allwinner,sun50i-h6
> +
> - description: Pine64 PineH64 model B
> items:
> - const: pine64,pine-h64-modelB
> diff --git a/arch/arm64/boot/dts/allwinner/Makefile
> b/arch/arm64/boot/dts/allwinner/Makefile index d2418021768b..6bda5d9961c8
> 100644
> --- a/arch/arm64/boot/dts/allwinner/Makefile
> +++ b/arch/arm64/boot/dts/allwinner/Makefile
> @@ -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-modelA.dtb
> dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-tanix-tx6.dtb
> diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts
> b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts new file mode
> 100644
> index 000000000000..fef47687c85e
> --- /dev/null
> +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-pine-h64-modelA.dts
> @@ -0,0 +1,26 @@
> +// 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 A";
> + compatible = "pine64,pine-h64-modelA", "allwinner,sun50i-h6";
> +
> + 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;
> + };
> +
> +};
> +
> +&emac {
> + phy-supply = <&reg_gmac_3v3>;
> +};

You forgot to include node mentioned here:
https://lkml.org/lkml/2019/8/16/309

Best regards,
Jernej