powerpc: ppc4xx: Add defaults for DT based booting to really work

These additional nodes need to be provided to get U-Boot to boot correctly
on the Canyonlands / Glacier board:

- chosen path to the console-uart
- reg-shift set to 0 in the uart device nodes

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/powerpc/dts/canyonlands.dts b/arch/powerpc/dts/canyonlands.dts
index 2ec9762e48106aa767b35d01ca7c4342596ce34f..0a2f5d7649237ba4e9ccda86ae72a392d6afa563 100644 (file)
--- a/arch/powerpc/dts/canyonlands.dts
+++ b/arch/powerpc/dts/canyonlands.dts
@@ -22,6 +22,10 @@
                serial1 = &UART1;
        };
 
                serial1 = &UART1;
        };
 

+       chosen {
+               stdout-path = &UART0;
+       };
+

        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;


@@ -280,6 +284,7 @@
 
                        UART0: serial@ef600300 {
                                device_type = "serial";
 
                        UART0: serial@ef600300 {
                                device_type = "serial";

+                               reg-shift = <0>;

                                compatible = "ns16550";
                                reg = <0xef600300 0x00000008>;
                                virtual-reg = <0xef600300>;
                                compatible = "ns16550";
                                reg = <0xef600300 0x00000008>;
                                virtual-reg = <0xef600300>;


@@ -291,6 +296,7 @@
 
                        UART1: serial@ef600400 {
                                device_type = "serial";
 
                        UART1: serial@ef600400 {
                                device_type = "serial";

+                               reg-shift = <0>;

                                compatible = "ns16550";
                                reg = <0xef600400 0x00000008>;
                                virtual-reg = <0xef600400>;
                                compatible = "ns16550";
                                reg = <0xef600400 0x00000008>;
                                virtual-reg = <0xef600400>;

diff --git a/arch/powerpc/dts/glacier.dts b/arch/powerpc/dts/glacier.dts
index 3e7ce2c9e644ef930245d887ea3ac98505f86e89..bb4e819e91571fc0448b4dc27d99c683be7c5090 100644 (file)
--- a/arch/powerpc/dts/glacier.dts
+++ b/arch/powerpc/dts/glacier.dts
@@ -251,6 +251,7 @@
 
                        UART1: serial@ef600400 {
                                device_type = "serial";
 
                        UART1: serial@ef600400 {
                                device_type = "serial";

+                               reg-shift = <0>;

                                compatible = "ns16550";
                                reg = <0xef600400 0x00000008>;
                                virtual-reg = <0xef600400>;
                                compatible = "ns16550";
                                reg = <0xef600400 0x00000008>;
                                virtual-reg = <0xef600400>;


@@ -262,6 +263,7 @@
 
                        UART2: serial@ef600500 {
                                device_type = "serial";
 
                        UART2: serial@ef600500 {
                                device_type = "serial";

+                               reg-shift = <0>;

                                compatible = "ns16550";
                                reg = <0xef600500 0x00000008>;
                                virtual-reg = <0xef600500>;
                                compatible = "ns16550";
                                reg = <0xef600500 0x00000008>;
                                virtual-reg = <0xef600500>;


@@ -273,6 +275,7 @@
 
                        UART3: serial@ef600600 {
                                device_type = "serial";
 
                        UART3: serial@ef600600 {
                                device_type = "serial";

+                               reg-shift = <0>;

                                compatible = "ns16550";
                                reg = <0xef600600 0x00000008>;
                                virtual-reg = <0xef600600>;
                                compatible = "ns16550";
                                reg = <0xef600600 0x00000008>;
                                virtual-reg = <0xef600600>;