GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

superio/*: Deal with some chip.h special cases 

While backing out the empty pc80 keyboard struct we encountered some
special cases where chip.h is used for other purposes. Deal with these
cases.

Change-Id: Ib11a46cfd14d050d5daa213623b9d8a401c06410
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5621
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
Edward O'Callaghan 2014-04-30 17:17:03 +10:00 committed by Kyösti Mälkki
parent def00be41d
commit 0403c863e1
7 changed files with 3 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/superio/ite/it8772f/chip.h
View File

@ -22,11 +22,8 @@
#define SUPERIO_ITE_IT8772F_CHIP_H
#include <device/device.h>
#include <pc80/keyboard.h>
struct superio_ite_it8772f_config {
struct pc_keyboard keyboard;
/* GPIO SimpleIO register values via devicetree.cb */
u8 gpio_set1;
u8 gpio_set2;
@ -51,4 +48,4 @@ struct superio_ite_it8772f_config {
u8 fan3_enable;
};
#endif
#endif /* SUPERIO_ITE_IT8772F_CHIP_H */

37
src/superio/nsc/pc97307/chip.h
View File

@ -1,37 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2000 AG Electronics Ltd.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef SUPERIO_NSC_PC97307_CHIP_H
#define SUPERIO_NSC_PC97307_CHIP_H
#ifndef PNP_INDEX_REG
#define PNP_INDEX_REG 0x15C
#endif
#ifndef PNP_DATA_REG
#define PNP_DATA_REG 0x15D
#endif
#include <pc80/keyboard.h>
struct superio_nsc_pc97307_config {
struct pc_keyboard keyboard;
};
#endif

1
src/superio/nsc/pc97307/superio.c
View File

@ -24,7 +24,6 @@
#include <device/pnp.h>
#include <stdlib.h>
#include <pc80/keyboard.h>
#include "chip.h" /* FIXME */
#include "pc97307.h"
static void init(device_t dev)

38
src/superio/nsc/pc97317/chip.h
View File

@ -1,38 +0,0 @@
/*
* This file is part of the coreboot project.
*
* Copyright (C) 2000 AG Electronics Ltd.
*
* 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.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
#ifndef SUPERIO_NSC_PC97317_CHIP_H
#define SUPERIO_NSC_PC97317_CHIP_H
#ifndef PNP_INDEX_REG
#define PNP_INDEX_REG 0x15C
#endif
#ifndef PNP_DATA_REG
#define PNP_DATA_REG 0x15D
#endif
#include <pc80/keyboard.h>
struct superio_nsc_pc97317_config {
struct pc_keyboard keyboard;
};
#endif

1
src/superio/nsc/pc97317/superio.c
View File

@ -24,7 +24,6 @@
#include <device/pnp.h>
#include <stdlib.h>
#include <pc80/keyboard.h>
#include "chip.h" /* FIXME */
#include "pc97317.h"
static void init(device_t dev)

2
src/superio/winbond/w83697hf/chip.h
View File

@ -27,4 +27,4 @@ struct superio_winbond_w83697hf_config {
unsigned int hwmon_fan2_divisor;
};
#endif
#endif /* SUPERIO_WINBOND_W83697HF_CHIP_H */

2
src/superio/winbond/w83697hf/superio.c
View File

@ -28,7 +28,7 @@
#include <pc80/mc146818rtc.h>
#include <stdlib.h>
#include <pc80/keyboard.h>
#include "chip.h" /* FIXME */
#include "chip.h"
#include "w83697hf.h"
static void hwmon_set_fan_divisor(unsigned int base, int num, unsigned int divisor) {