Thu, 03 Mar 2005 06:50:14 +0100

Author: jurij-guest
Date: 2005-03-03 06:50:08 +0100 (Thu, 03 Mar 2005)
New Revision: 2583

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/144_sparc64-sb1500-clock-2.4.diff
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sb1500-clock-2.6.dpatch
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sb1500-clock-2.6.dpatch
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-9
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
   trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
Log:
Added a (sparc64-specific) patch by David Miller, enabling the
recognition of the clock chip found on SunBlade 1500, required
for it to boot. Branches: 2.4.27-9, 2.6.8-14, 2.6.10-6.


Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog
===================================================================

--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/changelog	2005-03-03 05:50:08 UTC (rev 2583)
@@ -41,6 +41,10 @@
     systems. Thanks to Stephen Frost who helped fixing this.
     (Frederik Schüler)
 
+  * sparc64-sb1500-clock-2.6.dpatch by David Miller: enable recognition 
+    of the clock chip on SunBlade 1500, it won't boot otherwise.
+    (Jurij Smakov).
+    
  -- Frederik Schüler <fs@gmx.net>  Fri, 25 Feb 2005 22:49:22 +0100
 
 kernel-source-2.6.10 (2.6.10-5) unstable; urgency=low

Modified: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/series/2.6.10-6	2005-03-03 05:50:08 UTC (rev 2583)
@@ -10,3 +10,4 @@
 + amd64-noexec32-backport.dpatch 
 + outs.dpatch
 - 083-x86_64_switch_mm_context_race.dpatch
++ sparc64-sb1500-clock-2.6.dpatch

