Commit 22ca3643 authored by Anton Blanchard's avatar Anton Blanchard

ppc64: IDE fixes from Linas Vepstas

parent 9d6cb0a2
...@@ -359,7 +359,7 @@ _GLOBAL(_outsl) ...@@ -359,7 +359,7 @@ _GLOBAL(_outsl)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(ide_insw) /* _GLOBAL(ide_insw) now in drivers/ide/ide-iops.c */
_GLOBAL(_insw_ns) _GLOBAL(_insw_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
...@@ -371,7 +371,7 @@ _GLOBAL(_insw_ns) ...@@ -371,7 +371,7 @@ _GLOBAL(_insw_ns)
bdnz 00b bdnz 00b
blr blr
_GLOBAL(ide_outsw) /* _GLOBAL(ide_outsw) now in drivers/ide/ide-iops.c */
_GLOBAL(_outsw_ns) _GLOBAL(_outsw_ns)
cmpwi 0,r5,0 cmpwi 0,r5,0
mtctr r5 mtctr r5
......
...@@ -17,6 +17,12 @@ ...@@ -17,6 +17,12 @@
#include <asm/memory.h> #include <asm/memory.h>
#include <asm/delay.h> #include <asm/delay.h>
#define __ide_mm_insw(p, a, c) _insw_ns((volatile u16 *)(p), (a), (c))
#define __ide_mm_insl(p, a, c) _insl_ns((volatile u32 *)(p), (a), (c))
#define __ide_mm_outsw(p, a, c) _outsw_ns((volatile u16 *)(p), (a), (c))
#define __ide_mm_outsl(p, a, c) _outsl_ns((volatile u32 *)(p), (a), (c))
#define SIO_CONFIG_RA 0x398 #define SIO_CONFIG_RA 0x398
#define SIO_CONFIG_RD 0x399 #define SIO_CONFIG_RD 0x399
...@@ -93,7 +99,7 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl); ...@@ -93,7 +99,7 @@ extern void _outsl_ns(volatile u32 *port, const void *buf, int nl);
#define inw_p(port) inw(port) #define inw_p(port) inw(port)
#define outw_p(val, port) (udelay(1), outw((val), (port))) #define outw_p(val, port) (udelay(1), outw((val), (port)))
#define inl_p(port) inl(port) #define inl_p(port) inl(port)
#define outl_p(val, port) (udelay(1), outl((val, (port))) #define outl_p(val, port) (udelay(1), outl((val), (port)))
/* /*
* The *_ns versions below don't do byte-swapping. * The *_ns versions below don't do byte-swapping.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment