* [PATCH] Kirkwood: Fix explanation of MPP45 for QNAP TS41x
@ 2010-05-25 17:20 Martin Michlmayr
0 siblings, 0 replies; 2+ messages in thread
From: Martin Michlmayr @ 2010-05-25 17:20 UTC (permalink / raw)
To: linux-arm-kernel
On the QNAP TS-41x, MPP45 is used to show the setting of jumper JP1.
Fix the documentation to explain what the settings really indicate.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
--- a/arch/arm/mach-kirkwood/ts41x-setup.c 2010-05-24 14:22:37.000000000 +0000
+++ b/arch/arm/mach-kirkwood/ts41x-setup.c 2010-05-24 14:23:05.000000000 +0000
@@ -105,7 +105,7 @@
MPP37_GPIO, /* Reset button */
MPP43_GPIO, /* USB Copy button */
MPP44_GPIO, /* Board ID: 0: TS-419U, 1: TS-419 */
- MPP45_GPIO, /* JP1: 0: console, 1: LCD */
+ MPP45_GPIO, /* JP1: 0: LCD, 1: serial console */
MPP46_GPIO, /* External SATA HDD1 error indicator */
MPP47_GPIO, /* External SATA HDD2 error indicator */
MPP48_GPIO, /* External SATA HDD3 error indicator */
--
Martin Michlmayr
http://www.cyrius.com/
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] Kirkwood: Fix explanation of MPP45 for QNAP TS41x
@ 2010-05-26 1:21 Nicolas Pitre
0 siblings, 0 replies; 2+ messages in thread
From: Nicolas Pitre @ 2010-05-26 1:21 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, 25 May 2010, Martin Michlmayr wrote:
> On the QNAP TS-41x, MPP45 is used to show the setting of jumper JP1.
> Fix the documentation to explain what the settings really indicate.
>
> Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
I've applied your one-liners to the orion.git repo on git.kernel.org. I
should push them toward mainline after -rc1 is out.
Nicolas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-05-26 1:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-25 17:20 [PATCH] Kirkwood: Fix explanation of MPP45 for QNAP TS41x Martin Michlmayr
-- strict thread matches above, loose matches on Subject: below --
2010-05-26 1:21 Nicolas Pitre
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).