From: Magnus Damm <magnus.damm@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH] sh: Rework sh7720 GPIO header usage
Date: Mon, 29 Sep 2008 10:46:26 +0000 [thread overview]
Message-ID: <20080929104626.5354.80315.sendpatchset@rx1.opensource.se> (raw)
From: Magnus Damm <damm@igel.co.jp>
This patch reworks the sh7720 gpio includes. Makes space for the
generic GPIO code.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
---
Compile tested with the magicpanelr2_defconfig.
arch/sh/include/asm/gpio.h | 8 --------
arch/sh/include/asm/magicpanelr2.h | 2 +-
drivers/serial/sh-sci.h | 4 +++-
3 files changed, 4 insertions(+), 10 deletions(-)
--- 0001/arch/sh/include/asm/gpio.h
+++ work/arch/sh/include/asm/gpio.h 2008-09-29 15:31:10.000000000 +0900
@@ -1,10 +1,6 @@
/*
* include/asm-sh/gpio.h
*
- * Copyright (C) 2007 Markus Brunner, Mark Jonas
- *
- * Addresses for the Pin Function Controller
- *
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
* for more details.
@@ -12,8 +8,4 @@
#ifndef __ASM_SH_GPIO_H
#define __ASM_SH_GPIO_H
-#if defined(CONFIG_CPU_SH3)
-#include <cpu/gpio.h>
-#endif
-
#endif /* __ASM_SH_GPIO_H */
--- 0001/arch/sh/include/asm/magicpanelr2.h
+++ work/arch/sh/include/asm/magicpanelr2.h 2008-09-29 15:31:10.000000000 +0900
@@ -13,7 +13,7 @@
#ifndef __ASM_SH_MAGICPANELR2_H
#define __ASM_SH_MAGICPANELR2_H
-#include <asm/gpio.h>
+#include <cpu-sh3/cpu/gpio.h>
#define __IO_PREFIX mpr2
#include <asm/io_generic.h>
--- 0001/drivers/serial/sh-sci.h
+++ work/drivers/serial/sh-sci.h 2008-09-29 15:31:10.000000000 +0900
@@ -1,7 +1,9 @@
#include <linux/serial_core.h>
#include <asm/io.h>
-#include <asm/gpio.h>
+#ifdef CONFIG_CPU_SH3
+#include <cpu-sh3/cpu/gpio.h>
+#endif
#if defined(CONFIG_H83007) || defined(CONFIG_H83068)
#include <asm/regs306x.h>
#endif
next reply other threads:[~2008-09-29 10:46 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-09-29 10:46 Magnus Damm [this message]
2008-09-29 11:17 ` [PATCH] sh: Rework sh7720 GPIO header usage Paul Mundt
2008-09-29 11:20 ` Paul Mundt
2008-09-30 6:27 ` Mark Jonas
2008-09-30 6:40 ` Paul Mundt
2008-09-30 9:31 ` Magnus Damm
2008-09-30 18:25 ` Mark Jonas
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=20080929104626.5354.80315.sendpatchset@rx1.opensource.se \
--to=magnus.damm@gmail.com \
--cc=linux-sh@vger.kernel.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