X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fcns3xxx%2Fpatches-4.9%2F240-switch-at24-to-nvmem-api.patch;fp=target%2Flinux%2Fcns3xxx%2Fpatches-4.9%2F240-switch-at24-to-nvmem-api.patch;h=b8e900813760ce00717c6ca93c17ade2f5cfd4de;hb=1db4135e32e03c0131301ed46d906a2bf8f08c9b;hp=0000000000000000000000000000000000000000;hpb=b96566aad4340c5b790bdaea0514885857ea84bf;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch b/target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch
new file mode 100644
index 0000000000..b8e9008137
--- /dev/null
+++ b/target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch
@@ -0,0 +1,49 @@
+--- a/arch/arm/mach-cns3xxx/laguna.c
++++ b/arch/arm/mach-cns3xxx/laguna.c
+@@ -562,34 +562,34 @@ static struct platform_device laguna_i2c
+ 	.resource = laguna_i2c_resource,
+ };
+ 
+-static struct memory_accessor *at24_mem_acc;
++static struct nvmem_device *at24_nvmem;
+ 
+-static void at24_setup(struct memory_accessor *mem_acc, void *context)
++static void at24_setup(struct nvmem_device *mem_acc, void *context)
+ {
+ 	char buf[16];
+ 
+-	at24_mem_acc = mem_acc;
++	at24_nvmem = mem_acc;
+ 
+ 	/* Read MAC addresses */
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x100, 6) == 6)
++	if (nvmem_device_read(at24_nvmem, 0x100, 6, buf) == 6)
+ 		memcpy(&laguna_net_data.hwaddr[0], buf, ETH_ALEN);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x106, 6) == 6)
++	if (nvmem_device_read(at24_nvmem, 0x106, 6, buf) == 6)
+ 		memcpy(&laguna_net_data.hwaddr[1], buf, ETH_ALEN);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x10C, 6) == 6)
++	if (nvmem_device_read(at24_nvmem, 0x10C, 6, buf) == 6)
+ 		memcpy(&laguna_net_data.hwaddr[2], buf, ETH_ALEN);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x112, 6) == 6)
++	if (nvmem_device_read(at24_nvmem, 0x112, 6, buf) == 6)
+ 		memcpy(&laguna_net_data.hwaddr[3], buf, ETH_ALEN);
+ 
+ 	/* Read out Model Information */
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x130, 16) == 16)
++	if (nvmem_device_read(at24_nvmem, 0x130, 16, buf) == 16)
+ 		memcpy(&laguna_info.model, buf, 16);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x140, 1) == 1)
++	if (nvmem_device_read(at24_nvmem, 0x140, 1, buf) == 1)
+ 		memcpy(&laguna_info.nor_flash_size, buf, 1);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x141, 1) == 1)
++	if (nvmem_device_read(at24_nvmem, 0x141, 1, buf) == 1)
+ 		memcpy(&laguna_info.spi_flash_size, buf, 1);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x142, 4) == 4)
++	if (nvmem_device_read(at24_nvmem, 0x142, 4, buf) == 4)
+ 		memcpy(&laguna_info.config_bitmap, buf, 4);
+-	if (at24_mem_acc->read(at24_mem_acc, buf, 0x146, 4) == 4)
++	if (nvmem_device_read(at24_nvmem, 0x146, 4, buf) == 4)
+ 		memcpy(&laguna_info.config2_bitmap, buf, 4);
+ };
+