Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 138173d4 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Move NVRAM header to the include/linux/. 



There are two reasons for having this header in the common place:
1) Simplifying drivers that read NVRAM entries. We will be able to
   safely call bcm47xx_nvram_* functions without #ifdef-s.
2) Getting NVRAM driver out of MIPS arch code. This is needed to support
   BCM5301X arch which also requires this NVRAM driver. Patch for that
   will follow once we get is reviewed.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Acked-by: default avatarHauke Mehrtens <hauke@hauke-m.de>
Cc: linux-mips@linux-mips.org
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: linux-soc@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/8619/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 5ae03b12

arch/mips/bcm47xx/board.c

+1 −1
Original line number Diff line number Diff line 
#include <linux/errno.h>

#include <linux/export.h>

#include <linux/string.h>

#include <bcm47xx.h>

#include <bcm47xx_board.h>

#include <bcm47xx_nvram.h>



struct bcm47xx_board_type {

	const enum bcm47xx_board board;

arch/mips/bcm47xx/nvram.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/mtd/mtd.h>

#include <bcm47xx_nvram.h>

#include <linux/bcm47xx_nvram.h>



#define NVRAM_MAGIC		0x48534C46	/* 'FLSH' */

#define NVRAM_SPACE		0x8000

arch/mips/bcm47xx/setup.c

+0 −1
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include <asm/reboot.h>

#include <asm/time.h>

#include <bcm47xx.h>

#include <bcm47xx_nvram.h>

#include <bcm47xx_board.h>



union bcm47xx_bus bcm47xx_bus;

arch/mips/bcm47xx/sprom.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
 */



#include <bcm47xx.h>

#include <bcm47xx_nvram.h>

#include <linux/if_ether.h>

#include <linux/etherdevice.h>

arch/mips/bcm47xx/time.c

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/ssb/ssb.h>

#include <asm/time.h>

#include <bcm47xx.h>

#include <bcm47xx_nvram.h>

#include <bcm47xx_board.h>



void __init plat_time_init(void)