Luc Verhaegen has uploaded this change for review.

View Change

ati: add spi access enable

Change-Id: Ibd68fb11237a39857ba6a4bb69e89589afd8c198
Signed-off-by: Luc Verhaegen <libv@skynet.be>
---
M ati_spi.c
1 file changed, 37 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/88/29088/1
diff --git a/ati_spi.c b/ati_spi.c
index 97c056a..ee5041d 100644
--- a/ati_spi.c
+++ b/ati_spi.c
@@ -32,6 +32,7 @@

int (*save) (struct flashrom_pci_device *device);
int (*restore) (struct flashrom_pci_device *device);
+ int (*enable) (struct flashrom_pci_device *device);
};

#define R600_GENERAL_PWRMGT 0x0618
@@ -144,10 +145,42 @@
return 0;
}

+/*
+ * Enable SPI Access.
+ */
+static int
+r600_spi_enable(struct flashrom_pci_device *device)
+{
+ msg_pdbg("%s();\n", __func__);
+
+ /* software enable clock gating and set sck divider to 1 */
+ mmio_mask(R600_ROM_CNTL, 0x10000002, 0xF0000002);
+
+ /* set gpio7,8,9 low */
+ mmio_mask(R600_GPIOPAD_A, 0, 0x0700);
+ /* gpio7 is input, gpio8/9 are output */
+ mmio_mask(R600_GPIOPAD_EN, 0x0600, 0x0700);
+ /* only allow software control on gpio7,8,9 */
+ mmio_mask(R600_GPIOPAD_MASK, 0x0700, 0x0700);
+
+ /* disable open drain pads */
+ mmio_mask(R600_GENERAL_PWRMGT, 0, 0x0800);
+
+ mmio_mask(R600_CTXSW_VID_LOWER_GPIO_CNTL, 0, 0x0400);
+ mmio_mask(R600_HIGH_VID_LOWER_GPIO_CNTL, 0, 0x0400);
+ mmio_mask(R600_MEDIUM_VID_LOWER_GPIO_CNTL, 0, 0x0400);
+ mmio_mask(R600_LOW_VID_LOWER_GPIO_CNTL, 0, 0x0400);
+
+ mmio_mask(R600_LOWER_GPIO_ENABLE, 0x0400, 0x0400);
+
+ return 0;
+}
+
static const struct ati_spi_pci_private r600_spi_pci_private = {
.io_bar = 2,
.save = r600_spi_save,
.restore = r600_spi_restore,
+ .enable = r600_spi_enable,
};

const struct flashrom_pci_match ati_spi_pci_devices[] = {
@@ -189,5 +222,9 @@
if (ret)
return ret;

+ ret = private->enable(device);
+ if (ret)
+ return ret;
+
return 0;
}

To view, visit change 29088. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibd68fb11237a39857ba6a4bb69e89589afd8c198
Gerrit-Change-Number: 29088
Gerrit-PatchSet: 1
Gerrit-Owner: Luc Verhaegen <libv@skynet.be>