Unverified Commit a38dbb4f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-fixes-5.19' of... 

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/20220628135130.3114878-1-claudiu.beznea@microchip.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 620f83b8 91d60e25

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

+1 −2
Original line number Diff line number Diff line
@@ -233,10 +233,9 @@ 
		status = "okay";



		eeprom@53 {

			compatible = "atmel,24c32";

			compatible = "atmel,24c02";

			reg = <0x53>;

			pagesize = <16>;

			size = <128>;

			status = "okay";

		};

	};

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

+3 −3
Original line number Diff line number Diff line
@@ -329,21 +329,21 @@ 
	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c32";

		compatible = "atmel,24c02";

		reg = <0x50>;

		pagesize = <16>;

		status = "okay";

	};



	eeprom@52 {

		compatible = "atmel,24c32";

		compatible = "atmel,24c02";

		reg = <0x52>;

		pagesize = <16>;

		status = "disabled";

	};



	eeprom@53 {

		compatible = "atmel,24c32";

		compatible = "atmel,24c02";

		reg = <0x53>;

		pagesize = <16>;

		status = "disabled";

arch/arm/mach-at91/pm.c

+6 −6
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static const struct wakeup_source_info ws_info[] = { 


static const struct of_device_id sama5d2_ws_ids[] = {

	{ .compatible = "atmel,sama5d2-gem",		.data = &ws_info[0] },

	{ .compatible = "atmel,at91rm9200-rtc",		.data = &ws_info[1] },

	{ .compatible = "atmel,sama5d2-rtc",		.data = &ws_info[1] },

	{ .compatible = "atmel,sama5d3-udc",		.data = &ws_info[2] },

	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },

	{ .compatible = "usb-ohci",			.data = &ws_info[2] },
@@ -213,24 +213,24 @@ static const struct of_device_id sama5d2_ws_ids[] = { 
};



static const struct of_device_id sam9x60_ws_ids[] = {

	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },

	{ .compatible = "microchip,sam9x60-rtc",	.data = &ws_info[1] },

	{ .compatible = "atmel,at91rm9200-ohci",	.data = &ws_info[2] },

	{ .compatible = "usb-ohci",			.data = &ws_info[2] },

	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },

	{ .compatible = "usb-ehci",			.data = &ws_info[2] },

	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },

	{ .compatible = "microchip,sam9x60-rtt",	.data = &ws_info[4] },

	{ .compatible = "cdns,sam9x60-macb",		.data = &ws_info[5] },

	{ /* sentinel */ }

};



static const struct of_device_id sama7g5_ws_ids[] = {

	{ .compatible = "atmel,at91sam9x5-rtc",		.data = &ws_info[1] },

	{ .compatible = "microchip,sama7g5-rtc",	.data = &ws_info[1] },

	{ .compatible = "microchip,sama7g5-ohci",	.data = &ws_info[2] },

	{ .compatible = "usb-ohci",			.data = &ws_info[2] },

	{ .compatible = "atmel,at91sam9g45-ehci",	.data = &ws_info[2] },

	{ .compatible = "usb-ehci",			.data = &ws_info[2] },

	{ .compatible = "microchip,sama7g5-sdhci",	.data = &ws_info[3] },

	{ .compatible = "atmel,at91sam9260-rtt",	.data = &ws_info[4] },

	{ .compatible = "microchip,sama7g5-rtt",	.data = &ws_info[4] },

	{ /* sentinel */ }

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

}



static void at91_pm_secure_init(void)

static void __init at91_pm_secure_init(void)

{

	int suspend_mode;

	struct arm_smccc_res res;

drivers/soc/atmel/soc.c

+6 −6
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ static const struct at91_soc socs[] __initconst = { 
	AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,

		 AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,

		 "sam9x60", "sam9x60"),

	AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D5M_EXID_MATCH,

		 AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,

	AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,

		 AT91_CIDR_VERSION_MASK, SAM9X60_D5M_EXID_MATCH,

		 "sam9x60 64MiB DDR2 SiP", "sam9x60"),

	AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D1G_EXID_MATCH,

		 AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,

	AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,

		 AT91_CIDR_VERSION_MASK, SAM9X60_D1G_EXID_MATCH,

		 "sam9x60 128MiB DDR2 SiP", "sam9x60"),

	AT91_SOC(SAM9X60_CIDR_MATCH, SAM9X60_D6K_EXID_MATCH,

		 AT91_CIDR_VERSION_MASK, SAM9X60_EXID_MATCH,

	AT91_SOC(SAM9X60_CIDR_MATCH, AT91_CIDR_MATCH_MASK,

		 AT91_CIDR_VERSION_MASK, SAM9X60_D6K_EXID_MATCH,

		 "sam9x60 8MiB SDRAM SiP", "sam9x60"),

#endif

#ifdef CONFIG_SOC_SAMA5