5 files changed, 16 insertions, 81 deletions

diff --git a/src/superio/ite/it8728f/Kconfig b/src/superio/ite/it8728f/Kconfig
index 12af418816..90c3b509af 100644
--- a/src/superio/ite/it8728f/Kconfig
+++ b/src/superio/ite/it8728f/Kconfig
@@ -17,3 +17,7 @@
 config SUPERIO_ITE_IT8728F
 	bool
 	select SUPERIO_ITE_COMMON_ROMSTAGE
+	select SUPERIO_ITE_ENV_CTRL
+	select SUPERIO_ITE_ENV_CTRL_PWM_FREQ2
+	select SUPERIO_ITE_ENV_CTRL_FAN16_CONFIG
+	select SUPERIO_ITE_ENV_CTRL_8BIT_PWM
diff --git a/src/superio/ite/it8728f/Makefile.inc b/src/superio/ite/it8728f/Makefile.inc
index e0e26f467a..fb75418e43 100644
--- a/src/superio/ite/it8728f/Makefile.inc
+++ b/src/superio/ite/it8728f/Makefile.inc
@@ -14,5 +14,4 @@
 ## GNU General Public License for more details.
 ##
 
-ramstage-$(CONFIG_SUPERIO_ITE_IT8728F) += it8728f_hwm.c
 ramstage-$(CONFIG_SUPERIO_ITE_IT8728F) += superio.c
diff --git a/src/superio/ite/it8728f/chip.h b/src/superio/ite/it8728f/chip.h
index c925c854ea..3442439b02 100644
--- a/src/superio/ite/it8728f/chip.h
+++ b/src/superio/ite/it8728f/chip.h
@@ -17,14 +17,10 @@
 #ifndef SUPERIO_ITE_IT8728F_CHIP_H
 #define SUPERIO_ITE_IT8728F_CHIP_H
 
+#include <superio/ite/common/env_ctrl_chip.h>
+
 struct superio_ite_it8728f_config {
-	/* HWM configuration registers */
-	uint8_t hwm_ctl_register;
-	uint8_t hwm_main_ctl_register;
-	uint8_t hwm_adc_temp_chan_en_reg;
-	uint8_t hwm_fan1_ctl_pwm;
-	uint8_t hwm_fan2_ctl_pwm;
-	uint8_t hwm_fan3_ctl_pwm;
+	struct ite_ec_config ec;
 };
 
 #endif /* SUPERIO_ITE_IT8728F_CHIP_H */
diff --git a/src/superio/ite/it8728f/it8728f_hwm.c b/src/superio/ite/it8728f/it8728f_hwm.c
deleted file mode 100644
index 5ab4a39bde..0000000000
--- a/src/superio/ite/it8728f/it8728f_hwm.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2014 Edward O'Callaghan <eocallaghan@alterapraxis.com>
- *
- * 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; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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 <arch/io.h>
-#include <console/console.h>
-#include <device/device.h>
-#include <device/pnp.h>
-#include "chip.h"
-#include "it8728f_internal.h"
-
-/*
- * FAN controller configuration register index's
- */
-#define HWM_MAIN_CTL_REG		 0x13	/* default 0x07 */
-#define HWM_CTL_REG			 0x14	/* default 0x40 */
-#define HWM_FAN1_CTL_PWM		 0x15	/* default 0x00 */
-#define HWM_FAN2_CTL_PWM		 0x16	/* default 0x00 */
-#define HWM_FAN3_CTL_PWM		 0x17	/* default 0x00 */
-#define HWM_ADC_TEMP_CHAN_EN_REG 0x51	/* default 0x00 */
-
-void it8728f_hwm_ec_init(struct device *dev)
-{
-	struct superio_ite_it8728f_config *conf = dev->chip_info;
-	struct resource *res = find_resource(dev, PNP_IDX_IO0);
-
-	if (!res) {
-		printk(BIOS_WARNING, "Super I/O HWM: No HWM resource found.\n");
-		return;
-	}
-	/* I/O port for HWM is at base + 5 */
-	u16 port = res->base + 5;
-
-	printk(BIOS_INFO,
-		"ITE IT8728F Super I/O HWM: Initializing Hardware Monitor..\n");
-	printk(BIOS_DEBUG,
-		"ITE IT8728F Super I/O HWM: Base Address at 0x%x\n", port);
-
-	pnp_enter_conf_mode(dev);
-	pnp_set_logical_device(dev);
-
-	/* ITE IT8728F HWM (ordered) programming sequence. */
-
-	/* configure fan polarity */
-	pnp_write_index(port, HWM_CTL_REG, conf->hwm_ctl_register);
-
-	/* enable fans 1-3 */
-	pnp_write_index(port, HWM_MAIN_CTL_REG, conf->hwm_main_ctl_register);
-
-	/* enable termistor temps for temp1-temp3 */
-	pnp_write_index(port, HWM_ADC_TEMP_CHAN_EN_REG, conf->hwm_adc_temp_chan_en_reg);
-
-	/* configure which fanX uses which tempY */
-	pnp_write_index(port, HWM_FAN1_CTL_PWM, conf->hwm_fan1_ctl_pwm);
-	pnp_write_index(port, HWM_FAN2_CTL_PWM, conf->hwm_fan2_ctl_pwm);
-	pnp_write_index(port, HWM_FAN3_CTL_PWM, conf->hwm_fan3_ctl_pwm);
-
-	pnp_exit_conf_mode(dev);
-}
diff --git a/src/superio/ite/it8728f/superio.c b/src/superio/ite/it8728f/superio.c
index 9a1ceb1778..b8c5b22a65 100644
--- a/src/superio/ite/it8728f/superio.c
+++ b/src/superio/ite/it8728f/superio.c
@@ -21,6 +21,7 @@
 #include <console/console.h>
 #include <pc80/keyboard.h>
 #include <stdlib.h>
+#include <superio/ite/common/env_ctrl.h>
 
 #include "chip.h"
 #include "it8728f.h"
@@ -28,13 +29,19 @@
 
 static void it8728f_init(struct device *dev)
 {
+	const struct superio_ite_it8728f_config *conf = dev->chip_info;
+	const struct resource *res;
+
 	if (!dev->enabled)
 		return;
 
 	switch(dev->path.pnp.device) {
-	/* TODO: Might potentially need code for HWM or FDC etc. */
+	/* TODO: Might potentially need code for FDC etc. */
 	case IT8728F_EC:
-		it8728f_hwm_ec_init(dev);
+		res = find_resource(dev, PNP_IDX_IO0);
+		if (!conf || !res)
+			break;
+		ite_ec_init(res->base, &conf->ec);
 		break;
 	case IT8728F_KBCK:
 		set_kbc_ps2_mode();