target/linux/d1/patches-6.1/0018-nvmem-sunxi_sid-Drop-the-workaround-on-A64.patch

   1 From db71abf941d25b92b2117780d3771197417d1c81 Mon Sep 17 00:00:00 2001
   2 From: Samuel Holland <samuel@sholland.org>
   3 Date: Sun, 31 Jul 2022 20:34:20 -0500
   4 Subject: [PATCH 018/117] nvmem: sunxi_sid: Drop the workaround on A64
   5
   6 Now that the SRAM readout code is fixed by using 32-bit accesses, it
   7 always returns the same values as register readout, so the A64 variant
   8 no longer needs the workaround. This makes the D1 variant structure
   9 redundant, so remove it.
  10
  11 Signed-off-by: Samuel Holland <samuel@sholland.org>
  12 ---
  13  drivers/nvmem/sunxi_sid.c | 8 +-------
  14  1 file changed, 1 insertion(+), 7 deletions(-)
  15
  16 --- a/drivers/nvmem/sunxi_sid.c
  17 +++ b/drivers/nvmem/sunxi_sid.c
  18 @@ -196,15 +196,9 @@ static const struct sunxi_sid_cfg sun8i_
  19         .need_register_readout = true,
  20  };
  21
  22 -static const struct sunxi_sid_cfg sun20i_d1_cfg = {
  23 -       .value_offset = 0x200,
  24 -       .size = 0x100,
  25 -};
  26 -
  27  static const struct sunxi_sid_cfg sun50i_a64_cfg = {
  28         .value_offset = 0x200,
  29         .size = 0x100,
  30 -       .need_register_readout = true,
  31  };
  32
  33  static const struct sunxi_sid_cfg sun50i_h6_cfg = {
  34 @@ -217,7 +211,7 @@ static const struct of_device_id sunxi_s
  35         { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg },
  36         { .compatible = "allwinner,sun8i-a83t-sid", .data = &sun50i_a64_cfg },
  37         { .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg },
  38 -       { .compatible = "allwinner,sun20i-d1-sid", .data = &sun20i_d1_cfg },
  39 +       { .compatible = "allwinner,sun20i-d1-sid", .data = &sun50i_a64_cfg },
  40         { .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg },
  41         { .compatible = "allwinner,sun50i-h5-sid", .data = &sun50i_a64_cfg },
  42         { .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg },