| Message ID | 1310376501-14189-1-git-send-email-sudhakar.raj@ti.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Sudhakar, On Mon, Jul 11, 2011 at 14:58:21, Rajashekhara, Sudhakar wrote: > diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c > index a7b41bf..5bb6556 100644 > --- a/arch/arm/mach-davinci/board-da850-evm.c > +++ b/arch/arm/mach-davinci/board-da850-evm.c > @@ -115,6 +115,25 @@ static struct spi_board_info da850evm_spi_info[] = { > }, > }; > > +#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, > +}; > +#endif > + > static struct mtd_partition da850_evm_norflash_partition[] = { > { > .name = "bootloaders + env", > @@ -1117,6 +1136,15 @@ static __init int da850_evm_init_cpufreq(void) > static __init int da850_evm_init_cpufreq(void) { return 0; } > #endif > > +#ifdef CONFIG_MTD > +static void da850_evm_setup_mac_addr(void) > +{ > + register_mtd_user(&da850evm_spi_notifier); > +} > +#else > +static void da850_evm_setup_mac_addr(void) { } > +#endif Why not combine this ifdef construct with earlier one? Rest of it looks good to me. Thanks, Sekhar
Hi, On Mon, Jul 11, 2011 at 18:02:55, Nori, Sekhar wrote: > Hi Sudhakar, > > On Mon, Jul 11, 2011 at 14:58:21, Rajashekhara, Sudhakar wrote: > > > diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c > > index a7b41bf..5bb6556 100644 > > --- a/arch/arm/mach-davinci/board-da850-evm.c > > +++ b/arch/arm/mach-davinci/board-da850-evm.c > > @@ -115,6 +115,25 @@ static struct spi_board_info da850evm_spi_info[] = { > > }, > > }; > > > > +#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, > > +}; > > +#endif > > + > > static struct mtd_partition da850_evm_norflash_partition[] = { > > { > > .name = "bootloaders + env", > > @@ -1117,6 +1136,15 @@ static __init int da850_evm_init_cpufreq(void) > > static __init int da850_evm_init_cpufreq(void) { return 0; } > > #endif > > > > +#ifdef CONFIG_MTD > > +static void da850_evm_setup_mac_addr(void) > > +{ > > + register_mtd_user(&da850evm_spi_notifier); > > +} > > +#else > > +static void da850_evm_setup_mac_addr(void) { } > > +#endif > > Why not combine this ifdef construct with > earlier one? > Ok. Updated patch will follow. Regards, Sudhakar
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index a7b41bf..5bb6556 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -115,6 +115,25 @@ static struct spi_board_info da850evm_spi_info[] = { }, }; +#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, +}; +#endif + static struct mtd_partition da850_evm_norflash_partition[] = { { .name = "bootloaders + env", @@ -1117,6 +1136,15 @@ static __init int da850_evm_init_cpufreq(void) static __init int da850_evm_init_cpufreq(void) { return 0; } #endif +#ifdef CONFIG_MTD +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 __init void da850_evm_init(void) { int ret; @@ -1237,6 +1265,8 @@ static __init void da850_evm_init(void) if (ret) pr_warning("da850_evm_init: spi 1 registration failed: %d\n", ret); + + da850_evm_setup_mac_addr(); } #ifdef CONFIG_SERIAL_8250_CONSOLE
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. Signed-off-by: Rajashekhara, Sudhakar <sudhakar.raj@ti.com> --- arch/arm/mach-davinci/board-da850-evm.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-)