aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2017-02-11 14:27:41 +0100
committerFelix Fietkau <nbd@nbd.name>2017-02-11 21:18:42 +0100
commite9f76f0f46509dbaa03dc19564729480e3997684 (patch)
tree5794df3cdeab3a04225c07133d49e99fb0e345fe /target/linux
parent4383c13aee8963ee93ca1950e7f0ea5a35309ab4 (diff)
downloadupstream-e9f76f0f46509dbaa03dc19564729480e3997684.tar.gz
upstream-e9f76f0f46509dbaa03dc19564729480e3997684.tar.bz2
upstream-e9f76f0f46509dbaa03dc19564729480e3997684.zip
cns3xxx: clean up patches
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c26
-rw-r--r--target/linux/cns3xxx/patches-4.9/230-remove-deprecated-code.patch11
-rw-r--r--target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch49
3 files changed, 13 insertions, 73 deletions
diff --git a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
index 4584d54caf..f98eebccd6 100644
--- a/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
+++ b/target/linux/cns3xxx/files/arch/arm/mach-cns3xxx/laguna.c
@@ -562,34 +562,34 @@ static struct platform_device laguna_i2c_controller = {
.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);
};
@@ -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);
diff --git a/target/linux/cns3xxx/patches-4.9/230-remove-deprecated-code.patch b/target/linux/cns3xxx/patches-4.9/230-remove-deprecated-code.patch
deleted file mode 100644
index ff83a98f2d..0000000000
--- a/target/linux/cns3xxx/patches-4.9/230-remove-deprecated-code.patch
+++ /dev/null
@@ -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);
-
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
deleted file mode 100644
index b8e9008137..0000000000
--- a/target/linux/cns3xxx/patches-4.9/240-switch-at24-to-nvmem-api.patch
+++ /dev/null
@@ -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);
- };
-