|
@@ -1,279 +0,0 @@
|
|
|
-From 99cade8743158889b3e8db93c003b3318ebd4bda Mon Sep 17 00:00:00 2001
|
|
|
-From: =?UTF-8?q?Cl=C3=A9ment=20P=C3=A9ron?= <peron.clem@gmail.com>
|
|
|
-Date: Sun, 11 Aug 2019 22:38:57 +0200
|
|
|
-Subject: [PATCH] arm: dts: sync dts for Allwinner H6
|
|
|
-MIME-Version: 1.0
|
|
|
-Content-Type: text/plain; charset=UTF-8
|
|
|
-Content-Transfer-Encoding: 8bit
|
|
|
-
|
|
|
-Sync Kernel DTS for Allwinner H6 boards.
|
|
|
-
|
|
|
-Drop /omit-if-no-ref/ keyword as it's not supported by U-boot.
|
|
|
-
|
|
|
-commit <d45331b00ddb> Linux 5.3-rc4
|
|
|
-
|
|
|
-Signed-off-by: Clément Péron <peron.clem@gmail.com>
|
|
|
----
|
|
|
- arch/arm/dts/sun50i-h6-beelink-gs1.dts | 76 ++++++++++++++++++++++++++
|
|
|
- arch/arm/dts/sun50i-h6-pine-h64.dts | 12 ++++
|
|
|
- arch/arm/dts/sun50i-h6.dtsi | 46 +++++++++++++++-
|
|
|
- 3 files changed, 131 insertions(+), 3 deletions(-)
|
|
|
-
|
|
|
-diff --git a/arch/arm/dts/sun50i-h6-beelink-gs1.dts b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
|
-index 54b0882bed..0dc33c90dd 100644
|
|
|
---- a/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
|
-+++ b/arch/arm/dts/sun50i-h6-beelink-gs1.dts
|
|
|
-@@ -14,6 +14,7 @@
|
|
|
- compatible = "azw,beelink-gs1", "allwinner,sun50i-h6";
|
|
|
-
|
|
|
- aliases {
|
|
|
-+ ethernet0 = &emac;
|
|
|
- serial0 = &uart0;
|
|
|
- };
|
|
|
-
|
|
|
-@@ -21,6 +22,17 @@
|
|
|
- stdout-path = "serial0:115200n8";
|
|
|
- };
|
|
|
-
|
|
|
-+ connector {
|
|
|
-+ compatible = "hdmi-connector";
|
|
|
-+ type = "a";
|
|
|
-+
|
|
|
-+ port {
|
|
|
-+ hdmi_con_in: endpoint {
|
|
|
-+ remote-endpoint = <&hdmi_out_con>;
|
|
|
-+ };
|
|
|
-+ };
|
|
|
-+ };
|
|
|
-+
|
|
|
- leds {
|
|
|
- compatible = "gpio-leds";
|
|
|
-
|
|
|
-@@ -41,6 +53,40 @@
|
|
|
- };
|
|
|
- };
|
|
|
-
|
|
|
-+&de {
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&ehci0 {
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&emac {
|
|
|
-+ pinctrl-names = "default";
|
|
|
-+ pinctrl-0 = <&ext_rgmii_pins>;
|
|
|
-+ phy-mode = "rgmii";
|
|
|
-+ phy-handle = <&ext_rgmii_phy>;
|
|
|
-+ phy-supply = <®_aldo2>;
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&hdmi {
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&hdmi_out {
|
|
|
-+ hdmi_out_con: endpoint {
|
|
|
-+ remote-endpoint = <&hdmi_con_in>;
|
|
|
-+ };
|
|
|
-+};
|
|
|
-+
|
|
|
-+&mdio {
|
|
|
-+ ext_rgmii_phy: ethernet-phy@1 {
|
|
|
-+ compatible = "ethernet-phy-ieee802.3-c22";
|
|
|
-+ reg = <1>;
|
|
|
-+ };
|
|
|
-+};
|
|
|
-+
|
|
|
- &mmc0 {
|
|
|
- vmmc-supply = <®_cldo1>;
|
|
|
- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
|
|
|
-@@ -57,6 +103,15 @@
|
|
|
- status = "okay";
|
|
|
- };
|
|
|
-
|
|
|
-+&ohci0 {
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&pio {
|
|
|
-+ vcc-pd-supply = <®_cldo1>;
|
|
|
-+ vcc-pg-supply = <®_aldo1>;
|
|
|
-+};
|
|
|
-+
|
|
|
- &r_i2c {
|
|
|
- status = "okay";
|
|
|
-
|
|
|
-@@ -177,8 +232,29 @@
|
|
|
- };
|
|
|
- };
|
|
|
-
|
|
|
-+&r_pio {
|
|
|
-+ /*
|
|
|
-+ * PL0 and PL1 are used for PMIC I2C
|
|
|
-+ * don't enable the pl-supply else
|
|
|
-+ * it will fail at boot
|
|
|
-+ *
|
|
|
-+ * vcc-pl-supply = <®_aldo1>;
|
|
|
-+ */
|
|
|
-+ vcc-pm-supply = <®_aldo1>;
|
|
|
-+};
|
|
|
-+
|
|
|
- &uart0 {
|
|
|
- pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&uart0_ph_pins>;
|
|
|
- status = "okay";
|
|
|
- };
|
|
|
-+
|
|
|
-+&usb2otg {
|
|
|
-+ dr_mode = "host";
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-+
|
|
|
-+&usb2phy {
|
|
|
-+ usb0_vbus-supply = <®_vcc5v>;
|
|
|
-+ status = "okay";
|
|
|
-+};
|
|
|
-diff --git a/arch/arm/dts/sun50i-h6-pine-h64.dts b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
|
-index 4802902e12..1898345183 100644
|
|
|
---- a/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
|
-+++ b/arch/arm/dts/sun50i-h6-pine-h64.dts
|
|
|
-@@ -127,6 +127,12 @@
|
|
|
- status = "okay";
|
|
|
- };
|
|
|
-
|
|
|
-+&pio {
|
|
|
-+ vcc-pc-supply = <®_bldo2>;
|
|
|
-+ vcc-pd-supply = <®_cldo1>;
|
|
|
-+ vcc-pg-supply = <®_aldo1>;
|
|
|
-+};
|
|
|
-+
|
|
|
- &r_i2c {
|
|
|
- status = "okay";
|
|
|
-
|
|
|
-@@ -243,10 +249,16 @@
|
|
|
- pcf8563: rtc@51 {
|
|
|
- compatible = "nxp,pcf8563";
|
|
|
- reg = <0x51>;
|
|
|
-+ interrupt-parent = <&r_intc>;
|
|
|
-+ interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
|
|
|
- #clock-cells = <0>;
|
|
|
- };
|
|
|
- };
|
|
|
-
|
|
|
-+&r_pio {
|
|
|
-+ vcc-pm-supply = <®_aldo1>;
|
|
|
-+};
|
|
|
-+
|
|
|
- &uart0 {
|
|
|
- pinctrl-names = "default";
|
|
|
- pinctrl-0 = <&uart0_ph_pins>;
|
|
|
-diff --git a/arch/arm/dts/sun50i-h6.dtsi b/arch/arm/dts/sun50i-h6.dtsi
|
|
|
-index e0dc4a05c1..a117f479ae 100644
|
|
|
---- a/arch/arm/dts/sun50i-h6.dtsi
|
|
|
-+++ b/arch/arm/dts/sun50i-h6.dtsi
|
|
|
-@@ -101,7 +101,7 @@
|
|
|
- #size-cells = <1>;
|
|
|
- ranges;
|
|
|
-
|
|
|
-- display-engine@1000000 {
|
|
|
-+ bus@1000000 {
|
|
|
- compatible = "allwinner,sun50i-h6-de3",
|
|
|
- "allwinner,sun50i-a64-de2";
|
|
|
- reg = <0x1000000 0x400000>;
|
|
|
-@@ -203,11 +203,32 @@
|
|
|
- #reset-cells = <1>;
|
|
|
- };
|
|
|
-
|
|
|
-+ dma: dma-controller@3002000 {
|
|
|
-+ compatible = "allwinner,sun50i-h6-dma";
|
|
|
-+ reg = <0x03002000 0x1000>;
|
|
|
-+ interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
-+ clocks = <&ccu CLK_BUS_DMA>, <&ccu CLK_MBUS_DMA>;
|
|
|
-+ clock-names = "bus", "mbus";
|
|
|
-+ dma-channels = <16>;
|
|
|
-+ dma-requests = <46>;
|
|
|
-+ resets = <&ccu RST_BUS_DMA>;
|
|
|
-+ #dma-cells = <1>;
|
|
|
-+ };
|
|
|
-+
|
|
|
- sid: sid@3006000 {
|
|
|
- compatible = "allwinner,sun50i-h6-sid";
|
|
|
- reg = <0x03006000 0x400>;
|
|
|
- };
|
|
|
-
|
|
|
-+ watchdog: watchdog@30090a0 {
|
|
|
-+ compatible = "allwinner,sun50i-h6-wdt",
|
|
|
-+ "allwinner,sun6i-a31-wdt";
|
|
|
-+ reg = <0x030090a0 0x20>;
|
|
|
-+ interrupts = <GIC_SPI 50 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
-+ /* Broken on some H6 boards */
|
|
|
-+ status = "disabled";
|
|
|
-+ };
|
|
|
-+
|
|
|
- pio: pinctrl@300b000 {
|
|
|
- compatible = "allwinner,sun50i-h6-pinctrl";
|
|
|
- reg = <0x0300b000 0x400>;
|
|
|
-@@ -243,6 +264,18 @@
|
|
|
- bias-pull-up;
|
|
|
- };
|
|
|
-
|
|
|
-+ /*
|
|
|
-+ * /omit-if-no-ref/ isn't supported by U-boot
|
|
|
-+ * keep this comment to avoid bad sync with Linux
|
|
|
-+ */
|
|
|
-+ mmc1_pins: mmc1-pins {
|
|
|
-+ pins = "PG0", "PG1", "PG2", "PG3",
|
|
|
-+ "PG4", "PG5";
|
|
|
-+ function = "mmc1";
|
|
|
-+ drive-strength = <30>;
|
|
|
-+ bias-pull-up;
|
|
|
-+ };
|
|
|
-+
|
|
|
- mmc2_pins: mmc2-pins {
|
|
|
- pins = "PC1", "PC4", "PC5", "PC6",
|
|
|
- "PC7", "PC8", "PC9", "PC10",
|
|
|
-@@ -294,6 +327,8 @@
|
|
|
- resets = <&ccu RST_BUS_MMC1>;
|
|
|
- reset-names = "ahb";
|
|
|
- interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
-+ pinctrl-names = "default";
|
|
|
-+ pinctrl-0 = <&mmc1_pins>;
|
|
|
- status = "disabled";
|
|
|
- #address-cells = <1>;
|
|
|
- #size-cells = <0>;
|
|
|
-@@ -445,7 +480,6 @@
|
|
|
- resets = <&ccu RST_BUS_OHCI3>,
|
|
|
- <&ccu RST_BUS_EHCI3>;
|
|
|
- phys = <&usb2phy 3>;
|
|
|
-- phy-names = "usb";
|
|
|
- status = "disabled";
|
|
|
- };
|
|
|
-
|
|
|
-@@ -457,7 +491,6 @@
|
|
|
- <&ccu CLK_USB_OHCI3>;
|
|
|
- resets = <&ccu RST_BUS_OHCI3>;
|
|
|
- phys = <&usb2phy 3>;
|
|
|
-- phy-names = "usb";
|
|
|
- status = "disabled";
|
|
|
- };
|
|
|
-
|
|
|
-@@ -613,6 +646,13 @@
|
|
|
- #reset-cells = <1>;
|
|
|
- };
|
|
|
-
|
|
|
-+ r_watchdog: watchdog@7020400 {
|
|
|
-+ compatible = "allwinner,sun50i-h6-wdt",
|
|
|
-+ "allwinner,sun6i-a31-wdt";
|
|
|
-+ reg = <0x07020400 0x20>;
|
|
|
-+ interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
|
|
|
-+ };
|
|
|
-+
|
|
|
- r_intc: interrupt-controller@7021000 {
|
|
|
- compatible = "allwinner,sun50i-h6-r-intc",
|
|
|
- "allwinner,sun6i-a31-r-intc";
|
|
|
---
|
|
|
-2.20.1
|
|
|
-
|