Merge git://git.denx.de/u-boot-x86

[u-boot] / arch / x86 / cpu / quark / msg_port.c

diff --git a/arch/x86/cpu/quark/msg_port.c b/arch/x86/cpu/quark/msg_port.c
index 31713e321f2cf6c02e8b80f2458c38491d642fed..cf828f21c0104f9acf8fbb6cdbe3c11c54c23bde 100644 (file)
--- a/arch/x86/cpu/quark/msg_port.c
+++ b/arch/x86/cpu/quark/msg_port.c
@@ -5,34 +5,34 @@
  */
 
 #include <common.h>
-#include <pci.h>
 #include <asm/arch/device.h>
 #include <asm/arch/msg_port.h>
+#include <asm/arch/quark.h>
 
 void msg_port_setup(int op, int port, int reg)
 {
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_REG,
-                              (((op) << 24) | ((port) << 16) |
-                              (((reg) << 8) & 0xff00) | MSG_BYTE_ENABLE));
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_REG,
+                                  (((op) << 24) | ((port) << 16) |
+                                  (((reg) << 8) & 0xff00) | MSG_BYTE_ENABLE));
 }
 
 u32 msg_port_read(u8 port, u32 reg)
 {
        u32 value;
 
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_READ, port, reg);
-       pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+       qrk_pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
 
        return value;
 }
 
 void msg_port_write(u8 port, u32 reg, u32 value)
 {
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_WRITE, port, reg);
 }
 
@@ -40,19 +40,19 @@ u32 msg_port_alt_read(u8 port, u32 reg)
 {
        u32 value;
 
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_ALT_READ, port, reg);
-       pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+       qrk_pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
 
        return value;
 }
 
 void msg_port_alt_write(u8 port, u32 reg, u32 value)
 {
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_ALT_WRITE, port, reg);
 }
 
@@ -60,18 +60,18 @@ u32 msg_port_io_read(u8 port, u32 reg)
 {
        u32 value;
 
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_IO_READ, port, reg);
-       pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
+       qrk_pci_read_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, &value);
 
        return value;
 }
 
 void msg_port_io_write(u8 port, u32 reg, u32 value)
 {
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
-       pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
-                              reg & 0xffffff00);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_DATA_REG, value);
+       qrk_pci_write_config_dword(QUARK_HOST_BRIDGE, MSG_CTRL_EXT_REG,
+                                  reg & 0xffffff00);
        msg_port_setup(MSG_OP_IO_WRITE, port, reg);
 }