diff mbox

[U-Boot,v2,11/12] x86: Misc PCI touchups

Message ID 1320755603-8695-12-git-send-email-graeme.russ@gmail.com
State Accepted
Delegated to: Graeme Russ
Headers show

Commit Message

Graeme Russ Nov. 8, 2011, 12:33 p.m. UTC 
Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
---
Changes for v1:
 - None (skipped to set single version for consolidated series)
Changes for v2:
 - Consolidated patch series
 - Removed non x86 modification to drivers/pci/pci.c

 arch/x86/cpu/sc520/sc520_pci.c |    4 +---
 arch/x86/include/asm/pci.h     |    2 +-
 arch/x86/lib/pci_type1.c       |   10 +++++++---
 3 files changed, 9 insertions(+), 7 deletions(-)

--
1.7.5.2.317.g391b14

Comments

Graeme Russ Nov. 12, 2011, 10:12 a.m. UTC | #1 
On 08/11/11 23:33, Graeme Russ wrote:
> Signed-off-by: Graeme Russ <graeme.russ@gmail.com>
> ---
> Changes for v1:
>  - None (skipped to set single version for consolidated series)
> Changes for v2:
>  - Consolidated patch series
>  - Removed non x86 modification to drivers/pci/pci.c
> 
>  arch/x86/cpu/sc520/sc520_pci.c |    4 +---
>  arch/x86/include/asm/pci.h     |    2 +-
>  arch/x86/lib/pci_type1.c       |   10 +++++++---
>  3 files changed, 9 insertions(+), 7 deletions(-)

Applied to u-boot-x86

Thanks,

Graeme
diff mbox

Patch

diff --git a/arch/x86/cpu/sc520/sc520_pci.c b/arch/x86/cpu/sc520/sc520_pci.c
index a13798f..52d07c1 100644
--- a/arch/x86/cpu/sc520/sc520_pci.c
+++ b/arch/x86/cpu/sc520/sc520_pci.c
@@ -130,9 +130,7 @@  void pci_sc520_init(struct pci_controller *hose)
 	hose->last_busno = 0xff;
 	hose->region_count = pci_set_regions(hose);

-	pci_setup_type1(hose,
-			SC520_REG_ADDR,
-			SC520_REG_DATA);
+	pci_setup_type1(hose);

 	pci_register_hose(hose);

diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index c09078e..37cc7e3 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -29,7 +29,7 @@ 
 #define DEFINE_PCI_DEVICE_TABLE(_table) \
 	const struct pci_device_id _table[]

-void pci_setup_type1(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data);
+void pci_setup_type1(struct pci_controller *hose);
 int pci_enable_legacy_video_ports(struct pci_controller* hose);
 int pci_shadow_rom(pci_dev_t dev, unsigned char *dest);
 void pci_remove_rom_window(struct pci_controller* hose, u32 addr);
diff --git a/arch/x86/lib/pci_type1.c b/arch/x86/lib/pci_type1.c
index 6fc4df4..a25fa05 100644
--- a/arch/x86/lib/pci_type1.c
+++ b/arch/x86/lib/pci_type1.c
@@ -50,7 +50,11 @@  TYPE1_PCI_OP(write, byte, u8, outb, 3)
 TYPE1_PCI_OP(write, word, u16, outw, 2)
 TYPE1_PCI_OP(write, dword, u32, outl, 0)

-void pci_setup_type1(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
+/* bus mapping constants (used for PCI core initialization) */
+#define PCI_REG_ADDR		0x00000cf8
+#define PCI_REG_DATA		0x00000cfc
+
+void pci_setup_type1(struct pci_controller *hose)
 {
 	pci_set_ops(hose,
 		    type1_read_config_byte,
@@ -60,6 +64,6 @@  void pci_setup_type1(struct pci_controller *hose, u32 cfg_addr, u32 cfg_data)
 		    type1_write_config_word,
 		    type1_write_config_dword);

-	hose->cfg_addr = (unsigned int *)cfg_addr;
-	hose->cfg_data = (unsigned char *)cfg_data;
+	hose->cfg_addr = (unsigned int *)PCI_REG_ADDR;
+	hose->cfg_data = (unsigned char *)PCI_REG_DATA;
 }