mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 08:51:13 +00:00
43 lines
1.6 KiB
Diff
43 lines
1.6 KiB
Diff
|
From db71abf941d25b92b2117780d3771197417d1c81 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Samuel Holland <samuel@sholland.org>
|
||
|
|
Date: Sun, 31 Jul 2022 20:34:20 -0500
|
||
|
|
Subject: [PATCH 018/117] nvmem: sunxi_sid: Drop the workaround on A64
|
||
|
|
|
||
|
|
Now that the SRAM readout code is fixed by using 32-bit accesses, it
|
||
|
|
always returns the same values as register readout, so the A64 variant
|
||
|
|
no longer needs the workaround. This makes the D1 variant structure
|
||
|
|
redundant, so remove it.
|
||
|
|
|
||
|
|
Signed-off-by: Samuel Holland <samuel@sholland.org>
|
||
|
|
---
|
||
|
|
drivers/nvmem/sunxi_sid.c | 8 +-------
|
||
|
|
1 file changed, 1 insertion(+), 7 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/nvmem/sunxi_sid.c
|
||
|
|
+++ b/drivers/nvmem/sunxi_sid.c
|
||
|
|
@@ -196,15 +196,9 @@ static const struct sunxi_sid_cfg sun8i_
|
||
|
|
.need_register_readout = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
-static const struct sunxi_sid_cfg sun20i_d1_cfg = {
|
||
|
|
- .value_offset = 0x200,
|
||
|
|
- .size = 0x100,
|
||
|
|
-};
|
||
|
|
-
|
||
|
|
static const struct sunxi_sid_cfg sun50i_a64_cfg = {
|
||
|
|
.value_offset = 0x200,
|
||
|
|
.size = 0x100,
|
||
|
|
- .need_register_readout = true,
|
||
|
|
};
|
||
|
|
|
||
|
|
static const struct sunxi_sid_cfg sun50i_h6_cfg = {
|
||
|
|
@@ -217,7 +211,7 @@ static const struct of_device_id sunxi_s
|
||
|
|
{ .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg },
|
||
|
|
{ .compatible = "allwinner,sun8i-a83t-sid", .data = &sun50i_a64_cfg },
|
||
|
|
{ .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg },
|
||
|
|
- { .compatible = "allwinner,sun20i-d1-sid", .data = &sun20i_d1_cfg },
|
||
|
|
+ { .compatible = "allwinner,sun20i-d1-sid", .data = &sun50i_a64_cfg },
|
||
|
|
{ .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg },
|
||
|
|
{ .compatible = "allwinner,sun50i-h5-sid", .data = &sun50i_a64_cfg },
|
||
|
|
{ .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg },
|