Skip to contentSkip to conversation

ARM: mstar: wire up interrupt controllers

PATCH Applied Daniel Palmer 2 participants 7 messages Oct 2, 2020 – Oct 3, 2020

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

v2 cover ARM: mstar: wire up interrupt controllers

Mark-PK Tsai's driver for the MStar interrupt controller should be going into 5.10[0].

This small series selects the driver when building support for MStar/SigmaStar Arm v7 SoCs, adds the instances of it to the base dtsi and wires up the interrupt for pm_uart.

Differences from v1:

- Added two extra commits that fix up the file names for the MStar dtsi/dts files as requested by Arnd.

Daniel Palmer (5):
ARM: mstar: Select MStar intc
ARM: mstar: Add interrupt controller to base dtsi
ARM: mstar: Add interrupt to pm_uart
ARM: mstar: Add mstar prefix to all of the dtsi/dts files
ARM: mstar: Fix up the fallout from moving the dts/dtsi files

 MAINTAINERS                                   |  4 +---
 arch/arm/boot/dts/Makefile                    |  6 +++---
 ... mstar-infinity-msc313-breadbee_crust.dts} |  2 +-
 ...sc313e.dtsi => mstar-infinity-msc313.dtsi} |  2 +-
 .../{infinity.dtsi => mstar-infinity.dtsi}    |  0
 ...s => mstar-infinity3-msc313e-breadbee.dts} |  2 +-
 ...336n.dtsi => mstar-infinity3-msc313e.dtsi} |  2 +-
 .../{infinity3.dtsi => mstar-infinity3.dtsi}  |  2 +-
 ...=> mstar-mercury5-ssc8336n-midrived08.dts} |  2 +-
 ...c313.dtsi => mstar-mercury5-ssc8336n.dtsi} |  2 +-
 .../{mercury5.dtsi => mstar-mercury5.dtsi}    |  0
 arch/arm/boot/dts/mstar-v7.dtsi               | 20 +++++++++++++++++++
 arch/arm/mach-mstar/Kconfig                   |  1 +
 13 files changed, 32 insertions(+), 13 deletions(-)
 rename arch/arm/boot/dts/{infinity-msc313-breadbee_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} (90%)
 rename arch/arm/boot/dts/{infinity3-msc313e.dtsi => mstar-infinity-msc313.dtsi} (87%)
 rename arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity3-msc313e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} (89%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n.dtsi => mstar-infinity3-msc313e.dtsi} (87%)
 rename arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} (84%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n-midrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} (89%)
 rename arch/arm/boot/dts/{infinity-msc313.dtsi => mstar-mercury5-ssc8336n.dtsi} (87%)
 rename arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} (100%)
Signature · 1 line
2.27.0
#1 lore raw

PATCH v2 1/5 ARM: mstar: Select MStar intc

MediaTek recently introduced support for the MStar interrupt controller that is also present in some of their chips as well as the MStar/Sigmastar chips.

Almost all of the peripheral interrupts go through an instance of this controller in MStar/SigmaStar Arm v7 chips so we want to select it if CONFIG_ARCH_MSTARV7 is selected.

---
 arch/arm/mach-mstar/Kconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/mach-mstar/Kconfig +1 -0
index 52744fe32368..576d1ab293c8 100644
@@ -3,6 +3,7 @@ menuconfig ARCH_MSTARV7
 	depends on ARCH_MULTI_V7
 	select ARM_GIC
 	select ARM_HEAVY_MB
+	select MST_IRQ
 	help
 	  Support for newer MStar/Sigmastar SoC families that are
 	  based on Armv7 cores like the Cortex A7 and share the same
Signature · 1 line
2.27.0
#2 lore raw

PATCH v2 2/5 ARM: mstar: Add interrupt controller to base dtsi

In reply to Daniel Palmer

Add the IRQ and FIQ intc instances to the base MStar/SigmaStar v7 dtsi. All of the known SoCs have both and at the same place with their common IPs using the same interrupt lines.

---
 arch/arm/boot/dts/mstar-v7.dtsi | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
arch/arm/boot/dts/mstar-v7.dtsi +19 -0
index 3b7b9b793736..aec841b52ca4 100644
@@ -85,6 +85,25 @@ reboot {
 				mask = <0x79>;
 			};
 
