aboutsummaryrefslogtreecommitdiffstats
path: root/target
Commit message (Expand)AuthorAgeFilesLines
* kernel: mark all v3.18 and v4.4 kernels are source-onlyJohn Crispin2018-05-247-7/+7
* ramips: fix to mt7620a and add support for i2c on WD03Matthias Badaire2018-05-221-1/+5
* ath79: preliminary support for TP-Link WDR3600 / WDR4300 (AR9344)Johann Neuhauser2018-05-2210-2/+548
* kernel: bump 4.14 to 4.14.42Koen Vandeputte2018-05-226-21/+21
* kernel: bump 4.9 to 4.9.101Koen Vandeputte2018-05-223-15/+15
* ipq806x: drop "mtd: nand: add Winbond manufacturer and chip"Stefan Lippers-Hollmann2018-05-221-38/+0
* ipq806x: drop linux 4.9 supportStefan Lippers-Hollmann2018-05-2287-29438/+0
* ipq806x: switch to linux 4.14Stefan Lippers-Hollmann2018-05-221-1/+1
* ipq806x: remove spi-nor from r7800 dtsPavel Kubelun2018-05-222-90/+0
* ipq806x: remove rpm pinctrl from board dtsPavel Kubelun2018-05-2216-80/+0
* ipq806x: fix EA8500 switch controlPavel Kubelun2018-05-222-8/+36
* ipq806x: move mmc specific nodes into v1.0 dtsiPavel Kubelun2018-05-224-150/+150
* ipq806x: fix pcie tx termination offsetPavel Kubelun2018-05-222-0/+24
* ipq806x: apply updated USB PHY settings to v2.0 SoCPavel Kubelun2018-05-224-22/+34
* ipq806x: reference ipq8065 as ipq8064 v3.0Pavel Kubelun2018-05-228-8/+6
* ipq806x: move mass market ipq8064 to v2 dtsiPavel Kubelun2018-05-2210-10/+10
* ipq806x: introduce ipq8064 SoC v2 dtsiPavel Kubelun2018-05-222-0/+2
* kernel: iqp806x low latency kernel does not bootMarc Benoit2018-05-222-4/+4
* ipq806x: define KERNEL_SIZE in KB instead of byte for the image generationStefan Lippers-Hollmann2018-05-221-5/+5
* ipq806x: increase kernel partition size for the Netgear Nighthawk X4 R7500v2Stefan Lippers-Hollmann2018-05-223-7/+7
* ipq806x: increase kernel partition size for the Netgear Nighthawk X4 R7500Stefan Lippers-Hollmann2018-05-223-7/+7
* ipq806x: increase kernel partition size for the Netgear Nighthawk X4 D7800Stefan Lippers-Hollmann2018-05-223-7/+7
* ipq806x: increase kernel partition size for the TP-Link Archer VR2600vStefan Lippers-Hollmann2018-05-223-7/+7
* ipq806x: increase kernel partition size for the TP-Link Archer C2600Stefan Lippers-Hollmann2018-05-221-3/+3
* ipq806x: increase kernel partition size for the Netgear r7800Stefan Lippers-Hollmann2018-05-223-7/+7
* ipq806x: cleanup kernel configRam Chandra Jangir2018-05-221-14/+8
* ipq806x: add kernel 4.14 supportRam Chandra Jangir2018-05-2268-0/+25602
* ipq40xx: add eva-image for FRITZ!Box 4040David Bauer2018-05-221-1/+4
* ramips: change wifi led trigger for Archer C50v3David Bauer2018-05-221-2/+2
* ramips: fix Archer C50v3 LED mappingDavid Bauer2018-05-221-4/+4
* ath79: enable rtl8366rb phyLucian Cristian2018-05-221-0/+1
* ath79: fix loader-okli, lzma-loaderLucian Cristian2018-05-221-0/+1
* ar71xx: Add support for PISEN TS-D084Chuanhong Guo2018-05-2211-0/+117
* kernel: enable THIN_ARCHIVES by defaultSergey Ryazanov2018-05-2225-24/+1
* kernel: enable FUTEX_PI by defaultSergey Ryazanov2018-05-2225-24/+1
* kernel: enable EXPORTFS by defaultSergey Ryazanov2018-05-2225-25/+1
* kernel: disable DRM_LIB_RANDOM by defaultSergey Ryazanov2018-05-2225-24/+1
* kernel: disable DMA_{NOOP|VIRT}_OPS by defaultSergey Ryazanov2018-05-2225-48/+2
* kernel: disable ARCH_WANTS_THP_SWAP by defaultSergey Ryazanov2018-05-2225-24/+1
* arc770: remove source-onlyEvgeniy Didin2018-05-221-1/+1
* ar71xx: Fix build for dap-1330-a1 boardHauke Mehrtens2018-05-221-1/+1
* ath25: drop 4.9 kernel supportSergey Ryazanov2018-05-2212-3850/+0
* ath25: switch to 4.14 kernelSergey Ryazanov2018-05-221-1/+1
* ath25: add kernel 4.14 supportSergey Ryazanov2018-05-2212-0/+3865
* mvebu: initial support for Marvell Armada 7k and 8k DB boardsDamir Samardzic2018-05-213-0/+38
* mvebu: initial support for Marvell Armada 3720 DB boardDamir Samardzic2018-05-214-0/+29
* kernel: Add support spi-nor, Eon EN25QH32YuheiOKAWA2018-05-214-0/+40
* x86: disable CONFIG_EFI_VARSAlif M. Ahmad2018-05-181-1/+1
* ramips: add support for YUKAI Engineering Inc. BOCCOYuheiOKAWA2018-05-185-0/+174
* ar71xx: WNDR3700: enable RFKILL function for Wifi buttonMichal Cieslakiewicz2018-05-181-4/+4
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 14:55:32 +0000
specify the memory ranges where the content of the flash chip is memory mapped and this driver will search there for some nvram and parse it. Other drivers can use this driver to access the device nvram. The nvram is used to store board configurations like the mac addresses, the switch configuration and the calibration data for the wifi devices. This was copied from arch/mips/bcm47xx/nvram.c and modified to interact with device tree. My plan is to make the MIPS bcm47xx also use this new driver some time later. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- .../devicetree/bindings/misc/bcm47xx-nvram.txt | 19 ++ arch/mips/bcm47xx/board.c | 40 ++-- arch/mips/bcm47xx/nvram.c | 7 +- arch/mips/bcm47xx/setup.c | 4 +- arch/mips/bcm47xx/sprom.c | 4 +- arch/mips/bcm47xx/time.c | 2 +- drivers/misc/Kconfig | 5 + drivers/misc/Makefile | 1 + drivers/misc/bcm47xx-nvram.c | 215 +++++++++++++++++++++ drivers/net/ethernet/broadcom/b44.c | 2 +- drivers/net/ethernet/broadcom/bgmac.c | 5 +- drivers/ssb/driver_chipcommon_pmu.c | 3 +- include/linux/bcm47xx_nvram.h | 17 +- 13 files changed, 286 insertions(+), 38 deletions(-) create mode 100644 Documentation/devicetree/bindings/misc/bcm47xx-nvram.txt create mode 100644 drivers/misc/bcm47xx-nvram.c --- /dev/null +++ b/Documentation/devicetree/bindings/misc/bcm47xx-nvram.txt @@ -0,0 +1,19 @@ +Broadcom bcm47xx/bcm53xx nvram access driver + +This driver provides access to the nvram for other drivers. + +Required properties: + +- compatible : brcm,bcm47xx-nvram + +- reg : iomem address range + +On NorthStar ARM SoCs the NAND flash is available at 0x1c000000 and the +NOR flash is at 0x1e000000 + +Example: + +nvram0: nvram@0 { + compatible = "brcm,bcm47xx-nvram"; + reg = <0x1c000000 0x01000000>; +}; --- a/arch/mips/bcm47xx/board.c +++ b/arch/mips/bcm47xx/board.c @@ -218,36 +218,36 @@ static __init const struct bcm47xx_board const struct bcm47xx_board_type_list2 *e2; const struct bcm47xx_board_type_list3 *e3; - if (bcm47xx_nvram_getenv("model_name", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "model_name", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_model_name; e1->value1; e1++) { if (!strcmp(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("model_no", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "model_no", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_model_no; e1->value1; e1++) { if (strstarts(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("machine_name", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "machine_name", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_machine_name; e1->value1; e1++) { if (strstarts(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "hardware_version", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_hardware_version; e1->value1; e1++) { if (strstarts(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("hardware_version", buf1, sizeof(buf1)) >= 0 && - bcm47xx_nvram_getenv("boardtype", buf2, sizeof(buf2)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "hardware_version", buf1, sizeof(buf1)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boardtype", buf2, sizeof(buf2)) >= 0) { for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) { if (!strstarts(buf1, e2->value1) && !strcmp(buf2, e2->value2)) @@ -255,22 +255,22 @@ static __init const struct bcm47xx_board } } - if (bcm47xx_nvram_getenv("productid", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "productid", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_productid; e1->value1; e1++) { if (!strcmp(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("ModelId", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "ModelId", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_ModelId; e1->value1; e1++) { if (!strcmp(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("melco_id", buf1, sizeof(buf1)) >= 0 || - bcm47xx_nvram_getenv("buf1falo_id", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "melco_id", buf1, sizeof(buf1)) >= 0 || + bcm47xx_nvram_getenv(NULL, "buf1falo_id", buf1, sizeof(buf1)) >= 0) { /* buffalo hardware, check id for specific hardware matches */ for (e1 = bcm47xx_board_list_melco_id; e1->value1; e1++) { if (!strcmp(buf1, e1->value1)) @@ -278,8 +278,8 @@ static __init const struct bcm47xx_board } } - if (bcm47xx_nvram_getenv("boot_hw_model", buf1, sizeof(buf1)) >= 0 && - bcm47xx_nvram_getenv("boot_hw_ver", buf2, sizeof(buf2)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "boot_hw_model", buf1, sizeof(buf1)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boot_hw_ver", buf2, sizeof(buf2)) >= 0) { for (e2 = bcm47xx_board_list_boot_hw; e2->value1; e2++) { if (!strcmp(buf1, e2->value1) && !strcmp(buf2, e2->value2)) @@ -287,16 +287,16 @@ static __init const struct bcm47xx_board } } - if (bcm47xx_nvram_getenv("board_id", buf1, sizeof(buf1)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "board_id", buf1, sizeof(buf1)) >= 0) { for (e1 = bcm47xx_board_list_board_id; e1->value1; e1++) { if (!strcmp(buf1, e1->value1)) return &e1->board; } } - if (bcm47xx_nvram_getenv("boardtype", buf1, sizeof(buf1)) >= 0 && - bcm47xx_nvram_getenv("boardnum", buf2, sizeof(buf2)) >= 0 && - bcm47xx_nvram_getenv("boardrev", buf3, sizeof(buf3)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "boardtype", buf1, sizeof(buf1)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boardnum", buf2, sizeof(buf2)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boardrev", buf3, sizeof(buf3)) >= 0) { for (e3 = bcm47xx_board_list_board; e3->value1; e3++) { if (!strcmp(buf1, e3->value1) && !strcmp(buf2, e3->value2) && @@ -305,9 +305,9 @@ static __init const struct bcm47xx_board } } - if (bcm47xx_nvram_getenv("boardtype", buf1, sizeof(buf1)) >= 0 && - bcm47xx_nvram_getenv("boardrev", buf2, sizeof(buf2)) >= 0 && - bcm47xx_nvram_getenv("boardnum", buf3, sizeof(buf3)) == -ENOENT) { + if (bcm47xx_nvram_getenv(NULL, "boardtype", buf1, sizeof(buf1)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boardrev", buf2, sizeof(buf2)) >= 0 && + bcm47xx_nvram_getenv(NULL, "boardnum", buf3, sizeof(buf3)) == -ENOENT) { for (e2 = bcm47xx_board_list_board_type_rev; e2->value1; e2++) { if (!strcmp(buf1, e2->value1) && !strcmp(buf2, e2->value2)) @@ -327,7 +327,7 @@ void __init bcm47xx_board_detect(void) return; /* check if the nvram is available */ - err = bcm47xx_nvram_getenv("boardtype", buf, sizeof(buf)); + err = bcm47xx_nvram_getenv(NULL, "boardtype", buf, sizeof(buf)); /* init of nvram failed, probably too early now */ if (err == -ENXIO) { --- a/arch/mips/bcm47xx/nvram.c +++ b/arch/mips/bcm47xx/nvram.c @@ -158,7 +158,8 @@ static int nvram_init(void) return -ENXIO; } -int bcm47xx_nvram_getenv(char *name, char *val, size_t val_len) +int bcm47xx_nvram_getenv(const struct device *dev, const char *name, char *val, + size_t val_len) { char *var, *value, *end, *eq; int err; @@ -190,7 +191,7 @@ int bcm47xx_nvram_getenv(char *name, cha } EXPORT_SYMBOL(bcm47xx_nvram_getenv); -int bcm47xx_nvram_gpio_pin(const char *name) +int bcm47xx_nvram_gpio_pin(const struct device *dev, const char *name) { int i, err; char nvram_var[10]; @@ -200,7 +201,7 @@ int bcm47xx_nvram_gpio_pin(const char *n err = snprintf(nvram_var, sizeof(nvram_var), "gpio%i", i); if (err <= 0) continue; - err = bcm47xx_nvram_getenv(nvram_var, buf, sizeof(buf)); + err = bcm47xx_nvram_getenv(dev, nvram_var, buf, sizeof(buf)); if (err <= 0) continue; if (!strcmp(name, buf)) --- a/arch/mips/bcm47xx/setup.c +++ b/arch/mips/bcm47xx/setup.c @@ -132,7 +132,7 @@ static int bcm47xx_get_invariants(struct memset(&iv->sprom, 0, sizeof(struct ssb_sprom)); bcm47xx_fill_sprom(&iv->sprom, NULL, false); - if (bcm47xx_nvram_getenv("cardbus", buf, sizeof(buf)) >= 0) + if (bcm47xx_nvram_getenv(NULL, "cardbus", buf, sizeof(buf)) >= 0) iv->has_cardbus_slot = !!simple_strtoul(buf, NULL, 10); return 0; @@ -155,7 +155,7 @@ static void __init bcm47xx_register_ssb( panic("Failed to initialize SSB bus (err %d)", err); mcore = &bcm47xx_bus.ssb.mipscore; - if (bcm47xx_nvram_getenv("kernel_args", buf, sizeof(buf)) >= 0) { + if (bcm47xx_nvram_getenv(NULL, "kernel_args", buf, sizeof(buf)) >= 0) { if (strstr(buf, "console=ttyS1")) { struct ssb_serial_port port; --- a/arch/mips/bcm47xx/sprom.c +++ b/arch/mips/bcm47xx/sprom.c @@ -52,10 +52,10 @@ static int get_nvram_var(const char *pre create_key(prefix, postfix, name, key, sizeof(key)); - err = bcm47xx_nvram_getenv(key, buf, len); + err = bcm47xx_nvram_getenv(NULL, key, buf, len); if (fallback && err == -ENOENT && prefix) { create_key(NULL, postfix, name, key, sizeof(key)); - err = bcm47xx_nvram_getenv(key, buf, len); + err = bcm47xx_nvram_getenv(NULL, key, buf, len); } return err; } --- a/arch/mips/bcm47xx/time.c +++ b/arch/mips/bcm47xx/time.c @@ -61,7 +61,7 @@ void __init plat_time_init(void) } if (chip_id == 0x5354) { - len = bcm47xx_nvram_getenv("clkfreq", buf, sizeof(buf)); + len = bcm47xx_nvram_getenv(NULL, "clkfreq", buf, sizeof(buf)); if (len >= 0 && !strncmp(buf, "200", 4)) hz = 100000000; } --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -515,6 +515,11 @@ config VEXPRESS_SYSCFG bus. System Configuration interface is one of the possible means of generating transactions on this bus. +config BCM47XX_NVRAM + tristate "BCM47XX nvram driver" + help + This adds support for the brcm47xx nvram driver. + source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -56,3 +56,4 @@ obj-$(CONFIG_GENWQE) += genwqe/ obj-$(CONFIG_ECHO) += echo/ obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o obj-$(CONFIG_CXL_BASE) += cxl/ +obj-$(CONFIG_BCM47XX_NVRAM) += bcm47xx-nvram.o --- a/drivers/net/ethernet/broadcom/b44.c +++ b/drivers/net/ethernet/broadcom/b44.c @@ -411,7 +411,7 @@ static void b44_wap54g10_workaround(stru * see https://dev.openwrt.org/ticket/146 * check and reset bit "isolate" */ - if (bcm47xx_nvram_getenv("boardnum", buf, sizeof(buf)) < 0) + if (bcm47xx_nvram_getenv(NULL, "boardnum", buf, sizeof(buf)) < 0) return; if (simple_strtoul(buf, NULL, 0) == 2) { err = __b44_readphy(bp, 0, MII_BMCR, &val); --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -974,7 +974,8 @@ static void bgmac_chip_reset(struct bgma BGMAC_CHIPCTL_1_IF_TYPE_MII; char buf[4]; - if (bcm47xx_nvram_getenv("et_swtype", buf, sizeof(buf)) > 0) { + if (bcm47xx_nvram_getenv(NULL, "et_swtype", buf, + sizeof(buf)) > 0) { if (kstrtou8(buf, 0, &et_swtype)) bgmac_err(bgmac, "Failed to parse et_swtype (%s)\n", buf); @@ -1534,7 +1535,7 @@ static int bgmac_probe(struct bcma_devic } bgmac->int_mask = BGMAC_IS_ERRMASK | BGMAC_IS_RX | BGMAC_IS_TX_MASK; - if (bcm47xx_nvram_getenv("et0_no_txint", NULL, 0) == 0) + if (bcm47xx_nvram_getenv(NULL, "et0_no_txint", NULL, 0) == 0) bgmac->int_mask &= ~BGMAC_IS_TX_MASK; /* TODO: reset the external phy. Specs are needed */ --- a/drivers/ssb/driver_chipcommon_pmu.c +++ b/drivers/ssb/driver_chipcommon_pmu.c @@ -319,7 +319,8 @@ static void ssb_pmu_pll_init(struct ssb_ if (bus->bustype == SSB_BUSTYPE_SSB) { char buf[20]; - if (bcm47xx_nvram_getenv("xtalfreq", buf, sizeof(buf)) >= 0) + if (bcm47xx_nvram_getenv(NULL, "xtalfreq", buf, + sizeof(buf)) >= 0) crystalfreq = simple_strtoul(buf, NULL, 0); } --- a/include/linux/bcm47xx_nvram.h +++ b/include/linux/bcm47xx_nvram.h @@ -14,19 +14,24 @@ #include <linux/types.h> #include <linux/kernel.h> + +struct device; -#ifdef CONFIG_BCM47XX -int bcm47xx_nvram_getenv(const char *name, char *val, size_t val_len); +#if defined(CONFIG_BCM47XX) || defined(CONFIG_BCM47XX_NVRAM) +int bcm47xx_nvram_getenv(const struct device *dev, const char *name, char *val, + size_t val_len); -int bcm47xx_nvram_gpio_pin(const char *name); +int bcm47xx_nvram_gpio_pin(const struct device *dev, const char *name); #else -static inline int bcm47xx_nvram_getenv(const char *name, char *val, +static inline int bcm47xx_nvram_getenv(const struct device *dev, + const char *name, char *val, size_t val_len) { return -ENXIO; } -static inline int bcm47xx_nvram_gpio_pin(const char *name) +static inline int bcm47xx_nvram_gpio_pin(const struct device *dev, + const char *name) { return -ENXIO; } --- a/drivers/misc/bcm47xx-nvram.c +++ b/drivers/misc/bcm47xx-nvram.c @@ -28,7 +28,7 @@ struct nvram_header { u32 magic; - u32 len; + __le32 len; u32 crc_ver_init; /* 0:7 crc, 8:15 ver, 16:31 sdram_init */ u32 config_refresh; /* 0:15 sdram_config, 16:31 sdram_refresh */ u32 config_ncdl; /* ncdl values for memc */
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-31 14:55:31 +0000