Re: [PATCH 01/13] ARM: remove sa1100 platform

On Tue, Sep 8, 2026, at 21:39, Karl Mehltretter wrote:

On Tue, Sep 08, 2026 at 05:27:51PM +0100, Arnd Bergmann wrote:

quoted

 62 files changed, 19 insertions(+), 10501 deletions(-)

Note that Sashiko skipped reviewing this patch, because it exceeded
its current 10000 line limit.

quoted

diff --git a/drivers/rtc/rtc-sa1100.c b/drivers/rtc/rtc-sa1100.c

@@ -275,18 +275,10 @@ static int sa1100_rtc_probe(struct platform_device *pdev)
-	if (IS_ENABLED(CONFIG_ARCH_SA1100) ||
-	    of_device_is_compatible(pdev->dev.of_node, "mrvl,sa1100-rtc")) {
-		info->rcnr = base + 0x04;
-		info->rtsr = base + 0x10;
-		info->rtar = base + 0x00;
-		info->rttr = base + 0x08;
-	} else {
-		info->rcnr = base + 0x0;
-		info->rtsr = base + 0x8;
-		info->rtar = base + 0x4;
-		info->rttr = base + 0xc;
-	}
+	info->rcnr = base + 0x0;
+	info->rtsr = base + 0x8;
+	info->rtar = base + 0x4;
+	info->rttr = base + 0xc;

This drops the layout switch but keeps "mrvl,sa1100-rtc" in
sa1100_rtc_dt_ids[] and in bindings/rtc/sa1100-rtc.yaml, so a DT with
that compatible would now silently get the MMP register offsets instead
of the SA1100 ones.

This one is interesting: this was already the behavior before
my patch, as CONFIG_ARCH_SA1100 is mutually exclusive with all
other targets. That obviously wasn't the intention of the code.

I've removed the sa1100_rtc_dt_ids[] entry now.

quoted

diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig

@@ -614,16 +614,16 @@ config S3C2410_WATCHDOG
 	  be called s3c2410_wdt.
 
 config SA1100_WATCHDOG
-	tristate "SA1100/PXA2xx watchdog"
-	depends on ARCH_SA1100 || ARCH_PXA || COMPILE_TEST
+	tristate "PXA2xx watchdog"
+	depends on ARCH_PXA || COMPILE_TEST
 	help
-	  Watchdog timer embedded into SA11x0 and PXA2xx chips. This will
-	  reboot your system when timeout is reached.
+	  Watchdog timer embedded PXA2xx chips. This will reboot your
+	  system when timeout is reached.
 

"embedded into PXA2xx chips" is better.

The RTC_DRV_SA1100 help text a bit earlier in the patch also still says
"built into your SA11x0 or PXA2xx CPU".

Fixed all these now, thanks for the review!

      Arnd