150 lines
4.2 KiB
Diff
150 lines
4.2 KiB
Diff
From fc020448ed2abd7d649153e248e3ec08d17ae1f5 Mon Sep 17 00:00:00 2001
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
|
Date: Mon, 19 Jan 2015 14:05:12 +0100
|
|
Subject: [PATCH 15/15] ARM: dts: sunxi: Add simplefb nodes for de_be0-lcd0,
|
|
de_be0-lcd0-tve0 pipelines
|
|
Origin: https://git.kernel.org/linus/fd18c7eac03540654abdbfedd52e6dfb3718b489
|
|
|
|
Add simplefb nodes for "[de_fe0-]de_be0-lcd0" and "[de_fe0-]de_be0-lcd0-tve0"
|
|
display pipelines for when u-boot has set up a pipeline to drive a LCD panel /
|
|
VGA output rather then the HDMI output.
|
|
|
|
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
|
|
Conflicts:
|
|
arch/arm/boot/dts/sun8i-a23.dtsi
|
|
|
|
[ ijc -- dropped arch/arm/boot/dts/sun8i-a23.dtsi changes, not in baseline ]
|
|
---
|
|
arch/arm/boot/dts/sun4i-a10.dtsi | 18 ++++++++++++++++++
|
|
arch/arm/boot/dts/sun5i-a10s.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/sun5i-a13.dtsi | 14 ++++++++++++++
|
|
arch/arm/boot/dts/sun6i-a31.dtsi | 8 ++++++++
|
|
arch/arm/boot/dts/sun7i-a20.dtsi | 17 +++++++++++++++++
|
|
5 files changed, 65 insertions(+)
|
|
|
|
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
|
|
index 7e3e5dd..eae8bfd 100644
|
|
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
|
|
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
|
|
@@ -47,6 +47,24 @@
|
|
<&ahb_gates 44>, <&ahb_gates 46>;
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+ framebuffer@2 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_fe0-de_be0-lcd0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>,
|
|
+ <&ahb_gates 46>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ framebuffer@3 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_fe0-de_be0-lcd0-tve0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
|
|
+ <&ahb_gates 44>, <&ahb_gates 46>;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
cpus {
|
|
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
|
|
index 245a25b..95bbfea 100644
|
|
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
|
|
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
|
|
@@ -36,6 +36,14 @@
|
|
<&ahb_gates 44>;
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+ framebuffer@1 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_be0-lcd0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
cpus {
|
|
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
|
|
index 3b2a94c..a194c1e 100644
|
|
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
|
|
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
|
|
@@ -21,6 +21,20 @@
|
|
serial1 = &uart3;
|
|
};
|
|
|
|
+ chosen {
|
|
+ #address-cells = <1>;
|
|
+ #size-cells = <1>;
|
|
+ ranges;
|
|
+
|
|
+ framebuffer@0 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_be0-lcd0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+ };
|
|
+
|
|
cpus {
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
|
|
index fe2c938..90cc322 100644
|
|
--- a/arch/arm/boot/dts/sun6i-a31.dtsi
|
|
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
|
|
@@ -36,6 +36,14 @@
|
|
clocks = <&pll6 0>;
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+ framebuffer@1 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_be0-lcd0";
|
|
+ clocks = <&pll6 0>;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
cpus {
|
|
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
|
|
index e31ae3a..7d47914 100644
|
|
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
|
|
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
|
|
@@ -40,6 +40,23 @@
|
|
<&ahb_gates 44>;
|
|
status = "disabled";
|
|
};
|
|
+
|
|
+ framebuffer@1 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_be0-lcd0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 36>, <&ahb_gates 44>;
|
|
+ status = "disabled";
|
|
+ };
|
|
+
|
|
+ framebuffer@2 {
|
|
+ compatible = "allwinner,simple-framebuffer",
|
|
+ "simple-framebuffer";
|
|
+ allwinner,pipeline = "de_be0-lcd0-tve0";
|
|
+ clocks = <&pll5 1>, <&ahb_gates 34>, <&ahb_gates 36>,
|
|
+ <&ahb_gates 44>;
|
|
+ status = "disabled";
|
|
+ };
|
|
};
|
|
|
|
cpus {
|
|
--
|
|
2.1.4
|
|
|