diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2017-02-07 16:19:18 +0100 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2017-02-10 11:05:57 +0100 |
| commit | 1db4135e32e03c0131301ed46d906a2bf8f08c9b (patch) | |
| tree | f1da4a38a5ee6d7337843d9528f7e21fa61a006f /target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch | |
| parent | b96566aad4340c5b790bdaea0514885857ea84bf (diff) | |
| download | upstream-1db4135e32e03c0131301ed46d906a2bf8f08c9b.tar.gz upstream-1db4135e32e03c0131301ed46d906a2bf8f08c9b.tar.bz2 upstream-1db4135e32e03c0131301ed46d906a2bf8f08c9b.zip | |
cns3xxx: add preliminary 4.9 support
Adds preliminary kernel 4.9 support for this target.
- Refreshed/Updated all patches
Added 3 new patches:
- 093 --> Add virtual PCI MMIO mapping
- 230 --> Remove deprecated code
- 240 --> Rework AT24 eeprom code to use the new NVMEM API
Compiled & tested on cns3xxx (gw2388)
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch')
| -rw-r--r-- | target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch | 49 |
1 files changed, 49 insertions, 0 deletions
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); + }; + |