From c800d90b34c5fb50a0681af74cb50e8753fd744e Mon Sep 17 00:00:00 2001 From: Keith Hui Date: Sat, 9 Sep 2017 23:09:22 -0400 Subject: winbond/w83627hf: Drop early_init.c MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Once w83627hf_set_clksel_48() is unified into winbond/common/early_init.c by /c/21331 (Unify w*_set_clksel_48()), this file is no longer needed and can be dropped. Build tested on select affected mainboards. Change-Id: I6a5e27fdd48c6e002c3a39dc92fef77e85aea209 Signed-off-by: Keith Hui Reviewed-on: https://review.coreboot.org/21474 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/superio/winbond/w83627hf/Makefile.inc | 1 - src/superio/winbond/w83627hf/early_init.c | 51 ------------------------------- src/superio/winbond/w83627hf/w83627hf.h | 4 --- 3 files changed, 56 deletions(-) delete mode 100644 src/superio/winbond/w83627hf/early_init.c (limited to 'src/superio') diff --git a/src/superio/winbond/w83627hf/Makefile.inc b/src/superio/winbond/w83627hf/Makefile.inc index 93d011e402..09b9368dd7 100644 --- a/src/superio/winbond/w83627hf/Makefile.inc +++ b/src/superio/winbond/w83627hf/Makefile.inc @@ -16,5 +16,4 @@ ## GNU General Public License for more details. ## -romstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += early_init.c ramstage-$(CONFIG_SUPERIO_WINBOND_W83627HF) += superio.c diff --git a/src/superio/winbond/w83627hf/early_init.c b/src/superio/winbond/w83627hf/early_init.c deleted file mode 100644 index 1ec9810b4f..0000000000 --- a/src/superio/winbond/w83627hf/early_init.c +++ /dev/null @@ -1,51 +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 -#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); -} - -/* - * We duplicate this function, for non-ROMCC boards, from early_serial.c to - * work around a limitation of ROMCC where we can no make early_serial.c into - * link-time symbols and #include early_serial.c. - */ -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 4b55e0f62a..ecbf050ba4 100644 --- a/src/superio/winbond/w83627hf/w83627hf.h +++ b/src/superio/winbond/w83627hf/w83627hf.h @@ -109,8 +109,4 @@ #define W83627HF_XSCNF 0x15 #define W83627HF_XWBCNF 0x16 -#include - -void w83627hf_set_clksel_48(pnp_devfn_t dev); - #endif /* SUPERIO_WINBOND_W83627HF_H */ -- cgit v1.2.3