diff options
| author |   Jochen Friedrich <jochen@scram.de> | 2007-11-22 17:54:13 +0100 |
|---|---|---|
| committer |   Kumar Gala <galak@kernel.crashing.org> | 2007-12-13 22:46:42 -0600 |
| commit | 721c0c8af1a27941a34af5046aae4a8369c8404c (patch) | |
| tree | e21e70bf584b22296019f7ca4a97529f1f1f1d1d | |
| parent | [POWERPC] 8xx: Convert mpc866ads to the new device binding. (diff) | |
| download | linux-dev-721c0c8af1a27941a34af5046aae4a8369c8404c.tar.xz linux-dev-721c0c8af1a27941a34af5046aae4a8369c8404c.zip | |
[POWERPC] Add support for PORTA and PORTB odr registers
PORTA and PORTB have odr registers, as well. However, the PORTB odr
register is only 16bit.
Signed-off-by: Jochen Friedrich <jochen@scram.de>
Acked-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Vitaly Bordug <vitb@kernel.crashing.org>
| -rw-r--r-- | arch/powerpc/sysdev/commproc.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c index f6a63780bbde..74d937249348 100644 --- a/arch/powerpc/sysdev/commproc.c +++ b/arch/powerpc/sysdev/commproc.c @@ -408,7 +408,7 @@ EXPORT_SYMBOL(cpm_dpram_phys); #endif /* !CONFIG_PPC_CPM_NEW_BINDING */ struct cpm_ioport16 { - __be16 dir, par, sor, dat, intr; + __be16 dir, par, odr_sor, dat, intr; __be16 res[3]; }; @@ -438,6 +438,13 @@ static void cpm1_set_pin32(int port, int pin, int flags) else clrbits32(&iop->par, pin); + if (port == CPM_PORTB) { + if (flags & CPM_PIN_OPENDRAIN) + setbits16(&mpc8xx_immr->im_cpm.cp_pbodr, pin); + else + clrbits16(&mpc8xx_immr->im_cpm.cp_pbodr, pin); + } + if (port == CPM_PORTE) { if (flags & CPM_PIN_SECONDARY) setbits32(&iop->sor, pin); @@ -471,11 +478,17 @@ static void cpm1_set_pin16(int port, int pin, int flags) else clrbits16(&iop->par, pin); + if (port == CPM_PORTA) { + if (flags & CPM_PIN_OPENDRAIN) + setbits16(&iop->odr_sor, pin); + else + clrbits16(&iop->odr_sor, pin); + } if (port == CPM_PORTC) { if (flags & CPM_PIN_SECONDARY) - setbits16(&iop->sor, pin); + setbits16(&iop->odr_sor, pin); else - clrbits16(&iop->sor, pin); + clrbits16(&iop->odr_sor, pin); } } |