From 8c30170f3da1032a9fed47b60cb82dbe61e8f04f Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Fri, 25 Sep 2020 17:00:34 +0200 Subject: [PATCH 1/5] sam9x60 sip types added to soc description. --- drivers/soc/atmel/soc.c | 9 ++++++++- drivers/soc/atmel/soc.h | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 55a1f57a4d8cb0..d627640d3a0249 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -69,6 +69,12 @@ static const struct at91_soc __initconst socs[] = { #endif #ifdef CONFIG_SOC_SAM9X60 AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D5M_EXID_MATCH, + "sam9x60d6m", "sam9x60"), + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D1G_EXID_MATCH, + "sam9x60d1g", "sam9x60"), + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D6K_EXID_MATCH, + "sam9x60d6k", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5 AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH, @@ -237,7 +243,8 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs) } if (!soc->name) { - pr_warn("Could not find matching SoC description\n"); + pr_warn("Could not find matching SoC description" + " (cidr %08x, exid %08x)", cidr, exid); return NULL; } diff --git a/drivers/soc/atmel/soc.h b/drivers/soc/atmel/soc.h index ee652e4841a5c3..59dea1d77776d7 100644 --- a/drivers/soc/atmel/soc.h +++ b/drivers/soc/atmel/soc.h @@ -60,6 +60,9 @@ at91_soc_init(const struct at91_soc *socs); #define AT91SAM9CN11_EXID_MATCH 0x00000009 #define SAM9X60_EXID_MATCH 0x00000000 +#define SAM9X60D5M_EXID_MATCH 0x00000001 +#define SAM9X60D1G_EXID_MATCH 0x00000010 +#define SAM9X60D6K_EXID_MATCH 0x00000011 #define AT91SAM9XE128_CIDR_MATCH 0x329973a0 #define AT91SAM9XE256_CIDR_MATCH 0x329a93a0 From 7f38ed43c05e201485dda09250d1c50400fecffc Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Mon, 28 Sep 2020 08:27:41 +0200 Subject: [PATCH 2/5] Unrelated change reverted. --- drivers/soc/atmel/soc.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index d627640d3a0249..8fb4d4d6542e7e 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -243,8 +243,7 @@ struct soc_device * __init at91_soc_init(const struct at91_soc *socs) } if (!soc->name) { - pr_warn("Could not find matching SoC description" - " (cidr %08x, exid %08x)", cidr, exid); + pr_warn("Could not find matching SoC description\n"); return NULL; } From ab87417facd22df61e3e5302d775d437b506f93b Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Fri, 2 Oct 2020 13:05:39 +0200 Subject: [PATCH 3/5] sam9x60 sip type descriptions corrected. --- drivers/soc/atmel/soc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 8fb4d4d6542e7e..4a7803be63bda4 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -70,11 +70,11 @@ static const struct at91_soc __initconst socs[] = { #ifdef CONFIG_SOC_SAM9X60 AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D5M_EXID_MATCH, - "sam9x60d6m", "sam9x60"), + "sam9x60d5m 512MiB DDR2 SiP", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D1G_EXID_MATCH, - "sam9x60d1g", "sam9x60"), + "sam9x60d1g 1GiB DDR2 SiP", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D6K_EXID_MATCH, - "sam9x60d6k", "sam9x60"), + "sam9x60d6k 64MiB SiP", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5 AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH, From b5af97f4982e1c36778b161ca797289eba0acec9 Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Fri, 2 Oct 2020 14:52:08 +0200 Subject: [PATCH 4/5] Corrected sam9x60 sip size values in description. --- drivers/soc/atmel/soc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 4a7803be63bda4..3e14f46a741e8e 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -70,11 +70,11 @@ static const struct at91_soc __initconst socs[] = { #ifdef CONFIG_SOC_SAM9X60 AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D5M_EXID_MATCH, - "sam9x60d5m 512MiB DDR2 SiP", "sam9x60"), + "sam9x60d5m 64MiB DDR2 SiP", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D1G_EXID_MATCH, - "sam9x60d1g 1GiB DDR2 SiP", "sam9x60"), + "sam9x60d1g 128MiB DDR2 SiP", "sam9x60"), AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D6K_EXID_MATCH, - "sam9x60d6k 64MiB SiP", "sam9x60"), + "sam9x60d6k 8MiB SiP", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5 AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH, From feff97a0e7052ec8d397d953d85424a15f25fb87 Mon Sep 17 00:00:00 2001 From: "Kai Stuhlemmer (ebee Engineering)" Date: Mon, 5 Oct 2020 08:20:22 +0200 Subject: [PATCH 5/5] Naming scheme of sam9x60 sip exid definitions fixed. --- drivers/soc/atmel/soc.c | 6 +++--- drivers/soc/atmel/soc.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/soc/atmel/soc.c b/drivers/soc/atmel/soc.c index 3e14f46a741e8e..faf3c0dc8098aa 100644 --- a/drivers/soc/atmel/soc.c +++ b/drivers/soc/atmel/soc.c @@ -69,11 +69,11 @@ static const struct at91_soc __initconst socs[] = { #endif #ifdef CONFIG_SOC_SAM9X60 AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_EXID_MATCH, "sam9x60", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D5M_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH, "sam9x60d5m 64MiB DDR2 SiP", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D1G_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH, "sam9x60d1g 128MiB DDR2 SiP", "sam9x60"), - AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D6K_EXID_MATCH, + AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH, "sam9x60d6k 8MiB SiP", "sam9x60"), #endif #ifdef CONFIG_SOC_SAMA5 diff --git a/drivers/soc/atmel/soc.h b/drivers/soc/atmel/soc.h index 59dea1d77776d7..5849846a69d60e 100644 --- a/drivers/soc/atmel/soc.h +++ b/drivers/soc/atmel/soc.h @@ -60,9 +60,9 @@ at91_soc_init(const struct at91_soc *socs); #define AT91SAM9CN11_EXID_MATCH 0x00000009 #define SAM9X60_EXID_MATCH 0x00000000 -#define SAM9X60D5M_EXID_MATCH 0x00000001 -#define SAM9X60D1G_EXID_MATCH 0x00000010 -#define SAM9X60D6K_EXID_MATCH 0x00000011 +#define SAM9X60_D5M_EXID_MATCH 0x00000001 +#define SAM9X60_D1G_EXID_MATCH 0x00000010 +#define SAM9X60_D6K_EXID_MATCH 0x00000011 #define AT91SAM9XE128_CIDR_MATCH 0x329973a0 #define AT91SAM9XE256_CIDR_MATCH 0x329a93a0