From 2de4d4892b6f9190d3a75d53e3f68f595d4a582f Mon Sep 17 00:00:00 2001 From: Asgeir Stavik Hustad Date: Tue, 3 Sep 2024 01:07:06 +0200 Subject: [PATCH 1/4] same70b: patch: Fix SmcCs struct naming. This commit patches the incorrect SMC struct name. Signed-off-by: Asgeir Stavik Hustad --- asf/sam/include/same70b/README | 1 + asf/sam/include/same70b/component/smc.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/asf/sam/include/same70b/README b/asf/sam/include/same70b/README index ef318d78..b2e10d5a 100644 --- a/asf/sam/include/same70b/README +++ b/asf/sam/include/same70b/README @@ -39,6 +39,7 @@ License Link: https://www.apache.org/licenses/LICENSE-2.0 Patch List: + * Fix SmcCs struct naming. * Fix QDEC deprecated symbols. * Fix GMAC_SA register name. * Fix XDMAC_CHID register name. diff --git a/asf/sam/include/same70b/component/smc.h b/asf/sam/include/same70b/component/smc.h index 974cd046..5a6eecc6 100644 --- a/asf/sam/include/same70b/component/smc.h +++ b/asf/sam/include/same70b/component/smc.h @@ -372,12 +372,12 @@ typedef struct { __IO uint32_t SMC_PULSE; /**< (SMC_CS_NUMBER Offset: 0x04) SMC Pulse Register */ __IO uint32_t SMC_CYCLE; /**< (SMC_CS_NUMBER Offset: 0x08) SMC Cycle Register */ __IO uint32_t SMC_MODE; /**< (SMC_CS_NUMBER Offset: 0x0C) SMC Mode Register */ -} SmcCsNumber; +} SmcCs_number; -#define SMCCSNUMBER_NUMBER 4 +#define SMCCS_NUMBER_NUMBER 4 /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SMC_CS_NUMBER[SMCCSNUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register */ + SmcCs_number SMC_CS_NUMBER[SMCCS_NUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register */ __I uint8_t Reserved1[64]; __IO uint32_t SMC_OCMS; /**< (SMC Offset: 0x80) SMC Off-Chip Memory Scrambling Register */ __O uint32_t SMC_KEY1; /**< (SMC Offset: 0x84) SMC Off-Chip Memory Scrambling KEY1 Register */ @@ -394,11 +394,11 @@ typedef struct { __IO SMC_PULSE_Type SMC_PULSE; /**< Offset: 0x04 (R/W 32) SMC Pulse Register */ __IO SMC_CYCLE_Type SMC_CYCLE; /**< Offset: 0x08 (R/W 32) SMC Cycle Register */ __IO SMC_MODE_Type SMC_MODE; /**< Offset: 0x0C (R/W 32) SMC Mode Register */ -} SmcCsNumber; +} SmcCs_number; /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register */ + SmcCs_number SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register */ __I uint8_t Reserved1[64]; __IO SMC_OCMS_Type SMC_OCMS; /**< Offset: 0x80 (R/W 32) SMC Off-Chip Memory Scrambling Register */ __O SMC_KEY1_Type SMC_KEY1; /**< Offset: 0x84 ( /W 32) SMC Off-Chip Memory Scrambling KEY1 Register */ From f06ca0ce9107c61b815996997dab43f8c2b9c047 Mon Sep 17 00:00:00 2001 From: Asgeir Stavik Hustad Date: Sun, 8 Sep 2024 13:54:14 +0200 Subject: [PATCH 2/4] same70: patch: Fix SmcCs struct naming. This commit patches the incorrect SMC struct name for same70. Signed-off-by: Asgeir Stavik Hustad --- asf/sam/include/same70/README | 1 + asf/sam/include/same70/component/smc.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/asf/sam/include/same70/README b/asf/sam/include/same70/README index 17ba9e56..e43224e9 100644 --- a/asf/sam/include/same70/README +++ b/asf/sam/include/same70/README @@ -39,6 +39,7 @@ License Link: https://www.apache.org/licenses/LICENSE-2.0 Patch List: + * Fix SmcCs struct naming. * Fix the GMAC priority queue registers to match the datasheet. * Fix GMAC_SA register name. * Fix XDMAC_CHID register name. diff --git a/asf/sam/include/same70/component/smc.h b/asf/sam/include/same70/component/smc.h index 88e333f0..adec49b2 100644 --- a/asf/sam/include/same70/component/smc.h +++ b/asf/sam/include/same70/component/smc.h @@ -372,12 +372,12 @@ typedef struct { __IO uint32_t SMC_PULSE; /**< (SMC_CS_NUMBER Offset: 0x04) SMC Pulse Register (CS_number = 0) */ __IO uint32_t SMC_CYCLE; /**< (SMC_CS_NUMBER Offset: 0x08) SMC Cycle Register (CS_number = 0) */ __IO uint32_t SMC_MODE; /**< (SMC_CS_NUMBER Offset: 0x0C) SMC MODE Register (CS_number = 0) */ -} SmcCsNumber; +} SmcCs_number; -#define SMCCSNUMBER_NUMBER 4 +#define SMCCS_NUMBER_NUMBER 4 /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SMC_CS_NUMBER[SMCCSNUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ + SmcCs_number SMC_CS_NUMBER[SMCCS_NUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ __I uint8_t Reserved1[64]; __IO uint32_t SMC_OCMS; /**< (SMC Offset: 0x80) SMC OCMS MODE Register */ __O uint32_t SMC_KEY1; /**< (SMC Offset: 0x84) SMC OCMS KEY1 Register */ @@ -394,11 +394,11 @@ typedef struct { __IO SMC_PULSE_Type SMC_PULSE; /**< Offset: 0x04 (R/W 32) SMC Pulse Register (CS_number = 0) */ __IO SMC_CYCLE_Type SMC_CYCLE; /**< Offset: 0x08 (R/W 32) SMC Cycle Register (CS_number = 0) */ __IO SMC_MODE_Type SMC_MODE; /**< Offset: 0x0C (R/W 32) SMC MODE Register (CS_number = 0) */ -} SmcCsNumber; +} SmcCs_number; /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ + SmcCs_number SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ __I uint8_t Reserved1[64]; __IO SMC_OCMS_Type SMC_OCMS; /**< Offset: 0x80 (R/W 32) SMC OCMS MODE Register */ __O SMC_KEY1_Type SMC_KEY1; /**< Offset: 0x84 ( /W 32) SMC OCMS KEY1 Register */ From 080a82726c2cb39debff05a5f5cebc738b598a02 Mon Sep 17 00:00:00 2001 From: Asgeir Stavik Hustad Date: Sun, 8 Sep 2024 13:58:01 +0200 Subject: [PATCH 3/4] samv71: patch: Fix SmcCs struct naming This commit patches the incorrect SMC struct name. Signed-off-by: Asgeir Stavik Hustad --- asf/sam/include/samv71/README | 1 + asf/sam/include/samv71/component/smc.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/asf/sam/include/samv71/README b/asf/sam/include/samv71/README index 002e8f4a..8e70ad3e 100644 --- a/asf/sam/include/samv71/README +++ b/asf/sam/include/samv71/README @@ -39,5 +39,6 @@ License Link: https://www.apache.org/licenses/LICENSE-2.0 Patch List: + * Fix SmcCs struct naming. * Fix the GMAC priority queue registers to match the datasheet. * Fix XDMAC_CHID register name. diff --git a/asf/sam/include/samv71/component/smc.h b/asf/sam/include/samv71/component/smc.h index 6a8ec7f4..a0ebff76 100644 --- a/asf/sam/include/samv71/component/smc.h +++ b/asf/sam/include/samv71/component/smc.h @@ -399,12 +399,12 @@ typedef struct { __IO uint32_t SMC_PULSE; /**< (SMC_CS_NUMBER Offset: 0x04) SMC Pulse Register (CS_number = 0) */ __IO uint32_t SMC_CYCLE; /**< (SMC_CS_NUMBER Offset: 0x08) SMC Cycle Register (CS_number = 0) */ __IO uint32_t SMC_MODE; /**< (SMC_CS_NUMBER Offset: 0x0C) SMC Mode Register (CS_number = 0) */ -} SmcCsNumber; +} SmcCs_number; -#define SMCCSNUMBER_NUMBER 4 +#define SMCCS_NUMBER_NUMBER 4 /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SmcCsNumber[SMCCSNUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ + SmcCs_number SMC_CS_NUMBER[SMCCS_NUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ __I uint8_t Reserved1[64]; __IO uint32_t SMC_OCMS; /**< (SMC Offset: 0x80) SMC Off-Chip Memory Scrambling Register */ __O uint32_t SMC_KEY1; /**< (SMC Offset: 0x84) SMC Off-Chip Memory Scrambling KEY1 Register */ @@ -423,11 +423,11 @@ typedef struct { __IO SMC_PULSE_Type SMC_PULSE; /**< Offset: 0x04 (R/W 32) SMC Pulse Register (CS_number = 0) */ __IO SMC_CYCLE_Type SMC_CYCLE; /**< Offset: 0x08 (R/W 32) SMC Cycle Register (CS_number = 0) */ __IO SMC_MODE_Type SMC_MODE; /**< Offset: 0x0C (R/W 32) SMC Mode Register (CS_number = 0) */ -} SmcCsNumber; +} SmcCs_number; /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SmcCsNumber[4]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ + SmcCs_number SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register (CS_number = 0) */ __I uint8_t Reserved1[64]; __IO SMC_OCMS_Type SMC_OCMS; /**< Offset: 0x80 (R/W 32) SMC Off-Chip Memory Scrambling Register */ __O SMC_KEY1_Type SMC_KEY1; /**< Offset: 0x84 ( /W 32) SMC Off-Chip Memory Scrambling KEY1 Register */ From 2527282fc140e9846295e9549e89396fdd0479a6 Mon Sep 17 00:00:00 2001 From: Asgeir Stavik Hustad Date: Sun, 8 Sep 2024 14:19:38 +0200 Subject: [PATCH 4/4] samv71b: patch: Fix SmcCs struct naming. This commit patches the incorrect SMC struct name. Signed-off-by: Asgeir Stavik Hustad --- asf/sam/include/samv71b/README | 1 + asf/sam/include/samv71b/component/smc.h | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/asf/sam/include/samv71b/README b/asf/sam/include/samv71b/README index 04aff323..5751c5d0 100644 --- a/asf/sam/include/samv71b/README +++ b/asf/sam/include/samv71b/README @@ -39,5 +39,6 @@ License Link: https://www.apache.org/licenses/LICENSE-2.0 Patch List: + * Fix SmcCs struct naming. * Fix QDEC deprecated symbols. * Fix XDMAC_CHID register name. diff --git a/asf/sam/include/samv71b/component/smc.h b/asf/sam/include/samv71b/component/smc.h index 6e395f55..de0f5848 100644 --- a/asf/sam/include/samv71b/component/smc.h +++ b/asf/sam/include/samv71b/component/smc.h @@ -372,12 +372,12 @@ typedef struct { __IO uint32_t SMC_PULSE; /**< (SMC_CS_NUMBER Offset: 0x04) SMC Pulse Register */ __IO uint32_t SMC_CYCLE; /**< (SMC_CS_NUMBER Offset: 0x08) SMC Cycle Register */ __IO uint32_t SMC_MODE; /**< (SMC_CS_NUMBER Offset: 0x0C) SMC Mode Register */ -} SmcCsNumber; +} SmcCs_number; -#define SMCCSNUMBER_NUMBER 4 +#define SMCCS_NUMBER_NUMBER 4 /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SmcCsNumber[SMCCSNUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register */ + SmcCs_number SMC_CS_NUMBER[SMCCS_NUMBER_NUMBER]; /**< Offset: 0x00 SMC Setup Register */ __I uint8_t Reserved1[64]; __IO uint32_t SMC_OCMS; /**< (SMC Offset: 0x80) SMC Off-Chip Memory Scrambling Register */ __O uint32_t SMC_KEY1; /**< (SMC Offset: 0x84) SMC Off-Chip Memory Scrambling KEY1 Register */ @@ -394,11 +394,11 @@ typedef struct { __IO SMC_PULSE_Type SMC_PULSE; /**< Offset: 0x04 (R/W 32) SMC Pulse Register */ __IO SMC_CYCLE_Type SMC_CYCLE; /**< Offset: 0x08 (R/W 32) SMC Cycle Register */ __IO SMC_MODE_Type SMC_MODE; /**< Offset: 0x0C (R/W 32) SMC Mode Register */ -} SmcCsNumber; +} SmcCs_number; /** \brief SMC hardware registers */ typedef struct { - SmcCsNumber SmcCsNumber[4]; /**< Offset: 0x00 SMC Setup Register */ + SmcCs_number SMC_CS_NUMBER[4]; /**< Offset: 0x00 SMC Setup Register */ __I uint8_t Reserved1[64]; __IO SMC_OCMS_Type SMC_OCMS; /**< Offset: 0x80 (R/W 32) SMC Off-Chip Memory Scrambling Register */ __O SMC_KEY1_Type SMC_KEY1; /**< Offset: 0x84 ( /W 32) SMC Off-Chip Memory Scrambling KEY1 Register */