mpc85xx: fix mpc8548 support (reorder serial ports, add default stdout path to device tree), enable pcie

SVN-Revision: 25015
This commit is contained in:
Felix Fietkau 2011-01-16 01:24:53 +00:00
parent 6cf6302a78
commit d6d301bb14
2 changed files with 42 additions and 1 deletions

View file

@ -170,7 +170,10 @@ CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_PAGE_OFFSET=0xc0000000
# CONFIG_PARTITION_ADVANCED is not set
CONFIG_PCI=y
# CONFIG_PCIEPORTBUS is not set
CONFIG_PCIEAER=y
CONFIG_PCIEASPM=y
# CONFIG_PCIEASPM_DEBUG is not set
CONFIG_PCIEPORTBUS=y
CONFIG_PCI_DOMAINS=y
CONFIG_PHYLIB=y
CONFIG_PHYSICAL_ALIGN=0x04000000

View file

@ -0,0 +1,38 @@
--- a/arch/powerpc/boot/dts/mpc8548cds.dts
+++ b/arch/powerpc/boot/dts/mpc8548cds.dts
@@ -308,21 +308,21 @@
};
};
- serial0: serial@4500 {
- cell-index = <0>;
+ serial0: serial@4600 {
+ cell-index = <1>;
device_type = "serial";
compatible = "ns16550";
- reg = <0x4500 0x100>; // reg base, size
+ reg = <0x4600 0x100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot?
interrupts = <42 2>;
interrupt-parent = <&mpic>;
};
- serial1: serial@4600 {
- cell-index = <1>;
+ serial1: serial@4500 {
+ cell-index = <0>;
device_type = "serial";
compatible = "ns16550";
- reg = <0x4600 0x100>; // reg base, size
+ reg = <0x4500 0x100>; // reg base, size
clock-frequency = <0>; // should we fill in in uboot?
interrupts = <42 2>;
interrupt-parent = <&mpic>;
@@ -564,4 +564,7 @@
0x0 0x100000>;
};
};
+ chosen {
+ linux,stdout-path = "/soc8548@e0000000/serial@4600";
+ };
};