lkml.org 
[lkml]   [2012]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[v2.6.34-stable 034/165] ARM: davinci: da850 EVM: read mac address from SPI flash
    Date
    From: "Rajashekhara, Sudhakar" <sudhakar.raj@ti.com>

    -------------------
    This is a commit scheduled for the next v2.6.34 longterm release.
    http://git.kernel.org/?p=linux/kernel/git/paulg/longterm-queue-2.6.34.git
    If you see a problem with using this for longterm, please comment.
    -------------------

    commit 810198bc9c109489dfadc57131c5183ce6ad2d7d upstream.

    DA850/OMAP-L138 EMAC driver uses random mac address instead of
    a fixed one because the mac address is not stuffed into EMAC
    platform data.

    This patch provides a function which reads the mac address
    stored in SPI flash (registered as MTD device) and populates the
    EMAC platform data. The function which reads the mac address is
    registered as a callback which gets called upon addition of MTD
    device.

    NOTE: In case the MAC address stored in SPI flash is erased, follow
    the instructions at [1] to restore it.

    [1] http://processors.wiki.ti.com/index.php/GSG:_OMAP-L138_DVEVM_Additional_Procedures#Restoring_MAC_address_on_SPI_Flash

    Modifications in v2:
    Guarded registering the mtd_notifier only when MTD is enabled.
    Earlier this was handled using mtd_has_partitions() call, but
    this has been removed in Linux v3.0.

    Modifications in v3:
    a. Guarded da850_evm_m25p80_notify_add() function and
    da850evm_spi_notifier structure with CONFIG_MTD macros.
    b. Renamed da850_evm_register_mtd_user() function to
    da850_evm_setup_mac_addr() and removed the struct mtd_notifier
    argument to this function.
    c. Passed the da850evm_spi_notifier structure to register_mtd_user()
    function.

    Modifications in v4:
    Moved the da850_evm_setup_mac_addr() function within the first
    CONFIG_MTD ifdef construct.

    Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com>
    Signed-off-by: Sekhar Nori <nsekhar@ti.com>
    Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
    ---
    arch/arm/mach-davinci/board-da850-evm.c | 28 ++++++++++++++++++++++++++++
    1 file changed, 28 insertions(+)

    diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
    index 411284d..cc4e5cb 100644
    --- a/arch/arm/mach-davinci/board-da850-evm.c
    +++ b/arch/arm/mach-davinci/board-da850-evm.c
    @@ -44,6 +44,32 @@

    #define DA850_MII_MDIO_CLKEN_PIN GPIO_TO_PIN(2, 6)

    +#ifdef CONFIG_MTD
    +static void da850_evm_m25p80_notify_add(struct mtd_info *mtd)
    +{
    + char *mac_addr = davinci_soc_info.emac_pdata->mac_addr;
    + size_t retlen;
    +
    + if (!strcmp(mtd->name, "MAC-Address")) {
    + mtd->read(mtd, 0, ETH_ALEN, &retlen, mac_addr);
    + if (retlen == ETH_ALEN)
    + pr_info("Read MAC addr from SPI Flash: %pM\n",
    + mac_addr);
    + }
    +}
    +
    +static struct mtd_notifier da850evm_spi_notifier = {
    + .add = da850_evm_m25p80_notify_add,
    +};
    +
    +static void da850_evm_setup_mac_addr(void)
    +{
    + register_mtd_user(&da850evm_spi_notifier);
    +}
    +#else
    +static void da850_evm_setup_mac_addr(void) { }
    +#endif
    +
    static struct mtd_partition da850_evm_norflash_partition[] = {
    {
    .name = "bootloaders + env",
    @@ -726,6 +752,8 @@ static __init void da850_evm_init(void)
    if (ret)
    pr_warning("da850_evm_init: suspend registration failed: %d\n",
    ret);
    +
    + da850_evm_setup_mac_addr();
    }

    #ifdef CONFIG_SERIAL_8250_CONSOLE
    --
    1.7.12.rc2


    \
     
     \ /
      Last update: 2012-08-16 02:23    [W:0.028 / U:180.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site