171-media-atmel-atmel-isc-add-support-for-version-regist.patch 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586
  1. From 0939b0a92acca11a5a3b0de5dd70434e17e40ed3 Mon Sep 17 00:00:00 2001
  2. From: Eugen Hristev <[email protected]>
  3. Date: Tue, 13 Apr 2021 12:57:13 +0200
  4. Subject: [PATCH 171/247] media: atmel: atmel-isc: add support for version
  5. register
  6. Add support for version register and print it at probe time.
  7. Signed-off-by: Eugen Hristev <[email protected]>
  8. Signed-off-by: Hans Verkuil <[email protected]>
  9. Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  10. ---
  11. drivers/media/platform/atmel/atmel-isc-regs.h | 5 +++++
  12. drivers/media/platform/atmel/atmel-isc.h | 2 ++
  13. drivers/media/platform/atmel/atmel-sama5d2-isc.c | 5 +++++
  14. 3 files changed, 12 insertions(+)
  15. diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h
  16. index 4940998c82a2..344668dcfcf4 100644
  17. --- a/drivers/media/platform/atmel/atmel-isc-regs.h
  18. +++ b/drivers/media/platform/atmel/atmel-isc-regs.h
  19. @@ -295,6 +295,11 @@
  20. /* DMA Address 2 Register */
  21. #define ISC_DAD2 0x000003fc
  22. +/* Offset for version register specific to sama5d2 product */
  23. +#define ISC_SAMA5D2_VERSION_OFFSET 0
  24. +/* Version Register */
  25. +#define ISC_VERSION 0x0000040c
  26. +
  27. /* Histogram Entry */
  28. #define ISC_HIS_ENTRY 0x00000410
  29. diff --git a/drivers/media/platform/atmel/atmel-isc.h b/drivers/media/platform/atmel/atmel-isc.h
  30. index bea545327d3d..13ee19d99c2e 100644
  31. --- a/drivers/media/platform/atmel/atmel-isc.h
  32. +++ b/drivers/media/platform/atmel/atmel-isc.h
  33. @@ -152,6 +152,7 @@ struct isc_ctrls {
  34. * @rlp: Offset for the RLP register
  35. * @his: Offset for the HIS related registers
  36. * @dma: Offset for the DMA related registers
  37. + * @version: Offset for the version register
  38. */
  39. struct isc_reg_offsets {
  40. u32 csc;
  41. @@ -161,6 +162,7 @@ struct isc_reg_offsets {
  42. u32 rlp;
  43. u32 his;
  44. u32 dma;
  45. + u32 version;
  46. };
  47. /*
  48. diff --git a/drivers/media/platform/atmel/atmel-sama5d2-isc.c b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  49. index bfd56ac5c921..aebf38dde2d2 100644
  50. --- a/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  51. +++ b/drivers/media/platform/atmel/atmel-sama5d2-isc.c
  52. @@ -210,6 +210,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
  53. struct isc_subdev_entity *subdev_entity;
  54. int irq;
  55. int ret;
  56. + u32 ver;
  57. isc = devm_kzalloc(dev, sizeof(*isc), GFP_KERNEL);
  58. if (!isc)
  59. @@ -258,6 +259,7 @@ static int atmel_isc_probe(struct platform_device *pdev)
  60. isc->offsets.rlp = ISC_SAMA5D2_RLP_OFFSET;
  61. isc->offsets.his = ISC_SAMA5D2_HIS_OFFSET;
  62. isc->offsets.dma = ISC_SAMA5D2_DMA_OFFSET;
  63. + isc->offsets.version = ISC_SAMA5D2_VERSION_OFFSET;
  64. /* sama5d2-isc - 8 bits per beat */
  65. isc->dcfg = ISC_DCFG_YMBSIZE_BEATS8 | ISC_DCFG_CMBSIZE_BEATS8;
  66. @@ -346,6 +348,9 @@ static int atmel_isc_probe(struct platform_device *pdev)
  67. pm_runtime_enable(dev);
  68. pm_request_idle(dev);
  69. + regmap_read(isc->regmap, ISC_VERSION + isc->offsets.version, &ver);
  70. + dev_info(dev, "Microchip ISC version %x\n", ver);
  71. +
  72. return 0;
  73. cleanup_subdev:
  74. --
  75. 2.32.0