diff options
| author | Jon Loeliger <jdl@freescale.com> | 2008-01-03 09:46:55 -0600 |
|---|---|---|
| committer | Jon Loeliger <jdl@freescale.com> | 2008-01-03 09:46:55 -0600 |
| commit | 2c3536425d987bf079258973e2acebaaef3e16b6 (patch) | |
| tree | 659d06dd33eca4888e1f6d01d046507b76dc2d27 /cpu/mpc85xx/qe_io.c | |
| parent | f743931f9b4d4e15c9bdfe726bef033ea1f1402c (diff) | |
| parent | ce37422d0002e10490e268392e0c4e3028e52cec (diff) | |
| download | u-boot-imx-2c3536425d987bf079258973e2acebaaef3e16b6.zip u-boot-imx-2c3536425d987bf079258973e2acebaaef3e16b6.tar.gz u-boot-imx-2c3536425d987bf079258973e2acebaaef3e16b6.tar.bz2 | |
Merge commit 'wd/master'
Diffstat (limited to 'cpu/mpc85xx/qe_io.c')
| -rw-r--r-- | cpu/mpc85xx/qe_io.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc85xx/qe_io.c b/cpu/mpc85xx/qe_io.c index 8878bc5..98075bb 100644 --- a/cpu/mpc85xx/qe_io.c +++ b/cpu/mpc85xx/qe_io.c @@ -34,9 +34,9 @@ void qe_config_iopin(u8 port, u8 pin, int dir, int open_drain, int assign) u32 pin_2bit_assign; u32 pin_1bit_mask; u32 tmp_val; - volatile immap_t *im = (volatile immap_t *)CFG_IMMR; + volatile ccsr_gur_t *gur = (void *)(CFG_MPC85xx_GUTS_ADDR); volatile par_io_t *par_io = (volatile par_io_t *) - &(im->im_gur.qe_par_io); + &(gur->qe_par_io); /* Caculate pin location and 2bit mask and dir */ pin_2bit_mask = (u32)(0x3 << (NUM_OF_PINS-(pin%(NUM_OF_PINS/2)+1)*2)); |