diff options
author | Pete Popov <ppopov@embeddedalley.com> | 2005-09-15 04:03:12 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:20 -0400 |
commit | 26a940e21752e0de8f068f77dad606a7d1986937 (patch) | |
tree | 88e46225e19c4c72fa6914a21afb28c6ea52bfc6 /arch | |
parent | 64abf64d10b3a547becefeb26394dfbefac273fb (diff) |
Cleaned up AMD Au1200 IDE driver:
- converted to platform bus
- removed pci dependencies
- removed virt_to_phys/phys_to_virt calls
System now can root off of a disk.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
diff --git a/Documentation/mips/AU1xxx_IDE.README b/Documentation/mips/AU1xxx_IDE.README
new file mode 100644
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/Kconfig | 2 | ||||
-rw-r--r-- | arch/mips/au1000/common/dbdma.c | 6 | ||||
-rw-r--r-- | arch/mips/au1000/common/platform.c | 32 | ||||
-rw-r--r-- | arch/mips/au1000/pb1200/irqmap.c | 6 |
4 files changed, 41 insertions, 5 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8746e1b1621b..dc5c629af106 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -799,7 +799,7 @@ config MIPS_BOSPORUS | |||
799 | config MIPS_DB1200 | 799 | config MIPS_DB1200 |
800 | bool "AMD Alchemy DB1200 board" | 800 | bool "AMD Alchemy DB1200 board" |
801 | select SOC_AU1200 | 801 | select SOC_AU1200 |
802 | select DMA_NONCOHERENT | 802 | select DMA_COHERENT |
803 | select MIPS_DISABLE_OBSOLETE_IDE | 803 | select MIPS_DISABLE_OBSOLETE_IDE |
804 | select SYS_SUPPORTS_LITTLE_ENDIAN | 804 | select SYS_SUPPORTS_LITTLE_ENDIAN |
805 | 805 | ||
diff --git a/arch/mips/au1000/common/dbdma.c b/arch/mips/au1000/common/dbdma.c index 8f78c2fe7cf5..eb5803aed91b 100644 --- a/arch/mips/au1000/common/dbdma.c +++ b/arch/mips/au1000/common/dbdma.c | |||
@@ -197,6 +197,12 @@ find_dbdev_id (u32 id) | |||
197 | return NULL; | 197 | return NULL; |
198 | } | 198 | } |
199 | 199 | ||
200 | void * au1xxx_ddma_get_nextptr_virt(au1x_ddma_desc_t *dp) | ||
201 | { | ||
202 | return phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr)); | ||
203 | } | ||
204 | EXPORT_SYMBOL(au1xxx_ddma_get_nextptr_virt); | ||
205 | |||
200 | u32 | 206 | u32 |
201 | au1xxx_ddma_add_device(dbdev_tab_t *dev) | 207 | au1xxx_ddma_add_device(dbdev_tab_t *dev) |
202 | { | 208 | { |
diff --git a/arch/mips/au1000/common/platform.c b/arch/mips/au1000/common/platform.c index 0c3fd726c3d6..4aca18f0e290 100644 --- a/arch/mips/au1000/common/platform.c +++ b/arch/mips/au1000/common/platform.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/resource.h> | 13 | #include <linux/resource.h> |
14 | 14 | ||
15 | #include <asm/mach-au1x00/au1000.h> | 15 | #include <asm/mach-au1x00/au1xxx.h> |
16 | 16 | ||
17 | /* OHCI (USB full speed host controller) */ | 17 | /* OHCI (USB full speed host controller) */ |
18 | static struct resource au1xxx_usb_ohci_resources[] = { | 18 | static struct resource au1xxx_usb_ohci_resources[] = { |
@@ -154,7 +154,6 @@ static struct platform_device au1xxx_usb_otg_device = { | |||
154 | .resource = au1xxx_usb_otg_resources, | 154 | .resource = au1xxx_usb_otg_resources, |
155 | }; | 155 | }; |
156 | 156 | ||
157 | /*** AU1200 LCD controller ***/ | ||
158 | static struct resource au1200_lcd_resources[] = { | 157 | static struct resource au1200_lcd_resources[] = { |
159 | [0] = { | 158 | [0] = { |
160 | .start = LCD_PHYS_ADDR, | 159 | .start = LCD_PHYS_ADDR, |
@@ -168,6 +167,19 @@ static struct resource au1200_lcd_resources[] = { | |||
168 | } | 167 | } |
169 | }; | 168 | }; |
170 | 169 | ||
170 | static struct resource au1200_ide0_resources[] = { | ||
171 | [0] = { | ||
172 | .start = AU1XXX_ATA_PHYS_ADDR, | ||
173 | .end = AU1XXX_ATA_PHYS_ADDR + AU1XXX_ATA_PHYS_LEN, | ||
174 | .flags = IORESOURCE_MEM, | ||
175 | }, | ||
176 | [1] = { | ||
177 | .start = AU1XXX_ATA_INT, | ||
178 | .end = AU1XXX_ATA_INT, | ||
179 | .flags = IORESOURCE_IRQ, | ||
180 | } | ||
181 | }; | ||
182 | |||
171 | static u64 au1200_lcd_dmamask = ~(u32)0; | 183 | static u64 au1200_lcd_dmamask = ~(u32)0; |
172 | 184 | ||
173 | static struct platform_device au1200_lcd_device = { | 185 | static struct platform_device au1200_lcd_device = { |
@@ -180,6 +192,21 @@ static struct platform_device au1200_lcd_device = { | |||
180 | .num_resources = ARRAY_SIZE(au1200_lcd_resources), | 192 | .num_resources = ARRAY_SIZE(au1200_lcd_resources), |
181 | .resource = au1200_lcd_resources, | 193 | .resource = au1200_lcd_resources, |
182 | }; | 194 | }; |
195 | |||
196 | |||
197 | static u64 ide0_dmamask = ~(u32)0; | ||
198 | |||
199 | static struct platform_device au1200_ide0_device = { | ||
200 | .name = "au1200-ide", | ||
201 | .id = 0, | ||
202 | .dev = { | ||
203 | .dma_mask = &ide0_dmamask, | ||
204 | .coherent_dma_mask = 0xffffffff, | ||
205 | }, | ||
206 | .num_resources = ARRAY_SIZE(au1200_ide0_resources), | ||
207 | .resource = au1200_ide0_resources, | ||
208 | }; | ||
209 | |||
183 | #endif | 210 | #endif |
184 | 211 | ||
185 | static struct platform_device *au1xxx_platform_devices[] __initdata = { | 212 | static struct platform_device *au1xxx_platform_devices[] __initdata = { |
@@ -194,6 +221,7 @@ static struct platform_device *au1xxx_platform_devices[] __initdata = { | |||
194 | &au1xxx_usb_gdt_device, | 221 | &au1xxx_usb_gdt_device, |
195 | &au1xxx_usb_otg_device, | 222 | &au1xxx_usb_otg_device, |
196 | &au1200_lcd_device, | 223 | &au1200_lcd_device, |
224 | &au1200_ide0_device, | ||
197 | #endif | 225 | #endif |
198 | }; | 226 | }; |
199 | 227 | ||
diff --git a/arch/mips/au1000/pb1200/irqmap.c b/arch/mips/au1000/pb1200/irqmap.c index 2ec64e78aa01..59e70e5cf325 100644 --- a/arch/mips/au1000/pb1200/irqmap.c +++ b/arch/mips/au1000/pb1200/irqmap.c | |||
@@ -22,6 +22,7 @@ | |||
22 | * with this program; if not, write to the Free Software Foundation, Inc., | 22 | * with this program; if not, write to the Free Software Foundation, Inc., |
23 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 23 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
24 | */ | 24 | */ |
25 | #include <linux/config.h> | ||
25 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
27 | #include <linux/irq.h> | 28 | #include <linux/irq.h> |
@@ -65,7 +66,7 @@ int au1xxx_nr_irqs = sizeof(au1xxx_irq_map)/sizeof(au1xxx_irq_map_t); | |||
65 | */ | 66 | */ |
66 | static volatile int pb1200_cascade_en=0; | 67 | static volatile int pb1200_cascade_en=0; |
67 | 68 | ||
68 | void pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs) | 69 | irqreturn_t pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs) |
69 | { | 70 | { |
70 | unsigned short bisr = bcsr->int_status; | 71 | unsigned short bisr = bcsr->int_status; |
71 | int extirq_nr = 0; | 72 | int extirq_nr = 0; |
@@ -78,6 +79,7 @@ void pb1200_cascade_handler( int irq, void *dev_id, struct pt_regs *regs) | |||
78 | /* Ack and dispatch IRQ */ | 79 | /* Ack and dispatch IRQ */ |
79 | do_IRQ(extirq_nr,regs); | 80 | do_IRQ(extirq_nr,regs); |
80 | } | 81 | } |
82 | return IRQ_RETVAL(1); | ||
81 | } | 83 | } |
82 | 84 | ||
83 | inline void pb1200_enable_irq(unsigned int irq_nr) | 85 | inline void pb1200_enable_irq(unsigned int irq_nr) |
@@ -97,7 +99,7 @@ static unsigned int pb1200_startup_irq( unsigned int irq_nr ) | |||
97 | if (++pb1200_cascade_en == 1) | 99 | if (++pb1200_cascade_en == 1) |
98 | { | 100 | { |
99 | request_irq(AU1000_GPIO_7, &pb1200_cascade_handler, | 101 | request_irq(AU1000_GPIO_7, &pb1200_cascade_handler, |
100 | 0, "Pb1200 Cascade", &pb1200_cascade_handler ); | 102 | 0, "Pb1200 Cascade", (void *)&pb1200_cascade_handler ); |
101 | #ifdef CONFIG_MIPS_PB1200 | 103 | #ifdef CONFIG_MIPS_PB1200 |
102 | /* We have a problem with CPLD rev3. Enable a workaround */ | 104 | /* We have a problem with CPLD rev3. Enable a workaround */ |
103 | if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3) | 105 | if( ((bcsr->whoami & BCSR_WHOAMI_CPLD)>>4) <= 3) |