+			intc_fiq: interrupt-controller@201310 {
+				compatible = "mstar,mst-intc";
+				reg = <0x201310 0x40>;
+				#interrupt-cells = <3>;
+				interrupt-controller;
+				interrupt-parent = <&gic>;
+				mstar,irqs-map-range = <96 127>;
+			};
+
+			intc_irq: interrupt-controller@201350 {
+				compatible = "mstar,mst-intc";
+				reg = <0x201350 0x40>;
+				#interrupt-cells = <3>;
+				interrupt-controller;
+				interrupt-parent = <&gic>;
+				mstar,irqs-map-range = <32 95>;
+				mstar,intc-no-eoi;
+			};
+
 			l3bridge: l3bridge@204400 {
 				compatible = "mstar,l3bridge";
 				reg = <0x204400 0x200>;
Signature · 1 line
2.27.0
#3 lore raw

PATCH v2 3/5 ARM: mstar: Add interrupt to pm_uart

In reply to Daniel Palmer

Since we now have support for the interrupt controller pm_uart's interrupt is routed through it make sense to wire up it's interrupt in the device tree.

The interrupt is the same for all known chips so it goes in the base dtsi.

---
 arch/arm/boot/dts/mstar-v7.dtsi | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/mstar-v7.dtsi +1 -0
index aec841b52ca4..f07880561e11 100644
@@ -113,6 +113,7 @@ pm_uart: uart@221000 {
 				compatible = "ns16550a";
 				reg = <0x221000 0x100>;
 				reg-shift = <3>;
+				interrupts-extended = <&intc_irq GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;
 				clock-frequency = <172000000>;
 				status = "disabled";
 			};
Signature · 1 line
2.27.0
#4 lore raw

PATCH v2 4/5 ARM: mstar: Add mstar prefix to all of the dtsi/dts files

In reply to Daniel Palmer

Based on Arnd's comment[0] all of the MStar dtsi/dts files should have had a prefix.

This moves the files, fixes the Makefile that generates dtbs and fixes up the MAINTAINERS entry.

Fixing up some includes in the files themselves is left for a later commit as rolling it into this commit resulted in a confusing diff.

0 - https://lore.kernel.org/linux-arm-kernel/CAK8P3a0maQhfaerwG4KgFZOrUPwueKOp2+MOeG9C=+8ZNzc2Kg@mail.gmail.com/

---
 MAINTAINERS                                                 | 4 +---
 arch/arm/boot/dts/Makefile                                  | 6 +++---
 ...e_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} | 0
 .../{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi}    | 0
 arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi}    | 0
 ...3e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} | 0
 ...{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} | 0
 arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi}  | 0
 ...idrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} | 0
 ...{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} | 0
 arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi}    | 0
 11 files changed, 4 insertions(+), 6 deletions(-)
 rename arch/arm/boot/dts/{infinity-msc313-breadbee_crust.dts => mstar-infinity-msc313-breadbee_crust.dts} (100%)
 rename arch/arm/boot/dts/{infinity-msc313.dtsi => mstar-infinity-msc313.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity.dtsi => mstar-infinity.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity3-msc313e-breadbee.dts => mstar-infinity3-msc313e-breadbee.dts} (100%)
 rename arch/arm/boot/dts/{infinity3-msc313e.dtsi => mstar-infinity3-msc313e.dtsi} (100%)
 rename arch/arm/boot/dts/{infinity3.dtsi => mstar-infinity3.dtsi} (100%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n-midrived08.dts => mstar-mercury5-ssc8336n-midrived08.dts} (100%)
 rename arch/arm/boot/dts/{mercury5-ssc8336n.dtsi => mstar-mercury5-ssc8336n.dtsi} (100%)
 rename arch/arm/boot/dts/{mercury5.dtsi => mstar-mercury5.dtsi} (100%)
MAINTAINERS +1 -3
index 45ec9df85a64..89cf1e4cffb0 100644
@@ -2150,9 +2150,7 @@ L:	[email protected] (moderated for non-subscribers)
 S:	Maintained
 W:	http://linux-chenxing.org/
 F:	Documentation/devicetree/bindings/arm/mstar/*
-F:	arch/arm/boot/dts/infinity*.dtsi
-F:	arch/arm/boot/dts/mercury*.dtsi
-F:	arch/arm/boot/dts/mstar-v7.dtsi
+F:	arch/arm/boot/dts/mstar-*
 F:	arch/arm/mach-mstar/
 
 ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT
arch/arm/boot/dts/Makefile +3 -3
index 4572db3fa5ae..d80d20e6ce9e 100644
@@ -1356,9 +1356,9 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \
 	mt8135-evbp1.dtb
 dtb-$(CONFIG_ARCH_MILBEAUT) += milbeaut-m10v-evb.dtb
 dtb-$(CONFIG_ARCH_MSTARV7) += \
-	infinity-msc313-breadbee_crust.dtb \
-	infinity3-msc313e-breadbee.dtb \
-	mercury5-ssc8336n-midrived08.dtb
+	mstar-infinity-msc313-breadbee_crust.dtb \
+	mstar-infinity3-msc313e-breadbee.dtb \
+	mstar-mercury5-ssc8336n-midrived08.dtb
 dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb
 dtb-$(CONFIG_ARCH_ASPEED) += \
 	aspeed-ast2500-evb.dtb \
arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts renamed from arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity-msc313-breadbee_crust.dts
rename to arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts
arch/arm/boot/dts/mstar-infinity-msc313.dtsi renamed from arch/arm/boot/dts/infinity-msc313.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity-msc313.dtsi
rename to arch/arm/boot/dts/mstar-infinity-msc313.dtsi
arch/arm/boot/dts/mstar-infinity.dtsi renamed from arch/arm/boot/dts/infinity.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity.dtsi
rename to arch/arm/boot/dts/mstar-infinity.dtsi
arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts renamed from arch/arm/boot/dts/infinity3-msc313e-breadbee.dts +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity3-msc313e-breadbee.dts
rename to arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts
arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi renamed from arch/arm/boot/dts/infinity3-msc313e.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity3-msc313e.dtsi
rename to arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi
arch/arm/boot/dts/mstar-infinity3.dtsi renamed from arch/arm/boot/dts/infinity3.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/infinity3.dtsi
rename to arch/arm/boot/dts/mstar-infinity3.dtsi
arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts renamed from arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts +0 -0
similarity index 100%
rename from arch/arm/boot/dts/mercury5-ssc8336n-midrived08.dts
rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts
arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi renamed from arch/arm/boot/dts/mercury5-ssc8336n.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/mercury5-ssc8336n.dtsi
rename to arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi
arch/arm/boot/dts/mstar-mercury5.dtsi renamed from arch/arm/boot/dts/mercury5.dtsi +0 -0
similarity index 100%
rename from arch/arm/boot/dts/mercury5.dtsi
rename to arch/arm/boot/dts/mstar-mercury5.dtsi
Signature · 1 line
2.27.0
#5 lore raw

PATCH v2 5/5 ARM: mstar: Fix up the fallout from moving the dts/dtsi files

In reply to Daniel Palmer

Since the dtsi/dts files have been moved some includes are now broken so this fixes up the includes so the dtbs build again.

---
 arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts | 2 +-
 arch/arm/boot/dts/mstar-infinity-msc313.dtsi               | 2 +-
 arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts     | 2 +-
 arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi             | 2 +-
 arch/arm/boot/dts/mstar-infinity3.dtsi                     | 2 +-
 arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts   | 2 +-
 arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
arch/arm/boot/dts/mstar-infinity-msc313-breadbee_crust.dts +1 -1
index f24c5580d3e4..f9db2ff86f2d 100644
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include "infinity-msc313.dtsi"
+#include "mstar-infinity-msc313.dtsi"
 
 / {
 	model = "BreadBee Crust";
arch/arm/boot/dts/mstar-infinity-msc313.dtsi +1 -1
index 42f2b5552c77..3499fde263be 100644
@@ -4,7 +4,7 @@
  * Author: Daniel Palmer <[email protected]>
  */
 
