domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cns3xxx: clean up patches

Browse Source 
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau
2017-02-11 14:27:41 +01:00
parent 4383c13aee
commit e9f76f0f46
3 changed files with 13 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
View File

@@ -562,34 +562,34 @@ static struct platform_device laguna_i2c_controller = {
.resource = laguna_i2c_resource, .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]; char buf[16];
at24_mem_acc = mem_acc; at24_nvmem = mem_acc;
/* Read MAC addresses */ /* 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); 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); 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); 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); memcpy(&laguna_net_data.hwaddr[3], buf, ETH_ALEN);
/* Read out Model Information */ /* 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); 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); 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); 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); 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); memcpy(&laguna_info.config2_bitmap, buf, 4);
}; };
@@ -812,7 +812,7 @@ static void __init laguna_init(void)
u32 __iomem *reg; u32 __iomem *reg;
clk = clk_register_fixed_rate(NULL, "cpu", NULL, clk = clk_register_fixed_rate(NULL, "cpu", NULL,
CLK_IS_ROOT | CLK_IGNORE_UNUSED, CLK_IGNORE_UNUSED,
cns3xxx_cpu_clock() * (1000000 / 8)); cns3xxx_cpu_clock() * (1000000 / 8));
clk_register_clkdev(clk, "cpu", NULL); clk_register_clkdev(clk, "cpu", NULL);

11
target/linux/cns3xxx/patches-4.9/230-remove-deprecated-code.patch
View File

@@ -1,11 +0,0 @@
--- a/arch/arm/mach-cns3xxx/laguna.c
+++ b/arch/arm/mach-cns3xxx/laguna.c
@@ -812,7 +812,7 @@ static void __init laguna_init(void)
u32 __iomem *reg;
clk = clk_register_fixed_rate(NULL, "cpu", NULL,
- CLK_IS_ROOT | CLK_IGNORE_UNUSED,
+ CLK_IGNORE_UNUSED,
cns3xxx_cpu_clock() * (1000000 / 8));
clk_register_clkdev(clk, "cpu", NULL);

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

@@ -1,49 +0,0 @@
--- 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);
};