MIPS: BCM63XX: export PSI size from nvram

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Mon Aug 5 16:59:02 EDT 2013


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e60665c50f0d94c0f2696b19cad7d281b2bc00cf
Commit:     e60665c50f0d94c0f2696b19cad7d281b2bc00cf
Parent:     c88fd9d9705506b5d75757735745183e5f2ff2cd
Author:     Jonas Gorski <jogo at openwrt.org>
AuthorDate: Sat Mar 23 14:07:48 2013 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Mon Aug 5 18:58:55 2013 +0100

    MIPS: BCM63XX: export PSI size from nvram
    
    Signed-off-by: Jonas Gorski <jogo at openwrt.org>
    Acked-by: Florian Fainelli <florian at openwrt.org>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 arch/mips/bcm63xx/nvram.c                          | 11 +++++++++++
 arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/arch/mips/bcm63xx/nvram.c b/arch/mips/bcm63xx/nvram.c
index e652e57..4b50d40 100644
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
@@ -35,6 +35,8 @@ struct bcm963xx_nvram {
 	u32	checksum_high;
 };
 
+#define BCM63XX_DEFAULT_PSI_SIZE	64
+
 static struct bcm963xx_nvram nvram;
 static int mac_addr_used;
 
@@ -114,3 +116,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac)
 	return 0;
 }
 EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);
+
+int bcm63xx_nvram_get_psi_size(void)
+{
+	if (nvram.psi_size > 0)
+		return nvram.psi_size;
+
+	return BCM63XX_DEFAULT_PSI_SIZE;
+}
+EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
index 4e0b6bc..348df49 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void);
  */
 int bcm63xx_nvram_get_mac_address(u8 *mac);
 
+int bcm63xx_nvram_get_psi_size(void);
+
 #endif /* BCM63XX_NVRAM_H */



More information about the linux-mtd-cvs mailing list