Added: trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sb1500-clock-2.6.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sb1500-clock-2.6.dpatch	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.10-2.6.10/debian/patches/sparc64-sb1500-clock-2.6.dpatch	2005-03-03 05:50:08 UTC (rev 2583)
@@ -0,0 +1,43 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/02 14:03:27-08:00 davem@nuts.davemloft.net 
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
+# arch/sparc64/kernel/time.c
+#   2005/03/02 14:02:54-08:00 davem@nuts.davemloft.net +5 -2
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+# 
+diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
+--- a/arch/sparc64/kernel/time.c	2005-03-02 14:04:56 -08:00
++++ b/arch/sparc64/kernel/time.c	2005-03-02 14:04:56 -08:00
+@@ -779,6 +779,7 @@
+ 		    strcmp(model, "mk48t59") &&
+ 		    strcmp(model, "m5819") &&
+ 		    strcmp(model, "m5819p") &&
++		    strcmp(model, "m5823") &&
+ 		    strcmp(model, "ds1287")) {
+ 			if (cbus != NULL) {
+ 				prom_printf("clock_probe: Central bus lacks timer chip.\n");
+@@ -838,7 +839,8 @@
+ 
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = edev->resource[0].start;
+ 			} else {
+ 				mstk48t59_regs = edev->resource[0].start;
+@@ -859,7 +861,8 @@
+ 			}
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = isadev->resource.start;
+ 			} else {
+ 				mstk48t59_regs = isadev->resource.start;

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2005-03-03 05:50:08 UTC (rev 2583)
@@ -57,6 +57,10 @@
     fix potential information leak by making fragment queues private.
     (Joshua Kwan, Simon Horman)            
 
+  * sparc64-sb1500-clock-2.6.dpatch by David Miller: enable recognition 
+    of the clock chip on SunBlade 1500, it won't boot otherwise.
+    (Jurij Smakov).
+
  -- Joshua Kwan <joshk@triplehelix.org>  Sat, 26 Feb 2005 21:01:07 -0800
 
 kernel-source-2.6.8 (2.6.8-13) unstable; urgency=high

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-14	2005-03-03 05:50:08 UTC (rev 2583)
@@ -18,3 +18,4 @@
 + ipv4-fragment-queues-2.dpatch
 + ipv4-fragment-queues-3.dpatch
 + ipv4-fragment-queues-4.dpatch
++ sparc64-sb1500-clock-2.6.dpatch

Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sb1500-clock-2.6.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sb1500-clock-2.6.dpatch	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sb1500-clock-2.6.dpatch	2005-03-03 05:50:08 UTC (rev 2583)
@@ -0,0 +1,43 @@
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/02 14:03:27-08:00 davem@nuts.davemloft.net 
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
+# arch/sparc64/kernel/time.c
+#   2005/03/02 14:02:54-08:00 davem@nuts.davemloft.net +5 -2
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+# 
+diff -Nru a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
+--- a/arch/sparc64/kernel/time.c	2005-03-02 14:04:56 -08:00
++++ b/arch/sparc64/kernel/time.c	2005-03-02 14:04:56 -08:00
+@@ -779,6 +779,7 @@
+ 		    strcmp(model, "mk48t59") &&
+ 		    strcmp(model, "m5819") &&
+ 		    strcmp(model, "m5819p") &&
++		    strcmp(model, "m5823") &&
+ 		    strcmp(model, "ds1287")) {
+ 			if (cbus != NULL) {
+ 				prom_printf("clock_probe: Central bus lacks timer chip.\n");
+@@ -838,7 +839,8 @@
+ 
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = edev->resource[0].start;
+ 			} else {
+ 				mstk48t59_regs = edev->resource[0].start;
+@@ -859,7 +861,8 @@
+ 			}
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = isadev->resource.start;
+ 			} else {
+ 				mstk48t59_regs = isadev->resource.start;

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2005-03-03 05:50:08 UTC (rev 2583)
@@ -45,6 +45,10 @@
     write to privileged IO ports via OUTS instruction
     (Simon Horman)
 
+  * 144_sparc64-sb1500-clock-2.4.diff by David Miller: enable recognition 
+    of the clock chip on SunBlade 1500, it won't boot otherwise.
+    (Jurij Smakov).
+
  -- Simon Horman <horms@debian.org>  Thu, 24 Feb 2005 15:53:42 +0900
 
 kernel-source-2.4.27 (2.4.27-8) unstable; urgency=high

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/144_sparc64-sb1500-clock-2.4.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/144_sparc64-sb1500-clock-2.4.diff	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/144_sparc64-sb1500-clock-2.4.diff	2005-03-03 05:50:08 UTC (rev 2583)
@@ -0,0 +1,49 @@
+#
+# This patch has been re-diffed against kernel-source-2.4.27-8, 
+# as the original one applied to it with 6 line offset. Original
+# patch description follows.
+#
+# -- Jurij Smakov <jurij@wooyd.org>  Wed,  2 Mar 2005 20:46:14 -0500
+#
+# This is a BitKeeper generated diff -Nru style patch.
+#
+# ChangeSet
+#   2005/03/02 14:12:47-08:00 davem@nuts.davemloft.net 
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+#   
+#   Signed-off-by: David S. Miller <davem@davemloft.net>
+# 
+# arch/sparc64/kernel/time.c
+#   2005/03/02 14:12:26-08:00 davem@nuts.davemloft.net +5 -2
+#   [SPARC64]: Accept 'm5823' clock chip as seen on SB1500.
+# 
+--- a/arch/sparc64/kernel/time.c	2003-11-28 13:26:19.000000000 -0500
++++ b/arch/sparc64/kernel/time.c	2005-03-02 20:32:12.000000000 -0500
+@@ -776,6 +776,7 @@
+ 		    strcmp(model, "mk48t59") &&
+ 		    strcmp(model, "m5819") &&
+ 		    strcmp(model, "m5819p") &&
++		    strcmp(model, "m5823") &&
+ 		    strcmp(model, "ds1287")) {
+ 			if (cbus != NULL) {
+ 				prom_printf("clock_probe: Central bus lacks timer chip.\n");
+@@ -835,7 +836,8 @@
+ 
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = edev->resource[0].start;
+ 			} else {
+ 				mstk48t59_regs = edev->resource[0].start;
+@@ -856,7 +858,8 @@
+ 			}
+ 			if (!strcmp(model, "ds1287") ||
+ 			    !strcmp(model, "m5819") ||
+-			    !strcmp(model, "m5819p")) {
++			    !strcmp(model, "m5819p") ||
++			    !strcmp(model, "m5823")) {
+ 				ds1287_regs = isadev->resource.start;
+ 			} else {
+ 				mstk48t59_regs = isadev->resource.start;

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-9
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-9	2005-03-01 15:04:52 UTC (rev 2582)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-9	2005-03-03 05:50:08 UTC (rev 2583)
@@ -9,3 +9,4 @@
 + 142_acpi_skip_timer_override.diff
 + 121_drm-locking-checks-3.diff
 + 143_outs.diff
++ 144_sparc64-sb1500-clock-2.4.diff



