[Gc-linux-cvs] linux/arch/powerpc/platforms/embedded6xx usbgecko_udbg.h, NONE, 1.1 Kconfig, 1.2, 1.3 gcn-rsw.c, 1.2, 1.3 wii_dev.c, 1.1, 1.2

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15970/arch/powerpc/platforms/embedded6xx

Modified Files:
	Kconfig gcn-rsw.c wii_dev.c 
Added Files:
	usbgecko_udbg.h 
Log Message:
Small cleanups:
- Added copyright notices to the DTS files.
- Renamed DTS node names and compatible properties as per segher suggestion.
- s/-isobel/i/ from version strings.
- Added missing arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h file.
- s/DVD/Disk/ on gcn-di.c.
- Use "exi" instead of "exi-driver" in exi-driver messages.



Index: gcn-rsw.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/gcn-rsw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gcn-rsw.c	26 Mar 2008 20:14:58 -0000	1.2
+++ gcn-rsw.c	27 Mar 2008 22:35:24 -0000	1.3
@@ -36,7 +36,7 @@
 #define DRV_AUTHOR           "Stefan Esser <se...@no...>, " \
 			     "Albert Herranz"
 
-static char rsw_driver_version[] = "1.0-isobel";
+static char rsw_driver_version[] = "1.0i";
 
 #define drv_printk(level, format, arg...) \
 	printk(level DRV_MODULE_NAME ": " format , ## arg)
@@ -282,7 +282,8 @@
 }
 
 static struct of_device_id rsw_of_match[] = {
-	{.compatible = "nintendo,rsw"},
+	{.compatible = "nintendo,flipper-resetswitch"},
+	{.compatible = "nintendo,hollywood-resetswitch"},
 	{},
 };
 

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig	26 Mar 2008 20:02:27 -0000	1.2
+++ Kconfig	27 Mar 2008 22:35:24 -0000	1.3
@@ -65,7 +65,6 @@
 	 More information at: <http://gc-linux.sourceforge.net/>
 
 config TSI108_BRIDGE
-config TSI108_BRIDGE
 	bool
 	depends on MPC7448HPC2 || PPC_HOLLY
 	select PCI

--- NEW FILE: usbgecko_udbg.h ---
/*
 * arch/powerpc/platforms/embedded6xx/usbgecko_udbg.h
 *
 * udbg serial input/output routines for the USB Gecko adapter.
 * Copyright (C) 2008 The GameCube Linux Team
 * Copyright (C) 2008 Albert Herranz
 *
 * 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.
 *
 */

#ifndef __USBGECKO_UDBG_H
#define __USBGECKO_UDBG_H

#ifdef CONFIG_USBGECKO_UDBG

extern void __init ug_udbg_init(void);

#else

static inline void __init ug_udbg_init(void)
{
}

#endif /* CONFIG_USBGECKO_UDBG */


#ifdef CONFIG_PPC_EARLY_DEBUG_USBGECKO

void __init udbg_init_debug_usbgecko(void);

#endif /* CONFIG_PPC_EARLY_DEBUG_USBGECKO */


#endif /* __USBGECKO_UDBG_H */


Index: wii_dev.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/platforms/embedded6xx/wii_dev.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wii_dev.c	26 Mar 2008 19:51:02 -0000	1.1
+++ wii_dev.c	27 Mar 2008 22:35:26 -0000	1.2
@@ -35,7 +35,7 @@
 
 	of_platform_bus_probe(NULL, wii_of_bus, NULL);
 
-	np = of_find_compatible_node(NULL, NULL, "nintendo,mem2");
+	np = of_find_compatible_node(NULL, NULL, "nintendo,hollywood-mem2");
 	if (np) {
 		of_platform_device_create(np, NULL, NULL);
 		of_node_put(np);