summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <jrigby@freescale.com>2008-01-30 13:36:57 -0700
committerWolfgang Denk <wd@denx.de>2008-02-07 01:08:10 +0100
commitac9152830d7fdebace8a260b7737ef2870c21ca0 (patch)
tree3ed5432e177e9e7e03816ca507f603d306e6941e
parentde55d18df3ff2ea614624e74793de7c43520e0e7 (diff)
downloadu-boot-imx-ac9152830d7fdebace8a260b7737ef2870c21ca0.zip
u-boot-imx-ac9152830d7fdebace8a260b7737ef2870c21ca0.tar.gz
u-boot-imx-ac9152830d7fdebace8a260b7737ef2870c21ca0.tar.bz2
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>
-rw-r--r--cpu/mpc512x/cpu.c6
-rw-r--r--include/configs/ads5121.h5
2 files changed, 6 insertions, 5 deletions
diff --git a/cpu/mpc512x/cpu.c b/cpu/mpc512x/cpu.c
index 6421a51..bed77ac 100644
--- 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 ce458ae5..973f348 100644
--- 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 */