diff options
author | Jason Jin <Jason.Jin@freescale.com> | 2015-08-17 03:50:57 -0400 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2015-08-17 19:52:33 -0400 |
commit | e8c4b3dfe17a7e83ea134d6a857f9a3e8e71357f (patch) | |
tree | 5a326198b6c92c5601fbacf3329702632a067be1 /arch/powerpc | |
parent | c60232029aee84f69da0e74aa6f6d249edbbc80b (diff) |
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>
Signed-off-by: Wang Dongsheng <dongsheng.wang@freescale.com>
Signed-off-by: Scott Wood <scottwood@freescale.com>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 2 | ||||
-rw-r--r-- | arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi index ebf202234549..426bf4103b9e 100644 --- a/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | |||
@@ -175,7 +175,7 @@ | |||
175 | 175 | ||
176 | /include/ "pq3-gpio-0.dtsi" | 176 | /include/ "pq3-gpio-0.dtsi" |
177 | 177 | ||
178 | display@10000 { | 178 | display: display@10000 { |
179 | compatible = "fsl,diu", "fsl,p1022-diu"; | 179 | compatible = "fsl,diu", "fsl,p1022-diu"; |
180 | reg = <0x10000 1000>; | 180 | reg = <0x10000 1000>; |
181 | interrupts = <64 2 0 0>; | 181 | 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 1956dea040cc..de76ae8992c6 100644 --- a/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi +++ b/arch/powerpc/boot/dts/fsl/p1022si-pre.dtsi | |||
@@ -50,6 +50,8 @@ | |||
50 | pci0 = &pci0; | 50 | pci0 = &pci0; |
51 | pci1 = &pci1; | 51 | pci1 = &pci1; |
52 | pci2 = &pci2; | 52 | pci2 = &pci2; |
53 | vga = &display; | ||
54 | display = &display; | ||
53 | }; | 55 | }; |
54 | 56 | ||
55 | cpus { | 57 | cpus { |