Skip to content

Commit a38dbb4

Browse files
arndbarndb
committed
Merge tag 'at91-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes
AT91 fixes for 5.19 It contains 3 SoC fixes and 2 DT fixes: SoC: - fix the wakeup from RTC and RTT for ULP1 mode - fix section mismatch warning - fix SAM9X60 SiP detection DT: - fixes the EEPROMs compatibles for sama5d2_icp and sam9x60ek and EEPROM size for sam9x60ek * tag 'at91-fixes-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: ARM: at91: pm: Mark at91_pm_secure_init as __init ARM: at91: fix soc detection for SAM9X60 SiPs ARM: dts: at91: sama5d2_icp: fix eeprom compatibles ARM: dts: at91: sam9x60ek: fix eeprom compatible and size ARM: at91: pm: use proper compatibles for sama7g5's rtc and rtt ARM: at91: pm: use proper compatibles for sam9x60's rtc and rtt ARM: at91: pm: use proper compatible for sama5d2's rtc Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 620f83b + 91d60e2 commit a38dbb4

File tree

4 files changed

+16
-17
lines changed

4 files changed

+16
-17
lines changed

‎arch/arm/boot/dts/at91-sam9x60ek.dts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,10 +233,9 @@
233233
status = "okay";
234234

235235
eeprom@53 {
236-
compatible = "atmel,24c32";
236+
compatible = "atmel,24c02";
237237
reg = <0x53>;
238238
pagesize = <16>;
239-
size = <128>;
240239
status = "okay";
241240
};
242241
};

‎arch/arm/boot/dts/at91-sama5d2_icp.dts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -329,21 +329,21 @@
329329
status = "okay";
330330

331331
eeprom@50 {
332-
compatible = "atmel,24c32";
332+
compatible = "atmel,24c02";
333333
reg = <0x50>;
334334
pagesize = <16>;
335335
status = "okay";
336336
};
337337

338338
eeprom@52 {
339-
compatible = "atmel,24c32";
339+
compatible = "atmel,24c02";
340340
reg = <0x52>;
341341
pagesize = <16>;
342342
status = "disabled";
343343
};
344344

345345
eeprom@53 {
346-
compatible = "atmel,24c32";
346+
compatible = "atmel,24c02";
347347
reg = <0x53>;
348348
pagesize = <16>;
349349
status = "disabled";

‎arch/arm/mach-at91/pm.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ static const struct wakeup_source_info ws_info[] = {
202202

203203
static const struct of_device_id sama5d2_ws_ids[] = {
204204
{ .compatible = "atmel,sama5d2-gem", .data = &ws_info[0] },
205-
{ .compatible = "atmel,at91rm9200-rtc", .data = &ws_info[1] },
205+
{ .compatible = "atmel,sama5d2-rtc", .data = &ws_info[1] },
206206
{ .compatible = "atmel,sama5d3-udc", .data = &ws_info[2] },
207207
{ .compatible = "atmel,at91rm9200-ohci", .data = &ws_info[2] },
208208
{ .compatible = "usb-ohci", .data = &ws_info[2] },
@@ -213,24 +213,24 @@ static const struct of_device_id sama5d2_ws_ids[] = {
213213
};
214214

215215
static const struct of_device_id sam9x60_ws_ids[] = {
216-
{ .compatible = "atmel,at91sam9x5-rtc", .data = &ws_info[1] },
216+
{ .compatible = "microchip,sam9x60-rtc", .data = &ws_info[1] },
217217
{ .compatible = "atmel,at91rm9200-ohci", .data = &ws_info[2] },
218218
{ .compatible = "usb-ohci", .data = &ws_info[2] },
219219
{ .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] },
220220
{ .compatible = "usb-ehci", .data = &ws_info[2] },
221-
{ .compatible = "atmel,at91sam9260-rtt", .data = &ws_info[4] },
221+
{ .compatible = "microchip,sam9x60-rtt", .data = &ws_info[4] },
222222
{ .compatible = "cdns,sam9x60-macb", .data = &ws_info[5] },
223223
{ /* sentinel */ }
224224
};
225225

226226
static const struct of_device_id sama7g5_ws_ids[] = {
227-
{ .compatible = "atmel,at91sam9x5-rtc", .data = &ws_info[1] },
227+
{ .compatible = "microchip,sama7g5-rtc", .data = &ws_info[1] },
228228
{ .compatible = "microchip,sama7g5-ohci", .data = &ws_info[2] },
229229
{ .compatible = "usb-ohci", .data = &ws_info[2] },
230230
{ .compatible = "atmel,at91sam9g45-ehci", .data = &ws_info[2] },
231231
{ .compatible = "usb-ehci", .data = &ws_info[2] },
232232
{ .compatible = "microchip,sama7g5-sdhci", .data = &ws_info[3] },
233-
{ .compatible = "atmel,at91sam9260-rtt", .data = &ws_info[4] },
233+
{ .compatible = "microchip,sama7g5-rtt", .data = &ws_info[4] },
234234
{ /* sentinel */ }
235235
};
236236

@@ -1079,7 +1079,7 @@ static int __init at91_pm_backup_init(void)
10791079
return ret;
10801080
}
10811081

1082-
static void at91_pm_secure_init(void)
1082+
static void __init at91_pm_secure_init(void)
10831083
{
10841084
int suspend_mode;
10851085
struct arm_smccc_res res;

‎drivers/soc/atmel/soc.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ static const struct at91_soc socs[] __initconst = {
9191
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
9292
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
9393
"sam9x60", "sam9x60"),
94-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH,
95-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
94+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
95+
AT91_CIDR_VERSION_MASK, SAM9X60_D5M_EXID_MATCH,
9696
"sam9x60 64MiB DDR2 SiP", "sam9x60"),
97-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH,
98-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
97+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
98+
AT91_CIDR_VERSION_MASK, SAM9X60_D1G_EXID_MATCH,
9999
"sam9x60 128MiB DDR2 SiP", "sam9x60"),
100-
AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH,
101-
AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,
100+
AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,
101+
AT91_CIDR_VERSION_MASK, SAM9X60_D6K_EXID_MATCH,
102102
"sam9x60 8MiB SDRAM SiP", "sam9x60"),
103103
#endif
104104
#ifdef CONFIG_SOC_SAMA5

0 commit comments

Comments
 (0)