linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: marek.vasut@gmail.com (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] pxa/vpac270: add ide support
Date: Mon, 26 Apr 2010 21:46:07 +0200	[thread overview]
Message-ID: <1272311167-576-1-git-send-email-marek.vasut@gmail.com> (raw)

This patch adds support for the on-board IDE channel. I tested this with a CDROM
connected over 2.5-3.5 IDE reduction with external power supplied to the CDROM.
This was not tested with the Voipac 270-HDD-000 (official Voipac HDD module),
but I expect no problems.

Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
---
 arch/arm/mach-pxa/Kconfig                |    1 +
 arch/arm/mach-pxa/include/mach/vpac270.h |    2 +
 arch/arm/mach-pxa/vpac270.c              |   50 ++++++++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-pxa/Kconfig b/arch/arm/mach-pxa/Kconfig
index 12e16b9..5db128c 100644
--- a/arch/arm/mach-pxa/Kconfig
+++ b/arch/arm/mach-pxa/Kconfig
@@ -258,6 +258,7 @@ config MACH_COLIBRI320
 config MACH_VPAC270
 	bool "Voipac PXA270"
 	select PXA27x
+	select HAVE_PATA_PLATFORM
 	help
 	  PXA270 based Single Board Computer.
 
diff --git a/arch/arm/mach-pxa/include/mach/vpac270.h b/arch/arm/mach-pxa/include/mach/vpac270.h
index b90b380..0d82c47 100644
--- a/arch/arm/mach-pxa/include/mach/vpac270.h
+++ b/arch/arm/mach-pxa/include/mach/vpac270.h
@@ -35,4 +35,6 @@
 
 #define	GPIO114_VPAC270_ETH_IRQ		114
 
+#define	GPIO36_VPAC270_IDE_IRQ		36
+
 #endif
diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 0a9647b..6575b8f 100644
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -23,6 +23,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/dm9000.h>
 #include <linux/ucb1400.h>
+#include <linux/ata_platform.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -138,6 +139,10 @@ static unsigned long vpac270_pin_config[] __initdata = {
 	/* I2C */
 	GPIO117_I2C_SCL,
 	GPIO118_I2C_SDA,
+
+	/* IDE */
+	GPIO36_GPIO,	/* IDE IRQ */
+	GPIO80_DREQ_1,
 };
 
 /******************************************************************************
@@ -487,6 +492,50 @@ static inline void vpac270_lcd_init(void) {}
 #endif
 
 /******************************************************************************
+ * PATA IDE
+ ******************************************************************************/
+#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
+static struct pata_platform_info vpac270_pata_pdata = {
+	.ioport_shift	= 1,
+	.irq_flags	= IRQF_TRIGGER_RISING,
+};
+
+static struct resource vpac270_ide_resources[] = {
+	[0] = {	/* I/O Base address */
+	       .start	= PXA_CS3_PHYS + 0x120,
+	       .end	= PXA_CS3_PHYS + 0x13f,
+	       .flags	= IORESOURCE_MEM
+	},
+	[1] = {	/* CTL Base address */
+	       .start	= PXA_CS3_PHYS + 0x15c,
+	       .end	= PXA_CS3_PHYS + 0x15f,
+	       .flags	= IORESOURCE_MEM
+	},
+	[2] = {	/* IDE IRQ pin */
+	       .start	= gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
+	       .end	= gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
+	       .flags	= IORESOURCE_IRQ
+	}
+};
+
+static struct platform_device vpac270_ide_device = {
+	.name		= "pata_platform",
+	.num_resources	= ARRAY_SIZE(vpac270_ide_resources),
+	.resource	= vpac270_ide_resources,
+	.dev		= {
+		.platform_data	= &vpac270_pata_pdata,
+	}
+};
+
+static void __init vpac270_ide_init(void)
+{
+	platform_device_register(&vpac270_ide_device);
+}
+#else
+static inline void vpac270_ide_init(void) {}
+#endif
+
+/******************************************************************************
  * Machine init
  ******************************************************************************/
 static void __init vpac270_init(void)
@@ -507,6 +556,7 @@ static void __init vpac270_init(void)
 	vpac270_eth_init();
 	vpac270_ts_init();
 	vpac270_rtc_init();
+	vpac270_ide_init();
 }
 
 MACHINE_START(VPAC270, "Voipac PXA270")
-- 
1.7.0

             reply	other threads:[~2010-04-26 19:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-04-26 19:46 Marek Vasut [this message]
2010-04-26 21:05 ` [PATCH] pxa/vpac270: add ide support Daniel Mack
2010-04-26 21:15   ` Marek Vasut
     [not found] ` <4BFBBECD.70803@papillon.ru>
     [not found]   ` <201005251438.09494.marek.vasut@gmail.com>
2010-05-25 12:39     ` vpack270 and sleep mode Marek Vasut
2010-05-25 13:26       ` 237 Rumjantsev Egor (PROG)
2010-05-25 15:02         ` Marek Vasut
2010-05-25 15:35           ` 237 Rumjantsev Egor (PROG)
2010-05-25 20:24         ` Russell King - ARM Linux
2010-05-25 20:47           ` Marek Vasut
2010-05-26  3:47             ` 237 Rumjantsev Egor (PROG)
2010-05-26  9:07               ` Russell King - ARM Linux
2010-05-26  9:19                 ` 237 Rumjantsev Egor (PROG)
2010-05-26  9:27                   ` Russell King - ARM Linux
2010-05-26  9:50                     ` 237 Rumjantsev Egor (PROG)
2010-05-26  9:50                   ` Lothar Waßmann
2010-05-26 10:43                     ` 237 Rumjantsev Egor (PROG)

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=1272311167-576-1-git-send-email-marek.vasut@gmail.com \
    --to=marek.vasut@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.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;
as well as URLs for NNTP newsgroup(s).