diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-11 00:07:03 -0400 |
commit | cd04b947bc674f8fc9cac38ec30497bae5d664ad (patch) | |
tree | 988b0b7ea08063e5499672346eb2f619f0629717 /arch/ppc/syslib/ibm440gx_common.c | |
parent | b3df9f813bc7b9db62ae0c90b8990b1cebf97345 (diff) | |
parent | bc68552faad0e134eb22281343d5ae5a4873fa80 (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc/syslib/ibm440gx_common.c')
-rw-r--r-- | arch/ppc/syslib/ibm440gx_common.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c index 4ad85e0e0234..d4776af6a3ca 100644 --- a/arch/ppc/syslib/ibm440gx_common.c +++ b/arch/ppc/syslib/ibm440gx_common.c | |||
@@ -34,6 +34,10 @@ void __init ibm440gx_get_clocks(struct ibm44x_clocks* p, unsigned int sys_clk, | |||
34 | u32 plld = CPR_READ(DCRN_CPR_PLLD); | 34 | u32 plld = CPR_READ(DCRN_CPR_PLLD); |
35 | u32 uart0 = SDR_READ(DCRN_SDR_UART0); | 35 | u32 uart0 = SDR_READ(DCRN_SDR_UART0); |
36 | u32 uart1 = SDR_READ(DCRN_SDR_UART1); | 36 | u32 uart1 = SDR_READ(DCRN_SDR_UART1); |
37 | #ifdef CONFIG_440EP | ||
38 | u32 uart2 = SDR_READ(DCRN_SDR_UART2); | ||
39 | u32 uart3 = SDR_READ(DCRN_SDR_UART3); | ||
40 | #endif | ||
37 | 41 | ||
38 | /* Dividers */ | 42 | /* Dividers */ |
39 | u32 fbdv = __fix_zero((plld >> 24) & 0x1f, 32); | 43 | u32 fbdv = __fix_zero((plld >> 24) & 0x1f, 32); |
@@ -96,6 +100,17 @@ bypass: | |||
96 | p->uart1 = ser_clk; | 100 | p->uart1 = ser_clk; |
97 | else | 101 | else |
98 | p->uart1 = p->plb / __fix_zero(uart1 & 0xff, 256); | 102 | p->uart1 = p->plb / __fix_zero(uart1 & 0xff, 256); |
103 | #ifdef CONFIG_440EP | ||
104 | if (uart2 & 0x00800000) | ||
105 | p->uart2 = ser_clk; | ||
106 | else | ||
107 | p->uart2 = p->plb / __fix_zero(uart2 & 0xff, 256); | ||
108 | |||
109 | if (uart3 & 0x00800000) | ||
110 | p->uart3 = ser_clk; | ||
111 | else | ||
112 | p->uart3 = p->plb / __fix_zero(uart3 & 0xff, 256); | ||
113 | #endif | ||
99 | } | 114 | } |
100 | 115 | ||
101 | /* Issue L2C diagnostic command */ | 116 | /* Issue L2C diagnostic command */ |