riscv: dts: microchip: update pic64gx gpio interrupts to better match the SoC

Just like PolarFire SoC, the same issues with GPIO interrupts exist in
the pic64gx, due to their similarity. Yoinking from the commit message
for the same change for PolarFire SoC:

There are 3 GPIO controllers on this SoC, of which:
- GPIO controller 0 has 14 GPIOs
- GPIO controller 1 has 24 GPIOs
- GPIO controller 2 has 32 GPIOs

All GPIOs are capable of generating interrupts, for a total of 70.
There are only 41 IRQs available however, so a configurable mux is used
to ensure all GPIOs can be used for interrupt generation.
38 of the 41 interrupts are in what the documentation calls "direct
mode", as they provide an exclusive connection from a GPIO to the PLIC.
The 3 remaining interrupts are used to mux the interrupts which do not
have a exclusive connection, one for each GPIO controller.

The mux was overlooked when the bindings and driver were originally
written for the GPIO controllers on Polarfire SoC, and the interrupts
property in the GPIO nodes used to try and convey what the mapping was.
Instead, the mux should be a device in its own right, and the GPIO
controllers should be connected to it, rather than to the PLIC.
Now that a binding exists for that mux, fix the inaccurate description
of the interrupt controller hierarchy.

Signed-off-by: Conor Dooley <conor.dooley@microchip.com>

diff --git a/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts b/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts
index 2f2ccd77af30ab804e59bebec70505e69016f17a..ed3ff03f3b11b7597c22192cc8c01db359a14d63 100644 (file)
--- a/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts
+++ b/arch/riscv/boot/dts/microchip/pic64gx-curiosity-kit.dts
@@ -63,10 +63,6 @@
 };
 
 &gpio0 {
-       interrupts = <13>, <14>, <15>, <16>,
-                    <17>, <18>, <19>, <20>,
-                    <21>, <22>, <23>, <24>,
-                    <25>, <26>;
        status ="okay";
        gpio-line-names =
                "", "", "", "", "", "", "", "",
@@ -74,12 +70,6 @@
 };
 
 &gpio1 {
-       interrupts = <27>, <28>, <29>, <30>,
-                    <31>, <32>, <33>, <34>,
-                    <35>, <36>, <37>, <38>,
-                    <39>, <40>, <41>, <42>,
-                    <43>, <44>, <45>, <46>,
-                    <47>, <48>, <49>, <50>;
        status ="okay";
        gpio-line-names =
                "", "", "LED1", "LED2", "LED3", "LED4", "LED5", "LED6",
@@ -88,14 +78,6 @@
 };
 
 &gpio2 {
-       interrupts = <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>;
        pinctrl-names = "default";
        pinctrl-0 = <&mdio1_gpio>, <&spi0_gpio>, <&can0_gpio>, <&pcie_gpio>,
                    <&qspi_gpio>, <&uart3_gpio>, <&uart4_gpio>, <&can1_gpio>;
@@ -107,6 +89,35 @@
                "DIP4", "USR_IO11", "", "", "SWITCH1", "", "", "";
 };
 
