diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:04 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 16:56:04 +0200 |
commit | 64842a68070318c4c78e99bd69de2401e65de7a5 (patch) | |
tree | 316d943b62aed976d56d23296db6a98a88e3d914 /arch | |
parent | c1ecf62939df7256f6fc77568cb7953d71746c55 (diff) | |
parent | f345734707954466350b9d0f8e478ed06951a402 (diff) | |
download | barebox-64842a68070318c4c78e99bd69de2401e65de7a5.tar.gz barebox-64842a68070318c4c78e99bd69de2401e65de7a5.tar.xz |
Merge branch 'for-next/pci'
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/boards/gateworks-ventana/board.c | 29 | ||||
-rw-r--r-- | arch/arm/lib32/barebox.lds.S | 12 |
2 files changed, 41 insertions, 0 deletions
diff --git a/arch/arm/boards/gateworks-ventana/board.c b/arch/arm/boards/gateworks-ventana/board.c index 3ff142ee42..6f9e0343be 100644 --- a/arch/arm/boards/gateworks-ventana/board.c +++ b/arch/arm/boards/gateworks-ventana/board.c @@ -17,6 +17,7 @@ #include <i2c/i2c.h> #include <init.h> #include <linux/marvell_phy.h> +#include <linux/pci.h> #include <linux/phy.h> #include <mach/bbu.h> #include <mach/imx6.h> @@ -111,3 +112,31 @@ static int gw54xx_coredevices_init(void) return 0; } coredevice_initcall(gw54xx_coredevices_init); + +/* + * fixup for PLX PEX8909 bridge to configure GPIO1-7 as output High + * as they are used for slots1-7 PERST# + */ +static void ventana_pciesw_early_fixup(struct pci_dev *dev) +{ + u32 dw; + + if (!of_machine_is_compatible("gw,ventana")) + return; + + if (dev->devfn != 0) + return; + + pci_read_config_dword(dev, 0x62c, &dw); + dw |= 0xaaa8; // GPIO1-7 outputs + pci_write_config_dword(dev, 0x62c, dw); + + pci_read_config_dword(dev, 0x644, &dw); + dw |= 0xfe; // GPIO1-7 output high + pci_write_config_dword(dev, 0x644, dw); + + mdelay(100); +} +DECLARE_PCI_FIXUP_EARLY(0x10b5, 0x8609, ventana_pciesw_early_fixup); +DECLARE_PCI_FIXUP_EARLY(0x10b5, 0x8606, ventana_pciesw_early_fixup); +DECLARE_PCI_FIXUP_EARLY(0x10b5, 0x8604, ventana_pciesw_early_fixup); diff --git a/arch/arm/lib32/barebox.lds.S b/arch/arm/lib32/barebox.lds.S index 594bf56837..7230e5f31f 100644 --- a/arch/arm/lib32/barebox.lds.S +++ b/arch/arm/lib32/barebox.lds.S @@ -106,6 +106,18 @@ SECTIONS __usymtab : { BAREBOX_SYMS } __usymtab_end = .; +#ifdef CONFIG_PCI + __start_pci_fixups_early = .; + .pci_fixup_early : { KEEP(*(.pci_fixup_early)) } + __end_pci_fixups_early = .; + __start_pci_fixups_header = .; + .pci_fixup_header : { KEEP(*(.pci_fixup_header)) } + __end_pci_fixups_header = .; + __start_pci_fixups_enable = .; + .pci_fixup_enable : { KEEP(*(.pci_fixup_enable)) } + __end_pci_fixups_enable = .; +#endif + .oftables : { BAREBOX_CLK_TABLE() } .dtb : { BAREBOX_DTB() } |