X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fsuperio%2Fite%2Fit8712f%2Fit8712f_early_serial.c;h=dd84245dc4a3c3f10e58fd6a5791e6ef375b3c06;hb=3aca4b5734e13dc5a40d238421be8c0f072ee552;hp=7839732787bdec4317acef44d4bcedfc410dbd66;hpb=0f4282b538213c17913821bc8e84877074838edf;p=coreboot.git

diff --git a/src/superio/ite/it8712f/it8712f_early_serial.c b/src/superio/ite/it8712f/it8712f_early_serial.c
index 783973278..dd84245dc 100644
--- a/src/superio/ite/it8712f/it8712f_early_serial.c
+++ b/src/superio/ite/it8712f/it8712f_early_serial.c
@@ -45,10 +45,10 @@ static void it8712f_sio_write(uint8_t ldn, uint8_t index, uint8_t value)
 	outb(value, SIO_DATA);
 }
 
-/* Enable the peripheral devices on the IT8712F Super I/O chip. */
-static void it8712f_enable_serial(device_t dev, unsigned iobase)
+
+static void it8712f_enter_conf(void)
 {
-	/* (1) Enter the configuration state (MB PnP mode). */
+	/*  Enter the configuration state (MB PnP mode). */
 
 	/* Perform MB PnP setup to put the SIO chip at 0x2e. */
 	/* Base address 0x2e: 0x87 0x01 0x55 0x55. */
@@ -57,6 +57,32 @@ static void it8712f_enable_serial(device_t dev, unsigned iobase)
 	outb(0x01, IT8712F_CONFIGURATION_PORT);
 	outb(0x55, IT8712F_CONFIGURATION_PORT);
 	outb(0x55, IT8712F_CONFIGURATION_PORT);
+}
+
+static void it8712f_exit_conf(void)
+{
+	/* Exit the configuration state (MB PnP mode). */
+	it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CC, 0x02);
+}
+
+
+static void it8712f_24mhz_clkin(void)
+{
+	it8712f_enter_conf();
+
+	/* Select 24MHz CLKIN (48MHZ default)*/
+	it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CLOCKSEL, 0x1);
+
+	it8712f_exit_conf();
+
+}
+
+/* Enable the peripheral devices on the IT8712F Super I/O chip. */
+static void it8712f_enable_serial(device_t dev, unsigned iobase)
+{
+
+	/* (1) Enter the configuration state (MB PnP mode). */
+	it8712f_enter_conf();
 
 	/* (2) Modify the data of configuration registers. */
 
@@ -69,13 +95,9 @@ static void it8712f_enable_serial(device_t dev, unsigned iobase)
 	it8712f_sio_write(IT8712F_SP1,  0x30, 0x1); /* Serial port 1 */
 	it8712f_sio_write(IT8712F_SP2,  0x30, 0x1); /* Serial port 2 */
 
-	/* Select 24MHz CLKIN (set bit 0). */
-	it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CLOCKSEL, 0x01);
-
 	/* Clear software suspend mode (clear bit 0). TODO: Needed? */
 	/* it8712f_sio_write(0x00, IT8712F_CONFIG_REG_SWSUSP, 0x00); */
 
 	/* (3) Exit the configuration state (MB PnP mode). */
-	it8712f_sio_write(0x00, IT8712F_CONFIG_REG_CC, 0x02);
+	it8712f_exit_conf();
 }
-