[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>

diff --git a/arch/powerpc/sysdev/commproc.c b/arch/powerpc/sysdev/commproc.c
index f6a63780bbde5b3bcd7223cc34e0a85f6293f9a3..74d9372493489d280a3b7c8ef19f44c7e69ab91b 100644 (file)
--- 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);
        }
 }