-#include "infinity.dtsi"
+#include "mstar-infinity.dtsi"
 
 / {
 	memory@20000000 {
arch/arm/boot/dts/mstar-infinity3-msc313e-breadbee.dts +1 -1
index 1f93401c8530..f0eda80a95cc 100644
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include "infinity3-msc313e.dtsi"
+#include "mstar-infinity3-msc313e.dtsi"
 
 / {
 	model = "BreadBee";
arch/arm/boot/dts/mstar-infinity3-msc313e.dtsi +1 -1
index 4e7239afd823..f581b6f89555 100644
@@ -4,7 +4,7 @@
  * Author: Daniel Palmer <[email protected]>
  */
 
-#include "infinity3.dtsi"
+#include "mstar-infinity3.dtsi"
 
 / {
 	memory@20000000 {
arch/arm/boot/dts/mstar-infinity3.dtsi +1 -1
index 9b918c802654..9857e2a9934d 100644
@@ -4,7 +4,7 @@
  * Author: Daniel Palmer <[email protected]>
  */
 
-#include "infinity.dtsi"
+#include "mstar-infinity.dtsi"
 
 &imi {
 	reg = <0xa0000000 0x20000>;
arch/arm/boot/dts/mstar-mercury5-ssc8336n-midrived08.dts +1 -1
index f24bd8cb8e60..7306b737d9c4 100644
@@ -5,7 +5,7 @@
  */
 
 /dts-v1/;
-#include "mercury5-ssc8336n.dtsi"
+#include "mstar-mercury5-ssc8336n.dtsi"
 
 / {
 	model = "70mai Midrive D08";
arch/arm/boot/dts/mstar-mercury5-ssc8336n.dtsi +1 -1
index 7d4a4630c25c..3f5a4c029744 100644
@@ -4,7 +4,7 @@
  * Author: Daniel Palmer <[email protected]>
  */
 
-#include "mercury5.dtsi"
+#include "mstar-mercury5.dtsi"
 
 / {
 	memory@20000000 {
Signature · 1 line
2.27.0
#6 lore raw
In reply to Daniel Palmer
Quoted 13 lines · Daniel Palmer

Mark-PK Tsai's driver for the MStar interrupt controller should be going into 5.10[0].

This small series selects the driver when building support for MStar/SigmaStar Arm v7 SoCs, adds the instances of it to the base dtsi and wires up the interrupt for pm_uart.

Differences from v1:

- Added two extra commits that fix up the file names for the MStar dtsi/dts files as requested by Arnd.

Quoted 6 lines

Daniel Palmer (5):
ARM: mstar: Select MStar intc
ARM: mstar: Add interrupt controller to base dtsi
ARM: mstar: Add interrupt to pm_uart
ARM: mstar: Add mstar prefix to all of the dtsi/dts files
ARM: mstar: Fix up the fallout from moving the dts/dtsi files

Thanks, applied to arm/soc (patch 1), and arm/dt for the rest.

-Olof