diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/southbridge/intel/bd82x6x/smihandler.c | 17 | ||||
| -rw-r--r-- | src/southbridge/intel/bd82x6x/usb_ehci.c | 13 |
2 files changed, 16 insertions, 14 deletions
diff --git a/src/southbridge/intel/bd82x6x/smihandler.c b/src/southbridge/intel/bd82x6x/smihandler.c index 28337f69133f..bf03b1a51df1 100644 --- a/src/southbridge/intel/bd82x6x/smihandler.c +++ b/src/southbridge/intel/bd82x6x/smihandler.c @@ -1,20 +1,21 @@ /* SPDX-License-Identifier: GPL-2.0-only */ -#include <types.h> #include <arch/io.h> -#include <device/pci_ops.h> -#include <console/console.h> #include <commonlib/region.h> -#include <device/pci_def.h> -#include <cpu/x86/smm.h> +#include <console/console.h> #include <cpu/intel/em64t101_save_state.h> +#include <cpu/intel/model_206ax/model_206ax.h> +#include <cpu/x86/smm.h> +#include <device/mmio.h> +#include <device/pci_def.h> +#include <device/pci_ops.h> #include <northbridge/intel/sandybridge/sandybridge.h> #include <soc/nvs.h> #include <southbridge/intel/bd82x6x/me.h> +#include <southbridge/intel/common/finalize.h> #include <southbridge/intel/common/gpio.h> -#include <cpu/intel/model_206ax/model_206ax.h> #include <southbridge/intel/common/pmutil.h> -#include <southbridge/intel/common/finalize.h> +#include <types.h> #include "pch.h" @@ -168,7 +169,7 @@ static void xhci_a0_suspend_smm_workaround(void) /* Steps 3 to 6: If USB3 PORTSC current connect status (bit 0) is set, do IOBP magic */ for (unsigned int port = 0; port < 4; port++) { - if (read32((void *)(xhci_bar + XHCI_PORTSC_x_USB3(port))) & (1 << 0)) + if (read32p((xhci_bar + XHCI_PORTSC_x_USB3(port))) & (1 << 0)) pch_iobp_update(0xec000082 + 0x100 * port, ~0, 3 << 2); } diff --git a/src/southbridge/intel/bd82x6x/usb_ehci.c b/src/southbridge/intel/bd82x6x/usb_ehci.c index 3661aba4f2c5..1cb260ae7398 100644 --- a/src/southbridge/intel/bd82x6x/usb_ehci.c +++ b/src/southbridge/intel/bd82x6x/usb_ehci.c @@ -2,12 +2,13 @@ #include <console/console.h> #include <device/device.h> -#include <device/pci.h> -#include <device/pci_ids.h> -#include "pch.h" -#include <device/pci_ehci.h> #include <device/mmio.h> +#include <device/pci_ehci.h> +#include <device/pci_ids.h> #include <device/pci_ops.h> +#include <device/pci.h> + +#include "pch.h" static void usb_ehci_init(struct device *dev) { @@ -46,8 +47,8 @@ static void usb_ehci_init(struct device *dev) res = probe_resource(dev, PCI_BASE_ADDRESS_0); if (res) { /* Number of ports and companion controllers. */ - reg32 = read32((void *)(uintptr_t)(res->base + 4)); - write32((void *)(uintptr_t)(res->base + 4), + reg32 = read32p((uintptr_t)(res->base + 4)); + write32p((uintptr_t)(res->base + 4), (reg32 & 0xfff00000) | 3); } |