9cd0654380
Mainline Linux now has basic s500/roseapplepi support, so switch to that to get rid of the dependency on gcc7. Add two patches for the dts / fix that didn't make it for kernel 5.7. The mainline kernel does not yet have support for the mmc interface, so change to initramfs for now. Patches for mmc support have been posted recently, so this can be reverted once they show up in a stable kernel: https://lore.kernel.org/lkml/cover.1593124368.git.cristian.ciocaltea@gmail.com/ The owl serial port is called ttyOWLn in mainline, so adjust the bootargs to match. Also drop the unneeded execute permission on uEnv.txt. Signed-off-by: Peter Korsgaard <peter@korsgaard.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
53 lines
2.0 KiB
Diff
53 lines
2.0 KiB
Diff
From: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
|
|
Subject: [PATCH 1/4] arm: dts: owl-s500: Fix incorrect PPI interrupt specifiers
|
|
To: Rob Herring <robh+dt@kernel.org>,
|
|
Andreas Färber <afaerber@suse.de>,
|
|
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
|
Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
|
|
linux-kernel@vger.kernel.org
|
|
Date: Mon, 15 Jun 2020 03:19:08 +0300 (10 weeks, 3 days, 20 hours ago)
|
|
X-Mailer: git-send-email 2.27.0
|
|
|
|
The PPI interrupts for cortex-a9 were incorrectly specified, fix them.
|
|
|
|
Fixes: fdfe7f4f9d85 ("ARM: dts: Add Actions Semi S500 and LeMaker Guitar")
|
|
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@gmail.com>
|
|
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
|
---
|
|
arch/arm/boot/dts/owl-s500.dtsi | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/arch/arm/boot/dts/owl-s500.dtsi b/arch/arm/boot/dts/owl-s500.dtsi
|
|
index 5ceb6cc4451d..1dbe4e8b38ac 100644
|
|
--- a/arch/arm/boot/dts/owl-s500.dtsi
|
|
+++ b/arch/arm/boot/dts/owl-s500.dtsi
|
|
@@ -84,21 +84,21 @@ scu: scu@b0020000 {
|
|
global_timer: timer@b0020200 {
|
|
compatible = "arm,cortex-a9-global-timer";
|
|
reg = <0xb0020200 0x100>;
|
|
- interrupts = <GIC_PPI 0 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
+ interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
status = "disabled";
|
|
};
|
|
|
|
twd_timer: timer@b0020600 {
|
|
compatible = "arm,cortex-a9-twd-timer";
|
|
reg = <0xb0020600 0x20>;
|
|
- interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
status = "disabled";
|
|
};
|
|
|
|
twd_wdt: wdt@b0020620 {
|
|
compatible = "arm,cortex-a9-twd-wdt";
|
|
reg = <0xb0020620 0xe0>;
|
|
- interrupts = <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
+ interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>;
|
|
status = "disabled";
|
|
};
|
|
|
|
--
|
|
2.27.0
|
|
|
|
|