Change all occurences of NSC to nsc in the code. The next commit

will then rename the src/superio/NSC directory to src/superio/nsc.

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Stefan Reinauer <stepan@coresystems.de>




git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2472 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

43 files changed, 62 insertions, 62 deletions

diff --git a/documentation/LinuxBIOS-AMD64.tex b/documentation/LinuxBIOS-AMD64.tex
index 788faa4f9e..6fce3cfe67 100644
--- a/documentation/LinuxBIOS-AMD64.tex
+++ b/documentation/LinuxBIOS-AMD64.tex
@@ -724,7 +724,7 @@ the case, the \texttt{superio} section will be a subsection of the
 Example:
 
 \begin{verbatim}
-superio NSC/pc87360 link 1
+superio nsc/pc87360 link 1
         pnp 2e.0
         pnp 2e.1
         pnp 2e.2
diff --git a/documentation/RFC/config.tex b/documentation/RFC/config.tex
index fe58b5046b..b238f2fa21 100644
--- a/documentation/RFC/config.tex
+++ b/documentation/RFC/config.tex
@@ -58,7 +58,7 @@ default ::= 'default' ID '=' (``value'' | term)
 # as they are specified. To attach a superio to a southbridge, for
 # example, one would do this:
 # southbridge acer/5432 
-#   superio NSC/123 
+#   superio nsc/123 
 #   end 
 # end
 # the tool generates static initializers for this hierarchy.
@@ -234,7 +234,7 @@ end
 southbridge amd/amd8111
 end
 #mainboardinit arch/i386/smp/secondary.inc
-superio NSC/pc87360
+superio nsc/pc87360
 	register "com1={1} com2={0} floppy=1 lpt=1 keyboard=1"
 end
 dir /pc80
diff --git a/src/mainboard/advantech/som_gx533c/auto.c b/src/mainboard/advantech/som_gx533c/auto.c
index fa21b2abd3..138ca720a3 100644
--- a/src/mainboard/advantech/som_gx533c/auto.c
+++ b/src/mainboard/advantech/som_gx533c/auto.c
@@ -9,7 +9,7 @@
 #include "pc80/serial.c"
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/x86/bist.h"
 #include "cpu/x86/msr.h"
 #include <cpu/amd/gx2def.h>
diff --git a/src/mainboard/amd/quartet/Config.lb b/src/mainboard/amd/quartet/Config.lb
index eaae117a61..67cdff39d6 100644
--- a/src/mainboard/amd/quartet/Config.lb
+++ b/src/mainboard/amd/quartet/Config.lb
@@ -137,7 +137,7 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 1.0 on end
 					end
 					device pci 1.0 on 
-						chip superio/NSC/pc87360
+						chip superio/nsc/pc87360
 							device pnp 2e.0 off     # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/amd/quartet/auto.c b/src/mainboard/amd/quartet/auto.c
index 45ccbfbbca..4e5eb596c0 100644
--- a/src/mainboard/amd/quartet/auto.c
+++ b/src/mainboard/amd/quartet/auto.c
@@ -22,7 +22,7 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/amd/solo/Config.lb b/src/mainboard/amd/solo/Config.lb
index cbe809d587..ded0624979 100644
--- a/src/mainboard/amd/solo/Config.lb
+++ b/src/mainboard/amd/solo/Config.lb
@@ -145,7 +145,7 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 1.0 off end
 					end
 					device pci 1.0 on
-						chip superio/NSC/pc87360
+						chip superio/nsc/pc87360
 							device	pnp 2e.0 off  # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/amd/solo/auto.c b/src/mainboard/amd/solo/auto.c
index 64f3e91737..34a79cb514 100644
--- a/src/mainboard/amd/solo/auto.c
+++ b/src/mainboard/amd/solo/auto.c
@@ -19,7 +19,7 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index 3f709dff8c..8294053ae9 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -228,7 +228,7 @@ chip northbridge/amd/amdk8/root_complex
 					end
 					# LPC bridge
 					device pci 1.0 on
-						chip superio/NSC/pc87360
+						chip superio/nsc/pc87360
 							device	pnp 2e.0 off  # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/arima/hdama/auto.c b/src/mainboard/arima/hdama/auto.c
