* [PATCH 1/2] gpio: implement x86 gpio_to_irq convert function
@ 2011-01-11 10:55 Alan Cox
2011-01-11 10:55 ` [PATCH 2/2] Fix Moorestown VRTC fixmap placement Alan Cox
2011-01-11 12:28 ` [tip:x86/urgent] x86/gpio: Implement x86 gpio_to_irq convert function tip-bot for Alek Du
0 siblings, 2 replies; 4+ messages in thread
From: Alan Cox @ 2011-01-11 10:55 UTC (permalink / raw)
To: x86, akpm, linux-kernel
From: Alek Du <alek.du@intel.com>
We need this for x86 MID platforms where GPIO interrupts are used. No special
magic is needed so the default 1:1 behaviour will do nicely.
Signed-off-by: Alek Du <alek.du@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
arch/x86/include/asm/gpio.h | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 49dbfdf..91d915a 100644
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -38,12 +38,9 @@ static inline int gpio_cansleep(unsigned int gpio)
return __gpio_cansleep(gpio);
}
-/*
- * Not implemented, yet.
- */
static inline int gpio_to_irq(unsigned int gpio)
{
- return -ENOSYS;
+ return __gpio_to_irq(gpio);
}
static inline int irq_to_gpio(unsigned int irq)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 2/2] Fix Moorestown VRTC fixmap placement
2011-01-11 10:55 [PATCH 1/2] gpio: implement x86 gpio_to_irq convert function Alan Cox
@ 2011-01-11 10:55 ` Alan Cox
2011-01-11 12:28 ` [tip:x86/urgent] x86: " tip-bot for Arjan van de Ven
2011-01-11 12:28 ` [tip:x86/urgent] x86/gpio: Implement x86 gpio_to_irq convert function tip-bot for Alek Du
1 sibling, 1 reply; 4+ messages in thread
From: Alan Cox @ 2011-01-11 10:55 UTC (permalink / raw)
To: x86, akpm, linux-kernel
From: Arjan van de Ven <arjan@linux.intel.com>
The x86 fixmaps need to be all together... unfortunately the VRTC one
was misplaced.
This patch makes sure the MRST VRTC fixmap is put prior to the
__end_of_permanent_fixed_addresses marker.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
arch/x86/include/asm/fixmap.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 0141b23..4729b2b 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -116,11 +116,11 @@ enum fixed_addresses {
#endif
FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
- __end_of_permanent_fixed_addresses,
-
#ifdef CONFIG_X86_MRST
FIX_LNW_VRTC,
#endif
+ __end_of_permanent_fixed_addresses,
+
/*
* 256 temporary boot-time mappings, used by early_ioremap(),
* before ioremap() is functional.
^ permalink raw reply [flat|nested] 4+ messages in thread* [tip:x86/urgent] x86: Fix Moorestown VRTC fixmap placement
2011-01-11 10:55 ` [PATCH 2/2] Fix Moorestown VRTC fixmap placement Alan Cox
@ 2011-01-11 12:28 ` tip-bot for Arjan van de Ven
0 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Arjan van de Ven @ 2011-01-11 12:28 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, alan, hpa, mingo, arjan, tglx, mingo
Commit-ID: fa36e956c5027d9a985d555d104d293c0a98d2c3
Gitweb: http://git.kernel.org/tip/fa36e956c5027d9a985d555d104d293c0a98d2c3
Author: Arjan van de Ven <arjan@linux.intel.com>
AuthorDate: Tue, 11 Jan 2011 10:55:56 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 11 Jan 2011 12:46:16 +0100
x86: Fix Moorestown VRTC fixmap placement
The x86 fixmaps need to be all together... unfortunately the
VRTC one was misplaced.
This patch makes sure the MRST VRTC fixmap is put prior to the
__end_of_permanent_fixed_addresses marker.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20110111105544.24448.27607.stgit@bob.linux.org.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/fixmap.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/fixmap.h b/arch/x86/include/asm/fixmap.h
index 0141b23..4729b2b 100644
--- a/arch/x86/include/asm/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
@@ -116,11 +116,11 @@ enum fixed_addresses {
#endif
FIX_TEXT_POKE1, /* reserve 2 pages for text_poke() */
FIX_TEXT_POKE0, /* first page is last, because allocation is backward */
- __end_of_permanent_fixed_addresses,
-
#ifdef CONFIG_X86_MRST
FIX_LNW_VRTC,
#endif
+ __end_of_permanent_fixed_addresses,
+
/*
* 256 temporary boot-time mappings, used by early_ioremap(),
* before ioremap() is functional.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:x86/urgent] x86/gpio: Implement x86 gpio_to_irq convert function
2011-01-11 10:55 [PATCH 1/2] gpio: implement x86 gpio_to_irq convert function Alan Cox
2011-01-11 10:55 ` [PATCH 2/2] Fix Moorestown VRTC fixmap placement Alan Cox
@ 2011-01-11 12:28 ` tip-bot for Alek Du
1 sibling, 0 replies; 4+ messages in thread
From: tip-bot for Alek Du @ 2011-01-11 12:28 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, alan, hpa, mingo, alek.du, jacob.jun.pan, tglx, mingo
Commit-ID: 718c45bd1aa80c4e23a0ee204c973e3014e94708
Gitweb: http://git.kernel.org/tip/718c45bd1aa80c4e23a0ee204c973e3014e94708
Author: Alek Du <alek.du@intel.com>
AuthorDate: Tue, 11 Jan 2011 10:55:32 +0000
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 11 Jan 2011 12:46:15 +0100
x86/gpio: Implement x86 gpio_to_irq convert function
We need this for x86 MID platforms where GPIO interrupts are
used. No special magic is needed so the default 1:1 behaviour
will do nicely.
Signed-off-by: Alek Du <alek.du@intel.com>
Signed-off-by: Jacob Pan <jacob.jun.pan@intel.com>
Signed-off-by: Alan Cox <alan@linux.intel.com>
LKML-Reference: <20110111105439.24448.69863.stgit@bob.linux.org.uk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/gpio.h | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/gpio.h b/arch/x86/include/asm/gpio.h
index 49dbfdf..91d915a 100644
--- a/arch/x86/include/asm/gpio.h
+++ b/arch/x86/include/asm/gpio.h
@@ -38,12 +38,9 @@ static inline int gpio_cansleep(unsigned int gpio)
return __gpio_cansleep(gpio);
}
-/*
- * Not implemented, yet.
- */
static inline int gpio_to_irq(unsigned int gpio)
{
- return -ENOSYS;
+ return __gpio_to_irq(gpio);
}
static inline int irq_to_gpio(unsigned int irq)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-11 12:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-11 10:55 [PATCH 1/2] gpio: implement x86 gpio_to_irq convert function Alan Cox
2011-01-11 10:55 ` [PATCH 2/2] Fix Moorestown VRTC fixmap placement Alan Cox
2011-01-11 12:28 ` [tip:x86/urgent] x86: " tip-bot for Arjan van de Ven
2011-01-11 12:28 ` [tip:x86/urgent] x86/gpio: Implement x86 gpio_to_irq convert function tip-bot for Alek Du
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®