Based on the conversation about using common dtsi from this thread[1], I'm commenting here to make show the diff directly on the nodes, giving comments on each node so-that we can see the diff globally.

On Tue, Apr 9, 2019 at 5:55 AM megous via linux-sunxi linux-sunxi@googlegroups.com wrote:

From: Ondrej Jirman megous@megous.com

Orange Pi 3 is a H6 based SBC made by Xulong, released in January 2019. It has the following features:

• Allwinner H6 quad-core 64-bit ARM Cortex-A53
• GPU Mali-T720
• 1GB or 2GB LPDDR3 RAM
• AXP805 PMIC
• AP6256 Wifi/BT 5.0
• USB 2.0 host port (A)
• USB 2.0 micro usb, OTG
• USB 3.0 Host + 4 port USB hub (GL3510)
• Gigabit Ethernet (Realtek RTL8211E phy)
• HDMI 2.0 port
• soldered eMMC (optional)
• 3x LED (one is on the bottom)
• microphone
• audio jack
• PCIe

Add basic support for the board.

Signed-off-by: Ondrej Jirman megous@megous.com

arch/arm64/boot/dts/allwinner/Makefile | 1 + .../dts/allwinner/sun50i-h6-orangepi-3.dts | 216 ++++++++++++++++++ 2 files changed, 217 insertions(+) create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts

diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile index e4dce2f6fa3a..285a7cb5135b 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile @@ -20,6 +20,7 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-pc2.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-prime.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus.dtb dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h5-orangepi-zero-plus2.dtb +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 diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts new file mode 100644 index 000000000000..5fbc5e410883 --- /dev/null +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts @@ -0,0 +1,216 @@ +// SPDX-License-Identifier: (GPL-2.0+ or MIT) +/*

• • Copyright (C) 2019 Ondřej Jirman megous@megous.com
• */

+/dts-v1/;

+#include "sun50i-h6.dtsi"

+#include <dt-bindings/gpio/gpio.h>

+/ {

•   model = "OrangePi 3";
  

•   compatible = "xunlong,orangepi-3", "allwinner,sun50i-h6";
  

•   aliases {
  

•           serial0 = &uart0;
  

•   };
  

•   chosen {
  

•           stdout-path = "serial0:115200n8";
  

•   };
  

•   leds {
  

•           compatible = "gpio-leds";
  

•           power {
  

•                   label = "orangepi:red:power";
  

•                   gpios = <&r_pio 0 4 GPIO_ACTIVE_HIGH>; /* PL4 */
  

•                   default-state = "on";
  

•           };
  

•           status {
  

•                   label = "orangepi:green:status";
  

•                   gpios = <&r_pio 0 7 GPIO_ACTIVE_HIGH>; /* PL7 */
  

•           };
  

•   };
  

•   reg_vcc5v: vcc5v {
  

•           /* board wide 5V supply directly from the DC jack */
  

•           compatible = "regulator-fixed";
  

•           regulator-name = "vcc-5v";
  

•           regulator-min-microvolt = <5000000>;
  

•           regulator-max-microvolt = <5000000>;
  

•           regulator-always-on;
  

•   };
  

+};

all above nodes are common to all h6 opi boards.

+&cpu0 {

•   cpu-supply = <&reg_dcdca>;
  

+};

+&ehci0 {

•   status = "okay";
  

+};

+&ehci3 {

•   status = "okay";
  

+};

common to all h6 opi boards.

+&mmc0 {

•   pinctrl-names = "default";
  

•   pinctrl-0 = <&mmc0_pins>;
  

•   vmmc-supply = <&reg_cldo1>;
  

•   cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
  

•   bus-width = <4>;
  

•   status = "okay";
  

+};

common to all h6 opi boards.

+&ohci0 {

•   status = "okay";
  

+};

+&ohci3 {

•   status = "okay";
  

+};

common to all h6 opi boards.

+&pio {

•   vcc-pc-supply = <&reg_bldo2>;
  

•   vcc-pd-supply = <&reg_cldo1>;
  

+};

