Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 732c611e authored by sfking@fdwdc.com's avatar sfking@fdwdc.com Committed by Greg Ungerer
Browse files

generic GPIO support misc files. 



The definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in.

Signed-off-by: default avatarSteven King <sfking@fdwdc.com>
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
parent dca7cf33

arch/m68k/include/asm/mcfsmc.h

+3 −3
Original line number Diff line number Diff line
@@ -167,15 +167,15 @@ void smc_remap(unsigned int ioaddr) 
	static int		once = 0;

	extern unsigned short	ppdata;

	if (once++ == 0) {

		*((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADDR)) = 0x00ec;

		*((volatile unsigned short *)MCFSIM_PADDR) = 0x00ec;

		ppdata |= 0x0080;

		*((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata;

		*((volatile unsigned short *)MCFSIM_PADAT) = ppdata;

		outw(0x0001, ioaddr + BANK_SELECT);

		outw(0x0001, ioaddr + BANK_SELECT);

		outw(0x0067, ioaddr + BASE);



		ppdata &= ~0x0080;

		*((volatile unsigned short *)(MCF_MBAR+MCFSIM_PADAT)) = ppdata;

		*((volatile unsigned short *)MCFSIM_PADAT) = ppdata;

	}

	

	*((volatile unsigned short *)(MCF_MBAR+MCFSIM_CSCR3)) = 0x1180;

arch/m68k/include/asm/nettel.h

+2 −2
Original line number Diff line number Diff line
@@ -48,14 +48,14 @@ extern volatile unsigned short ppdata; 
static __inline__ unsigned int mcf_getppdata(void)

{

	volatile unsigned short *pp;

	pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);

	pp = (volatile unsigned short *) MCFSIM_PADAT;

	return((unsigned int) *pp);

}



static __inline__ void mcf_setppdata(unsigned int mask, unsigned int bits)

{

	volatile unsigned short *pp;

	pp = (volatile unsigned short *) (MCF_MBAR + MCFSIM_PADAT);

	pp = (volatile unsigned short *) MCFSIM_PADAT;

	ppdata = (ppdata & ~mask) | bits;

	*pp = ppdata;

}