ARM: davinci: step towards removing at24_platform_data
Subsystems (7)
v2 cover ARM: davinci: step towards removing at24_platform_data
From: Bartosz Golaszewski <[email protected]>
Since I took over maintainership of the at24 driver I've been working towards removing at24_platform_data in favor for device properties.
DaVinci is the only platform that's still using it - all other users have already been converted.
One of the obstacles in case of DaVinci is removing the setup() callback from the pdata struct, the only user of which are some davinci boards.
Most boards use the EEPROM to store the MAC address. This series adds support for cell lookups to the nvmem framework, registers relevant cells for all users, converts the davinci_emac driver to using them and replaces at24_platform_data with device properties.
The only board that's still using this callback is now mityomapl138. Unfortunately it stores more info in EEPROM than just the MAC address and will require some more work. Unfortunately I don't have access to this board so I can't test any actual solutions on a live hardware.
Tested on a dm365-evm board.
v1 -> v2:
- for backward compatiblity: fall back to using of_get_mac_address() if we can't get an nvmem cell in patch 7
- add patch 15 which removes dead code
Bartosz Golaszewski (15):
nvmem: add support for cell lookups
ARM: davinci: dm365-evm: use nvmem lookup for mac address
ARM: davinci: dm644-evm: use nvmem lookup for mac address
ARM: davinci: dm646x-evm: use nvmem lookup for mac address
ARM: davinci: da830-evm: use nvmem lookup for mac address
ARM: davinci: mityomapl138: add nvmem cells lookup entries
net: davinci_emac: use nvmem to retrieve the mac address
ARM: davinci: mityomapl138: don't read the MAC address from machine
code
ARM: davinci: dm365-evm: use device properties for at24 eeprom
ARM: davinci: da830-evm: use device properties for at24 eeprom
ARM: davinci: dm644x-evm: use device properties for at24 eeprom
ARM: davinci: dm646x-evm: use device properties for at24 eeprom
ARM: davinci: sffsdr: fix the at24 eeprom device name
ARM: davinci: sffsdr: use device properties for at24 eeprom
ARM: davinci: remove dead code
arch/arm/mach-davinci/board-da830-evm.c | 25 +++++++--- arch/arm/mach-davinci/board-dm365-evm.c | 25 +++++++--- arch/arm/mach-davinci/board-dm644x-evm.c | 24 ++++++--- arch/arm/mach-davinci/board-dm646x-evm.c | 25 +++++++--- arch/arm/mach-davinci/board-mityomapl138.c | 30 +++++++++--- arch/arm/mach-davinci/board-sffsdr.c | 13 +++-- arch/arm/mach-davinci/common.c | 15 ------ drivers/net/ethernet/ti/davinci_emac.c | 33 +++++++++---- drivers/nvmem/core.c | 57 +++++++++++++++++++++- include/linux/davinci_emac.h | 2 - include/linux/nvmem-consumer.h | 6 +++ include/linux/nvmem-provider.h | 6 +++ 12 files changed, 186 insertions(+), 75 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/15 nvmem: add support for cell lookups
From: Bartosz Golaszewski <[email protected]>
We can currently only register nvmem cells from device tree or by manually calling nvmem_add_cells(). The latter options however forces users to make sure that the nvmem provider with which the cells are associated is registered before the call.
This patch proposes a new solution inspired by other frameworks that offer resource lookups (GPIO, PWM etc.). It adds a function that allows machine code to register nvmem lookup which are later lazily used to add corresponding nvmem cells.
--- drivers/nvmem/core.c | 57 +++++++++++++++++++++++++++++++++- include/linux/nvmem-consumer.h | 6 ++++ include/linux/nvmem-provider.h | 6 ++++ 3 files changed, 68 insertions(+), 1 deletion(-)
drivers/nvmem/core.c +56 -1
@@ -62,6 +62,9 @@ static DEFINE_IDA(nvmem_ida);static LIST_HEAD (nvmem_cells);static DEFINE_MUTEX (nvmem_cells_mutex); +static LIST_HEAD (nvmem_cell_lookups); +static DEFINE_MUTEX (nvmem_lookup_mutex); +#ifdef CONFIG_DEBUG_LOCK_ALLOC static struct lock_class_key eeprom_lock_key;#endif
@@ -247,6 +250,23 @@ static const struct attribute_group *nvmem_ro_root_dev_groups[] = { NULL, }; +/** +* nvmem_register_lookup() - register a number of nvmem cell lookup entries +* +* @lookup: array of nvmem cell lookup entries +* @nentries: number of lookup entries in the array +*/ +void nvmem_register_lookup (struct nvmem_cell_lookup *lookup,size_t nentries) +{ +int i; + +mutex_lock (&nvmem_lookup_mutex); +for (i =0 ; i < nentries; i++) +list_add_tail (&lookup[i].list, &nvmem_cell_lookups); +mutex_unlock (&nvmem_lookup_mutex); +} +EXPORT_SYMBOL_GPL (nvmem_register_lookup); +static void nvmem_release (struct device *dev) {struct nvmem_device *nvmem =to_nvmem_device (dev);
@@ -916,6 +936,37 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,EXPORT_SYMBOL_GPL (of_nvmem_cell_get);#endif +static struct nvmem_cell *nvmem_cell_from_lookup (const char *cell_id) +{ +struct nvmem_cell *cell =ERR_PTR (-EPROBE_DEFER ); +struct nvmem_cell_lookup *lookup; +struct nvmem_device *nvmem; +int rc; + +mutex_lock (&nvmem_lookup_mutex); + +list_for_each_entry (lookup, &nvmem_cell_lookups, list) { +if (strcmp (cell_id, lookup->info.name) ==0 ) { + nvmem =nvmem_find (lookup->nvmem_name); +if (!nvmem) + goto out; + + rc =nvmem_add_cells (nvmem, &lookup->info,1 ); +if (rc) { + cell =ERR_PTR (rc); + goto out; + } + + cell =nvmem_cell_get_from_list (cell_id); +break ; + } + } + +out: +mutex_unlock (&nvmem_lookup_mutex); +return cell; +} +/** * nvmem_cell_get() - Get nvmem cell of device form a given cell name *
@@ -936,7 +987,11 @@ struct nvmem_cell *nvmem_cell_get(struct device *dev, const char *cell_id)return cell; } -return nvmem_cell_get_from_list (cell_id); + cell =nvmem_cell_get_from_list (cell_id); +if (!IS_ERR (cell) ||PTR_ERR (cell) == -EPROBE_DEFER ) +return cell; + +return nvmem_cell_from_lookup (cell_id); }EXPORT_SYMBOL_GPL (nvmem_cell_get);
include/linux/nvmem-consumer.h +6 -0
@@ -29,6 +29,12 @@ struct nvmem_cell_info {unsigned int nbits; }; +struct nvmem_cell_lookup { +struct nvmem_cell_info info; +struct list_head list; +const char *nvmem_name; +}; +#if IS_ENABLED (CONFIG_NVMEM )/* Cell based interface */
include/linux/nvmem-provider.h +6 -0
@@ -17,6 +17,7 @@struct nvmem_device ;struct nvmem_cell_info ; +struct nvmem_cell_lookup ;typedef int (*nvmem_reg_read_t )(void *priv,unsigned int offset,void *val,size_t bytes); typedef int (*nvmem_reg_write_t)(void *priv, unsigned int offset,
@@ -72,6 +73,8 @@ struct nvmem_config {struct nvmem_device *nvmem_register (const struct nvmem_config *cfg);int nvmem_unregister (struct nvmem_device *nvmem); +void nvmem_register_lookup (struct nvmem_cell_lookup *lookup,size_t nentries); +struct nvmem_device *devm_nvmem_register (struct device *dev,const struct nvmem_config *cfg);
@@ -92,6 +95,9 @@ static inline int nvmem_unregister(struct nvmem_device *nvmem)return -ENOSYS ; } +static inline void +nvmem_register_lookup (struct nvmem_cell_lookup *lookup,size_t nentries) {} +static inline struct nvmem_device *devm_nvmem_register (struct device *dev,const struct nvmem_config *c) {
Signature · 1 line
2.17.1
Re: [PATCH v2 01/15] nvmem: add support for cell lookups
Thanks for the patch,
Quoted 7 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We can currently only register nvmem cells from device tree or by manually calling
nvmem_add_cells(). The latter options however forces users to make sure that the nvmem provider with which the cells are associated is registered before the call.
Quoted 5 lines
This patch proposes a new solution inspired by other frameworks that offer resource lookups (GPIO, PWM etc.). It adds a function that allows machine code to register nvmem lookup which are later lazily used to add corresponding nvmem cells.
Overall the idea look fine to me.
This needs to be documented in ./Documentation/nvmem/nvmem.txt
Quoted 22 lines
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/nvmem/core.c | 57 +++++++++++++++++++++++++++++++++- include/linux/nvmem-consumer.h | 6 ++++ include/linux/nvmem-provider.h | 6 ++++ 3 files changed, 68 insertions(+), 1 deletion(-)drivers/nvmem/core.c +3
-0@@ -62,6 +62,9 @@ static DEFINE_IDA(nvmem_ida);static LIST_HEAD (nvmem_cells);static DEFINE_MUTEX (nvmem_cells_mutex); +static LIST_HEAD (nvmem_cell_lookups); +static DEFINE_MUTEX (nvmem_lookup_mutex); +#ifdef CONFIG_DEBUG_LOCK_ALLOC static struct lock_class_key eeprom_lock_key;#endif
drivers/nvmem/core.c static const struct attribute_group *nvmem_ro_root_dev_groups[] = { · line 255
Quoted 6 lines
drivers/nvmem/core.c +3
-0@@ -247,6 +250,23 @@ static const struct attribute_group *nvmem_ro_root_dev_groups[] = { NULL, }; +/** +* nvmem_register_lookup() - register a number of nvmem cell lookup entries +*
Can we rename this to nvmem_add_lookup_table()?
register sound bit heavy here.
We should also have something like nvmem_remove_lookup_table() for consistency, and it should ensure that it clears the cells entry too.
Quoted 20 lines
drivers/nvmem/core.c +13
-0+* @lookup: array of nvmem cell lookup entries +* @nentries: number of lookup entries in the array +*/ +void nvmem_register_lookup (struct nvmem_cell_lookup *lookup,size_t nentries) +{ +int i; + > + mutex_lock(&nvmem_lookup_mutex); +for (i =0 ; i < nentries; i++) +list_add_tail (&lookup[i].list, &nvmem_cell_lookups); +mutex_unlock (&nvmem_lookup_mutex); +} +EXPORT_SYMBOL_GPL (nvmem_register_lookup); +static void nvmem_release (struct device *dev) {struct nvmem_device *nvmem =to_nvmem_device (dev);@@ -916,6 +936,37 @@ struct nvmem_cell *of_nvmem_cell_get(struct device_node *np,EXPORT_SYMBOL_GPL (of_nvmem_cell_get);#endif
Re: [PATCH v2 01/15] nvmem: add support for cell lookups
2018-06-26 13:06 GMT+02:00 Srinivas Kandagatla <[email protected]>:
Quoted 53 lines
Thanks for the patch,
Quoted 8 lines · Bartosz Golaszewski
From: Bartosz Golaszewski <[email protected]>
We can currently only register nvmem cells from device tree or by manually calling
nvmem_add_cells(). The latter options however forces users to make sure that the nvmem provider with which the cells are associated is registered before the call.Quoted 5 lines
This patch proposes a new solution inspired by other frameworks that offer resource lookups (GPIO, PWM etc.). It adds a function that allows machine code to register nvmem lookup which are later lazily used to add corresponding nvmem cells.
Overall the idea look fine to me.
This needs to be documented in
./Documentation/nvmem/nvmem.txtQuoted 26 lines
Signed-off-by Bartosz Golaszewski <[email protected]>--- drivers/nvmem/core.c | 57 +++++++++++++++++++++++++++++++++- include/linux/nvmem-consumer.h | 6 ++++ include/linux/nvmem-provider.h | 6 ++++ 3 files changed, 68 insertions(+), 1 deletion(-)drivers/nvmem/core.c +3
-0@@ -62,6 +62,9 @@ static DEFINE_IDA(nvmem_ida);static LIST_HEAD (nvmem_cells);static DEFINE_MUTEX (nvmem_cells_mutex); +static LIST_HEAD(nvmem_cell_lookups); +static DEFINE_MUTEX (nvmem_lookup_mutex); +#ifdef CONFIG_DEBUG_LOCK_ALLOC static struct lock_class_key eeprom_lock_key;#endif @@ -247,6 +250,23 @@ static const struct attribute_group *nvmem_ro_root_dev_groups[] = {NULL , }; +/** +* nvmem_register_lookup() - register a number of nvmem cell lookup Quoted 2 lines
entries
+ *Can we rename this to
nvmem_add_lookup_table()?
register sound bit heavy here.
Quoted 3 lines
We should also have something like
nvmem_remove_lookup_table()for consistency, and it should ensure that it clears the cells entry too.
What do you mean by clearing the cells entry exactly?
Bart
Quoted 23 lines
Quoted 23 lines
+ * @lookup: array of nvmem cell lookup entries
+ * @nentries: number of lookup entries in the array
+ */
+voidnvmem_register_lookup(struct nvmem_cell_lookup *lookup, size_t nentries)drivers/nvmem/core.c +9
-0+{ +int i; + > + mutex_lock(&nvmem_lookup_mutex); +for (i =0 ; i < nentries; i++) +list_add_tail (&lookup[i].list, &nvmem_cell_lookups); +mutex_unlock (&nvmem_lookup_mutex); +} +EXPORT_SYMBOL_GPL (nvmem_register_lookup); +static void nvmem_release (struct device *dev) {struct nvmem_device *nvmem =to_nvmem_device (dev);@@ -916,6 +936,37 @@ struct nvmem_cell *of_nvmem_cell_get(structdevice_node *np,EXPORT_SYMBOL_GPL (of_nvmem_cell_get );#endif
Re: [PATCH v2 01/15] nvmem: add support for cell lookups
Quoted 4 lines · Bartosz Golaszewski
Quoted 3 lines
We should also have something like
nvmem_remove_lookup_table()for consistency, and it should ensure that it clears the cells entry too.What do you mean by clearing the cells entry exactly?
I meant, Removing entry from the nvmem_cells list.
Initially I though we should remove the entry form nvmem_cells list, but It would complicate this path if some consumer has reference to it.
So, just removing the lookup list should be good! Lets not worry about removing from nvmem_cells list.
--srini
Quoted 3 lines
Bart
PATCH v2 2/15 ARM: davinci: dm365-evm: use nvmem lookup for mac address
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now support nvmem lookups for machine code. Add a lookup for mac-address.
--- arch/arm/mach-davinci/board-dm365-evm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/mach-davinci/board-dm365-evm.c +12 -0
@@ -28,6 +28,7 @@#include <linux/spi/spi.h> #include <linux/spi/eeprom.h> #include <linux/v4l2-dv-timings.h> +#include <linux/nvmem-provider.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -169,6 +170,15 @@ static struct platform_device davinci_nand_device = { }, }; +static struct nvmem_cell_lookup dm365evm_mac_address_cell = { + .info = { + .name ="mac-address" , + .offset =0x7f00 , + .bytes =ETH_ALEN , + }, + .nvmem_name ="1-00500" , +}; +static struct at24_platform_data eeprom_info = { .byte_len = (256 *1024 ) /8 , .page_size =64 ,
@@ -769,6 +779,8 @@ static __init void dm365_evm_init(void)dm365_init_spi0 (BIT (0 ), dm365_evm_spi_info,ARRAY_SIZE (dm365_evm_spi_info)); + +nvmem_register_lookup (&dm365evm_mac_address_cell,1 ); }MACHINE_START (DAVINCI_DM365_EVM ,"DaVinci DM365 EVM" )
Signature · 1 line
2.17.1
PATCH v2 3/15 ARM: davinci: dm644-evm: use nvmem lookup for mac address
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now support nvmem lookups for machine code. Add a lookup for mac-address.
--- arch/arm/mach-davinci/board-dm644x-evm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/mach-davinci/board-dm644x-evm.c +12 -0
@@ -28,6 +28,7 @@#include <linux/v4l2-dv-timings.h> #include <linux/export.h> #include <linux/leds.h> +#include <linux/nvmem-provider.h> #include <media/i2c/tvp514x.h>
@@ -476,6 +477,15 @@ static struct pcf857x_platform_data pcf_data_u35 = {* - ... newer boards may have more */ +static struct nvmem_cell_lookup dm6446evm_mac_address_cell = { + .info = { + .name ="mac-address" , + .offset =0x7f00 , + .bytes =ETH_ALEN , + }, + .nvmem_name ="1-00500" , +}; +static struct at24_platform_data eeprom_info = { .byte_len = (256 *1024 ) /8 , .page_size =64 ,
@@ -828,6 +838,8 @@ static __init void davinci_evm_init(void)phy_register_fixup_for_uid (LXT971_PHY_ID ,LXT971_PHY_MASK , davinci_phy_fixup); } + +nvmem_register_lookup (&dm6446evm_mac_address_cell,1 ); }MACHINE_START (DAVINCI_EVM ,"DaVinci DM644x EVM" )
Signature · 1 line
2.17.1
PATCH v2 4/15 ARM: davinci: dm646x-evm: use nvmem lookup for mac address
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now support nvmem lookups for machine code. Add a lookup for mac-address.
--- arch/arm/mach-davinci/board-dm646x-evm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/mach-davinci/board-dm646x-evm.c +12 -0
@@ -37,6 +37,7 @@#include <linux/platform_data/i2c-davinci.h> #include <linux/platform_data/mtd-davinci.h> #include <linux/platform_data/mtd-davinci-aemif.h> +#include <linux/nvmem-provider.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -310,6 +311,15 @@ static struct pcf857x_platform_data pcf_data = {* - ... newer boards may have more */ +static struct nvmem_cell_lookup dm646x_evm_mac_address_cell = { + .info = { + .name ="mac-address" , + .offset =0x7f00 , + .bytes =ETH_ALEN , + }, + .nvmem_name ="1-00500" , +}; +static struct at24_platform_data eeprom_info = { .byte_len = (256 *1024 ) /8 , .page_size =64 ,
@@ -802,6 +812,8 @@ static __init void evm_init(void)davinci_init_ide (); soc_info->emac_pdata->phy_id =DM646X_EVM_PHY_ID ; + +nvmem_register_lookup (&dm646x_evm_mac_address_cell,1 ); }MACHINE_START (DAVINCI_DM6467_EVM ,"DaVinci DM646x EVM" )
Signature · 1 line
2.17.1
PATCH v2 5/15 ARM: davinci: da830-evm: use nvmem lookup for mac address
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now support nvmem lookups for machine code. Add a lookup for mac-address.
--- arch/arm/mach-davinci/board-da830-evm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/arm/mach-davinci/board-da830-evm.c +12 -0
@@ -29,6 +29,7 @@#include <linux/platform_data/spi-davinci.h> #include <linux/platform_data/usb-davinci.h> #include <linux/regulator/machine.h> +#include <linux/nvmem-provider.h> #include <asm/mach-types.h> #include <asm/mach/arch.h>
@@ -409,6 +410,15 @@ static inline void da830_evm_init_lcdc(int mux_mode)static inline void da830_evm_init_lcdc (int mux_mode) { }#endif +static struct nvmem_cell_lookup da830_evm_mac_address_cell = { + .info = { + .name ="mac-address" , + .offset =0x7f00 , + .bytes =ETH_ALEN , + }, + .nvmem_name ="1-00500" , +}; +static struct at24_platform_data da830_evm_i2c_eeprom_info = { .byte_len =SZ_256K /8 , .page_size =64 ,
@@ -618,6 +628,8 @@ static __init void da830_evm_init(void)pr_warn ("%s: spi 0 registration failed: %d\n" , __func__, ret);regulator_has_full_constraints (); + +nvmem_register_lookup (&da830_evm_mac_address_cell,1 ); }#ifdef CONFIG_SERIAL_8250_CONSOLE
Signature · 1 line
2.17.1
PATCH v2 6/15 ARM: davinci: mityomapl138: add nvmem cells lookup entries
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We now support nvmem lookups for machine code. Add a lookup for mac-address.
--- arch/arm/mach-davinci/board-mityomapl138.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/arm/mach-davinci/board-mityomapl138.c +22 -0
@@ -21,6 +21,7 @@#include <linux/etherdevice.h> #include <linux/spi/spi.h> #include <linux/spi/flash.h> +#include <linux/nvmem-provider.h> #include <asm/io.h> #include <asm/mach-types.h>
@@ -160,6 +161,25 @@ static void read_factory_config(struct nvmem_device *nvmem, void *context)mityomapl138_cpufreq_init (partnum); } +static struct nvmem_cell_lookup mityomapl138_nvmem_cells[] = { + { + .info = { + .name ="factory-config" , + .offset =0x0 , + .bytes =sizeof (struct factory_config ), + }, + .nvmem_name ="1-00500" , + }, + { + .info = { + .name ="mac-address" , + .offset =0x64 , + .bytes =ETH_ALEN , + }, + .nvmem_name ="1-00500" , + } +}; +static struct at24_platform_data mityomapl138_fd_chip = { .byte_len =256 , .page_size =8 ,
@@ -534,6 +554,8 @@ static void __init mityomapl138_init(void)if (ret)pr_warn ("spi 1 registration failed: %d\n" , ret); +nvmem_register_lookup (mityomapl138_nvmem_cells, +ARRAY_SIZE (mityomapl138_nvmem_cells));mityomapl138_config_emac (); ret =da8xx_register_rtc ();
Signature · 1 line
2.17.1
PATCH v2 7/15 net: davinci_emac: use nvmem to retrieve the mac address
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
All users which store the MAC address in EEPROM now register relevant nvmem cells. Switch to retrieving the MAC address over the nvmem framework. If we can't get the nvmem cell then fall back to using the device tree.
--- drivers/net/ethernet/ti/davinci_emac.c | 33 ++++++++++++++++++-------- 1 file changed, 23 insertions(+), 10 deletions(-)
drivers/net/ethernet/ti/davinci_emac.c +23 -10
@@ -67,7 +67,7 @@#include <linux/of_irq.h> #include <linux/of_net.h> #include <linux/mfd/syscon.h> - +#include <linux/nvmem-consumer.h> #include <asm/irq.h> #include <asm/page.h>
@@ -1696,7 +1696,6 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv)const struct of_device_id *match;const struct emac_platform_data *auxdata;struct emac_platform_data *pdata =NULL ; -const u8 *mac_addr;if (!IS_ENABLED (CONFIG_OF ) || !pdev->dev.of_node)return dev_get_platdata (&pdev->dev);
@@ -1708,12 +1707,6 @@ davinci_emac_of_get_pdata(struct platform_device *pdev, struct emac_priv *priv) np = pdev->dev.of_node; pdata->version =EMAC_VERSION_2 ; -if (!is_valid_ether_addr (pdata->mac_addr)) { - mac_addr =of_get_mac_address (np); -if (mac_addr) -ether_addr_copy (pdata->mac_addr, mac_addr); - } -of_property_read_u32 (np,"ti,davinci-ctrl-reg-offset" , &pdata->ctrl_reg_offset);
@@ -1783,7 +1776,9 @@ static int davinci_emac_probe(struct platform_device *pdev)struct cpdma_params dma_params;struct clk *emac_clk;unsigned long emac_bus_frequency; - +struct nvmem_cell *cell; +const void *mac_addr; +size_t mac_addr_len;/* obtain emac clock from kernel */ emac_clk =devm_clk_get (&pdev->dev,NULL );
@@ -1815,8 +1810,26 @@ static int davinci_emac_probe(struct platform_device *pdev) goto err_free_netdev; } + cell =nvmem_cell_get (&pdev->dev,"mac-address" ); +if (!IS_ERR (cell)) { + mac_addr =nvmem_cell_read (cell, &mac_addr_len); +if (!IS_ERR (mac_addr)) { +if (is_valid_ether_addr (mac_addr)) { +dev_info (&pdev->dev, +"Read MAC addr from EEPROM: %pM\n" , + mac_addr); +ether_addr_copy (priv->mac_addr, mac_addr); + } +kfree (mac_addr); + } +nvmem_cell_put (cell); + }else { + mac_addr =of_get_mac_address (np); +if (mac_addr) +ether_addr_copy (priv->mac_addr, mac_addr); + } +/* MAC addr and PHY mask , RMII enable info from platform_data */ -memcpy (priv->mac_addr, pdata->mac_addr,ETH_ALEN ); priv->phy_id = pdata->phy_id; priv->rmii_en = pdata->rmii_en; priv->version = pdata->version;
Signature · 1 line
2.17.1
PATCH v2 8/15 ARM: davinci: mityomapl138: don't read the MAC address from machine code
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
This is now done by the emac driver using a registered nvmem cell.
--- arch/arm/mach-davinci/board-mityomapl138.c | 8 -------- 1 file changed, 8 deletions(-)
arch/arm/mach-davinci/board-mityomapl138.c +0 -8
@@ -120,7 +120,6 @@ static void read_factory_config(struct nvmem_device *nvmem, void *context) {int ret;const char *partnum =NULL ; -struct davinci_soc_info *soc_info = &davinci_soc_info;if (!IS_BUILTIN (CONFIG_NVMEM )) {pr_warn ("Factory Config not available without CONFIG_NVMEM\n" );
@@ -146,13 +145,6 @@ static void read_factory_config(struct nvmem_device *nvmem, void *context) goto bad_config; } -pr_info ("Found MAC = %pM\n" , factory_config.mac); -if (is_valid_ether_addr (factory_config.mac)) -memcpy (soc_info->emac_pdata->mac_addr, - factory_config.mac,ETH_ALEN ); -else -pr_warn ("Invalid MAC found in factory config block\n" ); - partnum = factory_config.partnum;pr_info ("Part Number = %s\n" , partnum);
Signature · 1 line
2.17.1
PATCH v2 9/15 ARM: davinci: dm365-evm: use device properties for at24 eeprom
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.
Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.
--- arch/arm/mach-davinci/board-dm365-evm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm/mach-davinci/board-dm365-evm.c +5 -8
@@ -18,7 +18,7 @@#include <linux/i2c.h> #include <linux/io.h> #include <linux/clk.h> -#include <linux/platform_data/at24.h> +#include <linux/property.h> #include <linux/leds.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h>
@@ -179,18 +179,15 @@ static struct nvmem_cell_lookup dm365evm_mac_address_cell = { .nvmem_name = "1-00500", }; -static struct at24_platform_data eeprom_info = { - .byte_len = (256 *1024 ) /8 , - .page_size =64 , - .flags =AT24_FLAG_ADDR16 , - .setup = davinci_get_mac_addr, - .context = (void *)0x7f00 , +static const struct property_entry eeprom_properties[] = { +PROPERTY_ENTRY_U32 ("pagesize" ,64 ), + { } };static struct i2c_board_info i2c_info[] = { {I2C_BOARD_INFO ("24c256" ,0x50 ), - .platform_data = &eeprom_info, + .properties = eeprom_properties, }, {I2C_BOARD_INFO ("tlv320aic3x" ,0x18 ),
Signature · 1 line
2.17.1
PATCH v2 10/15 ARM: davinci: da830-evm: use device properties for at24 eeprom
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.
Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.
--- arch/arm/mach-davinci/board-da830-evm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm/mach-davinci/board-da830-evm.c +5 -8
@@ -18,7 +18,7 @@#include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/platform_data/pcf857x.h> -#include <linux/platform_data/at24.h> +#include <linux/property.h> #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> #include <linux/spi/spi.h>
@@ -419,12 +419,9 @@ static struct nvmem_cell_lookup da830_evm_mac_address_cell = { .nvmem_name = "1-00500", }; -static struct at24_platform_data da830_evm_i2c_eeprom_info = { - .byte_len =SZ_256K /8 , - .page_size =64 , - .flags =AT24_FLAG_ADDR16 , - .setup = davinci_get_mac_addr, - .context = (void *)0x7f00 , +static const struct property_entry da830_evm_i2c_eeprom_properties[] = { +PROPERTY_ENTRY_U32 ("pagesize" ,64 ), + { } }; static int __init da830_evm_ui_expander_setup(struct i2c_client *client,
@@ -458,7 +455,7 @@ static struct pcf857x_platform_data __initdata da830_evm_ui_expander_info = {static struct i2c_board_info __initdata da830_evm_i2c_devices[] = { {I2C_BOARD_INFO ("24c256" ,0x50 ), - .platform_data = &da830_evm_i2c_eeprom_info, + .properties = da830_evm_i2c_eeprom_properties, }, {I2C_BOARD_INFO ("tlv320aic3x" ,0x18 ),
Signature · 1 line
2.17.1
PATCH v2 11/15 ARM: davinci: dm644x-evm: use device properties for at24 eeprom
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.
Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.
--- arch/arm/mach-davinci/board-dm644x-evm.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
arch/arm/mach-davinci/board-dm644x-evm.c +4 -8
@@ -16,8 +16,8 @@#include <linux/gpio/machine.h> #include <linux/i2c.h> #include <linux/platform_data/pcf857x.h> -#include <linux/platform_data/at24.h> #include <linux/platform_data/gpio-davinci.h> +#include <linux/property.h> #include <linux/mtd/mtd.h> #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h>
@@ -486,12 +486,8 @@ static struct nvmem_cell_lookup dm6446evm_mac_address_cell = { .nvmem_name = "1-00500", }; -static struct at24_platform_data eeprom_info = { - .byte_len = (256 *1024 ) /8 , - .page_size =64 , - .flags =AT24_FLAG_ADDR16 , - .setup = davinci_get_mac_addr, - .context = (void *)0x7f00 , +static const struct property_entry eeprom_properties[] = { +PROPERTY_ENTRY_U32 ("pagesize" ,64 ), };/*
@@ -601,7 +597,7 @@ static struct i2c_board_info __initdata i2c_info[] = { }, { I2C_BOARD_INFO("24c256", 0x50), - .platform_data = &eeprom_info, + .properties = eeprom_properties, }, { I2C_BOARD_INFO("tlv320aic33", 0x1b),
Signature · 1 line
2.17.1
PATCH v2 12/15 ARM: davinci: dm646x-evm: use device properties for at24 eeprom
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.
Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.
--- arch/arm/mach-davinci/board-dm646x-evm.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
arch/arm/mach-davinci/board-dm646x-evm.c +5 -8
@@ -22,7 +22,7 @@#include <linux/gpio.h> #include <linux/platform_device.h> #include <linux/i2c.h> -#include <linux/platform_data/at24.h> +#include <linux/property.h> #include <linux/platform_data/pcf857x.h> #include <media/i2c/tvp514x.h>
@@ -320,12 +320,9 @@ static struct nvmem_cell_lookup dm646x_evm_mac_address_cell = { .nvmem_name = "1-00500", }; -static struct at24_platform_data eeprom_info = { - .byte_len = (256 *1024 ) /8 , - .page_size =64 , - .flags =AT24_FLAG_ADDR16 , - .setup = davinci_get_mac_addr, - .context = (void *)0x7f00 , +static const struct property_entry eeprom_properties[] = { +PROPERTY_ENTRY_U32 ("pagesize" ,64 ), + { } };#endif
@@ -396,7 +393,7 @@ static void evm_init_cpld(void)static struct i2c_board_info __initdata i2c_info[] = { {I2C_BOARD_INFO ("24c256" ,0x50 ), - .platform_data = &eeprom_info, + .properties = eeprom_properties, }, {I2C_BOARD_INFO ("pcf8574a" ,0x38 ),
Signature · 1 line
2.17.1
PATCH v2 13/15 ARM: davinci: sffsdr: fix the at24 eeprom device name
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
The currently used 24lc64 i2c device name doesn't match against any of the devices supported by the at24 driver. Change it to the closest compatible chip.
--- arch/arm/mach-davinci/board-sffsdr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-davinci/board-sffsdr.c +1 -1
@@ -100,7 +100,7 @@ static struct at24_platform_data eeprom_info = {static struct i2c_board_info __initdata i2c_info[] = { { -I2C_BOARD_INFO ("24lc64" ,0x50 ), +I2C_BOARD_INFO ("24c64" ,0x50 ), .platform_data = &eeprom_info, },/* Other I2C devices:
Signature · 1 line
2.17.1
PATCH v2 14/15 ARM: davinci: sffsdr: use device properties for at24 eeprom
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.
Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.
--- arch/arm/mach-davinci/board-sffsdr.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/arm/mach-davinci/board-sffsdr.c +5 -6
@@ -26,7 +26,7 @@#include <linux/init.h> #include <linux/platform_device.h> #include <linux/i2c.h> -#include <linux/platform_data/at24.h> +#include <linux/property.h> #include <linux/mtd/mtd.h> #include <linux/mtd/rawnand.h> #include <linux/mtd/partitions.h>
@@ -92,16 +92,15 @@ static struct platform_device davinci_sffsdr_nandflash_device = { .resource = davinci_sffsdr_nandflash_resource, }; -static struct at24_platform_data eeprom_info = { - .byte_len = (64 *1024 ) /8 , - .page_size =32 , - .flags =AT24_FLAG_ADDR16 , +static const struct property_entry eeprom_properties[] = { +PROPERTY_ENTRY_U32 ("pagesize" ,32 ), + { }, };static struct i2c_board_info __initdata i2c_info[] = { {I2C_BOARD_INFO ("24c64" ,0x50 ), - .platform_data = &eeprom_info, + .properties = eeprom_properties, },/* Other I2C devices: * MSP430, addr 0x23 (not used)
Signature · 1 line
2.17.1
PATCH v2 15/15 ARM: davinci: remove dead code
In reply to Bartosz GolaszewskiFrom: Bartosz Golaszewski <[email protected]>
There are no more users of davinci_get_mac_addr(). Remove it. Also remove the mac_addr field from the emac platform data struct.
--- arch/arm/mach-davinci/common.c | 15 --------------- include/linux/davinci_emac.h | 2 -- 2 files changed, 17 deletions(-)
arch/arm/mach-davinci/common.c +0 -15
@@ -28,21 +28,6 @@ EXPORT_SYMBOL(davinci_soc_info);void __iomem *davinci_intc_base;int davinci_intc_type; -void davinci_get_mac_addr (struct nvmem_device *nvmem,void *context) -{ -char *mac_addr = davinci_soc_info.emac_pdata->mac_addr; -off_t offset = (off_t )context; - -if (!IS_BUILTIN (CONFIG_NVMEM )) { -pr_warn ("Cannot read MAC addr from EEPROM without CONFIG_NVMEM\n" ); -return ; - } - -/* Read MAC addr from EEPROM */ -if (nvmem_device_read (nvmem, offset,ETH_ALEN , mac_addr) ==ETH_ALEN ) -pr_info ("Read MAC addr from EEPROM: %pM\n" , mac_addr); -} -static int __init davinci_init_id (struct davinci_soc_info *soc_info) {int i;
include/linux/davinci_emac.h +0 -2
@@ -19,7 +19,6 @@ struct mdio_platform_data { };struct emac_platform_data { -char mac_addr[ETH_ALEN ];u32 ctrl_reg_offset;u32 ctrl_mod_reg_offset;u32 ctrl_ram_offset;
@@ -46,5 +45,4 @@ enum { EMAC_VERSION_2, /* DM646x */ }; -void davinci_get_mac_addr (struct nvmem_device *nvmem,void *context);#endif
Signature · 1 line
2.17.1