Device tree updates

Changes to match 5121 device tree going mainline in 2.6.25.

Change OF_SOC from "soc5121" to plain "soc".
Remove unneeded "ref-frequency" fixups.
Remove "address" enetaddr fixup.

Add bus-frequency fixup for old OF_SOC so old
kernels with old device trees will work with new
u-boot with 66MHz IPS clock

Signed-off-by: John Rigby <jrigby@freescale.com>

diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 6421a511e423a49fe1d87c60c993c5f252c49e25..bed77acaa93a6a570b527318168a526d33cbcfca 100644 (file)
--- a/cpu/mpc512x/cpu.c
+++ b/cpu/mpc512x/cpu.c
@@ -138,11 +138,11 @@ void ft_cpu_setup(void *blob, bd_t *bd)
 
        do_fixup_by_path_u32(blob, cpu_path, "timebase-frequency", OF_TBCLK, 1);
        do_fixup_by_path_u32(blob, cpu_path, "bus-frequency", bd->bi_busfreq, 1);
-       do_fixup_by_path_u32(blob, cpu_path, "ref-frequency", CFG_MPC512X_CLKIN, 1);
        do_fixup_by_path_u32(blob, cpu_path, "clock-frequency", bd->bi_intfreq, 1);
        do_fixup_by_path_u32(blob, "/" OF_SOC, "bus-frequency", bd->bi_ipsfreq, 1);
-       do_fixup_by_path_u32(blob, "/" OF_SOC, "ref-frequency", CFG_MPC512X_CLKIN, 1);
-       do_fixup_by_path(blob, eth_path, "address", bd->bi_enetaddr, 6, 0);
        do_fixup_by_path(blob, eth_path, "local-mac-address", bd->bi_enetaddr, 6, 0);
+
+       /* this is so old kernels with old device trees will boot */
+       do_fixup_by_path_u32(blob, "/" OF_SOC_OLD, "bus-frequency", bd->bi_ipsfreq, 0);
 }
 #endif

diff --git a/include/configs/ads5121.h b/include/configs/ads5121.h
index ce458ae5b8789200ebee271ea9c1ded8c7b0f2b0..973f348dd5cf50f5c9cc16325628c1d1b3812090 100644 (file)
--- a/include/configs/ads5121.h
+++ b/include/configs/ads5121.h
@@ -415,8 +415,9 @@
 #define CONFIG_OF_BOARD_SETUP  1
 
 #define OF_CPU                 "PowerPC,5121@0"
-#define OF_SOC                 "soc5121@80000000"
+#define OF_SOC                 "soc@80000000"
+#define OF_SOC_OLD             "soc5121@80000000"
 #define OF_TBCLK               (bd->bi_busfreq / 4)
-#define OF_STDOUT_PATH         "/soc5121@80000000/serial@11300"
+#define OF_STDOUT_PATH         "/soc@80000000/serial@11300"
 
 #endif /* __CONFIG_H */