Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / boot / cuboot-taishan.c

diff --git a/arch/powerpc/boot/cuboot-taishan.c b/arch/powerpc/boot/cuboot-taishan.c
index afd828d050c07626a5020b47d8e18cb2e9eef69b..9bc906a754dd53dbdbab24f6d5721fcf4f6835ff 100644 (file)
--- a/arch/powerpc/boot/cuboot-taishan.c
+++ b/arch/powerpc/boot/cuboot-taishan.c
@@ -21,7 +21,9 @@
 #include "dcr.h"
 #include "4xx.h"
 
+#define TARGET_4xx
 #define TARGET_44x
+#define TARGET_440GX
 #include "ppcboot.h"
 
 static bd_t bd;
@@ -34,13 +36,12 @@ static void taishan_fixups(void)
           registers */
        unsigned long sysclk = 33000000;
 
-       /* 440EP Clock logic is all but identical to 440GX
-          so we just use that code for now at least */
-       ibm440ep_fixup_clocks(sysclk, 6 * 1843200);
+       ibm440gx_fixup_clocks(sysclk, 6 * 1843200, 25000000);
 
        ibm4xx_sdram_fixup_memsize();
 
-       dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);
+       dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);
+       dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);
 
        ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
 }