Use the canonical name of the vendors/devices and the

same format for all CHIP_NAME() entries in LinuxBIOS (Closes #20).

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



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

12 files changed, 12 insertions, 12 deletions

diff --git a/src/southbridge/amd/amd8111/amd8111.c b/src/southbridge/amd/amd8111/amd8111.c
index 32797041f3..f1a1862edb 100644
--- a/src/southbridge/amd/amd8111/amd8111.c
+++ b/src/southbridge/amd/amd8111/amd8111.c
@@ -65,7 +65,7 @@ void amd8111_enable(device_t dev)
 }
 
 struct chip_operations southbridge_amd_amd8111_ops = {
-	CHIP_NAME("AMD 8111")
+	CHIP_NAME("AMD-8111 Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/amd/cs5536/cs5536.c b/src/southbridge/amd/cs5536/cs5536.c
index d2fbe99644..47958dba6a 100644
--- a/src/southbridge/amd/cs5536/cs5536.c
+++ b/src/southbridge/amd/cs5536/cs5536.c
@@ -198,7 +198,7 @@ static struct pci_driver cs5536_pci_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_amd_cs5536_ops = {
-	CHIP_NAME("AMD cs5536")
+	CHIP_NAME("AMD Geode CS5536 Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/amd/cs5536_lx/cs5536.c b/src/southbridge/amd/cs5536_lx/cs5536.c
index acc51667dc..5f93d24769 100644
--- a/src/southbridge/amd/cs5536_lx/cs5536.c
+++ b/src/southbridge/amd/cs5536_lx/cs5536.c
@@ -323,7 +323,7 @@ static struct pci_driver cs5536_lx_pci_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_amd_cs5536_lx_ops = {
-	CHIP_NAME("AMD cs5536 (LX)")
+	CHIP_NAME("AMD Geode CS5536 (LX) Southbridge")
 	/* This only called when this device is listed in the 
 	* static device tree.
 	*/
diff --git a/src/southbridge/broadcom/bcm5785/bcm5785.c b/src/southbridge/broadcom/bcm5785/bcm5785.c
index ebb7e8e729..a1d3eaa8d1 100644
--- a/src/southbridge/broadcom/bcm5785/bcm5785.c
+++ b/src/southbridge/broadcom/bcm5785/bcm5785.c
@@ -75,6 +75,6 @@ void bcm5785_enable(device_t dev)
 }
 
 struct chip_operations southbridge_broadcom_bcm5785_ops = {
-	CHIP_NAME("Serverworks bcm5785")
+	CHIP_NAME("Serverworks BCM5785 Southbridge")
 	.enable_dev = bcm5785_enable,
 };
diff --git a/src/southbridge/intel/esb6300/esb6300.c b/src/southbridge/intel/esb6300/esb6300.c
index 3551a59ea6..162771d7dc 100644
--- a/src/southbridge/intel/esb6300/esb6300.c
+++ b/src/southbridge/intel/esb6300/esb6300.c
@@ -43,6 +43,6 @@ void esb6300_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_esb6300_ops = {
-	CHIP_NAME("INTEL 6300ESB")
+	CHIP_NAME("Intel 6300ESB Southbridge")
 	.enable_dev = esb6300_enable,
 };
diff --git a/src/southbridge/intel/i82801ca/i82801ca.c b/src/southbridge/intel/i82801ca/i82801ca.c
index 11ac82c329..f416e363d4 100644
--- a/src/southbridge/intel/i82801ca/i82801ca.c
+++ b/src/southbridge/intel/i82801ca/i82801ca.c
@@ -48,6 +48,6 @@ void i82801ca_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801ca_ops = {
-	CHIP_NAME("Intel 82801ca Southbridge")
+	CHIP_NAME("Intel 82801CA Southbridge")
 	.enable_dev = i82801ca_enable,
 };
diff --git a/src/southbridge/intel/i82801dbm/i82801dbm.c b/src/southbridge/intel/i82801dbm/i82801dbm.c
index 1e49205f90..5b55bd92f6 100644
--- a/src/southbridge/intel/i82801dbm/i82801dbm.c
+++ b/src/southbridge/intel/i82801dbm/i82801dbm.c
@@ -60,6 +60,6 @@ void i82801dbm_enable(device_t dev)
 }
 
 struct chip_operations southbridge_intel_i82801dbm_control = {
-	CHIP_NAME("Intel 82801dbm Southbridge")
+	CHIP_NAME("Intel 82801DBM Southbridge")
 	.enable_dev = i82801dbm_enable,
 };
diff --git a/src/southbridge/intel/pxhd/pxhd_bridge.c b/src/southbridge/intel/pxhd/pxhd_bridge.c
index bceca29db9..e0cb02e3af 100644
--- a/src/southbridge/intel/pxhd/pxhd_bridge.c
+++ b/src/southbridge/intel/pxhd/pxhd_bridge.c
@@ -253,6 +253,6 @@ static struct pci_driver ioapic2_driver __pci_driver = {
 };
 
 struct chip_operations southbridge_intel_pxhd_ops = {
-	CHIP_NAME("PXHD")
+	CHIP_NAME("Intel PXHD Southbridge")
 	.enable_dev = pxhd_enable,
 };
diff --git a/src/southbridge/nvidia/ck804/ck804.c b/src/southbridge/nvidia/ck804/ck804.c
index a4b77c3596..6be237f753 100644
--- a/src/southbridge/nvidia/ck804/ck804.c
+++ b/src/southbridge/nvidia/ck804/ck804.c
@@ -192,6 +192,6 @@ void ck804_enable(device_t dev)
 }
 
 struct chip_operations southbridge_nvidia_ck804_ops = {
-	CHIP_NAME("Nvidia ck804")
+	CHIP_NAME("NVIDIA CK804 Southbridge")
 	.enable_dev = ck804_enable,
 };
diff --git a/src/southbridge/ricoh/rl5c476/rl5c476.c b/src/southbridge/ricoh/rl5c476/rl5c476.c
index f85a803fab..7a5813255a 100644
--- a/src/southbridge/ricoh/rl5c476/rl5c476.c
+++ b/src/southbridge/ricoh/rl5c476/rl5c476.c
@@ -212,6 +212,6 @@ void southbridge_init(device_t dev)
 }
 
 struct chip_operations southbridge_ricoh_rl5c476_ops = {
-	CHIP_NAME("RICOH RL5C476")
+	CHIP_NAME("Ricoh RL5C476 CardBus Controller")
 	.enable_dev    = southbridge_init,
 };
diff --git a/src/southbridge/via/vt8231/vt8231.c b/src/southbridge/via/vt8231/vt8231.c
index 514d0c0626..71874cba57 100644
--- a/src/southbridge/via/vt8231/vt8231.c
+++ b/src/southbridge/via/vt8231/vt8231.c
@@ -68,6 +68,6 @@ static void vt8231_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8231_ops = {
-	CHIP_NAME("VIA vt8231")
+	CHIP_NAME("VIA VT8231 Southbridge")
 	.enable_dev	= vt8231_enable,
 };
diff --git a/src/southbridge/via/vt8235/vt8235.c b/src/southbridge/via/vt8235/vt8235.c
index e6287ece9c..2d732142d9 100644
--- a/src/southbridge/via/vt8235/vt8235.c
+++ b/src/southbridge/via/vt8235/vt8235.c
@@ -92,6 +92,6 @@ static void vt8235_enable(struct device *dev)
 }
 
 struct chip_operations southbridge_via_vt8235_ops = {
-	CHIP_NAME("VIA vt8235")
+	CHIP_NAME("VIA VT8235 Southbridge")
 	.enable_dev = vt8235_enable,
 };