linux-toradex.git/arch/mips/bcm47xx, branch v3.10.85

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next

2013-02-22T09:07:30+00:00

Conflicts:
    include/linux/ssb/ssb_driver_gige.h

Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.

Merge branch 'mips-next-3.9' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next

2013-02-21T11:51:33+00:00

MIPS: BCM47XX: use fallback sprom var for board_{rev,type}

2013-02-15T18:01:57+00:00

An SoC normally do not define path variables for board_rev and
board_type and the Broadcom SDK also uses the nvram values without a
prefix in such cases. Do the same to fill these sprom attributes from
nvram and do not leave them empty, because brcmsmac do not like this.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4679/
Signed-off-by: John Crispin

MIPS: BCM47XX: trim the nvram values for parsing

2013-02-15T18:01:57+00:00

Some nvram values on some devices have a newline character at the end
of the value, that caused read errors. Trim the string before reading
the number.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4745/
Signed-off-by: John Crispin

MIPS: BCM47XX: add bcm47xx prefix in front of nvram function names

2013-02-15T18:01:57+00:00

The nvram functions are exported and used by some normal drivers. To
prevent name clashes with ofter parts of the kernel code add a bcm47xx_
prefix in front of the function names and the header file name.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4744/
Signed-off-by: John Crispin

MIPS: BCM47XX: handle different nvram sizes

2013-02-15T18:01:56+00:00

The old code just worked for nvram with a size of 0x8000 bytes. This
patch adds support for reading nvram from partitions of 0xF000 and
0x10000 bytes.

There is just 32KB space for the nvram, but most devices do not use the
full size and this code reads the first 32KB in that case and prints a
warning.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4743/
Signed-off-by: John Crispin

MIPS: BCM47XX: rename early_nvram_init to nvram_init

2013-02-15T18:01:56+00:00

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4742/
Signed-off-by: John Crispin

MIPS: BCM47XX: nvram add nand flash support

2013-02-15T18:01:56+00:00

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4741/
Signed-off-by: John Crispin

MIPS: BCM47XX: return error when init of nvram failed

2013-02-15T18:01:56+00:00

This makes it possible to handle the case of not being able to read the
nvram ram. This could happen when the code searching for the specific
flash chip have not run jet.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4740/
Signed-off-by: John Crispin

MIPS: BCM47XX: use common error codes in nvram reads

2013-02-15T18:01:56+00:00

Instead of using our own error codes use some common codes.

Signed-off-by: Hauke Mehrtens 
Patchwork: http://patchwork.linux-mips.org/patch/4739/
Signed-off-by: John Crispin