[coreboot-gerrit] Change in coreboot[master]: winbond/w83697hf: Drop early_serial.c

[Keith Hui (Code Review)]

Keith Hui has uploaded this change for review. ( https://review.coreboot.org/21332


Change subject: winbond/w83697hf: Drop early_serial.c
......................................................................

winbond/w83697hf: Drop early_serial.c

It is already using winbond_enable_serial(). Once
w83697hf_set_clksel_48() is unified into winbond/common/early_init.c,
this file is no longer needed and can be dropped.

Change-Id: I7424233b5d70e143721038493f194760f07346a1
Signed-off-by: Keith Hui <buurin at gmail.com>
---
M src/superio/winbond/w83697hf/Makefile.inc
D src/superio/winbond/w83697hf/early_serial.c
M src/superio/winbond/w83697hf/w83697hf.h
3 files changed, 0 insertions(+), 62 deletions(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/32/21332/1

diff --git a/src/superio/winbond/w83697hf/Makefile.inc b/src/superio/winbond/w83697hf/Makefile.inc
index 3b521ed..d1ef2b0 100644
--- a/src/superio/winbond/w83697hf/Makefile.inc
+++ b/src/superio/winbond/w83697hf/Makefile.inc
@@ -14,5 +14,4 @@
 ## GNU General Public License for more details.
 ##
 
-romstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += early_serial.c
 ramstage-$(CONFIG_SUPERIO_WINBOND_W83697HF) += superio.c
diff --git a/src/superio/winbond/w83697hf/early_serial.c b/src/superio/winbond/w83697hf/early_serial.c
deleted file mode 100644
index 48d76e0..0000000
--- a/src/superio/winbond/w83697hf/early_serial.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2008 Sean Nelson <snelson at nmt.edu>
- *
- * 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 <device/pnp_def.h>
-#include "w83697hf.h"
-
-static void pnp_enter_ext_func_mode(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(0x87, port);
-	outb(0x87, port);
-}
-
-static void pnp_exit_ext_func_mode(pnp_devfn_t dev)
-{
-	u16 port = dev >> 8;
-	outb(0xaa, port);
-}
-
-void w83697hf_set_clksel_48(pnp_devfn_t dev)
-{
-	u8 reg8;
-
-	pnp_enter_ext_func_mode(dev);
-	reg8 = pnp_read_config(dev, 0x24);
-	reg8 |= (1 << 6); /* Set the clock input to 48MHz. */
-	pnp_write_config(dev, 0x24, reg8);
-	pnp_exit_ext_func_mode(dev);
-}
-
-/* Depreciated, use winbond_enable_serial() */
-void w83697hf_enable_serial(pnp_devfn_t dev, u16 iobase)
-{
-	pnp_enter_ext_func_mode(dev);
-	pnp_set_logical_device(dev);
-	pnp_set_enable(dev, 0);
-	pnp_set_iobase(dev, PNP_IDX_IO0, iobase);
-	pnp_set_enable(dev, 1);
-	pnp_exit_ext_func_mode(dev);
-}
diff --git a/src/superio/winbond/w83697hf/w83697hf.h b/src/superio/winbond/w83697hf/w83697hf.h
index 756fa98..52466a8 100644
--- a/src/superio/winbond/w83697hf/w83697hf.h
+++ b/src/superio/winbond/w83697hf/w83697hf.h
@@ -17,8 +17,6 @@
 #ifndef SUPERIO_WINBOND_W83697HF_H
 #define SUPERIO_WINBOND_W83697HF_H
 
-#include <arch/io.h>
-
 #define W83697HF_FDC            0    /* Floppy */
 #define W83697HF_PP             1    /* Parallel port */
 #define W83697HF_SP1            2    /* Com1 */
@@ -29,10 +27,5 @@
 #define W83697HF_GPIO234        9    /* GPIO 2, 3, 4 */
 #define W83697HF_ACPI           10   /* ACPI */
 #define W83697HF_HWM            11   /* Hardware monitor */
-
-void w83697hf_set_clksel_48(pnp_devfn_t);
-
-/* Depreciated, use winbond_enable_serial() */
-void w83697hf_enable_serial(pnp_devfn_t dev, u16 iobase);
 
 #endif /* SUPERIO_WINBOND_W83697HF_H */

-- 
To view, visit https://review.coreboot.org/21332
To unsubscribe, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7424233b5d70e143721038493f194760f07346a1
Gerrit-Change-Number: 21332
Gerrit-PatchSet: 1
Gerrit-Owner: Keith Hui <buurin at gmail.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20170902/10ac487d/attachment.html>