aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSonny Rao <sonnyrao@us.ibm.com>2009-06-18 11:14:36 -0400
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2009-06-26 00:37:26 -0400
commite4031d52c57b17c76bbdb15fcf1a32a9f87d9756 (patch)
treeec50f6143d2ca15cdd4e4a4bdb8ca9ee311450b7
parent4a5cbf17c49a6024a6d7baf03efdffb8ed252bb1 (diff)
powerpc/BSR: add 4096 byte BSR size
Add a 4096 byte BSR size which will be used on new machines. Also, remove the warning when we run into an unknown size, as this can spam the kernel log excessively. Signed-off-by: Sonny Rao <sonnyrao@us.ibm.com> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-rw-r--r--drivers/char/bsr.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c
index 140ea10ecb88..7d9fd8a8dfd0 100644
--- a/drivers/char/bsr.c
+++ b/drivers/char/bsr.c
@@ -75,12 +75,13 @@ static struct class *bsr_class;
75static int bsr_major; 75static int bsr_major;
76 76
77enum { 77enum {
78 BSR_8 = 0, 78 BSR_8 = 0,
79 BSR_16 = 1, 79 BSR_16 = 1,
80 BSR_64 = 2, 80 BSR_64 = 2,
81 BSR_128 = 3, 81 BSR_128 = 3,
82 BSR_UNKNOWN = 4, 82 BSR_4096 = 4,
83 BSR_MAX = 5, 83 BSR_UNKNOWN = 5,
84 BSR_MAX = 6,
84}; 85};
85 86
86static unsigned bsr_types[BSR_MAX]; 87static unsigned bsr_types[BSR_MAX];
@@ -218,9 +219,11 @@ static int bsr_add_node(struct device_node *bn)
218 case 128: 219 case 128:
219 cur->bsr_type = BSR_128; 220 cur->bsr_type = BSR_128;
220 break; 221 break;
222 case 4096:
223 cur->bsr_type = BSR_4096;
224 break;
221 default: 225 default:
222 cur->bsr_type = BSR_UNKNOWN; 226 cur->bsr_type = BSR_UNKNOWN;
223 printk(KERN_INFO "unknown BSR size %d\n",cur->bsr_bytes);
224 } 227 }
225 228
226 cur->bsr_num = bsr_types[cur->bsr_type]; 229 cur->bsr_num = bsr_types[cur->bsr_type];