mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-25 16:21:32 +00:00
a57ce78b37
* Bump to 4.18, removing the obvious, fixing build problems, put some on waiting. * Pin 4.18 to DEV, rollback 4.14 to NEXT, adjust configs, remove one deprecated patch from NEXT and add board-h3-address-some-stability-issues.patch * Adjust few boards in development to new reality, removing it from NEXT for now * Adjust few board configs * Board config adjustement * Adjust few boards configs * Port NeoCore2 and Neo21.1 to 4.14.y * Adjust board config * Adjust board config
201 lines
4.7 KiB
Diff
201 lines
4.7 KiB
Diff
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
index d75e1fc3..a46b5ec2 100644
|
|
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
|
|
@@ -143,6 +143,12 @@
|
|
};
|
|
};
|
|
|
|
+ de: display-engine {
|
|
+ compatible = "allwinner,sun50i-a64-display-engine";
|
|
+ allwinner,pipelines = <&mixer1>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
osc24M: osc24M_clk {
|
|
#clock-cells = <0>;
|
|
compatible = "fixed-clock";
|
|
@@ -224,6 +230,76 @@
|
|
#dma-cells = <1>;
|
|
};
|
|
|
|
+ tcon0: lcd-controller@1c0c000 {
|
|
+ compatible = "allwinner,sun50i-a64-tcon-lcd",
|
|
+ "allwinner,sun8i-a83t-tcon-lcd";
|
|
+ reg = <0x01c0c000 0x1000>;
|
|
+ interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&ccu CLK_BUS_TCON0>, <&ccu CLK_TCON0>;
|
|
+ clock-names = "ahb", "tcon-ch0";
|
|
+ clock-output-names = "tcon-pixel-clock";
|
|
+ resets = <&ccu RST_BUS_TCON0>, <&ccu RST_BUS_LVDS>;
|
|
+ reset-names = "lcd", "lvds";
|
|
+
|
|
+ ports {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ tcon0_in: port@0 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ reg = <0>;
|
|
+
|
|
+ tcon0_in_mixer0: endpoint@0 {
|
|
+ reg = <0>;
|
|
+ remote-endpoint = <&mixer0_out_tcon0>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ tcon0_out: port@1 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ reg = <1>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ tcon1: lcd-controller@1c0d000 {
|
|
+ compatible = "allwinner,sun50i-a64-tcon-tv",
|
|
+ "allwinner,sun8i-a83t-tcon-tv";
|
|
+ reg = <0x01c0d000 0x1000>;
|
|
+ interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&ccu CLK_BUS_TCON1>, <&ccu CLK_TCON1>;
|
|
+ clock-names = "ahb", "tcon-ch1";
|
|
+ resets = <&ccu RST_BUS_TCON1>;
|
|
+ reset-names = "lcd";
|
|
+ status = "disabled";
|
|
+
|
|
+ ports {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ tcon1_in: port@0 {
|
|
+ reg = <0>;
|
|
+
|
|
+ tcon1_in_mixer1: endpoint {
|
|
+ remote-endpoint = <&mixer1_out_tcon1>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ tcon1_out: port@1 {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+ reg = <1>;
|
|
+
|
|
+ tcon1_out_hdmi: endpoint@1 {
|
|
+ reg = <1>;
|
|
+ remote-endpoint = <&hdmi_in_tcon1>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
mmc0: mmc@1c0f000 {
|
|
compatible = "allwinner,sun50i-a64-mmc";
|
|
reg = <0x01c0f000 0x1000>;
|
|
@@ -467,6 +543,55 @@
|
|
pins = "PD4", "PD5";
|
|
function = "uart4";
|
|
};
|
|
+
|
|
+ mixer0: mixer@100000 {
|
|
+ compatible = "allwinner,sun50i-a64-de2-mixer-0";
|
|
+ reg = <0x100000 0x100000>;
|
|
+ clocks = <&display_clocks CLK_BUS_MIXER0>,
|
|
+ <&display_clocks CLK_MIXER0>;
|
|
+ clock-names = "bus",
|
|
+ "mod";
|
|
+ resets = <&display_clocks RST_MIXER0>;
|
|
+ status = "disabled";
|
|
+
|
|
+ ports {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ mixer0_out: port@1 {
|
|
+ reg = <1>;
|
|
+
|
|
+ mixer0_out_tcon0: endpoint {
|
|
+ remote-endpoint = <&tcon0_in_mixer0>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ mixer1: mixer@200000 {
|
|
+ compatible = "allwinner,sun50i-a64-de2-mixer-1";
|
|
+ reg = <0x200000 0x100000>;
|
|
+ clocks = <&display_clocks CLK_BUS_MIXER1>,
|
|
+ <&display_clocks CLK_MIXER1>;
|
|
+ clock-names = "bus",
|
|
+ "mod";
|
|
+ /* The reset line is shared */
|
|
+ resets = <&display_clocks RST_WB>;
|
|
+ status = "disabled";
|
|
+
|
|
+ ports {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ mixer1_out: port@1 {
|
|
+ reg = <1>;
|
|
+
|
|
+ mixer1_out_tcon1: endpoint {
|
|
+ remote-endpoint = <&tcon1_in_mixer1>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+ };
|
|
};
|
|
|
|
spdif: spdif@1c21000 {
|
|
@@ -668,6 +793,50 @@
|
|
#interrupt-cells = <3>;
|
|
};
|
|
|
|
+ hdmi: hdmi@1ee0000 {
|
|
+ compatible = "allwinner,sun50i-a64-dw-hdmi",
|
|
+ "allwinner,sun8i-a83t-dw-hdmi";
|
|
+ reg = <0x01ee0000 0x10000>;
|
|
+ reg-io-width = <1>;
|
|
+ interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
|
|
+ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
|
|
+ <&ccu CLK_HDMI>;
|
|
+ clock-names = "iahb", "isfr", "tmds";
|
|
+ resets = <&ccu RST_BUS_HDMI1>;
|
|
+ reset-names = "ctrl";
|
|
+ phys = <&hdmi_phy>;
|
|
+ phy-names = "hdmi-phy";
|
|
+ status = "disabled";
|
|
+
|
|
+ ports {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <0>;
|
|
+
|
|
+ hdmi_in: port@0 {
|
|
+ reg = <0>;
|
|
+
|
|
+ hdmi_in_tcon1: endpoint {
|
|
+ remote-endpoint = <&tcon1_out_hdmi>;
|
|
+ };
|
|
+ };
|
|
+
|
|
+ hdmi_out: port@1 {
|
|
+ reg = <1>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
+ hdmi_phy: hdmi-phy@1ef0000 {
|
|
+ compatible = "allwinner,sun50i-a64-hdmi-phy";
|
|
+ reg = <0x01ef0000 0x10000>;
|
|
+ clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
|
|
+ <&ccu CLK_PLL_VIDEO0>, <&ccu CLK_PLL_VIDEO1>;
|
|
+ clock-names = "bus", "mod", "pll-0", "pll-1";
|
|
+ resets = <&ccu RST_BUS_HDMI0>;
|
|
+ reset-names = "phy";
|
|
+ #phy-cells = <0>;
|
|
+ };
|
|
+
|
|
rtc: rtc@1f00000 {
|
|
compatible = "allwinner,sun6i-a31-rtc";
|
|
reg = <0x01f00000 0x54>;
|