<p>Keith Hui has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/21332">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">winbond/w83697hf: Drop early_serial.c<br><br>It is already using winbond_enable_serial(). Once<br>w83697hf_set_clksel_48() is unified into winbond/common/early_init.c,<br>this file is no longer needed and can be dropped.<br><br>Change-Id: I7424233b5d70e143721038493f194760f07346a1<br>Signed-off-by: Keith Hui <buurin@gmail.com><br>---<br>M src/superio/winbond/w83697hf/Makefile.inc<br>D src/superio/winbond/w83697hf/early_serial.c<br>M src/superio/winbond/w83697hf/w83697hf.h<br>3 files changed, 0 insertions(+), 62 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/21332/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/src/superio/winbond/w83697hf/Makefile.inc b/src/superio/winbond/w83697hf/Makefile.inc<br>index 3b521ed..d1ef2b0 100644<br>--- a/src/superio/winbond/w83697hf/Makefile.inc<br>+++ b/src/superio/winbond/w83697hf/Makefile.inc<br>@@ -14,5 +14,4 @@<br> ## GNU General Public License for more details.<br> ##<br> <br>-romstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += early_serial.c<br> ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c<br>diff --git a/src/superio/winbond/w83697hf/early_serial.c b/src/superio/winbond/w83697hf/early_serial.c<br>deleted file mode 100644<br>index 48d76e0..0000000<br>--- a/src/superio/winbond/w83697hf/early_serial.c<br>+++ /dev/null<br>@@ -1,54 +0,0 @@<br>-/*<br>- * This file is part of the coreboot project.<br>- *<br>- * Copyright (C) 2008 Sean Nelson <snelson@nmt.edu><br>- *<br>- * This program is free software; you can redistribute it and/or modify<br>- * it under the terms of the GNU General Public License as published by<br>- * the Free Software Foundation; either version 2 of the License, or<br>- * (at your option) any later version.<br>- *<br>- * This program is distributed in the hope that it will be useful,<br>- * but WITHOUT ANY WARRANTY; without even the implied warranty of<br>- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br>- * GNU General Public License for more details.<br>- */<br>-<br>-#include <arch/io.h><br>-#include <device/pnp_def.h><br>-#include "w83697hf.h"<br>-<br>-static void pnp_enter_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0x87, port);<br>- outb(0x87, port);<br>-}<br>-<br>-static void pnp_exit_ext_func_mode(pnp_devfn_t dev)<br>-{<br>- u16 port = dev >> 8;<br>- outb(0xaa, port);<br>-}<br>-<br>-void w83697hf_set_clksel_48(pnp_devfn_t dev)<br>-{<br>- u8 reg8;<br>-<br>- pnp_enter_ext_func_mode(dev);<br>- reg8 = pnp_read_config(dev, 0x24);<br>- reg8 |= (1 << 6); /* Set the clock input to 48MHz. */<br>- pnp_write_config(dev, 0x24, reg8);<br>- pnp_exit_ext_func_mode(dev);<br>-}<br>-<br>-/* Depreciated, use winbond_enable_serial() */<br>-void w83697hf_enable_serial(pnp_devfn_t dev, u16 iobase)<br>-{<br>- pnp_enter_ext_func_mode(dev);<br>- pnp_set_logical_device(dev);<br>- pnp_set_enable(dev, 0);<br>- pnp_set_iobase(dev, PNP_IDX_IO0, iobase);<br>- pnp_set_enable(dev, 1);<br>- pnp_exit_ext_func_mode(dev);<br>-}<br>diff --git a/src/superio/winbond/w83697hf/w83697hf.h b/src/superio/winbond/w83697hf/w83697hf.h<br>index 756fa98..52466a8 100644<br>--- a/src/superio/winbond/w83697hf/w83697hf.h<br>+++ b/src/superio/winbond/w83697hf/w83697hf.h<br>@@ -17,8 +17,6 @@<br> #ifndef SUPERIO_WINBOND_W83697HF_H<br> #define SUPERIO_WINBOND_W83697HF_H<br> <br>-#include <arch/io.h><br>-<br> #define W83697HF_FDC 0 /* Floppy */<br> #define W83697HF_PP 1 /* Parallel port */<br> #define W83697HF_SP1 2 /* Com1 */<br>@@ -29,10 +27,5 @@<br> #define W83697HF_GPIO234 9 /* GPIO 2, 3, 4 */<br> #define W83697HF_ACPI 10 /* ACPI */<br> #define W83697HF_HWM 11 /* Hardware monitor */<br>-<br>-void w83697hf_set_clksel_48(pnp_devfn_t);<br>-<br>-/* Depreciated, use winbond_enable_serial() */<br>-void w83697hf_enable_serial(pnp_devfn_t dev, u16 iobase);<br> <br> #endif /* SUPERIO_WINBOND_W83697HF_H */<br></pre><p>To view, visit <a href="https://review.coreboot.org/21332">change 21332</a>. To unsubscribe, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/21332"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I7424233b5d70e143721038493f194760f07346a1 </div>
<div style="display:none"> Gerrit-Change-Number: 21332 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Keith Hui <buurin@gmail.com> </div>