MIPS: BCM47XX: Make bcma init NVRAM instead of bcm47xx polling it
This drops ssb/bcma dependency and will allow us to make it a standalone driver. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> Cc: linux-mips@linux-mips.org Cc: Hauke Mehrtens <hauke@hauke-m.de> Patchwork: https://patchwork.linux-mips.org/patch/8233/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
21400f252a
commit
7177efc5b0
@@ -20,6 +20,9 @@
|
||||
#include <linux/serial_core.h>
|
||||
#include <linux/serial_reg.h>
|
||||
#include <linux/time.h>
|
||||
#ifdef CONFIG_BCM47XX
|
||||
#include <bcm47xx_nvram.h>
|
||||
#endif
|
||||
|
||||
enum bcma_boot_dev {
|
||||
BCMA_BOOT_DEV_UNK = 0,
|
||||
@@ -323,10 +326,16 @@ static void bcma_core_mips_flash_detect(struct bcma_drv_mips *mcore)
|
||||
switch (boot_dev) {
|
||||
case BCMA_BOOT_DEV_PARALLEL:
|
||||
case BCMA_BOOT_DEV_SERIAL:
|
||||
/* TODO: Init NVRAM using BCMA_SOC_FLASH2 window */
|
||||
#ifdef CONFIG_BCM47XX
|
||||
bcm47xx_nvram_init_from_mem(BCMA_SOC_FLASH2,
|
||||
BCMA_SOC_FLASH2_SZ);
|
||||
#endif
|
||||
break;
|
||||
case BCMA_BOOT_DEV_NAND:
|
||||
/* TODO: Init NVRAM using BCMA_SOC_FLASH1 window */
|
||||
#ifdef CONFIG_BCM47XX
|
||||
bcm47xx_nvram_init_from_mem(BCMA_SOC_FLASH1,
|
||||
BCMA_SOC_FLASH1_SZ);
|
||||
#endif
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
|
Reference in New Issue
Block a user