index bb42c0faee..bc02ec2bba 100644
--- a/src/mainboard/arima/hdama/auto.c
+++ b/src/mainboard/arima/hdama/auto.c
@@ -18,7 +18,7 @@
 #include "lib/delay.c"
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/bitworks/ims/auto.c b/src/mainboard/bitworks/ims/auto.c
index 89d3fa24ec..f4f90d260e 100644
--- a/src/mainboard/bitworks/ims/auto.c
+++ b/src/mainboard/bitworks/ims/auto.c
@@ -10,7 +10,7 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 #include "southbridge/intel/i82371eb/i82371eb_early_smbus.c"
-#include "superio/NSC/pc87351/pc87351_early_serial.c"
+#include "superio/nsc/pc87351/pc87351_early_serial.c"
 #include "northbridge/intel/i440bx/raminit.h"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"
diff --git a/src/mainboard/broadcom/blast/Config.lb b/src/mainboard/broadcom/blast/Config.lb
index 412afb4b7d..2b8ebd6b51 100644
--- a/src/mainboard/broadcom/blast/Config.lb
+++ b/src/mainboard/broadcom/blast/Config.lb
@@ -217,7 +217,7 @@ chip northbridge/amd/amdk8/root_complex
 					end
                                         device pci 1.1 on end # IDE        0x0214
                                         device pci 1.2 on     # LPC        0x0234
-                                                chip superio/NSC/pc87417
+                                                chip superio/nsc/pc87417
                                                         device  pnp 2e.0 off  # Floppy
                                                                  io 0x60 = 0x3f0
                                                                 irq 0x70 = 6
