From: sfking@fdwdc.com
To: linux-kernel@vger.kernel.org
Cc: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Subject: [PATCH 13/13] generic GPIO support misc files.
Date: Fri, 19 Jun 2009 18:11:12 -0700 [thread overview]
Message-ID: <1245460272-4329-14-git-send-email-sfking@fdwdc.com> (raw)
In-Reply-To: <1245460272-4329-13-git-send-email-sfking@fdwdc.com>
The definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in.
Signed-off-by: Steven King <sfking@fdwdc.com>
---
arch/m68k/include/asm/mcfsmc.h | 6 +++---
arch/m68k/include/asm/nettel.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/m68k/include/asm/mcfsmc.h b/arch/m68k/include/asm/mcfsmc.h
index 2d7a4db..527bea5 100644
--- a/arch/m68k/include/asm/mcfsmc.h
+++ b/arch/m68k/include/asm/mcfsmc.h
@@ -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;
diff --git a/arch/m68k/include/asm/nettel.h b/arch/m68k/include/asm/nettel.h
index 0299f6a..4dec2d9 100644
--- a/arch/m68k/include/asm/nettel.h
+++ b/arch/m68k/include/asm/nettel.h
@@ -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;
}
--
1.5.6.5
_______________________________________________
uClinux-dev mailing list
uClinux-dev@uclinux.org
http://mailman.uclinux.org/mailman/listinfo/uclinux-dev
This message was resent by uclinux-dev@uclinux.org
To unsubscribe see:
http://mailman.uclinux.org/mailman/options/uclinux-dev
next prev parent reply other threads:[~2009-06-20 1:11 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-20 1:10 [PATCH 00/13] revised Coldfire generic GPIO (mk68nommu) sfking
2009-06-20 1:11 ` [PATCH 01/13] core generic GPIO support for Freescale Coldfire processors sfking
2009-06-20 1:11 ` [PATCH 02/13] generic GPIO support for the Freescale Coldfire 5206 sfking
2009-06-20 1:11 ` [PATCH 03/13] generic GPIO support for the Freescale Coldire 5206e sfking
2009-06-20 1:11 ` [PATCH 04/13] generic GPIO support for the Freescale Coldfire 520x sfking
2009-06-20 1:11 ` [PATCH 05/13] generic GPIO support for the Freescale Coldfire 523x sfking
2009-06-20 1:11 ` [PATCH 06/13] generic GPIO support for the Freescale Coldfire 5249 sfking
2009-06-20 1:11 ` [PATCH 07/13] generic GPIO support for the Freescale Coldfire 527x sfking
2009-06-20 1:11 ` [PATCH 08/13] generic GPIO support for the Freescale Coldfire 5272 sfking
2009-06-20 1:11 ` [PATCH 09/13] generic GPIO support for the Freescale Coldfire 528x sfking
2009-06-20 1:11 ` [PATCH 10/13] generic GPIO support for the Freescale Coldfire 5307 sfking
2009-06-20 1:11 ` [PATCH 11/13] generic GPIO support for the Freescale Coldfire 532x sfking
2009-06-20 1:11 ` [PATCH 12/13] generic GPIO support for the Freescale Coldfire 5407 sfking
2009-06-20 1:11 ` sfking [this message]
2009-06-24 5:57 ` [PATCH 00/13] revised Coldfire generic GPIO (mk68nommu) Greg Ungerer
2009-06-24 19:09 ` Steven King
2009-07-02 4:36 ` Greg Ungerer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1245460272-4329-14-git-send-email-sfking@fdwdc.com \
--to=sfking@fdwdc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=uclinux-dev@uclinux.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox