140-drivers-soc-atmel-add-support-for-sama7g5.patch 3.0 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  1. From e20bb57fc51741677a6fcae04e564797fd18921b Mon Sep 17 00:00:00 2001
  2. From: Claudiu Beznea <[email protected]>
  3. Date: Fri, 22 Jan 2021 14:21:37 +0200
  4. Subject: [PATCH 140/247] drivers: soc: atmel: add support for sama7g5
  5. Add support for SAMA7G5 SoCs.
  6. Signed-off-by: Claudiu Beznea <[email protected]>
  7. Signed-off-by: Nicolas Ferre <[email protected]>
  8. Link: https://lore.kernel.org/r/[email protected]
  9. ---
  10. drivers/soc/atmel/soc.c | 18 ++++++++++++++++++
  11. drivers/soc/atmel/soc.h | 6 ++++++
  12. 2 files changed, 24 insertions(+)
  13. --- a/drivers/soc/atmel/soc.c
  14. +++ b/drivers/soc/atmel/soc.c
  15. @@ -27,8 +27,10 @@
  16. #define AT91_CHIPID_EXID 0x04
  17. #define AT91_CIDR_VERSION(x, m) ((x) & (m))
  18. #define AT91_CIDR_VERSION_MASK GENMASK(4, 0)
  19. +#define AT91_CIDR_VERSION_MASK_SAMA7G5 GENMASK(3, 0)
  20. #define AT91_CIDR_EXT BIT(31)
  21. #define AT91_CIDR_MATCH_MASK GENMASK(30, 5)
  22. +#define AT91_CIDR_MASK_SAMA7G5 GENMASK(27, 5)
  23. static const struct at91_soc socs[] __initconst = {
  24. #ifdef CONFIG_SOC_AT91RM9200
  25. @@ -221,6 +223,20 @@ static const struct at91_soc socs[] __in
  26. AT91_CIDR_VERSION_MASK, SAMV70Q19_EXID_MATCH,
  27. "samv70q19", "samv7"),
  28. #endif
  29. +#ifdef CONFIG_SOC_SAMA7
  30. + AT91_SOC(SAMA7G5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
  31. + AT91_CIDR_VERSION_MASK_SAMA7G5, SAMA7G51_EXID_MATCH,
  32. + "sama7g51", "sama7g5"),
  33. + AT91_SOC(SAMA7G5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
  34. + AT91_CIDR_VERSION_MASK_SAMA7G5, SAMA7G52_EXID_MATCH,
  35. + "sama7g52", "sama7g5"),
  36. + AT91_SOC(SAMA7G5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
  37. + AT91_CIDR_VERSION_MASK_SAMA7G5, SAMA7G53_EXID_MATCH,
  38. + "sama7g53", "sama7g5"),
  39. + AT91_SOC(SAMA7G5_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
  40. + AT91_CIDR_VERSION_MASK_SAMA7G5, SAMA7G54_EXID_MATCH,
  41. + "sama7g54", "sama7g5"),
  42. +#endif
  43. { /* sentinel */ },
  44. };
  45. @@ -258,6 +274,7 @@ static int __init at91_get_cidr_exid_fro
  46. void __iomem *regs;
  47. static const struct of_device_id chipids[] = {
  48. { .compatible = "atmel,sama5d2-chipid" },
  49. + { .compatible = "microchip,sama7g5-chipid" },
  50. { },
  51. };
  52. @@ -345,6 +362,7 @@ static const struct of_device_id at91_so
  53. { .compatible = "atmel,at91sam9", },
  54. { .compatible = "atmel,sama5", },
  55. { .compatible = "atmel,samv7", },
  56. + { .compatible = "microchip,sama7g5", },
  57. { }
  58. };
  59. --- a/drivers/soc/atmel/soc.h
  60. +++ b/drivers/soc/atmel/soc.h
  61. @@ -48,6 +48,7 @@ at91_soc_init(const struct at91_soc *soc
  62. #define AT91SAM9X5_CIDR_MATCH 0x019a05a0
  63. #define AT91SAM9N12_CIDR_MATCH 0x019a07a0
  64. #define SAM9X60_CIDR_MATCH 0x019b35a0
  65. +#define SAMA7G5_CIDR_MATCH 0x00162100
  66. #define AT91SAM9M11_EXID_MATCH 0x00000001
  67. #define AT91SAM9M10_EXID_MATCH 0x00000002
  68. @@ -69,6 +70,11 @@ at91_soc_init(const struct at91_soc *soc
  69. #define SAM9X60_D1G_EXID_MATCH 0x00000010
  70. #define SAM9X60_D6K_EXID_MATCH 0x00000011
  71. +#define SAMA7G51_EXID_MATCH 0x3
  72. +#define SAMA7G52_EXID_MATCH 0x2
  73. +#define SAMA7G53_EXID_MATCH 0x1
  74. +#define SAMA7G54_EXID_MATCH 0x0
  75. +
  76. #define AT91SAM9XE128_CIDR_MATCH 0x329973a0
  77. #define AT91SAM9XE256_CIDR_MATCH 0x329a93a0
  78. #define AT91SAM9XE512_CIDR_MATCH 0x329aa3a0