Skip to content

sam9x60 sip types added to soc description. #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ksdd wants to merge 5 commits into from
Closed

sam9x60 sip types added to soc description. #46

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8c30170
sam9x60 sip types added to soc description.
ksdd Sep 25, 2020
7f38ed4
Unrelated change reverted.
ksdd Sep 28, 2020
ab87417
sam9x60 sip type descriptions corrected.
ksdd Oct 2, 2020
b5af97f
Corrected sam9x60 sip size values in description.
ksdd Oct 2, 2020
feff97a
Naming scheme of sam9x60 sip exid definitions fixed.
ksdd Oct 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions drivers/soc/atmel/soc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Copy link
Member

@noglitch noglitch Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd like that the #defines are like the other ones: SAM9X60_D5M_EXID_MATCH

Copy link
Author

@ksdd ksdd Oct 5, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@noglitch : EXID_MATCH definitions changed with commit feff97a.

"sam9x60d5m 512MiB DDR2 SiP", "sam9x60"),
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D1G_EXID_MATCH,
"sam9x60d1g 1GiB DDR2 SiP", "sam9x60"),
Copy link
Member

@noglitch noglitch Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, no, this is not 1GiB, it's 128MiB: please correct all them.

Copy link
Author

@ksdd ksdd Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bits and bytes - always difficult. I will fix it.

AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60D6K_EXID_MATCH,
"sam9x60d6k 64MiB SiP", "sam9x60"),
#endif
#ifdef CONFIG_SOC_SAMA5
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D21CU_EXID_MATCH,
Expand Down
3 changes: 3 additions & 0 deletions drivers/soc/atmel/soc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down