summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorJon Loeliger <jdl@freescale.com>2006-07-31 09:53:08 -0500
committerJon Loeliger <jdl@freescale.com>2006-07-31 09:53:08 -0500
commit3aeec2860471f12f17aa19ce4799ff7f3d335b05 (patch)
tree49aeccfae1a1870c260fbe44db121bd1fbd90b31 /board
parent12d1ff4c18832d26d2bb8aaab240aaa06c2a83eb (diff)
parent71748af833ca1017edf1415be376366ff2937d17 (diff)
downloadu-boot-imx-3aeec2860471f12f17aa19ce4799ff7f3d335b05.zip
u-boot-imx-3aeec2860471f12f17aa19ce4799ff7f3d335b05.tar.gz
u-boot-imx-3aeec2860471f12f17aa19ce4799ff7f3d335b05.tar.bz2
Merge branch 'mpc86xx'
Diffstat (limited to 'board')
-rw-r--r--board/mpc8641hpcn/mpc8641hpcn.c64
-rw-r--r--board/mpc8641hpcn/oftree.dts2
2 files changed, 65 insertions, 1 deletions
diff --git a/board/mpc8641hpcn/mpc8641hpcn.c b/board/mpc8641hpcn/mpc8641hpcn.c
index 2626ccc..5023c1c 100644
--- a/board/mpc8641hpcn/mpc8641hpcn.c
+++ b/board/mpc8641hpcn/mpc8641hpcn.c
@@ -359,3 +359,67 @@ my_usage:
puts("For example: reset cf 40 2.5 10\n");
puts("See MPC8641HPCN Design Workbook for valid values of command line parameters.\n");
}
+
+/*
+ * get_board_sys_clk
+ * Reads the FPGA on board for CONFIG_SYS_CLK_FREQ
+ */
+
+unsigned long get_board_sys_clk(ulong dummy)
+{
+ u8 i, go_bit, rd_clks;
+ ulong val = 0;
+
+ go_bit = in8(PIXIS_BASE + PIXIS_VCTL);
+ go_bit &= 0x01;
+
+ rd_clks = in8(PIXIS_BASE + PIXIS_VCFGEN0);
+ rd_clks &= 0x1C;
+
+ /*
+ * Only if both go bit and the SCLK bit in VCFGEN0 are set
+ * should we be using the AUX register. Remember, we also set the
+ * GO bit to boot from the alternate bank on the on-board flash
+ */
+
+ if (go_bit) {
+ if (rd_clks == 0x1c)
+ i = in8(PIXIS_BASE + PIXIS_AUX);
+ else
+ i = in8(PIXIS_BASE + PIXIS_SPD);
+ } else {
+ i = in8(PIXIS_BASE + PIXIS_SPD);
+ }
+
+ i &= 0x07;
+
+ switch (i) {
+ case 0:
+ val = 33000000;
+ break;
+ case 1:
+ val = 40000000;
+ break;
+ case 2:
+ val = 50000000;
+ break;
+ case 3:
+ val = 66000000;
+ break;
+ case 4:
+ val = 83000000;
+ break;
+ case 5:
+ val = 100000000;
+ break;
+ case 6:
+ val = 134000000;
+ break;
+ case 7:
+ val = 166000000;
+ break;
+ }
+
+ return val;
+}
+
diff --git a/board/mpc8641hpcn/oftree.dts b/board/mpc8641hpcn/oftree.dts
index e3f5efa..742a140 100644
--- a/board/mpc8641hpcn/oftree.dts
+++ b/board/mpc8641hpcn/oftree.dts
@@ -187,7 +187,7 @@
compatible = "ns16550";
reg = <4600 100>;
clock-frequency = <0>;
- interrupts = <2a 2>;
+ interrupts = <1c 2>;
interrupt-parent = <40000>;
};