Enhance io.h for periphals origin design on x86 systems. For example, pci, ide, etc.

Signed-off-by: Macpaul Lin macpaul@andestech.com --- arch/nds32/include/asm/io.h | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/nds32/include/asm/io.h b/arch/nds32/include/asm/io.h index 2c105f7..39c3dc8 100644 --- a/arch/nds32/include/asm/io.h +++ b/arch/nds32/include/asm/io.h @@ -165,6 +165,24 @@ static inline unsigned int readl(unsigned int *addr) #define __raw_base_readw(base, off) __arch_base_getw(base, off) #define __raw_base_readl(base, off) __arch_base_getl(base, off)

+#define out_arch(type, endian, a, v) __raw_write##type(cpu_to_##endian(v), a) +#define in_arch(type, endian, a) endian##_to_cpu(__raw_read##type(a)) + +#define out_le32(a, v) out_arch(l, le32, a, v) +#define out_le16(a, v) out_arch(w, le16, a, v) + +#define in_le32(a) in_arch(l, le32, a) +#define in_le16(a) in_arch(w, le16, a) + +#define out_be32(a, v) out_arch(l, be32, a, v) +#define out_be16(a, v) out_arch(w, be16, a, v) + +#define in_be32(a) in_arch(l, be32, a) +#define in_be16(a) in_arch(w, be16, a) + +#define out_8(a, v) __raw_writeb(v, a) +#define in_8(a) __raw_readb(a) + /* * Now, pick up the machine-defined IO definitions * #include <asm/arch/io.h>

Fix incorrect information display format when probing the device.

Signed-off-by: Macpaul Lin macpaul@andestech.com --- Changes for v2: - Replace the display format of device name.

drivers/block/ftide020.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/block/ftide020.c b/drivers/block/ftide020.c index 4a7a07f..ad8fdad 100644 --- a/drivers/block/ftide020.c +++ b/drivers/block/ftide020.c @@ -316,10 +316,9 @@ int ide_preinit(void)

/* auto-detect IDE controller */ if (ftide_controller_probe()) { - printf("Faraday %s driver version %s\n", FTIDE_IP_NAME, - FTIDE_DRIVER_VERSION); + printf("FTIDE020_S\n"); } else { - printf("Faraday ATA controller not found.\n"); + printf("FTIDE020_S ATA controller not found.\n"); return API_ENODEV; }