From 2a3f9f543a04a6382c40bc9b4f6a3b5c4846a4f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Mon, 26 Aug 2019 13:59:54 +0300
Subject: smsc/superio/sio1007: Fix header name
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The file chip.h has a special purpose for defining the
configuration structure used in static devicetree.

Change-Id: If0289c29ca72768009c1b7166311bc4c3cee4171
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/35095
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-by: Richard Spiegel <richard.spiegel@silverbackltd.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 src/mainboard/compulab/intense_pc/romstage.c |  2 +-
 src/mainboard/intel/emeraldlake2/romstage.c  |  2 +-
 src/superio/smsc/sio1007/chip.h              | 23 -----------------------
 src/superio/smsc/sio1007/early_serial.c      |  2 +-
 src/superio/smsc/sio1007/sio1007.h           | 24 ++++++++++++++++++++++++
 5 files changed, 27 insertions(+), 26 deletions(-)
 delete mode 100644 src/superio/smsc/sio1007/chip.h
 create mode 100644 src/superio/smsc/sio1007/sio1007.h

diff --git a/src/mainboard/compulab/intense_pc/romstage.c b/src/mainboard/compulab/intense_pc/romstage.c
index 6c3d980b65..74f00c21d1 100644
--- a/src/mainboard/compulab/intense_pc/romstage.c
+++ b/src/mainboard/compulab/intense_pc/romstage.c
@@ -17,7 +17,7 @@
 #include <arch/io.h>
 #include <device/pci_ops.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
-#include <superio/smsc/sio1007/chip.h>
+#include <superio/smsc/sio1007/sio1007.h>
 #include <southbridge/intel/bd82x6x/pch.h>
 
 #define SIO_PORT 0x164e
diff --git a/src/mainboard/intel/emeraldlake2/romstage.c b/src/mainboard/intel/emeraldlake2/romstage.c
index a28ae78f28..ee3cec1ebf 100644
--- a/src/mainboard/intel/emeraldlake2/romstage.c
+++ b/src/mainboard/intel/emeraldlake2/romstage.c
@@ -19,7 +19,7 @@
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
 #include <cpu/x86/lapic.h>
-#include <superio/smsc/sio1007/chip.h>
+#include <superio/smsc/sio1007/sio1007.h>
 #include <northbridge/intel/sandybridge/sandybridge.h>
 #include <northbridge/intel/sandybridge/raminit.h>
 #include <northbridge/intel/sandybridge/raminit_native.h>
diff --git a/src/superio/smsc/sio1007/chip.h b/src/superio/smsc/sio1007/chip.h
deleted file mode 100644
index 78ac18a249..0000000000
--- a/src/superio/smsc/sio1007/chip.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2013 Sage Electronic Engineering LLC.
- *
- * 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; version 2 of the License.
- *
- * 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.
- */
-
-#ifndef SUPERIO_SMSC_1007_CHIP_H
-#define SUPERIO_SMSC_1007_CHIP_H
-
-/* FIXME: wrong place for this! */
-void sio1007_setreg(u16 lpc_port, u8 reg, u8 value, u8 mask);
-int sio1007_enable_uart_at(u16 port);
-
-#endif
diff --git a/src/superio/smsc/sio1007/early_serial.c b/src/superio/smsc/sio1007/early_serial.c
index 022a1aba7c..2028e67fc3 100644
--- a/src/superio/smsc/sio1007/early_serial.c
+++ b/src/superio/smsc/sio1007/early_serial.c
@@ -15,7 +15,7 @@
 
 #include <stdint.h>
 #include <arch/io.h>
-#include "chip.h"
+#include "sio1007.h"
 
 void sio1007_setreg(u16 lpc_port, u8 reg, u8 value, u8 mask)
 {
diff --git a/src/superio/smsc/sio1007/sio1007.h b/src/superio/smsc/sio1007/sio1007.h
new file mode 100644
index 0000000000..a99ec5c273
--- /dev/null
+++ b/src/superio/smsc/sio1007/sio1007.h
@@ -0,0 +1,24 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2013 Sage Electronic Engineering LLC.
+ *
+ * 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; version 2 of the License.
+ *
+ * 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.
+ */
+
+#ifndef SUPERIO_SMSC_SIO1007_H
+#define SUPERIO_SMSC_SIO1007_H
+
+#include <stdint.h>
+
+void sio1007_setreg(u16 lpc_port, u8 reg, u8 value, u8 mask);
+int sio1007_enable_uart_at(u16 port);
+
+#endif
-- 
cgit v1.2.3