target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch

   1 --- a/arch/arm/mach-cns3xxx/laguna.c
   2 +++ b/arch/arm/mach-cns3xxx/laguna.c
   3 @@ -562,34 +562,34 @@ static struct platform_device laguna_i2c
   4         .resource = laguna_i2c_resource,
   5  };
   6
   7 -static struct memory_accessor *at24_mem_acc;
   8 +static struct nvmem_device *at24_nvmem;
   9
  10 -static void at24_setup(struct memory_accessor *mem_acc, void *context)
  11 +static void at24_setup(struct nvmem_device *mem_acc, void *context)
  12  {
  13         char buf[16];
  14
  15 -       at24_mem_acc = mem_acc;
  16 +       at24_nvmem = mem_acc;
  17
  18         /* Read MAC addresses */
  19 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x100, 6) == 6)
  20 +       if (nvmem_device_read(at24_nvmem, 0x100, 6, buf) == 6)
  21                 memcpy(&laguna_net_data.hwaddr[0], buf, ETH_ALEN);
  22 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x106, 6) == 6)
  23 +       if (nvmem_device_read(at24_nvmem, 0x106, 6, buf) == 6)
  24                 memcpy(&laguna_net_data.hwaddr[1], buf, ETH_ALEN);
  25 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x10C, 6) == 6)
  26 +       if (nvmem_device_read(at24_nvmem, 0x10C, 6, buf) == 6)
  27                 memcpy(&laguna_net_data.hwaddr[2], buf, ETH_ALEN);
  28 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x112, 6) == 6)
  29 +       if (nvmem_device_read(at24_nvmem, 0x112, 6, buf) == 6)
  30                 memcpy(&laguna_net_data.hwaddr[3], buf, ETH_ALEN);
  31
  32         /* Read out Model Information */
  33 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x130, 16) == 16)
  34 +       if (nvmem_device_read(at24_nvmem, 0x130, 16, buf) == 16)
  35                 memcpy(&laguna_info.model, buf, 16);
  36 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x140, 1) == 1)
  37 +       if (nvmem_device_read(at24_nvmem, 0x140, 1, buf) == 1)
  38                 memcpy(&laguna_info.nor_flash_size, buf, 1);
  39 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x141, 1) == 1)
  40 +       if (nvmem_device_read(at24_nvmem, 0x141, 1, buf) == 1)
  41                 memcpy(&laguna_info.spi_flash_size, buf, 1);
  42 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x142, 4) == 4)
  43 +       if (nvmem_device_read(at24_nvmem, 0x142, 4, buf) == 4)
  44                 memcpy(&laguna_info.config_bitmap, buf, 4);
  45 -       if (at24_mem_acc->read(at24_mem_acc, buf, 0x146, 4) == 4)
  46 +       if (nvmem_device_read(at24_nvmem, 0x146, 4, buf) == 4)
  47                 memcpy(&laguna_info.config2_bitmap, buf, 4);
  48  };
  49