target/linux/at91/patches-5.10/140-drivers-soc-atmel-add-support-for-sama7g5.patch

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