aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2011-01-16 01:24:53 +0000
committerFelix Fietkau <nbd@openwrt.org>2011-01-16 01:24:53 +0000
commitda09857f8d3039a021d16e58f4bd4648172f331b (patch)
tree12e36b78ddf9eac83324a2b12d6097a1b396c964 /target/linux
parentc92b694937f731783cf89cc1f429f86965a9d90b (diff)
downloadmaster-187ad058-da09857f8d3039a021d16e58f4bd4648172f331b.tar.gz
master-187ad058-da09857f8d3039a021d16e58f4bd4648172f331b.tar.bz2
master-187ad058-da09857f8d3039a021d16e58f4bd4648172f331b.zip
mpc85xx: fix mpc8548 support (reorder serial ports, add default stdout path to device tree), enable pcie
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/mpc85xx/config-default5
-rw-r--r--target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch38
2 files changed, 42 insertions, 1 deletions
diff --git a/target/linux/mpc85xx/config-default b/target/linux/mpc85xx/config-default
index dfde393434..2b8e84c1cb 100644
--- a/target/linux/mpc85xx/config-default
+++ b/target/linux/mpc85xx/config-default
@@ -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
diff --git a/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
new file mode 100644
index 0000000000..3cca8288c6
--- /dev/null
+++ b/target/linux/mpc85xx/patches/110-fix_mpc8548_cds.patch
@@ -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";
++ };
+ };