From 641370e1dcbb5fb419ba8d21967e4095a3b6a5e1 Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Sun, 13 Aug 2017 15:23:29 -0400 Subject: superio/winbond/w83627*: Remove deprecated code Early serial for W83627[HF|EHG] superios are handled by superio/winbond/common/early_serial.c. Remove code thus deprecated. Build tested on select affected mainboards. Change-Id: Idad6e0281f7a272e184feff686ce1407825429c7 Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/20988 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/superio/winbond/w83627ehg/Makefile.inc | 1 - src/superio/winbond/w83627ehg/early_serial.c | 33 -------------- src/superio/winbond/w83627ehg/w83627ehg.h | 5 --- src/superio/winbond/w83627hf/early_serial.c | 67 ---------------------------- src/superio/winbond/w83627hf/w83627hf.h | 1 - 5 files changed, 107 deletions(-) delete mode 100644 src/superio/winbond/w83627ehg/early_serial.c delete mode 100644 src/superio/winbond/w83627hf/early_serial.c (limited to 'src/superio/winbond') diff --git a/src/superio/winbond/w83627ehg/Makefile.inc b/src/superio/winbond/w83627ehg/Makefile.inc index b9719b5a11..88fb0f243f 100644 --- a/src/superio/winbond/w83627ehg/Makefile.inc +++ b/src/superio/winbond/w83627ehg/Makefile.inc @@ -15,5 +15,4 @@ ## GNU General Public License for more details. ## -romstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += early_serial.c ramstage-$(CONFIG_SUPERIO_WINBOND_W83627EHG) += superio.c diff --git a/src/superio/winbond/w83627ehg/early_serial.c b/src/superio/winbond/w83627ehg/early_serial.c deleted file mode 100644 index b690cac20a..0000000000 --- a/src/superio/winbond/w83627ehg/early_serial.c +++ /dev/null @@ -1,33 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2007 AMD - * Written by Yinghai Lu for AMD. - * - * 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 -#include -#include "w83627ehg.h" - -void pnp_enter_ext_func_mode(pnp_devfn_t dev) -{ - u16 port = dev >> 8; - outb(0x87, port); - outb(0x87, port); -} - -void pnp_exit_ext_func_mode(pnp_devfn_t dev) -{ - u16 port = dev >> 8; - outb(0xaa, port); -} diff --git a/src/superio/winbond/w83627ehg/w83627ehg.h b/src/superio/winbond/w83627ehg/w83627ehg.h index 5b760f2e71..e74dbef41b 100644 --- a/src/superio/winbond/w83627ehg/w83627ehg.h +++ b/src/superio/winbond/w83627ehg/w83627ehg.h @@ -18,8 +18,6 @@ #ifndef SUPERIO_WINBOND_W83627EHG_H #define SUPERIO_WINBOND_W83627EHG_H -#include - #define W83627EHG_FDC 0 /* Floppy */ #define W83627EHG_PP 1 /* Parallel port */ #define W83627EHG_SP1 2 /* Com1 */ @@ -52,7 +50,4 @@ #define W83627EHG_GPIO4 ((2 << 8) | W83627EHG_GPIO_SUSLED_V) #define W83627EHG_GPIO5 ((3 << 8) | W83627EHG_GPIO_SUSLED_V) -void pnp_enter_ext_func_mode(pnp_devfn_t dev); -void pnp_exit_ext_func_mode(pnp_devfn_t dev); - #endif /* SUPERIO_WINBOND_W83627EHG_H */ diff --git a/src/superio/winbond/w83627hf/early_serial.c b/src/superio/winbond/w83627hf/early_serial.c deleted file mode 100644 index a87c7e98fa..0000000000 --- a/src/superio/winbond/w83627hf/early_serial.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * Copyright (C) 2000 AG Electronics Ltd. - * Copyright (C) 2003-2004 Linux Networx - * Copyright (C) 2004 Tyan - * Copyright (C) 2010 Win Enterprises (anishp@win-ent.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 -#include "w83627hf.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); -} - -/* - * FIXME: The following ROMCC boards are blocking the removal this superio's - * model specific w83627hf_enable_serial() symbol. - * - * mainboard/supermicro/x6dai_g - * mainboard/supermicro/x6dhe_g - * mainboard/supermicro/x6dhr_ig - * mainboard/supermicro/x6dhr_ig2 - * - * XXX: ROMCC - everything is inlined, no forwarding function prototypes - * declarations are accepted. - */ -void w83627hf_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); -} - -void w83627hf_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 CLKSEL (clock input on pin 1) to 48MHz. */ - pnp_write_config(dev, 0x24, reg8); - pnp_exit_ext_func_mode(dev); -} diff --git a/src/superio/winbond/w83627hf/w83627hf.h b/src/superio/winbond/w83627hf/w83627hf.h index e4f3784ec9..4b55e0f62a 100644 --- a/src/superio/winbond/w83627hf/w83627hf.h +++ b/src/superio/winbond/w83627hf/w83627hf.h @@ -112,6 +112,5 @@ #include void w83627hf_set_clksel_48(pnp_devfn_t dev); -void w83627hf_enable_serial(pnp_devfn_t dev, u16 iobase); #endif /* SUPERIO_WINBOND_W83627HF_H */ -- cgit v1.2.3