7 files changed, 93 insertions, 84 deletions
diff --git a/src/drivers/i2c/ck505/Kconfig b/src/drivers/i2c/ck505/Kconfig
new file mode 100644
index 0000000000..43826a0fe9
--- /dev/null
+++ b/src/drivers/i2c/ck505/Kconfig
@@ -0,0 +1,2 @@
+config DRIVERS_I2C_CK505
+	bool
diff --git a/src/drivers/i2c/ck505/Makefile.inc b/src/drivers/i2c/ck505/Makefile.inc
new file mode 100644
index 0000000000..5ccf4a86cd
--- /dev/null
+++ b/src/drivers/i2c/ck505/Makefile.inc
@@ -0,0 +1 @@
+ramstage-$(CONFIG_DRIVERS_I2C_CK505) += ck505.c
diff --git a/src/drivers/ics/954309/chip.h b/src/drivers/i2c/ck505/chip.h
index cc52857917..8ce297cb53 100644
--- a/src/drivers/ics/954309/chip.h
+++ b/src/drivers/i2c/ck505/chip.h
@@ -14,17 +14,13 @@
  * GNU General Public License for more details.
  */
 
-struct drivers_ics_954309_config {
-	u8 reg0;
-	u8 reg1;
-	u8 reg2;
-	u8 reg3;
-	u8 reg4;
-	u8 reg5;
-	u8 reg6;
-	u8 reg7;
-	u8 reg8;
-	u8 reg9;
-	u8 reg10;
-	u8 reg11;
+#ifndef DRIVERS_CK505_CHIP_H
+#define DRIVERS_CK505_CHIP_H
+
+struct drivers_i2c_ck505_config {
+	const int nregs;
+	const u8 regs[32];
+	const u8 mask[32];
 };
+
+#endif
diff --git a/src/drivers/i2c/ck505/ck505.c b/src/drivers/i2c/ck505/ck505.c
new file mode 100644
index 0000000000..4f1e51e02a
--- /dev/null
+++ b/src/drivers/i2c/ck505/ck505.c
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; version 2 of
+ * the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <assert.h>
+#include <console/console.h>
+#include <device/device.h>
+#include <device/smbus.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <device/pci_ops.h>
+#include <cpu/x86/msr.h>
+#include "chip.h"
+#include <string.h>
+
+#define SMBUS_BLOCK_SIZE 32
+
+static void ck505_init(struct device *dev)
+{
+	struct drivers_i2c_ck505_config *config;
+	int dev_nregs, nregs;
+	u8 block[SMBUS_BLOCK_SIZE];
+	int i;
+
+	if (!dev->enabled || dev->path.type != DEVICE_PATH_I2C)
+		return;
+
+	config = dev->chip_info;
+
+	dev_nregs = smbus_block_read(dev, 0, sizeof(block), block);
+
+	if (dev_nregs < 0) {
+		printk(BIOS_ERR, "Failed reading ck505 configuration!\n");
+		return;
+	}
+
+	/* This means that the devicetree doesn't have to specify nregs */
+	nregs = MIN(MIN(dev_nregs, config->nregs == 0 ? SMBUS_BLOCK_SIZE
+				: config->nregs), ARRAY_SIZE(config->mask));
+
+
+	printk(BIOS_DEBUG, "Changing %d of the %d ck505 config bytes.\n",
+		nregs, dev_nregs);
+
+	assert(ARRAY_SIZE(config->mask) == ARRAY_SIZE(config->regs));
+
+	for (i = 0; i < nregs && i < SMBUS_BLOCK_SIZE; i++)
+		block[i] = (block[i] & ~config->mask[i]) | config->regs[i];
+
+	if (smbus_block_write(dev, 0, dev_nregs, block) < 0)
+		printk(BIOS_ERR, "Failed writing ck505 configuration!\n");
+}
+
+static struct device_operations ck505_operations = {
+	.read_resources		= DEVICE_NOOP,
+	.set_resources		= DEVICE_NOOP,
+	.enable_resources	= DEVICE_NOOP,
+	.init			= ck505_init,
+};
+
+static void enable_dev(struct device *dev)
+{
+	dev->ops = &ck505_operations;
+}
+
+struct chip_operations drivers_i2c_ck505_ops = {
+	CHIP_NAME("CK505 Clock generator")
+	.enable_dev = enable_dev,
+};
diff --git a/src/drivers/ics/954309/Kconfig b/src/drivers/ics/954309/Kconfig
deleted file mode 100644
index 43840a3b37..0000000000
--- a/src/drivers/ics/954309/Kconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-config DRIVERS_ICS_954309
-	bool
diff --git a/src/drivers/ics/954309/Makefile.inc b/src/drivers/ics/954309/Makefile.inc
deleted file mode 100644
index 1c66a8ca9a..0000000000
--- a/src/drivers/ics/954309/Makefile.inc
+++ /dev/null
@@ -1 +0,0 @@
-ramstage-$(CONFIG_DRIVERS_ICS_954309) += ics954309.c
diff --git a/src/drivers/ics/954309/ics954309.c b/src/drivers/ics/954309/ics954309.c
deleted file mode 100644
index a3d1d810af..0000000000
--- a/src/drivers/ics/954309/ics954309.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2011 Sven Schnelle <svens@stackframe.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <console/console.h>
-#include <device/device.h>
-#include <device/smbus.h>
-#include <device/pci.h>
-#include <device/pci_ids.h>
-#include <device/pci_ops.h>
-#include <cpu/x86/msr.h>
-#include "chip.h"
-#include <string.h>
-
-static void ics954309_init(struct device *dev)
-{
-	struct drivers_ics_954309_config *config;
-	u8 initdata[12];
-
-	if (!dev->enabled || dev->path.type != DEVICE_PATH_I2C)
-		return;
-
-	config = dev->chip_info;
-
-	initdata[0] = config->reg0;
-	initdata[1] = config->reg1;
-	initdata[2] = config->reg2;
-	initdata[3] = config->reg3;
-	initdata[4] = config->reg4;
-	initdata[5] = config->reg5;
-	initdata[6] = config->reg6;
-	initdata[7] = config->reg7;
-	initdata[8] = config->reg8;
-	initdata[9] = config->reg9;
-	initdata[10] = config->reg10;
-	initdata[11] = config->reg11;
-
-	smbus_block_write(dev, 0, 12, initdata);
-}
-
-static struct device_operations ics954309_operations = {
-	.read_resources   = DEVICE_NOOP,
-	.set_resources    = DEVICE_NOOP,
-	.enable_resources = DEVICE_NOOP,
-	.init             = ics954309_init,
-};
-
-static void enable_dev(struct device *dev)
-{
-	dev->ops = &ics954309_operations;
-}
-
-struct chip_operations drivers_ics_954309_ops = {
-	CHIP_NAME("ICS 954309 Clock generator")
-	.enable_dev = enable_dev,
-};