154 lines
4.7 KiB
Diff
154 lines
4.7 KiB
Diff
From 7063a1583166abe1a9cefed38c2f53a0e14a0005 Mon Sep 17 00:00:00 2001
|
|
From: Hauke Mehrtens <hauke@hauke-m.de>
|
|
Date: Sun, 4 May 2014 16:35:42 +0200
|
|
Subject: [PATCH 01/17] MIPS: BCM47XX: move the nvram header file into common
|
|
space
|
|
|
|
Moving mach-bcm47xx/bcm47xx_nvram.h to include/linux/bcm47xx_nvram.h
|
|
makes it possible to reuse this header on the ARM based bcm47xx/bcm53xx
|
|
SoCs (e.g. BCM5301X devices). Broadcom uses ARM CPUs in their new SoC
|
|
form the bcm47xx and bcm53xx line, but many other things like nvram
|
|
stayed the same.
|
|
|
|
This is a preparation for adding a new nvram driver, which can be used
|
|
by the ARM SoC and the MIPS SoC code. The device drivers accessing
|
|
nvram do not have to care about ARM or MIPS SoC version.
|
|
|
|
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
|
|
---
|
|
arch/mips/bcm47xx/board.c | 2 +-
|
|
arch/mips/bcm47xx/nvram.c | 2 +-
|
|
arch/mips/bcm47xx/setup.c | 2 +-
|
|
arch/mips/bcm47xx/sprom.c | 2 +-
|
|
arch/mips/bcm47xx/time.c | 2 +-
|
|
arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h | 53 -----------------
|
|
drivers/net/ethernet/broadcom/b44.c | 8 +--
|
|
drivers/net/ethernet/broadcom/bgmac.c | 2 +-
|
|
drivers/ssb/driver_chipcommon_pmu.c | 6 +-
|
|
include/linux/bcm47xx_nvram.h | 66 ++++++++++++++++++++++
|
|
10 files changed, 74 insertions(+), 71 deletions(-)
|
|
delete mode 100644 arch/mips/include/asm/mach-bcm47xx/bcm47xx_nvram.h
|
|
create mode 100644 include/linux/bcm47xx_nvram.h
|
|
|
|
--- a/arch/mips/bcm47xx/board.c
|
|
+++ b/arch/mips/bcm47xx/board.c
|
|
@@ -2,7 +2,7 @@
|
|
#include <linux/export.h>
|
|
#include <linux/string.h>
|
|
#include <bcm47xx_board.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
|
|
struct bcm47xx_board_type {
|
|
const enum bcm47xx_board board;
|
|
--- a/arch/mips/bcm47xx/nvram.c
|
|
+++ b/arch/mips/bcm47xx/nvram.c
|
|
@@ -17,7 +17,7 @@
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <asm/addrspace.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
#include <asm/mach-bcm47xx/bcm47xx.h>
|
|
|
|
static char nvram_buf[NVRAM_SPACE];
|
|
--- a/arch/mips/bcm47xx/setup.c
|
|
+++ b/arch/mips/bcm47xx/setup.c
|
|
@@ -42,7 +42,7 @@
|
|
#include <asm/reboot.h>
|
|
#include <asm/time.h>
|
|
#include <bcm47xx.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
#include <bcm47xx_board.h>
|
|
|
|
union bcm47xx_bus bcm47xx_bus;
|
|
--- a/arch/mips/bcm47xx/sprom.c
|
|
+++ b/arch/mips/bcm47xx/sprom.c
|
|
@@ -27,7 +27,7 @@
|
|
*/
|
|
|
|
#include <bcm47xx.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
#include <linux/if_ether.h>
|
|
#include <linux/etherdevice.h>
|
|
|
|
--- a/arch/mips/bcm47xx/time.c
|
|
+++ b/arch/mips/bcm47xx/time.c
|
|
@@ -27,7 +27,7 @@
|
|
#include <linux/ssb/ssb.h>
|
|
#include <asm/time.h>
|
|
#include <bcm47xx.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
#include <bcm47xx_board.h>
|
|
|
|
void __init plat_time_init(void)
|
|
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
@@ -31,6 +31,7 @@
|
|
#include <linux/ssb/ssb.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/phy.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
#include <asm/io.h>
|
|
@@ -399,8 +400,6 @@ static void b44_set_flow_ctrl(struct b44
|
|
__b44_set_flow_ctrl(bp, pause_enab);
|
|
}
|
|
|
|
-#ifdef CONFIG_BCM47XX
|
|
-#include <bcm47xx_nvram.h>
|
|
static void b44_wap54g10_workaround(struct b44 *bp)
|
|
{
|
|
char buf[20];
|
|
@@ -429,11 +428,6 @@ static void b44_wap54g10_workaround(stru
|
|
error:
|
|
pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
|
|
}
|
|
-#else
|
|
-static inline void b44_wap54g10_workaround(struct b44 *bp)
|
|
-{
|
|
-}
|
|
-#endif
|
|
|
|
static int b44_setup_phy(struct b44 *bp)
|
|
{
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.c
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.c
|
|
@@ -17,7 +17,7 @@
|
|
#include <linux/interrupt.h>
|
|
#include <linux/dma-mapping.h>
|
|
#include <linux/platform_data/b53.h>
|
|
-#include <bcm47xx_nvram.h>
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
|
|
static const struct bcma_device_id bgmac_bcma_tbl[] = {
|
|
BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS),
|
|
--- a/drivers/ssb/driver_chipcommon_pmu.c
|
|
+++ b/drivers/ssb/driver_chipcommon_pmu.c
|
|
@@ -13,9 +13,7 @@
|
|
#include <linux/ssb/ssb_driver_chipcommon.h>
|
|
#include <linux/delay.h>
|
|
#include <linux/export.h>
|
|
-#ifdef CONFIG_BCM47XX
|
|
-#include <bcm47xx_nvram.h>
|
|
-#endif
|
|
+#include <linux/bcm47xx_nvram.h>
|
|
|
|
#include "ssb_private.h"
|
|
|
|
@@ -320,11 +318,9 @@ static void ssb_pmu_pll_init(struct ssb_
|
|
u32 crystalfreq = 0; /* in kHz. 0 = keep default freq. */
|
|
|
|
if (bus->bustype == SSB_BUSTYPE_SSB) {
|
|
-#ifdef CONFIG_BCM47XX
|
|
char buf[20];
|
|
if (bcm47xx_nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0)
|
|
crystalfreq = simple_strtoul(buf, NULL, 0);
|
|
-#endif
|
|
}
|
|
|
|
switch (bus->chip_id) {
|