mmp3: tidy up interrupt controller references

Drop unnecessary interrupt-parent.

Qualify the names with the bus location so that it's obvious which
interrupt controller do we mean (there also are muxes and possibly a GIC).

Don't include INTC in MUX paths. It is there by accident -- the MUXes
cna happily multiplex interrupts via the GIC as well. This will make it
easier to tidy things up.

8 files changed, 8 insertions, 9 deletions

diff --git a/cpu/arm/mmp2/galcore.fth b/cpu/arm/mmp2/galcore.fth
index 024425a7..7f077f7c 100644
--- a/cpu/arm/mmp2/galcore.fth
+++ b/cpu/arm/mmp2/galcore.fth
@@ -9,7 +9,6 @@ new-device
    " vivante,gc" +compatible
    gpu-pa /gpu reg
    8 encode-int " interrupts" property
-   " /interrupt-controller" encode-phandle " interrupt-parent" property
 
    " /clocks" encode-phandle mmp2-gpu-3d-clk# encode-int encode+
    " /clocks" encode-phandle encode+ mmp2-gpu-bus-clk# encode-int encode+
diff --git a/cpu/arm/mmp2/rtc.fth b/cpu/arm/mmp2/rtc.fth
index 9e9a1064..151d2b3c 100644
--- a/cpu/arm/mmp2/rtc.fth
+++ b/cpu/arm/mmp2/rtc.fth
@@ -7,7 +7,7 @@ purpose: Driver for MMP2 internal RTC
    my-address my-space  h# 1000 reg
 
    d# 1 encode-int  0 encode-int encode+ " interrupts" property
-   " /interrupt-controller/interrupt-controller@154" encode-phandle " interrupt-parent" property
+   " /interrupt-controller@154" encode-phandle " interrupt-parent" property
 
    " rtc 1Hz" encode-string " rtc alarm" encode-string  encode+ " interrupt-names" property
          
diff --git a/cpu/arm/mmp2/twsi-node.fth b/cpu/arm/mmp2/twsi-node.fth
index c24e95f2..5026a363 100644
--- a/cpu/arm/mmp2/twsi-node.fth
+++ b/cpu/arm/mmp2/twsi-node.fth
@@ -13,7 +13,7 @@ new-device
 " mrvl,mmp-twsi" +compatible                       ( baseadr clock# irq# muxed-irq? fast? )
 [if]  0 0  " mrvl,i2c-fast-mode" property  [then]  ( baseadr clock# irq# muxed-irq? )
 [if]
-   " /interrupt-controller/interrupt-controller@158" encode-phandle " interrupt-parent" property
+   " /interrupt-controller@158" encode-phandle " interrupt-parent" property
 [then]                                             ( baseadr clock# irq# )
 " interrupts" integer-property                     ( baseadr clock# )
 
diff --git a/cpu/arm/mmp3/galcore.fth b/cpu/arm/mmp3/galcore.fth
index 7f0d66f6..98f701c7 100644
--- a/cpu/arm/mmp3/galcore.fth
+++ b/cpu/arm/mmp3/galcore.fth
@@ -9,7 +9,7 @@ new-device
    " mrvl,galcore" +compatible
    gpu-pa /gpu reg
    d# 0 encode-int  2 encode-int encode+ " interrupts" property
-   " /interrupt-controller/interrupt-controller@1c0" encode-phandle " interrupt-parent" property
+   " /interrupt-controller@1c0" encode-phandle " interrupt-parent" property
 
    " galcore 3D" encode-string " galcore 2D" encode-string  encode+ " interrupt-names" property
 
diff --git a/cpu/arm/mmp3/thermal.fth b/cpu/arm/mmp3/thermal.fth
index 4921692d..607cd586 100644
--- a/cpu/arm/mmp3/thermal.fth
+++ b/cpu/arm/mmp3/thermal.fth
@@ -7,7 +7,7 @@ purpose: Driver for the MMP3 thermal sensor
    my-address my-space  h# 1000 reg
 
    d# 11 encode-int " interrupts" property
-   " /interrupt-controller/interrupt-controller@188" encode-phandle " interrupt-parent" property
+   " /interrupt-controller@188" encode-phandle " interrupt-parent" property
 
    " /clocks" encode-phandle
       mmp2-thermal0-clk# encode-int encode+
diff --git a/cpu/arm/olpc/build-fw.fth b/cpu/arm/olpc/build-fw.fth
index 63441573..a05aac95 100644
--- a/cpu/arm/olpc/build-fw.fth
+++ b/cpu/arm/olpc/build-fw.fth
@@ -406,8 +406,8 @@ warning @ warning off
       ['] ec-name$  catch  0=  if  " ec-name" string-property  then
       ['] ec-date$  catch  0=  if  " ec-date" string-property  then
       ['] ec-user$  catch  0=  if  " ec-user" string-property  then
-      " /interrupt-controller" encode-phandle " interrupt-parent" property
-\      " /interrupt-controller"  find-package  if
+      " /interrupt-controller@d4282000" encode-phandle " interrupt-parent" property
+\      " /interrupt-controller@d4282000"  find-package  if
 \         " interrupt-parent" integer-property
 \      then
       0 0 " ranges" property
diff --git a/cpu/arm/olpc/cl4/sdhci.fth b/cpu/arm/olpc/cl4/sdhci.fth
index 9e390b3e..9d7f5f17 100644
--- a/cpu/arm/olpc/cl4/sdhci.fth
+++ b/cpu/arm/olpc/cl4/sdhci.fth
@@ -37,7 +37,7 @@ dev /sd  \ MMC5 - internal micro-SD
       " mrvl,pxav3-mmc" +compatible
       d# 15 encode-int " clk-delay-cycles" property
       fload ${BP}/dev/mmc/sdhci/slot.fth
-      " /interrupt-controller/interrupt-controller@184" encode-phandle " interrupt-parent" property
+      " /interrupt-controller@184" encode-phandle " interrupt-parent" property
       d# 0 " interrupts" integer-property
 
       \ The media is considered non-removable (at run-time) since the slot is
diff --git a/dev/olpc/mmp2camera/loadpkg.fth b/dev/olpc/mmp2camera/loadpkg.fth
index 150723af..5e8a5402 100644
--- a/dev/olpc/mmp2camera/loadpkg.fth
+++ b/dev/olpc/mmp2camera/loadpkg.fth
@@ -6,7 +6,7 @@
    " /clocks" encode-phandle mmp2-ccic0-clk# encode-int encode+ " clocks" property
 [ifdef] mmp3
    \ The CCIC interrupt is shared between CCIC1 and CCIC2 on MMP3
-   " /interrupt-controller/interrupt-controller@1cc" encode-phandle " interrupt-parent" property
+   " /interrupt-controller@1cc" encode-phandle " interrupt-parent" property
    1 " interrupts" integer-property
 [else]
    d# 42 " interrupts" integer-property