350-v5.18-regmap-add-configurable-downshift-for-addresses.patch 3.3 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990
  1. From 86fc59ef818beb0e1945d17f8e734898baba7e4e Mon Sep 17 00:00:00 2001
  2. From: Colin Foster <[email protected]>
  3. Date: Sun, 13 Mar 2022 15:45:23 -0700
  4. Subject: [PATCH 1/2] regmap: add configurable downshift for addresses
  5. Add an additional reg_downshift to be applied to register addresses before
  6. any register accesses. An example of a device that uses this is a VSC7514
  7. chip, which require each register address to be downshifted by two if the
  8. access is performed over a SPI bus.
  9. Signed-off-by: Colin Foster <[email protected]>
  10. Link: https://lore.kernel.org/r/[email protected]
  11. Signed-off-by: Mark Brown <[email protected]>
  12. ---
  13. drivers/base/regmap/internal.h | 1 +
  14. drivers/base/regmap/regmap.c | 5 +++++
  15. include/linux/regmap.h | 3 +++
  16. 3 files changed, 9 insertions(+)
  17. --- a/drivers/base/regmap/internal.h
  18. +++ b/drivers/base/regmap/internal.h
  19. @@ -31,6 +31,7 @@ struct regmap_format {
  20. size_t buf_size;
  21. size_t reg_bytes;
  22. size_t pad_bytes;
  23. + size_t reg_downshift;
  24. size_t val_bytes;
  25. void (*format_write)(struct regmap *map,
  26. unsigned int reg, unsigned int val);
  27. --- a/drivers/base/regmap/regmap.c
  28. +++ b/drivers/base/regmap/regmap.c
  29. @@ -823,6 +823,7 @@ struct regmap *__regmap_init(struct devi
  30. map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
  31. map->format.pad_bytes = config->pad_bits / 8;
  32. + map->format.reg_downshift = config->reg_downshift;
  33. map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
  34. map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
  35. config->val_bits + config->pad_bits, 8);
  36. @@ -1750,6 +1751,7 @@ static int _regmap_raw_write_impl(struct
  37. return ret;
  38. }
  39. + reg >>= map->format.reg_downshift;
  40. map->format.format_reg(map->work_buf, reg, map->reg_shift);
  41. regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
  42. map->write_flag_mask);
  43. @@ -1920,6 +1922,7 @@ static int _regmap_bus_formatted_write(v
  44. return ret;
  45. }
  46. + reg >>= map->format.reg_downshift;
  47. map->format.format_write(map, reg, val);
  48. trace_regmap_hw_write_start(map, reg, 1);
  49. @@ -2360,6 +2363,7 @@ static int _regmap_raw_multi_reg_write(s
  50. unsigned int reg = regs[i].reg;
  51. unsigned int val = regs[i].def;
  52. trace_regmap_hw_write_start(map, reg, 1);
  53. + reg >>= map->format.reg_downshift;
  54. map->format.format_reg(u8, reg, map->reg_shift);
  55. u8 += reg_bytes + pad_bytes;
  56. map->format.format_val(u8, val, 0);
  57. @@ -2685,6 +2689,7 @@ static int _regmap_raw_read(struct regma
  58. return ret;
  59. }
  60. + reg >>= map->format.reg_downshift;
  61. map->format.format_reg(map->work_buf, reg, map->reg_shift);
  62. regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
  63. map->read_flag_mask);
  64. --- a/include/linux/regmap.h
  65. +++ b/include/linux/regmap.h
  66. @@ -237,6 +237,8 @@ typedef void (*regmap_unlock)(void *);
  67. * @reg_stride: The register address stride. Valid register addresses are a
  68. * multiple of this value. If set to 0, a value of 1 will be
  69. * used.
  70. + * @reg_downshift: The number of bits to downshift the register before
  71. + * performing any operations.
  72. * @pad_bits: Number of bits of padding between register and value.
  73. * @val_bits: Number of bits in a register value, mandatory.
  74. *
  75. @@ -366,6 +368,7 @@ struct regmap_config {
  76. int reg_bits;
  77. int reg_stride;
  78. + int reg_downshift;
  79. int pad_bits;
  80. int val_bits;