summaryrefslogtreecommitdiff
path: root/arch/powerpc/boot/dts/fsl
diff options
context:
space:
mode:
authorJason Jin <Jason.Jin@freescale.com>2013-11-18 06:25:03 (GMT)
committerJose Rivera <German.Rivera@freescale.com>2013-11-28 15:48:13 (GMT)
commitcfe7db8829c71a5994acb8425bde262ac87e3b5e (patch)
tree2b091ca7047a25b3ac6a9e6b3d89af97c5ed4204 /arch/powerpc/boot/dts/fsl
parent4230e45ab939801ac53eb5dc0ea4050668436233 (diff)
downloadlinux-fsl-qoriq-cfe7db8829c71a5994acb8425bde262ac87e3b5e.tar.xz
powerpc: Add a vga alias node for P1022
In u-boot, when set the video as console, the name 'vga' is used as a general name for the video device, during the fdt_fixup_stdout process, the 'vga' name is used to search in the dtb to setup the 'linux,stdout-path' node. Though the P1022 DIU is not VGA-compatible device, to meet the 'vga' name used in u-boot, the vga alias node is added for P1022 in this patch. At the same time, a display alias is also added so that no other components grow dependencies on the vga alias node. Signed-off-by: Jason Jin <Jason.Jin@freescale.com> Change-Id: I67b52b9381f35b53a1812005c31e08a202a054fc Reviewed-on: http://git.am.freescale.net:8181/4088 Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com> Reviewed-by: Yuantian Tang <yuantian.tang@freescale.com> Reviewed-by: Jose Rivera <German.Rivera@freescale.com>
Diffstat (limited to 'arch/powerpc/boot/dts/fsl')
-rw-r--r--arch/powerpc/boot/dts/fsl/p1022si-post.dtsi2
-rw-r--r--arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi3
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
index 1f189a9..c907c8e 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi
@@ -175,7 +175,7 @@
/include/ "pq3-gpio-0.dtsi"
- display@10000 {
+ display: display@10000 {
compatible = "fsl,diu", "fsl,p1022-diu";
reg = <0x10000 1000>;
interrupts = <64 2 0 0>;
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
index 1956dea..362ac51 100644
--- a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
+++ b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi
@@ -50,6 +50,9 @@
pci0 = &pci0;
pci1 = &pci1;
pci2 = &pci2;
+ /*inaccurate vga name for U-Boot compatibility*/
+ vga = &display;
+ display = &display;
};
cpus {