diff --git a/src/mainboard/broadcom/blast/cache_as_ram_auto.c b/src/mainboard/broadcom/blast/cache_as_ram_auto.c
index e7266903eb..1ecb79d90e 100644
--- a/src/mainboard/broadcom/blast/cache_as_ram_auto.c
+++ b/src/mainboard/broadcom/blast/cache_as_ram_auto.c
@@ -47,7 +47,7 @@ static void post_code(uint8_t value) {
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
-#include "superio/NSC/pc87417/pc87417_early_serial.c"
+#include "superio/nsc/pc87417/pc87417_early_serial.c"
 
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
diff --git a/src/mainboard/dell/s1850/Config.lb b/src/mainboard/dell/s1850/Config.lb
index a53897c586..50ab93c83a 100644
--- a/src/mainboard/dell/s1850/Config.lb
+++ b/src/mainboard/dell/s1850/Config.lb
@@ -147,7 +147,7 @@ chip northbridge/intel/E7520 # mch
 		
 			# -> ISA
 			device pci 1f.0 on 
-				chip superio/NSC/pc8374
+				chip superio/nsc/pc8374
 					device pnp 2e.0 off end
 					device pnp 2e.1 off end
 					device pnp 2e.2 off end
diff --git a/src/mainboard/eaglelion/5bcm/Config.lb b/src/mainboard/eaglelion/5bcm/Config.lb
index c86b0c389c..364c7e7804 100644
--- a/src/mainboard/eaglelion/5bcm/Config.lb
+++ b/src/mainboard/eaglelion/5bcm/Config.lb
@@ -130,7 +130,7 @@ chip northbridge/amd/gx1
     device pci 0.0 on end
       chip southbridge/amd/cs5530
         device pci 12.0 on
-          chip superio/NSC/pc97317
+          chip superio/nsc/pc97317
             device pnp 2e.0 on		# Keyboard
                io 0x60 = 0x60
                io 0x62 = 0x64
diff --git a/src/mainboard/eaglelion/5bcm/auto.c b/src/mainboard/eaglelion/5bcm/auto.c
index cefa559ffe..9c08077388 100644
--- a/src/mainboard/eaglelion/5bcm/auto.c
+++ b/src/mainboard/eaglelion/5bcm/auto.c
@@ -10,7 +10,7 @@
 #include "arch/i386/lib/console.c"
 #include "ram/ramtest.c"
 //#include "southbridge/intel/i440bx/i440bx_early_smbus.c"
-#include "superio/NSC/pc97317/pc97317_early_serial.c"
+#include "superio/nsc/pc97317/pc97317_early_serial.c"
 //#include "northbridge/intel/i440bx/raminit.h"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/ibm/e325/Config.lb b/src/mainboard/ibm/e325/Config.lb
index 27d553c244..9d2e4fde56 100644
--- a/src/mainboard/ibm/e325/Config.lb
+++ b/src/mainboard/ibm/e325/Config.lb
@@ -147,7 +147,7 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 1.0 off end
 					end
 					device pci 1.0 on
-						chip superio/NSC/pc87366
+						chip superio/nsc/pc87366
 							device	pnp 2e.0 off  # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/ibm/e325/auto.c b/src/mainboard/ibm/e325/auto.c
index be0076847b..0cdfca80e0 100644
--- a/src/mainboard/ibm/e325/auto.c
+++ b/src/mainboard/ibm/e325/auto.c
@@ -21,7 +21,7 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
-#include "superio/NSC/pc87366/pc87366_early_serial.c"
+#include "superio/nsc/pc87366/pc87366_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/ibm/e326/Config.lb b/src/mainboard/ibm/e326/Config.lb
index 90640ae015..4f6070fe1b 100644
--- a/src/mainboard/ibm/e326/Config.lb
+++ b/src/mainboard/ibm/e326/Config.lb
@@ -157,7 +157,7 @@ chip northbridge/amd/amdk8/root_complex
                                                 end
 					end
 					device pci 1.0 on
-						chip superio/NSC/pc87366
+						chip superio/nsc/pc87366
 							device	pnp 2e.0 off  # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/ibm/e326/auto.c b/src/mainboard/ibm/e326/auto.c
index 958c7d8ab8..c6f0fa678e 100644
--- a/src/mainboard/ibm/e326/auto.c
+++ b/src/mainboard/ibm/e326/auto.c
@@ -21,7 +21,7 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
-#include "superio/NSC/pc87366/pc87366_early_serial.c"
+#include "superio/nsc/pc87366/pc87366_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/intel/jarrell/Config.lb b/src/mainboard/intel/jarrell/Config.lb
index 8533409f7c..c355640cc1 100644
--- a/src/mainboard/intel/jarrell/Config.lb
+++ b/src/mainboard/intel/jarrell/Config.lb
@@ -163,7 +163,7 @@ chip northbridge/intel/E7520
 				end
 			end
 			device pci 1f.0 on 
-				chip superio/NSC/pc87427
+				chip superio/nsc/pc87427
 					device pnp 2e.0 off end
 					device pnp 2e.2 on
 #						 io 0x60 = 0x2f8
diff --git a/src/mainboard/intel/jarrell/auto.c b/src/mainboard/intel/jarrell/auto.c
index 9ff4288552..f102746636 100644
--- a/src/mainboard/intel/jarrell/auto.c
+++ b/src/mainboard/intel/jarrell/auto.c
@@ -12,14 +12,14 @@
 #include "ram/ramtest.c"
 #include "southbridge/intel/i82801er/i82801er_early_smbus.c"
 #include "northbridge/intel/E7520/raminit.h"
-#include "superio/NSC/pc87427/pc87427.h"
+#include "superio/nsc/pc87427/pc87427.h"
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "watchdog.c"
 #include "reset.c"
 #include "power_reset_check.c"
 #include "jarrell_fixups.c"
-#include "superio/NSC/pc87427/pc87427_early_init.c"
+#include "superio/nsc/pc87427/pc87427_early_init.c"
 #include "northbridge/intel/E7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/iwill/dk8x/auto.c b/src/mainboard/iwill/dk8x/auto.c
index 52dfb87074..150d7a063e 100644
--- a/src/mainboard/iwill/dk8x/auto.c
+++ b/src/mainboard/iwill/dk8x/auto.c
@@ -20,7 +20,7 @@
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
 
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Config.lb b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Config.lb
index 170d5673e3..89338e00eb 100644
--- a/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Config.lb
+++ b/src/mainboard/motorola/sandpointx3_altimus_mpc7410/Config.lb
@@ -14,7 +14,7 @@ chip northbridge/motorola/mpc107
 		device pci 0.0 on end
 		device pci b.0 on
 			chip southbridge/winbond/w83c553
-				chip superio/NSC/pc97307
+				chip superio/nsc/pc97307
 					device pnp 15c.0 on end # Kyeboard
 					device pnp 15c.1 on end # Mouse
 					device pnp 15c.2 on end # Real-time Clock
diff --git a/src/mainboard/newisys/khepri/Config.lb b/src/mainboard/newisys/khepri/Config.lb
index 6102e67233..e4ed8538fe 100644
--- a/src/mainboard/newisys/khepri/Config.lb
+++ b/src/mainboard/newisys/khepri/Config.lb
@@ -148,7 +148,7 @@ chip northbridge/amd/amdk8/root_complex
 						device pci 1.0 on end
 					end
 					device pci 1.0 on
-						chip superio/NSC/pc87360
+						chip superio/nsc/pc87360
 							device pnp 2e.0 off    # Floppy 
 								 io 0x60 = 0x3f0
 								irq 0x70 = 6
diff --git a/src/mainboard/newisys/khepri/auto.c b/src/mainboard/newisys/khepri/auto.c
index 24c6e3d3b2..c0289edaa4 100644
--- a/src/mainboard/newisys/khepri/auto.c
+++ b/src/mainboard/newisys/khepri/auto.c
@@ -19,7 +19,7 @@
 #include "northbridge/amd/amdk8/reset_test.c"
 #include "northbridge/amd/amdk8/debug.c"
 #include <cpu/amd/model_fxx_rev.h>
-#include "superio/NSC/pc87360/pc87360_early_serial.c"
+#include "superio/nsc/pc87360/pc87360_early_serial.c"
 #include "cpu/amd/mtrr/amd_earlymtrr.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/mainboard/supermicro/x6dhe_g2/Config.lb b/src/mainboard/supermicro/x6dhe_g2/Config.lb
index dd58bb18ee..92567883d2 100644
--- a/src/mainboard/supermicro/x6dhe_g2/Config.lb
+++ b/src/mainboard/supermicro/x6dhe_g2/Config.lb
@@ -167,7 +167,7 @@ chip northbridge/intel/E7520  # MCH
 
 
 			device pci 1f.0 on 	# ISA bridge
-				chip superio/NSC/pc87427
+				chip superio/nsc/pc87427
 					device pnp 2e.0 off end
 					device pnp 2e.2 on 
 						 io 0x60 = 0x3f8
diff --git a/src/mainboard/supermicro/x6dhe_g2/auto.c b/src/mainboard/supermicro/x6dhe_g2/auto.c
index 735ad43c27..854a74a132 100644
--- a/src/mainboard/supermicro/x6dhe_g2/auto.c
+++ b/src/mainboard/supermicro/x6dhe_g2/auto.c
@@ -12,14 +12,14 @@
 #include "ram/ramtest.c"
 #include "southbridge/intel/i82801er/i82801er_early_smbus.c"
 #include "northbridge/intel/E7520/raminit.h"
-#include "superio/NSC/pc87427/pc87427.h"
+#include "superio/nsc/pc87427/pc87427.h"
 #include "cpu/x86/lapic/boot_cpu.c"
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "debug.c"
 #include "watchdog.c"
 #include "reset.c"
 #include "x6dhe_g2_fixups.c"
-#include "superio/NSC/pc87427/pc87427_early_init.c"
+#include "superio/nsc/pc87427/pc87427_early_init.c"
 #include "northbridge/intel/E7520/memory_initialized.c"
 #include "cpu/x86/bist.h"
 
diff --git a/src/superio/NSC/pc8374/chip.h b/src/superio/NSC/pc8374/chip.h
index 5b87bdba4b..7bfa0db101 100644
--- a/src/superio/NSC/pc8374/chip.h
+++ b/src/superio/NSC/pc8374/chip.h
@@ -1,10 +1,10 @@
 struct chip_operations;
-extern struct chip_operations superio_NSC_pc8374_ops;
+extern struct chip_operations superio_nsc_pc8374_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc8374_config {
+struct superio_nsc_pc8374_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc8374/superio.c b/src/superio/NSC/pc8374/superio.c
index b7dcde4bbc..1ef3d29da3 100644
--- a/src/superio/NSC/pc8374/superio.c
+++ b/src/superio/NSC/pc8374/superio.c
@@ -15,7 +15,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc8374_config *conf;
+	struct superio_nsc_pc8374_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -67,7 +67,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc8374_ops = {
+struct chip_operations superio_nsc_pc8374_ops = {
 	CHIP_NAME("NSC 8374")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc87351/chip.h b/src/superio/NSC/pc87351/chip.h
index 1b9a578d72..05a02a2565 100644
--- a/src/superio/NSC/pc87351/chip.h
+++ b/src/superio/NSC/pc87351/chip.h
@@ -1,10 +1,10 @@
 struct chip_operations;
-extern struct chip_operations superio_NSC_pc87351_ops;
+extern struct chip_operations superio_nsc_pc87351_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc87351_config {
+struct superio_nsc_pc87351_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc87351/superio.c b/src/superio/NSC/pc87351/superio.c
index a106d3a947..cdc19b2d2d 100644
--- a/src/superio/NSC/pc87351/superio.c
+++ b/src/superio/NSC/pc87351/superio.c
@@ -21,7 +21,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc87351_config *conf;
+	struct superio_nsc_pc87351_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -74,7 +74,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc87351_ops = {
+struct chip_operations superio_nsc_pc87351_ops = {
 	CHIP_NAME("NSC 87351")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc87360/chip.h b/src/superio/NSC/pc87360/chip.h
index 37f544ea8e..0d6023b927 100644
--- a/src/superio/NSC/pc87360/chip.h
+++ b/src/superio/NSC/pc87360/chip.h
@@ -1,10 +1,10 @@
 struct chip_operations;
-extern struct chip_operations superio_NSC_pc87360_ops;
+extern struct chip_operations superio_nsc_pc87360_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc87360_config {
+struct superio_nsc_pc87360_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc87360/superio.c b/src/superio/NSC/pc87360/superio.c
index e564cdfd54..2b017d5b73 100644
--- a/src/superio/NSC/pc87360/superio.c
+++ b/src/superio/NSC/pc87360/superio.c
@@ -15,7 +15,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc87360_config *conf;
+	struct superio_nsc_pc87360_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc87360_ops = {
+struct chip_operations superio_nsc_pc87360_ops = {
 	CHIP_NAME("NSC 87360")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc87366/chip.h b/src/superio/NSC/pc87366/chip.h
index 0a35863239..440885aec8 100644
--- a/src/superio/NSC/pc87366/chip.h
+++ b/src/superio/NSC/pc87366/chip.h
@@ -1,9 +1,9 @@
-extern struct chip_operations superio_NSC_pc87366_ops;
+extern struct chip_operations superio_nsc_pc87366_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc87366_config {
+struct superio_nsc_pc87366_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc87366/superio.c b/src/superio/NSC/pc87366/superio.c
index 03e2a4f8a8..732ad3fee1 100644
--- a/src/superio/NSC/pc87366/superio.c
+++ b/src/superio/NSC/pc87366/superio.c
@@ -15,7 +15,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc87366_config *conf;
+	struct superio_nsc_pc87366_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -70,7 +70,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc87366_ops = {
+struct chip_operations superio_nsc_pc87366_ops = {
 	CHIP_NAME("NSC 87366")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc87417/chip.h b/src/superio/NSC/pc87417/chip.h
index adae8eead3..e3c8891d53 100644
--- a/src/superio/NSC/pc87417/chip.h
+++ b/src/superio/NSC/pc87417/chip.h
@@ -1,9 +1,9 @@
-extern struct chip_operations superio_NSC_pc87417_ops;
+extern struct chip_operations superio_nsc_pc87417_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc87417_config {
+struct superio_nsc_pc87417_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc87417/superio.c b/src/superio/NSC/pc87417/superio.c
index f7e5115e72..f7a679c6e2 100644
--- a/src/superio/NSC/pc87417/superio.c
+++ b/src/superio/NSC/pc87417/superio.c
@@ -17,7 +17,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc87417_config *conf;
+	struct superio_nsc_pc87417_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc87417_ops = {
+struct chip_operations superio_nsc_pc87417_ops = {
 	CHIP_NAME("NSC pc87417")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc87427/chip.h b/src/superio/NSC/pc87427/chip.h
index cfac26070c..8eaf135702 100644
--- a/src/superio/NSC/pc87427/chip.h
+++ b/src/superio/NSC/pc87427/chip.h
@@ -1,9 +1,9 @@
-extern struct chip_operations superio_NSC_pc87427_ops;
+extern struct chip_operations superio_nsc_pc87427_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc87427_config {
+struct superio_nsc_pc87427_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc87427/superio.c b/src/superio/NSC/pc87427/superio.c
index 84c6ecb628..6f192f6631 100644
--- a/src/superio/NSC/pc87427/superio.c
+++ b/src/superio/NSC/pc87427/superio.c
@@ -14,7 +14,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc87427_config *conf;
+	struct superio_nsc_pc87427_config *conf;
 	struct resource *res0, *res1;
 	/* Wishlist handle well known programming interfaces more
 	 * generically.
@@ -71,7 +71,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info); 
 }
 
-struct chip_operations superio_NSC_pc87427_ops = {
+struct chip_operations superio_nsc_pc87427_ops = {
 	CHIP_NAME("NSC 87427")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc97307/chip.h b/src/superio/NSC/pc97307/chip.h
index 4bca987271..3e6b7f64ad 100644
--- a/src/superio/NSC/pc97307/chip.h
+++ b/src/superio/NSC/pc97307/chip.h
@@ -8,12 +8,12 @@
 #define PNP_DATA_REG    0x15D
 #endif
 
-extern struct chip_operations superio_NSC_pc97307_ops;
+extern struct chip_operations superio_nsc_pc97307_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc97307_config {
+struct superio_nsc_pc97307_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc97307/superio.c b/src/superio/NSC/pc97307/superio.c
index 711b98639f..b2de76a4c1 100644
--- a/src/superio/NSC/pc97307/superio.c
+++ b/src/superio/NSC/pc97307/superio.c
@@ -10,7 +10,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc97307_config *conf;
+	struct superio_nsc_pc97307_config *conf;
 	struct resource *res0, *res1;
 
 	if (!dev->enabled) {
@@ -82,7 +82,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc97307_ops = {
+struct chip_operations superio_nsc_pc97307_ops = {
 	CHIP_NAME("NSC 97307")
 	.enable_dev = enable_dev,
 };
diff --git a/src/superio/NSC/pc97317/chip.h b/src/superio/NSC/pc97317/chip.h
index 10ad1cc4a7..7997dff8bc 100644
--- a/src/superio/NSC/pc97317/chip.h
+++ b/src/superio/NSC/pc97317/chip.h
@@ -8,12 +8,12 @@
 #define PNP_DATA_REG    0x15D
 #endif
 
-extern struct chip_operations superio_NSC_pc97317_ops;
+extern struct chip_operations superio_nsc_pc97317_ops;
 
 #include <pc80/keyboard.h>
 #include <uart8250.h>
 
-struct superio_NSC_pc97317_config {
+struct superio_nsc_pc97317_config {
 	struct uart8250 com1, com2;
 	struct pc_keyboard keyboard;
 };
diff --git a/src/superio/NSC/pc97317/superio.c b/src/superio/NSC/pc97317/superio.c
index cb49d55e34..59a1214f7b 100644
--- a/src/superio/NSC/pc97317/superio.c
+++ b/src/superio/NSC/pc97317/superio.c
@@ -10,7 +10,7 @@
 
 static void init(device_t dev)
 {
-	struct superio_NSC_pc97317_config *conf;
+	struct superio_nsc_pc97317_config *conf;
 	struct resource *res0, *res1;
 
 	if (!dev->enabled) {
@@ -84,7 +84,7 @@ static void enable_dev(struct device *dev)
 		sizeof(pnp_dev_info)/sizeof(pnp_dev_info[0]), pnp_dev_info);
 }
 
-struct chip_operations superio_NSC_pc97317_ops = {
+struct chip_operations superio_nsc_pc97317_ops = {
 	CHIP_NAME("NSC 97317")
 	.enable_dev = enable_dev,
 };