Skip to content

Commit e04c02c

Browse files
committed
Merge branch 'at91-4.14-trunk/soc' into linux-4.14-at91
2 parents 6847db5 + 60dc562 commit e04c02c

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

drivers/soc/atmel/soc.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,20 @@ static const struct at91_soc __initconst socs[] = {
9090
"sama5d27c 128MiB SiP", "sama5d2"),
9191
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_D5M_EXID_MATCH,
9292
"sama5d27c 64MiB SiP", "sama5d2"),
93+
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD1G_EXID_MATCH,
94+
"sama5d27c 128MiB LPDDR2 SiP", "sama5d2"),
95+
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D27C_LD2G_EXID_MATCH,
96+
"sama5d27c 256MiB LPDDR2 SiP", "sama5d2"),
9397
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CU_EXID_MATCH,
9498
"sama5d28", "sama5d2"),
9599
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28CN_EXID_MATCH,
96100
"sama5d28", "sama5d2"),
97101
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_D1G_EXID_MATCH,
98102
"sama5d28c 128MiB SiP", "sama5d2"),
103+
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD1G_EXID_MATCH,
104+
"sama5d28c 128MiB LPDDR2 SiP", "sama5d2"),
105+
AT91_SOC(SAMA5D2_CIDR_MATCH, SAMA5D28C_LD2G_EXID_MATCH,
106+
"sama5d28c 256MiB LPDDR2 SiP", "sama5d2"),
99107
AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D31_EXID_MATCH,
100108
"sama5d31", "sama5d3"),
101109
AT91_SOC(SAMA5D3_CIDR_MATCH, SAMA5D33_EXID_MATCH,

drivers/soc/atmel/soc.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,13 @@ at91_soc_init(const struct at91_soc *socs);
7373
#define SAMA5D26CU_EXID_MATCH 0x00000012
7474
#define SAMA5D27C_D1G_EXID_MATCH 0x00000033
7575
#define SAMA5D27C_D5M_EXID_MATCH 0x00000032
76+
#define SAMA5D27C_LD1G_EXID_MATCH 0x00000061
77+
#define SAMA5D27C_LD2G_EXID_MATCH 0x00000062
7678
#define SAMA5D27CU_EXID_MATCH 0x00000011
7779
#define SAMA5D27CN_EXID_MATCH 0x00000021
7880
#define SAMA5D28C_D1G_EXID_MATCH 0x00000013
81+
#define SAMA5D28C_LD1G_EXID_MATCH 0x00000071
82+
#define SAMA5D28C_LD2G_EXID_MATCH 0x00000072
7983
#define SAMA5D28CU_EXID_MATCH 0x00000010
8084
#define SAMA5D28CN_EXID_MATCH 0x00000020
8185

0 commit comments

Comments
 (0)