1 files changed, 72 insertions, 33 deletions

diff --git a/ogp_spi.c b/ogp_spi.c
index e603edb8b..d85c82306 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -18,7 +18,8 @@
 #include <string.h>
 #include "flash.h"
 #include "programmer.h"
-#include "hwaccess.h"
+#include "hwaccess_physmap.h"
+#include "platform/pci.h"
 
 #define PCI_VENDOR_ID_OGP 0x1227
 
@@ -36,68 +37,87 @@
 #define OGA1_XP10_CPROM_SCK			     0x0058 /*	W */
 #define OGA1_XP10_CPROM_REG_SEL			     0x005C /*	W */
 
-static uint8_t *ogp_spibar;
+struct ogp_spi_data {
+	uint8_t *spibar;
 
-static uint32_t ogp_reg_sel;
-static uint32_t ogp_reg_siso;
-static uint32_t ogp_reg__ce;
-static uint32_t ogp_reg_sck;
+	uint32_t reg_sel;
+	uint32_t reg_siso;
+	uint32_t reg__ce;
+	uint32_t reg_sck;
+};
 
-const struct dev_entry ogp_spi[] = {
+static const struct dev_entry ogp_spi[] = {
 	{PCI_VENDOR_ID_OGP, 0x0000, OK, "Open Graphics Project", "Development Board OGD1"},
 
 	{0},
 };
 
-static void ogp_request_spibus(void)
+static void ogp_request_spibus(void *spi_data)
 {
-	pci_mmio_writel(1, ogp_spibar + ogp_reg_sel);
+	struct ogp_spi_data *data = spi_data;
+	pci_mmio_writel(1, data->spibar + data->reg_sel);
 }
 
-static void ogp_release_spibus(void)
+static void ogp_release_spibus(void *spi_data)
 {
-	pci_mmio_writel(0, ogp_spibar + ogp_reg_sel);
+	struct ogp_spi_data *data = spi_data;
+	pci_mmio_writel(0, data->spibar + data->reg_sel);
 }
 
-static void ogp_bitbang_set_cs(int val)
+static void ogp_bitbang_set_cs(int val, void *spi_data)
 {
-	pci_mmio_writel(val, ogp_spibar + ogp_reg__ce);
+	struct ogp_spi_data *data = spi_data;
+	pci_mmio_writel(val, data->spibar + data->reg__ce);
 }
 
-static void ogp_bitbang_set_sck(int val)
+static void ogp_bitbang_set_sck(int val, void *spi_data)
 {
-	pci_mmio_writel(val, ogp_spibar + ogp_reg_sck);
+	struct ogp_spi_data *data = spi_data;
+	pci_mmio_writel(val, data->spibar + data->reg_sck);
 }
 
-static void ogp_bitbang_set_mosi(int val)
+static void ogp_bitbang_set_mosi(int val, void *spi_data)
 {
-	pci_mmio_writel(val, ogp_spibar + ogp_reg_siso);
+	struct ogp_spi_data *data = spi_data;
+	pci_mmio_writel(val, data->spibar + data->reg_siso);
 }
 
-static int ogp_bitbang_get_miso(void)
+static int ogp_bitbang_get_miso(void *spi_data)
 {
+	struct ogp_spi_data *data = spi_data;
 	uint32_t tmp;
 
-	tmp = pci_mmio_readl(ogp_spibar + ogp_reg_siso);
+	tmp = pci_mmio_readl(data->spibar + data->reg_siso);
 	return tmp & 0x1;
 }
 
 static const struct bitbang_spi_master bitbang_spi_master_ogp = {
-	.set_cs = ogp_bitbang_set_cs,
-	.set_sck = ogp_bitbang_set_sck,
-	.set_mosi = ogp_bitbang_set_mosi,
-	.get_miso = ogp_bitbang_get_miso,
-	.request_bus = ogp_request_spibus,
-	.release_bus = ogp_release_spibus,
-	.half_period = 0,
+	.set_cs		= ogp_bitbang_set_cs,
+	.set_sck	= ogp_bitbang_set_sck,
+	.set_mosi	= ogp_bitbang_set_mosi,
+	.get_miso	= ogp_bitbang_get_miso,
+	.request_bus	= ogp_request_spibus,
+	.release_bus	= ogp_release_spibus,
+	.half_period	= 0,
 };
 
-int ogp_spi_init(void)
+static int ogp_spi_shutdown(void *data)
+{
+	free(data);
+	return 0;
+}
+
+static int ogp_spi_init(const struct programmer_cfg *cfg)
 {
 	struct pci_dev *dev = NULL;
 	char *type;
+	uint8_t *ogp_spibar;
+	uint32_t ogp_reg_sel;
+	uint32_t ogp_reg_siso;
+	uint32_t ogp_reg__ce;
+	uint32_t ogp_reg_sck;
 
-	type = extract_programmer_param("rom");
+	type = extract_programmer_param_str(cfg, "rom");
 
 	if (!type) {
 		msg_perr("Please use flashrom -p ogp_spi:rom=... to specify "
@@ -120,10 +140,7 @@ int ogp_spi_init(void)
 	}
 	free(type);
 
-	if (rget_io_perms())
-		return 1;
-
-	dev = pcidev_init(ogp_spi, PCI_BASE_ADDRESS_0);
+	dev = pcidev_init(cfg, ogp_spi, PCI_BASE_ADDRESS_0);
 	if (!dev)
 		return 1;
 
@@ -135,8 +152,30 @@ int ogp_spi_init(void)
 	if (ogp_spibar == ERROR_PTR)
 		return 1;
 
-	if (register_spi_bitbang_master(&bitbang_spi_master_ogp))
+	struct ogp_spi_data *data = calloc(1, sizeof(*data));
+	if (!data) {
+		msg_perr("Unable to allocate space for SPI master data\n");
+		return 1;
+	}
+	data->spibar = ogp_spibar;
+	data->reg_sel = ogp_reg_sel;
+	data->reg_siso = ogp_reg_siso;
+	data->reg__ce = ogp_reg__ce;
+	data->reg_sck = ogp_reg_sck;
+	if (register_shutdown(ogp_spi_shutdown, data)) {
+		free(data);
+		return 1;
+	}
+
+	if (register_spi_bitbang_master(&bitbang_spi_master_ogp, data))
 		return 1;
 
 	return 0;
 }
+
+const struct programmer_entry programmer_ogp_spi = {
+	.name			= "ogp_spi",
+	.type			= PCI,
+	.devs.dev		= ogp_spi,
+	.init			= ogp_spi_init,
+};