+&irqmux {
+       interrupt-map = <0 &plic 13>, <1 &plic 14>, <2 &plic 15>,
+                       <3 &plic 16>, <4 &plic 17>, <5 &plic 18>,
+                       <6 &plic 19>, <7 &plic 20>, <8 &plic 21>,
+                       <9 &plic 22>, <10 &plic 23>, <11 &plic 24>,
+                       <12 &plic 25>, <13 &plic 26>,
+
+                       <32 &plic 27>, <33 &plic 28>, <34 &plic 29>,
+                       <35 &plic 30>, <36 &plic 31>, <37 &plic 32>,
+                       <38 &plic 33>, <39 &plic 34>, <40 &plic 35>,
+                       <41 &plic 36>, <42 &plic 37>, <43 &plic 38>,
+                       <44 &plic 39>, <45 &plic 40>, <46 &plic 41>,
+                       <47 &plic 42>, <48 &plic 43>, <49 &plic 44>,
+                       <50 &plic 45>, <51 &plic 46>, <52 &plic 47>,
+                       <53 &plic 48>, <54 &plic 49>, <55 &plic 50>,
+
+                       <64 &plic 53>, <65 &plic 53>, <66 &plic 53>,
+                       <67 &plic 53>, <68 &plic 53>, <69 &plic 53>,
+                       <70 &plic 53>, <71 &plic 53>, <72 &plic 53>,
+                       <73 &plic 53>, <74 &plic 53>, <75 &plic 53>,
+                       <76 &plic 53>, <77 &plic 53>, <78 &plic 53>,
+                       <79 &plic 53>, <80 &plic 53>, <81 &plic 53>,
+                       <82 &plic 53>, <83 &plic 53>, <84 &plic 53>,
+                       <85 &plic 53>, <86 &plic 53>, <87 &plic 53>,
+                       <88 &plic 53>, <89 &plic 53>, <90 &plic 53>,
+                       <91 &plic 53>, <92 &plic 53>, <93 &plic 53>,
+                       <94 &plic 53>, <95 &plic 53>;
+};
+
 &mac0 {
        status = "okay";
        phy-mode = "sgmii";

diff --git a/arch/riscv/boot/dts/microchip/pic64gx.dtsi b/arch/riscv/boot/dts/microchip/pic64gx.dtsi
index e9ec376b1776b61949fc19f2547f85ce4b9d3eb6..5cf3e3de0e0673cfbd31ef45a2d7f301d93bb809 100644 (file)
--- a/arch/riscv/boot/dts/microchip/pic64gx.dtsi
+++ b/arch/riscv/boot/dts/microchip/pic64gx.dtsi
@@ -295,6 +295,14 @@
                        #size-cells = <1>;
                        #reset-cells = <1>;
 
+                       irqmux: interrupt-controller@54 {
+                               compatible = "microchip,pic64gx-irqmux", "microchip,mpfs-irqmux";
+                               reg = <0x54 0x4>;
+                               #address-cells = <0>;
+                               #interrupt-cells = <1>;
+                               interrupt-map-mask = <0x7f>;
+                       };
+
                        iomux0: pinctrl@200 {
                                compatible = "microchip,pic64gx-pinctrl-iomux0",
                                             "microchip,mpfs-pinctrl-iomux0";
@@ -484,9 +492,13 @@
                gpio0: gpio@20120000 {
                        compatible = "microchip,pic64gx-gpio", "microchip,mpfs-gpio";
                        reg = <0x0 0x20120000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
+                       interrupt-parent = <&irqmux>;
                        interrupt-controller;
                        #interrupt-cells = <1>;
+                       interrupts = <0>, <1>, <2>, <3>,
+                                    <4>, <5>, <6>, <7>,
+                                    <8>, <9>, <10>, <11>,
+                                    <12>, <13>;
                        clocks = <&clkcfg CLK_GPIO0>;
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -497,9 +509,15 @@
                gpio1: gpio@20121000 {
                        compatible = "microchip,pic64gx-gpio", "microchip,mpfs-gpio";
                        reg = <0x0 0x20121000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
+                       interrupt-parent = <&irqmux>;
                        interrupt-controller;
                        #interrupt-cells = <1>;
+                       interrupts = <32>, <33>, <34>, <35>,
+                                    <36>, <37>, <38>, <39>,
+                                    <40>, <41>, <42>, <43>,
+                                    <44>, <45>, <46>, <47>,
+                                    <48>, <49>, <50>, <51>,
+                                    <52>, <53>, <54>, <55>;
                        clocks = <&clkcfg CLK_GPIO1>;
                        gpio-controller;
                        #gpio-cells = <2>;
@@ -510,9 +528,17 @@
                gpio2: gpio@20122000 {
                        compatible = "microchip,pic64gx-gpio", "microchip,mpfs-gpio";
                        reg = <0x0 0x20122000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
+                       interrupt-parent = <&irqmux>;
                        interrupt-controller;
                        #interrupt-cells = <1>;
+                       interrupts = <64>, <65>, <66>, <67>,
+                                    <68>, <69>, <70>, <71>,
+                                    <72>, <73>, <74>, <75>,
+                                    <76>, <77>, <78>, <79>,
+                                    <80>, <81>, <82>, <83>,
+                                    <84>, <85>, <86>, <87>,
+                                    <88>, <89>, <90>, <91>,
+                                    <92>, <93>, <94>, <95>;
                        clocks = <&clkcfg CLK_GPIO2>;
                        gpio-controller;
                        #gpio-cells = <2>;