diff options
| author | Sonny Rao <sonnyrao@us.ibm.com> | 2009-06-18 15:14:36 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-06-26 14:37:26 +1000 |
| commit | e4031d52c57b17c76bbdb15fcf1a32a9f87d9756 (patch) | |
| tree | ec50f6143d2ca15cdd4e4a4bdb8ca9ee311450b7 /drivers/char | |
| parent | 4a5cbf17c49a6024a6d7baf03efdffb8ed252bb1 (diff) | |
| download | linux-3.10-e4031d52c57b17c76bbdb15fcf1a32a9f87d9756.tar.gz linux-3.10-e4031d52c57b17c76bbdb15fcf1a32a9f87d9756.tar.bz2 linux-3.10-e4031d52c57b17c76bbdb15fcf1a32a9f87d9756.zip | |
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>
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/bsr.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c index 140ea10ecb8..7d9fd8a8dfd 100644 --- a/drivers/char/bsr.c +++ b/drivers/char/bsr.c @@ -75,12 +75,13 @@ static struct class *bsr_class; static int bsr_major; enum { - BSR_8 = 0, - BSR_16 = 1, - BSR_64 = 2, - BSR_128 = 3, - BSR_UNKNOWN = 4, - BSR_MAX = 5, + BSR_8 = 0, + BSR_16 = 1, + BSR_64 = 2, + BSR_128 = 3, + BSR_4096 = 4, + BSR_UNKNOWN = 5, + BSR_MAX = 6, }; static unsigned bsr_types[BSR_MAX]; @@ -218,9 +219,11 @@ static int bsr_add_node(struct device_node *bn) case 128: cur->bsr_type = BSR_128; break; + case 4096: + cur->bsr_type = BSR_4096; + break; default: cur->bsr_type = BSR_UNKNOWN; - printk(KERN_INFO "unknown BSR size %d\n",cur->bsr_bytes); } cur->bsr_num = bsr_types[cur->bsr_type]; |