[kernel] r12945 - in dists/lenny/linux-2.6/debian: . config/mips patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Mon Feb 23 16:19:18 2009
New Revision: 12945

Log:
Fix RTC on SGI IP32 (O2)


Added:
   dists/lenny/linux-2.6/debian/patches/bugfix/mips/ip32-register-cmos.patch
Modified:
   dists/lenny/linux-2.6/debian/changelog
   dists/lenny/linux-2.6/debian/config/mips/config.r5k-ip32
   dists/lenny/linux-2.6/debian/patches/series/14

Modified: dists/lenny/linux-2.6/debian/changelog
==============================================================================
--- dists/lenny/linux-2.6/debian/changelog	(original)
+++ dists/lenny/linux-2.6/debian/changelog	Mon Feb 23 16:19:18 2009
@@ -23,6 +23,8 @@
   * rt2x00: Fix VGC lower bound initialization. (Closes: #510607)
   * sata_mv: fix 8-port timeouts on 508x/6081 chips (Closes: #514155)
   * sata_mv: Properly initialize main irq mask.
+  * IP32: Add platform device for CMOS RTC; remove dead code.
+  * [mips/r5k-ip32] Build in RTC_DRV_CMOS. (Closes: #516775)
 
   [ Bastian Blank ]
   * [sparc] Revert: Reintroduce dummy PCI host controller to workaround broken

Modified: dists/lenny/linux-2.6/debian/config/mips/config.r5k-ip32
==============================================================================
--- dists/lenny/linux-2.6/debian/config/mips/config.r5k-ip32	(original)
+++ dists/lenny/linux-2.6/debian/config/mips/config.r5k-ip32	Mon Feb 23 16:19:18 2009
@@ -120,9 +120,6 @@
 CONFIG_PRINTER=m
 # CONFIG_LP_CONSOLE is not set
 # CONFIG_PPDEV is not set
-CONFIG_RTC=m
-CONFIG_GEN_RTC=y
-CONFIG_GEN_RTC_X=y
 # CONFIG_DTLK is not set
 # CONFIG_R3964 is not set
 # CONFIG_APPLICOM is not set
@@ -778,3 +775,8 @@
 # CONFIG_SND_VX222 is not set
 # CONFIG_SND_YMFPCI is not set
 
+## file: drivers/rtc/Kconfig
+##
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_CMOS=y
+

Added: dists/lenny/linux-2.6/debian/patches/bugfix/mips/ip32-register-cmos.patch
==============================================================================
--- (empty file)
+++ dists/lenny/linux-2.6/debian/patches/bugfix/mips/ip32-register-cmos.patch	Mon Feb 23 16:19:18 2009
@@ -0,0 +1,55 @@
+From: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+Date: Mon, 22 Sep 2008 22:53:20 +0000 (+0200)
+Subject: MIPS: IP32: Add platform device for CMOS RTC; remove dead code
+X-Git-Tag: v2.6.28-rc1~564^2~1
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=656e9503bae1dbc7b0e8c709715e5eda9ae82653
+
+MIPS: IP32: Add platform device for CMOS RTC; remove dead code
+
+Signed-off-by: Thomas Bogendoerfer <tsbogend at alpha.franken.de>
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+---
+
+diff --git a/arch/mips/sgi-ip32/ip32-platform.c b/arch/mips/sgi-ip32/ip32-platform.c
+index 3d63721..511e9ff 100644
+--- a/arch/mips/sgi-ip32/ip32-platform.c
++++ b/arch/mips/sgi-ip32/ip32-platform.c
+@@ -90,6 +90,22 @@ static __init int sgio2btns_devinit(void)
+ 
+ device_initcall(sgio2btns_devinit);
+ 
++static struct resource sgio2_cmos_rsrc[] = {
++	{
++		.start = 0x70,
++		.end   = 0x71,
++		.flags = IORESOURCE_IO
++	}
++};
++
++static __init int sgio2_cmos_devinit(void)
++{
++	return IS_ERR(platform_device_register_simple("rtc_cmos", -1,
++						      sgio2_cmos_rsrc, 1));
++}
++
++device_initcall(sgio2_cmos_devinit);
++
+ MODULE_AUTHOR("Ralf Baechle <ralf at linux-mips.org>");
+ MODULE_LICENSE("GPL");
+ MODULE_DESCRIPTION("8250 UART probe driver for SGI IP32 aka O2");
+diff --git a/arch/mips/sgi-ip32/ip32-setup.c b/arch/mips/sgi-ip32/ip32-setup.c
+index 1024bf4..c5a5d4a 100644
+--- a/arch/mips/sgi-ip32/ip32-setup.c
++++ b/arch/mips/sgi-ip32/ip32-setup.c
+@@ -62,11 +62,6 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
+ }
+ #endif
+ 
+-unsigned long read_persistent_clock(void)
+-{
+-	return mc146818_get_cmos_time();
+-}
+-
+ /* An arbitrary time; this can be decreased if reliability looks good */
+ #define WAIT_MS 10
+ 

Modified: dists/lenny/linux-2.6/debian/patches/series/14
==============================================================================
--- dists/lenny/linux-2.6/debian/patches/series/14	(original)
+++ dists/lenny/linux-2.6/debian/patches/series/14	Mon Feb 23 16:19:18 2009
@@ -15,3 +15,4 @@
 + bugfix/x86/alsa-hda-add-support-for-toshiba-l305.patch
 + bugfix/sparc/sungem-soft-lockup-fix.patch
 + bugfix/x86/agp-intel-add-support-for-G41-chipset.patch
++ bugfix/mips/ip32-register-cmos.patch