diff options
author | Markus Klotzbuecher <mk@denx.de> | 2007-09-17 17:12:45 +0200 |
---|---|---|
committer | Markus Klotzbuecher <mk@pollux.denx.de> | 2007-09-17 17:12:45 +0200 |
commit | f930922f061ea7bf585296859d1c14194c24b840 (patch) | |
tree | c46b9f120f7c55f5baf8b6ac3048ba759e10a512 /drivers/qe/qe.c | |
parent | 97213f32416ead885deafea86774e912ffd60ad0 (diff) | |
parent | 67c31036acaaaa992fc346cc89db0909a7e733c4 (diff) | |
download | u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.zip u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.gz u-boot-imx-f930922f061ea7bf585296859d1c14194c24b840.tar.bz2 |
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'drivers/qe/qe.c')
-rw-r--r-- | drivers/qe/qe.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/qe/qe.c b/drivers/qe/qe.c index 5f20962..7559e92 100644 --- a/drivers/qe/qe.c +++ b/drivers/qe/qe.c @@ -30,6 +30,8 @@ qe_map_t *qe_immr = NULL; static qe_snum_t snums[QE_NUM_OF_SNUM]; +DECLARE_GLOBAL_DATA_PTR; + void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data) { u32 cecr; @@ -51,8 +53,6 @@ void qe_issue_cmd(uint cmd, uint sbc, u8 mcn, u32 cmd_data) uint qe_muram_alloc(uint size, uint align) { - DECLARE_GLOBAL_DATA_PTR; - uint retloc; uint align_mask, off; uint savebase; @@ -98,7 +98,7 @@ static void qe_sdma_init(void) out_be32(&p->sdaqmr, 0); /* Allocate 2KB temporary buffer for sdma */ - sdma_buffer_base = qe_muram_alloc(2048, 64); + sdma_buffer_base = qe_muram_alloc(2048, 4096); out_be32(&p->sdwbcr, sdma_buffer_base & QE_SDEBCR_BA_MASK); /* Clear sdma status */ @@ -158,8 +158,6 @@ void qe_put_snum(u8 snum) void qe_init(uint qe_base) { - DECLARE_GLOBAL_DATA_PTR; - /* Init the QE IMMR base */ qe_immr = (qe_map_t *)qe_base; @@ -204,7 +202,6 @@ void qe_assign_page(uint snum, uint para_ram_base) int qe_set_brg(uint brg, uint rate) { - DECLARE_GLOBAL_DATA_PTR; volatile uint *bp; u32 divisor; int div16 = 0; |