+&r_i2c {

•   status = "okay";
  

•   axp805: pmic@36 {
  

•           compatible = "x-powers,axp805", "x-powers,axp806";
  

•           reg = <0x36>;
  

•           interrupt-parent = <&r_intc>;
  

•           interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
  

•           interrupt-controller;
  

•           #interrupt-cells = <1>;
  

•           x-powers,self-working-mode;
  

•           vina-supply = <&reg_vcc5v>;
  

•           vinb-supply = <&reg_vcc5v>;
  

•           vinc-supply = <&reg_vcc5v>;
  

•           vind-supply = <&reg_vcc5v>;
  

•           vine-supply = <&reg_vcc5v>;
  

•           aldoin-supply = <&reg_vcc5v>;
  

•           bldoin-supply = <&reg_vcc5v>;
  

•           cldoin-supply = <&reg_vcc5v>;
  

all these supply voltage regulators are common to h6 opi boards.

•           regulators {
  

•                   reg_aldo1: aldo1 {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <3300000>;
  

•                           regulator-max-microvolt = <3300000>;
  

•                           regulator-name = "vcc-pl-led-ir";
  

•                   };
  

same like other h6 boards.

•                   reg_aldo2: aldo2 {
  

•                           regulator-min-microvolt = <3300000>;
  

•                           regulator-max-microvolt = <3300000>;
  

•                           regulator-name = "vcc33-audio-tv-ephy-mac";
  

•                   };
  

rest of h6 opi boards used it for vcc-ac200, we may append ac200 and make it common since the voltage is same.

•                   /* ALDO3 is shorted to CLDO1 */
  

•                   reg_aldo3: aldo3 {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <3300000>;
  

•                           regulator-max-microvolt = <3300000>;
  

•                           regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-1";
  

•                   };
  

same like above regulator.

•                   reg_bldo1: bldo1 {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <1800000>;
  

•                           regulator-max-microvolt = <1800000>;
  

•                           regulator-name = "vcc18-dram-bias-pll";
  

same like other h6 boards.

•                   };
  

•                   reg_bldo2: bldo2 {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <1800000>;
  

•                           regulator-max-microvolt = <1800000>;
  

•                           regulator-name = "vcc-efuse-pcie-hdmi-pc";
  

•                   };
  

same like other h6 boards.

•                   bldo3 {
  

•                           /* unused */
  

•                   };
  

This is used in other h6 opi boards so we may attach status or re-enable it on board dts file.

•                   bldo4 {
  

•                           /* unused */
  

•                   };
  

same like other h6 boards.

•                   reg_cldo1: cldo1 {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <3300000>;
  

•                           regulator-max-microvolt = <3300000>;
  

•                           regulator-name = "vcc33-io-pd-emmc-sd-usb-uart-2";
  

•                   };
  

same like other h6 boards.

•                   cldo2 {
  

•                           /* unused */
  

•                   };
  

•                   cldo3 {
  

•                           /* unused */
  

•                   };
  

These two used for wifi, so we may define on board dts or attach status property.

•                   reg_dcdca: dcdca {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <800000>;
  

•                           regulator-max-microvolt = <1160000>;
  

•                           regulator-name = "vdd-cpu";
  

•                   };
  

•                   reg_dcdcc: dcdcc {
  

•                           regulator-min-microvolt = <810000>;
  

•                           regulator-max-microvolt = <1080000>;
  

•                           regulator-name = "vdd-gpu";
  

•                   };
  

•                   reg_dcdcd: dcdcd {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <960000>;
  

•                           regulator-max-microvolt = <960000>;
  

•                           regulator-name = "vdd-sys";
  

•                   };
  

•                   reg_dcdce: dcdce {
  

•                           regulator-always-on;
  

•                           regulator-min-microvolt = <1200000>;
  

•                           regulator-max-microvolt = <1200000>;
  

•                           regulator-name = "vcc-dram";
  

•                   };
  

•                   sw {
  

•                           /* unused */
  

•                   };
  

all above regulators are common to h6 boards.

•           };
  

•   };
  

+};

+&uart0 {

•   pinctrl-names = "default";
  

•   pinctrl-0 = <&uart0_ph_pins>;
  

•   status = "okay";
  

+};

+&usb2otg {

•   /*
  

•    * Beware that this board will not automatically disconnect
  

•    * VBUS from DCIN, when self-powered and used as a peripheral.
  

•    */
  

•   dr_mode = "otg";
  

•   status = "okay";
  

+};

above nodes uart0, usb2otg are common to h6 opi boards.

+&usb2phy {

•   usb0_id_det-gpios = <&pio 2 15 GPIO_ACTIVE_HIGH>; /* PC15 */
  

•   usb0_vbus-supply = <&reg_vcc5v>;
  

•   usb3_vbus-supply = <&reg_vcc5v>;
  

•   status = "okay";
  

+};

id detect pin can be differ, so we may move this on board specific dts.

Note: the emac node is also common between h6 opi boards.

[1] https://lkml.org/lkml/2019/4/5/857